summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2012-06-08 19:37:29 +0000
committerParabola <dev@list.parabolagnulinux.org>2012-06-08 19:37:29 +0000
commit8735a5c54cf26dd5b5b686850f800a4aed49ff78 (patch)
treeac7404dae428201298c7fed6e3b5360443763694 /core
parent7d11e9346ebd0f9c378952caee0c82d6ca815f4e (diff)
Fri Jun 8 19:37:17 UTC 2012
Diffstat (limited to 'core')
-rw-r--r--core/libusb/PKGBUILD30
-rw-r--r--core/pinentry/gtk2-pinentry-segfault.patch11
-rw-r--r--core/procps-ng/complain_unmounted_proc.patch17
-rw-r--r--core/procps-ng/gnu-kbsd-version.patch38
-rw-r--r--core/procps-ng/includes_restrict.patch144
-rw-r--r--core/procps-ng/makefile_watch_ncurses.patch11
-rw-r--r--core/procps-ng/sig_printf_literal.patch11
-rw-r--r--core/procps-ng/sysctl_man.patch20
-rw-r--r--core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch79
-rw-r--r--core/udev/0002-reinstate-TIMEOUT-handling.patch146
-rw-r--r--core/udev/PKGBUILD76
-rw-r--r--core/udev/initcpio-hooks-udev20
-rw-r--r--core/udev/initcpio-install-udev26
-rw-r--r--core/udev/udev.install59
14 files changed, 0 insertions, 688 deletions
diff --git a/core/libusb/PKGBUILD b/core/libusb/PKGBUILD
deleted file mode 100644
index 801cd583b..000000000
--- a/core/libusb/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 157958 2012-04-30 07:20:00Z tpowa $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=libusb
-pkgver=1.0.9
-pkgrel=1
-depends=('glibc')
-pkgdesc="Library to enable user space application programs to communicate with USB devices."
-arch=(i686 x86_64)
-url="http://libusb.sourceforge.net/"
-license=('LGPL')
-source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2)
-options=(!libtool)
-replaces=(libusb1)
-md5sums=('7f5a02375ad960d4e33a6dae7d63cfcb')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make check
-}
-
-package () {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/core/pinentry/gtk2-pinentry-segfault.patch b/core/pinentry/gtk2-pinentry-segfault.patch
deleted file mode 100644
index c0b9fb4ca..000000000
--- a/core/pinentry/gtk2-pinentry-segfault.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk+-2/pinentry-gtk-2.c.orig 2010-03-03 05:19:55.000000000 -0600
-+++ gtk+-2/pinentry-gtk-2.c 2010-07-07 00:11:30.413572124 -0500
-@@ -145,7 +145,7 @@
- {
- gdk_keyboard_ungrab (gdk_event_get_time (event));
- /* Unmake window transient for the root window. */
-- gdk_window_set_transient_for (win->window, NULL);
-+ gdk_property_delete (win->window, gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
- }
-
-
diff --git a/core/procps-ng/complain_unmounted_proc.patch b/core/procps-ng/complain_unmounted_proc.patch
deleted file mode 100644
index ed932dbba..000000000
--- a/core/procps-ng/complain_unmounted_proc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: <hesso@hesso.pool.math.tu-berlin.de>
-Description: Complain when /proc/version cannot be found instead of
-exiting silently.
---- a/proc/version.c
-+++ b/proc/version.c
-@@ -33,8 +33,10 @@
- char buf[256];
- int version_string_depth;
-
-- if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */
-+ if ( (fp=fopen("/proc/version","r")) == NULL) {
-+ fprintf(stderr, "Cannot find /proc/version - is /proc mounted?\n");
- exit(1);
-+ }
- if (fgets(buf, 256, fp) == NULL) {
- fprintf(stderr, "Cannot read kernel version from /proc/version\n");
- fclose(fp);
diff --git a/core/procps-ng/gnu-kbsd-version.patch b/core/procps-ng/gnu-kbsd-version.patch
deleted file mode 100644
index f310a4c93..000000000
--- a/core/procps-ng/gnu-kbsd-version.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Author: <csmall@debian.org>
-Description: Rework version parsing so its ok with other OSes
---- a/proc/version.c
-+++ b/proc/version.c
-@@ -28,20 +28,26 @@
- int linux_version_code;
-
- void init_Linux_version(void) {
-- static struct utsname uts;
- int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */
-+ FILE *fp;
-+ char buf[256];
- int version_string_depth;
-
-- if (uname(&uts) == -1) /* failure implies impending death */
-- exit(1);
--
-- version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z);
-+ if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */
-+ exit(1);
-+ if (fgets(buf, 256, fp) == NULL) {
-+ fprintf(stderr, "Cannot read kernel version from /proc/version\n");
-+ fclose(fp);
-+ exit(1);
-+ }
-+ fclose(fp);
-+ version_string_depth = sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z);
-
- if ((version_string_depth < 2) || /* Non-standard for all known kernels */
- ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */
- fprintf(stderr, /* *very* unlikely to happen by accident */
- "Non-standard uts for running kernel:\n"
-- "release %s=%d.%d.%d gives version code %d\n",
-- uts.release, x, y, z, LINUX_VERSION(x,y,z));
-+ "%s=%d.%d.%d gives version code %d\n",
-+ buf, x, y, z, LINUX_VERSION(x,y,z));
- linux_version_code = LINUX_VERSION(x, y, z);
- }
diff --git a/core/procps-ng/includes_restrict.patch b/core/procps-ng/includes_restrict.patch
deleted file mode 100644
index 417e93223..000000000
--- a/core/procps-ng/includes_restrict.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Author: Craig Small <csmall@debian.org>
-Description: Change restrict to __restrict
- procps automake defines restrict which means the binaries for procps
- binaries compile. However external programs may not of defined
- restrict. includes from libc6 use __restrict and if is good enough for
- them, its good enough for us.
-
---- a/proc/devname.h
-+++ b/proc/devname.h
-@@ -10,9 +10,9 @@
- #define ABBREV_TTY 2 /* remove tty */
- #define ABBREV_PTS 4 /* remove pts/ */
-
--extern unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags);
-+extern unsigned dev_to_tty(char *__restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags);
-
--extern int tty_to_dev(const char *restrict const name);
-+extern int tty_to_dev(const char *__restrict const name);
-
- EXTERN_C_END
- #endif
---- a/proc/escape.h
-+++ b/proc/escape.h
-@@ -14,10 +14,10 @@
- #define ESC_BRACKETS 0x2 // if using cmd, put '[' and ']' around it
- #define ESC_DEFUNCT 0x4 // mark zombies with " <defunct>"
-
--extern int escape_strlist(char *restrict dst, char *restrict const *restrict src, size_t n, int *cells);
--extern int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *maxcells);
--extern int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int *cells, unsigned flags);
--extern int escaped_copy(char *restrict dst, const char *restrict src, int bufsize, int *maxroom);
-+extern int escape_strlist(char *__restrict dst, char *__restrict const *__restrict src, size_t n, int *cells);
-+extern int escape_str(char *__restrict dst, const char *__restrict src, int bufsize, int *maxcells);
-+extern int escape_command(char *__restrict const outbuf, const proc_t *__restrict const pp, int bytes, int *cells, unsigned flags);
-+extern int escaped_copy(char *__restrict dst, const char *__restrict src, int bufsize, int *maxroom);
-
- EXTERN_C_END
- #endif
---- a/proc/procps.h
-+++ b/proc/procps.h
-@@ -103,6 +103,6 @@
- #endif
-
-
--typedef void (*message_fn)(const char *restrict, ...) __attribute__((format(printf,1,2)));
-+typedef void (*message_fn)(const char *__restrict, ...) __attribute__((format(printf,1,2)));
-
- #endif
---- a/proc/readproc.h
-+++ b/proc/readproc.h
-@@ -173,10 +173,10 @@
- // char deBug1[64];
- pid_t taskdir_user; // for threads
- int did_fake; // used when taskdir is missing
-- int(*finder)(struct PROCTAB *restrict const, proc_t *restrict const);
-- proc_t*(*reader)(struct PROCTAB *restrict const, proc_t *restrict const);
-- int(*taskfinder)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const);
-- proc_t*(*taskreader)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const);
-+ int(*finder)(struct PROCTAB *__restrict const, proc_t *__restrict const);
-+ proc_t*(*reader)(struct PROCTAB *__restrict const, proc_t *__restrict const);
-+ int(*taskfinder)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const);
-+ proc_t*(*taskreader)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const);
- pid_t* pids; // pids of the procs
- uid_t* uids; // uids of procs
- int nuid; // cannot really sentinel-terminate unsigned short[]
-@@ -200,8 +200,8 @@
- int ntask; // * readproctab2
- } proc_data_t; // * when PROC_LOOSE_TASKS set
-
--extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *restrict const PT);
--extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *restrict const PT);
-+extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT);
-+extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT);
-
- // Convenient wrapper around openproc and readproc to slurp in the whole process
- // table subset satisfying the constraints of flags and the optional PID list.
-@@ -222,12 +222,12 @@
- // only before first use. Thereafter, the library will manage such
- // a passed proc_t, freeing any additional acquired memory associated
- // with the previous process or thread.
--extern proc_t* readproc(PROCTAB *restrict const PT, proc_t *restrict p);
--extern proc_t* readtask(PROCTAB *restrict const PT, const proc_t *restrict const p, proc_t *restrict t);
--extern proc_t* readeither(PROCTAB *restrict const PT, proc_t *restrict x);
-+extern proc_t* readproc(PROCTAB *__restrict const PT, proc_t *__restrict p);
-+extern proc_t* readtask(PROCTAB *__restrict const PT, const proc_t *__restrict const p, proc_t *__restrict t);
-+extern proc_t* readeither(PROCTAB *__restrict const PT, proc_t *__restrict x);
-
- // warning: interface may change
--extern int read_cmdline(char *restrict const dst, unsigned sz, unsigned pid);
-+extern int read_cmdline(char *__restrict const dst, unsigned sz, unsigned pid);
-
- extern void look_up_our_self(proc_t *p);
-
---- a/proc/sig.h
-+++ b/proc/sig.h
-@@ -16,13 +16,13 @@
- EXTERN_C_BEGIN
-
- /* return -1 on failure */
--extern int signal_name_to_number(const char *restrict name);
-+extern int signal_name_to_number(const char *__restrict name);
-
- extern const char *signal_number_to_name(int signo);
-
--extern int print_given_signals(int argc, const char *restrict const *restrict argv, int max_line);
-+extern int print_given_signals(int argc, const char *__restrict const *__restrict argv, int max_line);
-
--extern char *strtosig(const char *restrict s);
-+extern char *strtosig(const char *__restrict s);
-
- extern void pretty_print_signals(void);
-
---- a/proc/sysinfo.h
-+++ b/proc/sysinfo.h
-@@ -57,11 +57,11 @@
-
- #define BUFFSIZE (64*1024)
- typedef unsigned long long jiff;
--extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz,
-- unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout,
-- unsigned *restrict intr, unsigned *restrict ctxt,
-- unsigned int *restrict running, unsigned int *restrict blocked,
-- unsigned int *restrict btime, unsigned int *restrict processes);
-+extern void getstat(jiff *__restrict cuse, jiff *__restrict cice, jiff *__restrict csys, jiff *__restrict cide, jiff *__restrict ciow, jiff *__restrict cxxx, jiff *__restrict cyyy, jiff *__restrict czzz,
-+ unsigned long *__restrict pin, unsigned long *__restrict pout, unsigned long *__restrict s_in, unsigned long *__restrict sout,
-+ unsigned *__restrict intr, unsigned *__restrict ctxt,
-+ unsigned int *__restrict running, unsigned int *__restrict blocked,
-+ unsigned int *__restrict btime, unsigned int *__restrict processes);
-
- extern void meminfo(void);
-
---- a/proc/wchan.h
-+++ b/proc/wchan.h
-@@ -6,8 +6,8 @@
- EXTERN_C_BEGIN
-
- extern const char * lookup_wchan(unsigned KLONG address, unsigned pid);
--extern int open_psdb(const char *restrict override);
--extern int open_psdb_message(const char *restrict override, message_fn message);
-+extern int open_psdb(const char *__restrict override);
-+extern int open_psdb_message(const char *__restrict override, message_fn message);
-
- EXTERN_C_END
-
diff --git a/core/procps-ng/makefile_watch_ncurses.patch b/core/procps-ng/makefile_watch_ncurses.patch
deleted file mode 100644
index 08d70bdc7..000000000
--- a/core/procps-ng/makefile_watch_ncurses.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -383,7 +383,7 @@
- @WITH_NCURSES_TRUE@slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c
- @WITH_NCURSES_TRUE@slabtop_LDADD = @NCURSES_LIBS@
- @WITH_NCURSES_TRUE@watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c
--@WITH_NCURSES_TRUE@watch_LDADD = @NCURSES_LIBS@
-+@WITH_NCURSES_TRUE@watch_LDADD = @WATCH_NCURSES_LIBS@
- kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
- skill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
- snice_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
diff --git a/core/procps-ng/sig_printf_literal.patch b/core/procps-ng/sig_printf_literal.patch
deleted file mode 100644
index 2140abf0d..000000000
--- a/core/procps-ng/sig_printf_literal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/proc/sig.c
-+++ b/proc/sig.c
-@@ -257,7 +257,7 @@
- while(++i <= number_of_signals){
- int n;
- n = printf("%2d %s", i, signal_number_to_name(i));
-- if(n>0 && i%7) printf(" \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
-+ if(n>0 && i%7) printf("%s", " \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n);
- else printf("\n");
- }
- if((i-1)%7) printf("\n");
diff --git a/core/procps-ng/sysctl_man.patch b/core/procps-ng/sysctl_man.patch
deleted file mode 100644
index d6023edfb..000000000
--- a/core/procps-ng/sysctl_man.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/sysctl.8
-+++ b/sysctl.8
-@@ -55,7 +55,7 @@
- \fB\-w\fR, \fB\-\-write\fR
- Use this option when you want to change a sysctl setting.
- .TP
--\fB\-p\fR, \fB\-\-load\fR[=\fIFILE\fR]
-+\fB\-p\fR[\fIFILE\fR], \fB\-\-load\fR[=\fIFILE\fR]
- Load in sysctl settings from the file specified or /etc/sysctl.conf if none
- given. Specifying \- as filename means reading data from standard input.
- .TP
-@@ -117,7 +117,7 @@
- .br
- /sbin/sysctl \-w kernel.domainname="example.com"
- .br
--/sbin/sysctl \-p /etc/sysctl.conf
-+/sbin/sysctl \-p/etc/sysctl.conf
- .br
- /sbin/sysctl \-a \-\-pattern forward
- .br
diff --git a/core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch b/core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
deleted file mode 100644
index 7873dc337..000000000
--- a/core/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 12250c0acf747d4ed538927ad7604356b93fb444 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sat, 3 Mar 2012 12:28:15 +0100
-Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev
-
-This means we don't need a flagday in order to move udev to use
-/usr/lib/udev/rules.d
----
- src/libudev.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/src/libudev.c b/src/libudev.c
-index d954dae..4da6309 100644
---- a/src/libudev.c
-+++ b/src/libudev.c
-@@ -43,8 +43,8 @@ struct udev {
- void *userdata;
- char *sys_path;
- char *dev_path;
-- char *rules_path[4];
-- unsigned long long rules_path_ts[4];
-+ char *rules_path[5];
-+ unsigned long long rules_path_ts[5];
- int rules_path_count;
- char *run_path;
- struct udev_list properties_list;
-@@ -255,9 +255,14 @@ UDEV_EXPORT struct udev *udev_new(void)
- goto err;
-
- if (udev->rules_path[0] == NULL) {
-- /* /usr/lib/udev -- system rules */
-- udev->rules_path[0] = strdup(PKGLIBEXECDIR "/rules.d");
-+ /* /lib/udev -- compat for system rules */
-+ udev->rules_path[0] = strdup("/lib/udev/rules.d");
- if (!udev->rules_path[0])
-+ goto err;
-+
-+ /* /usr/lib/udev -- system rules */
-+ udev->rules_path[1] = strdup(PKGLIBEXECDIR "/rules.d");
-+ if (!udev->rules_path[1])
- goto err;
-
- /* /run/udev -- runtime rules */
-@@ -265,11 +270,11 @@ UDEV_EXPORT struct udev *udev_new(void)
- goto err;
-
- /* /etc/udev -- local administration rules */
-- udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d");
-- if (!udev->rules_path[1])
-+ udev->rules_path[3] = strdup(SYSCONFDIR "/udev/rules.d");
-+ if (!udev->rules_path[3])
- goto err;
-
-- udev->rules_path_count = 3;
-+ udev->rules_path_count = 4;
- }
-
- dbg(udev, "context %p created\n", udev);
-@@ -278,7 +283,8 @@ UDEV_EXPORT struct udev *udev_new(void)
- dbg(udev, "dev_path='%s'\n", udev->dev_path);
- dbg(udev, "sys_path='%s'\n", udev->sys_path);
- dbg(udev, "run_path='%s'\n", udev->run_path);
-- dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]);
-+ dbg(udev, "rules_path='%s':'%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1],
-+ udev->rules_path[2], udev->rules_path[3]);
- free(config_file);
- return udev;
- err:
-@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev)
- free(udev->rules_path[0]);
- free(udev->rules_path[1]);
- free(udev->rules_path[2]);
-+ free(udev->rules_path[3]);
- free(udev->run_path);
- dbg(udev, "context %p released\n", udev);
- free(udev);
---
-1.7.10
-
diff --git a/core/udev/0002-reinstate-TIMEOUT-handling.patch b/core/udev/0002-reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index edbbf1d32..000000000
--- a/core/udev/0002-reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 629d840316280cffcc724fac41047374a7685490 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Thu, 15 Mar 2012 02:12:43 +0100
-Subject: [PATCH 2/2] reinstate TIMEOUT= handling
-
-Without treating events with timeouts specially some drivers would cause a
-30 seconds stall on boot: .
-
-I also received reports of some drivers not working at all, even after the
-timeout.
-
-We will remove this patch when more drivers have been fixed in the kernel (3.4?).
-
-This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and
-57c6f8ae5f52a6e8ffc66a54966346f733dded39.
----
- TODO | 2 ++
- src/libudev-device.c | 19 +++++++++++++++++++
- src/libudev-private.h | 1 +
- src/udevd.c | 13 ++++++++++---
- 4 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/TODO b/TODO
-index 8b8b9c8..3d26e89 100644
---- a/TODO
-+++ b/TODO
-@@ -7,6 +7,8 @@
-
- - move /usr/lib/udev/devices/ to tmpfiles
-
-+ - remove TIMEOUT= handling
-+
- - trigger --subsystem-match=usb/usb_device
-
- - kill rules_generator
-diff --git a/src/libudev-device.c b/src/libudev-device.c
-index 10f28b8..639c367 100644
---- a/src/libudev-device.c
-+++ b/src/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
- struct udev_list tags_list;
- unsigned long long int seqnum;
- unsigned long long int usec_initialized;
-+ int timeout;
- int devlink_priority;
- int refcount;
- dev_t devnum;
-@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum)
- return 0;
- }
-
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+ return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+ char num[32];
-+
-+ udev_device->timeout = timeout;
-+ snprintf(num, sizeof(num), "%u", timeout);
-+ udev_device_add_property(udev_device, "TIMEOUT", num);
-+ return 0;
-+}
-+
- const char *udev_device_get_devpath_old(struct udev_device *udev_device)
- {
- return udev_device->devpath_old;
-@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
- udev_device_set_devpath_old(udev_device, &property[12]);
- } else if (strncmp(property, "SEQNUM=", 7) == 0) {
- udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10));
-+ } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
- } else if (strncmp(property, "IFINDEX=", 8) == 0) {
- udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10));
- } else if (strncmp(property, "DEVMODE=", 8) == 0) {
-@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev)
- udev_list_init(udev, &udev_device->sysattr_value_list, true);
- udev_list_init(udev, &udev_device->sysattr_list, false);
- udev_list_init(udev, &udev_device->tags_list, true);
-+ udev_device->timeout = -1;
- udev_device->watch_handle = -1;
- /* copy global properties */
- udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev-private.h b/src/libudev-private.h
-index 5f5c64a..ec63b67 100644
---- a/src/libudev-private.h
-+++ b/src/libudev-private.h
-@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udevd.c b/src/udevd.c
-index 1702217..88e9272 100644
---- a/src/udevd.c
-+++ b/src/udevd.c
-@@ -401,7 +401,7 @@ out:
- }
- }
-
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
- struct udev_list_node *loop;
-
-@@ -427,7 +427,7 @@ static void event_run(struct event *event)
- return;
- }
-
-- if (children >= children_max) {
-+ if (!force && children >= children_max) {
- if (children_max > 1)
- info(event->udev, "maximum number (%i) of children reached\n", children);
- return;
-@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev)
-
- event->state = EVENT_QUEUED;
- udev_list_node_append(&event->node, &event_list);
-+
-+ /* run all events with a timeout set immediately */
-+ if (udev_device_get_timeout(dev) > 0) {
-+ event_run(event, true);
-+ return 0;
-+ }
-+
- return 0;
- }
-
-@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev)
- continue;
- }
-
-- event_run(event);
-+ event_run(event, false);
- }
- }
-
---
-1.7.10
-
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
deleted file mode 100644
index 9916a3a9c..000000000
--- a/core/udev/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 159406 2012-05-23 20:09:27Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=udev
-pkgver=182
-pkgrel=4
-pkgdesc="The userspace dev tools (udev)"
-depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash' 'acl')
-install=udev.install
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('gobject-introspection' 'gperf' 'libxslt')
-source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz
- 0001-split-usr-always-read-config-files-from-lib-udev.patch
- 0002-reinstate-TIMEOUT-handling.patch
- initcpio-hooks-udev
- initcpio-install-udev)
-url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
-backup=(etc/udev/udev.conf)
-groups=('base')
-options=(!makeflags !libtool)
-md5sums=('023877e6cc0d907994b8c648beab542b'
- '0fa3eac115ad0140af1582d941b15f2c'
- '94b816896bf23275c0598fc8e07270c3'
- 'e433c11d38cf4f877b41d06e2753ebe0'
- 'e6faf4c3fe456f10d8efd2487d5e3cb7')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- patch -p1 -i ../0001-split-usr-always-read-config-files-from-lib-udev.patch
- patch -p1 -i ../0002-reinstate-TIMEOUT-handling.patch
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --with-systemdsystemunitdir=/usr/lib/systemd/system \
- --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \
- --with-usb-ids-path=/usr/share/hwdata/usb.ids \
- --with-pci-ids-path=/usr/share/hwdata/pci.ids
-
- make
-}
-
-check() {
- make -C "$pkgname-$pkgver" check
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=${pkgdir} install
-
- # install the mkinitpcio hook
- install -D -m644 ../initcpio-hooks-udev ${pkgdir}/usr/lib/initcpio/hooks/udev
- install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev
-
- # udevd moved, symlink to make life easy for restarting udevd manually
- ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd
-
- # the path to udevadm is hardcoded in some places
- install -d ${pkgdir}/sbin
- ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm
-
- # fix wrong path to /bin/sh
- sed -i -e 's#/usr/bin/sh#/bin/sh#g' $pkgdir/usr/lib/udev/keyboard-force-release.sh
-
- # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
- for i in $pkgdir/usr/lib/udev/rules.d/*.rules; do
- sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
- s#GROUP="tape"#GROUP="storage"#g;
- s#GROUP="cdrom"#GROUP="optical"#g' $i
- done
-}
diff --git a/core/udev/initcpio-hooks-udev b/core/udev/initcpio-hooks-udev
deleted file mode 100644
index 313a88130..000000000
--- a/core/udev/initcpio-hooks-udev
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
- /usr/lib/udev/udevd --daemon --resolve-names=never
- udevd_running=1
-}
-
-run_hook() {
- msg ":: Triggering uevents..."
- udevadm trigger --action=add --type=subsystems
- udevadm trigger --action=add --type=devices
- udevadm settle
-}
-
-run_cleanuphook() {
- udevadm control --exit
- udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/udev/initcpio-install-udev b/core/udev/initcpio-install-udev
deleted file mode 100644
index e33664459..000000000
--- a/core/udev/initcpio-install-udev
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-build() {
- add_file "/etc/udev/udev.conf"
- add_binary /usr/lib/udev/udevd
- add_binary /usr/bin/udevadm
-
- for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
- add_file "/usr/lib/udev/rules.d/$rules"
- done
- for tool in ata_id scsi_id; do
- add_file "/usr/lib/udev/$tool"
- done
-
- add_runscript
-}
-
-help() {
- cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/udev/udev.install b/core/udev/udev.install
deleted file mode 100644
index 557efe9e1..000000000
--- a/core/udev/udev.install
+++ /dev/null
@@ -1,59 +0,0 @@
-# arg 1: the new package version
-# arg 2: the old package version
-
-post_upgrade() {
- if [ "$(vercmp $2 181-3)" -lt 0 ]; then
- echo "udev changes:"
- if [ "$(vercmp $2 168)" -lt 0 ]; then
- echo " * Kernel 2.6.32 or newer is now required."
- echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed."
- echo " * Arch specific cd symlinks are now no longer created."
- echo " * cd and net persistent rules will no longer be autogenerated,"
- echo " see <https://wiki.archlinux.org/index.php/Udev> for details."
- echo " * Errors are now logged (possibly to the console) by default."
- fi
- if [ "$(vercmp $2 171)" -lt 0 ]; then
- echo " * Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and"
- echo " blacklisting in MODULES no longer works."
- echo " See 'man modprobe.conf' for a replacement to blacklisting."
- echo " To disable a module mod1 on the kernel command line, use"
- echo " mod1.disable=1"
- echo " or"
- echo " modprobe.blacklist=mod1"
- echo " * The following modules are no longer unconditionally loaded:"
- echo " pcspkr irtty-sir analog lp ppdev ide-generic"
- echo " Add them to MODULES in rc.conf if you need them."
- fi
- if [ "$(vercmp $2 172)" -lt 0 ]; then
- echo " * Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
- echo " /lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
- echo " takes precedence."
- echo " * kbd and rtc devices are no longer world readable."
- echo " * rtc is no longer in the audio group and fb devices are no longer in"
- echo " the video group, as permissions and ownership of fb devices are controlled"
- echo " by X."
- fi
- if [ "$(vercmp $2 174)" -lt 0 ]; then
- echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
- echo " 'scanner' and 'video' groups. Beware of any changes."
- echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
- echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
- echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
- echo " this functionality back."
- echo " * We no longer create the static nodes on install needed for an initrd-less"
- echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh"
- echo " installs."
- fi
- if [ "$(vercmp $2 175)" -lt 0 ]; then
- echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
- echo " kernels have this enabled."
- fi
- if [ "$(vercmp $2 181)" -lt 0 ]; then
- echo " * udev-compat has been removed, and should be uninstalled."
- echo " * Framebuffers are no longer blacklisted by default."
- echo " * binaries moved from /sbin to /usr/bin"
- fi
- echo " * if your kernel does not provide /dev/loop-control, you need to manually"
- echo " load the 'loop' module before using losetup"
- fi
-}