From d2cb40f302ec24942f7d6d72801e80b7e0be983a Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 17 Aug 2010 11:45:34 +0200 Subject: [PATCH 01/66] - udev-161 with an upstream quirk for the qemu cdrom and more cdrom handling bugfixes Resolves: rhbz#609049 rhbz#624286 - added floppy group Resolves: rhbz#620814 --- sources | 3 ++- udev.spec | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/sources b/sources index c193652..f53200e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -65459a1f090082c0471bf4e5112208d7 udev-160.tar.bz2 +2f42aff9f8c7258fecde71df321032b7 udev-161.tar.bz2.sign +95b6a0ffc9913f3e8021c65f51eb4f88 udev-161.tar.bz2 diff --git a/udev.spec b/udev.spec index 37d0082..8b8febb 100644 --- a/udev.spec +++ b/udev.spec @@ -6,8 +6,8 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 160 -Release: 8%{?dist} +Version: 161 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -190,6 +190,7 @@ exit 0 getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || : getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || : getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || : +getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then @@ -348,6 +349,20 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Tue Aug 17 2010 Harald Hoyer 161-1 +- udev-161 with an upstream quirk for the qemu cdrom and + more cdrom handling bugfixes +Resolves: rhbz#609049 rhbz#624286 +- added floppy group +Resolves: rhbz#620814 + +* Fri Aug 06 2010 Harald Hoyer 160-9 +- added quirk to cdrom_id, to boot from qemu +Resolves: rhbz#609049 +- fix console switching and ACLs +Resolves: rhbz#608712 +- minor bugfixes + * Tue Jul 20 2010 Harald Hoyer 160-8 - make loop block device again From b11538a6c787f92b59f88c73b52069d4bf4f1fe8 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 1 Sep 2010 11:26:01 +0200 Subject: [PATCH 02/66] - bugfixes for systemd service files - bugfix for selinux labeling - bugfixes for cdrom_id --- ...-cdrom_id-Add-media-status-debugging.patch | 26 ++++++++ ...-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch | 56 +++++++++++++++++ ...rop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch | 34 ++++++++++ 0004-init-update-systemd-service-files.patch | 42 +++++++++++++ 0005-init-update-systemd-service-files.patch | 38 +++++++++++ ...mistake-all-SCSI-processor-devices-f.patch | 33 ++++++++++ ...-description-in-systemd-service-file.patch | 47 ++++++++++++++ 0008-udevd-add-pid-to-kmsg-logs.patch | 41 ++++++++++++ ...it-edit-systemd-service-descriptions.patch | 47 ++++++++++++++ ...-required-extension-and-remove-some-.patch | 42 +++++++++++++ 0012-keymap-Add-Onkyo-PC.patch | 63 +++++++++++++++++++ 0013-keymap-Add-HP-G60.patch | 26 ++++++++ ...eeded-credential-passing-from-init_n.patch | 58 +++++++++++++++++ 0015-Add-support-for-oom_score_adj.patch | 48 ++++++++++++++ 0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch | 28 +++++++++ ...ev-7-manpage-Fix-description-of-attr.patch | 32 ++++++++++ ...ix-crash-if-netlink-is-not-available.patch | 57 +++++++++++++++++ 0019-keymap-Fix-Acer-TravelMate-4720.patch | 28 +++++++++ ...-cdrom_id-Fix-DVD-RW-media-detection.patch | 53 ++++++++++++++++ ...-blank-detection-for-sloppy-firmware.patch | 42 +++++++++++++ ...text-on-add-but-not-on-change-events.patch | 35 +++++++++++ ...rsistent-name-rules-for-KVM-network-.patch | 28 +++++++++ udev.spec | 52 ++++++++++++++- 23 files changed, 955 insertions(+), 1 deletion(-) create mode 100644 0001-cdrom_id-Add-media-status-debugging.patch create mode 100644 0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch create mode 100644 0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch create mode 100644 0004-init-update-systemd-service-files.patch create mode 100644 0005-init-update-systemd-service-files.patch create mode 100644 0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch create mode 100644 0007-init-add-udev-to-description-in-systemd-service-file.patch create mode 100644 0008-udevd-add-pid-to-kmsg-logs.patch create mode 100644 0009-init-edit-systemd-service-descriptions.patch create mode 100644 0011-udev-7-Point-out-required-extension-and-remove-some-.patch create mode 100644 0012-keymap-Add-Onkyo-PC.patch create mode 100644 0013-keymap-Add-HP-G60.patch create mode 100644 0014-udevd-remove-unneeded-credential-passing-from-init_n.patch create mode 100644 0015-Add-support-for-oom_score_adj.patch create mode 100644 0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch create mode 100644 0017-udev-7-manpage-Fix-description-of-attr.patch create mode 100644 0018-gudev-fix-crash-if-netlink-is-not-available.patch create mode 100644 0019-keymap-Fix-Acer-TravelMate-4720.patch create mode 100644 0020-cdrom_id-Fix-DVD-RW-media-detection.patch create mode 100644 0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch create mode 100644 0022-set-SELinux-context-on-add-but-not-on-change-events.patch create mode 100644 0023-do-not-create-persistent-name-rules-for-KVM-network-.patch diff --git a/0001-cdrom_id-Add-media-status-debugging.patch b/0001-cdrom_id-Add-media-status-debugging.patch new file mode 100644 index 0000000..f282114 --- /dev/null +++ b/0001-cdrom_id-Add-media-status-debugging.patch @@ -0,0 +1,26 @@ +From 24af530a543c70ac59fdd244377d648ef77a0e21 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Thu, 12 Aug 2010 07:10:12 +0200 +Subject: [PATCH 01/23] cdrom_id: Add media status debugging + +Show which media status the hardware originally reports, since we mangle it in +some cases. +--- + extras/cdrom_id/cdrom_id.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c +index 83e95d5..d59991c 100644 +--- a/extras/cdrom_id/cdrom_id.c ++++ b/extras/cdrom_id/cdrom_id.c +@@ -573,6 +573,7 @@ static int cd_media_info(struct udev *udev, int fd) + + cd_media = 1; + info(udev, "disk type %02x\n", header[8]); ++ info(udev, "hardware reported media status: %s\n", media_status[header[2] & 3]); + + /* exclude plain CDROM, some fake cdroms return 0 for "blank" media here */ + if (!cd_media_cd_rom) +-- +1.7.2.2 + diff --git a/0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch b/0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch new file mode 100644 index 0000000..486c148 --- /dev/null +++ b/0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch @@ -0,0 +1,56 @@ +From 9cd075e35b8f660c75b0d72d4bea496fd6459f29 Mon Sep 17 00:00:00 2001 +From: David Woodhouse +Date: Thu, 12 Aug 2010 17:04:55 +0100 +Subject: [PATCH 02/23] Add keymap for Lenovo IdeaPad S10-3 + +Tested on S10-3, but presumably applicable to all IdeaPads. + +Signed-off-by: Martin Pitt +--- + Makefile.am | 1 + + extras/keymap/95-keymap.rules | 2 ++ + extras/keymap/keymaps/lenovo-ideapad | 7 +++++++ + 3 files changed, 10 insertions(+), 0 deletions(-) + create mode 100644 extras/keymap/keymaps/lenovo-ideapad + +diff --git a/Makefile.am b/Makefile.am +index c16b259..77df6ab 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -537,6 +537,7 @@ dist_udevkeymap_DATA = \ + extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ + extras/keymap/keymaps/inventec-symphony_6.0_7.0 \ + extras/keymap/keymaps/lenovo-3000 \ ++ extras/keymap/keymaps/lenovo-ideapad \ + extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ + extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \ + extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \ +diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules +index 13b5571..2241422 100644 +--- a/extras/keymap/95-keymap.rules ++++ b/extras/keymap/95-keymap.rules +@@ -65,6 +65,8 @@ ENV{DMI_VENDOR}=="Compaq*", ATTR{[dmi/id]product_name}=="*E500*|*Evo N*", RUN+=" + ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="*3000*", RUN+="keymap $name lenovo-3000" + ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="ThinkPad X6*", ATTR{[dmi/id]product_version}=="* Tablet" RUN+="keymap $name lenovo-thinkpad_x6_tablet" + ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="ThinkPad X200 Tablet*", ATTR{[dmi/id]product_version}=="* Tablet" RUN+="keymap $name lenovo-thinkpad_x200_tablet" ++ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="*IdeaPad*", RUN+="keymap $name lenovo-ideapad" ++ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_name}=="S10-*", RUN+="keymap $name lenovo-ideapad" + + ENV{DMI_VENDOR}=="Hewlett-Packard*", RUN+="keymap $name hewlett-packard" + ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][aA][bB][lL][eE][tT]*", RUN+="keymap $name hewlett-packard-tablet" +diff --git a/extras/keymap/keymaps/lenovo-ideapad b/extras/keymap/keymaps/lenovo-ideapad +new file mode 100644 +index 0000000..d5f2567 +--- /dev/null ++++ b/extras/keymap/keymaps/lenovo-ideapad +@@ -0,0 +1,7 @@ ++# Key codes observed on S10-3, assumed valid on other IdeaPad models ++0x81 rfkill # does nothing in BIOS ++0x83 display_off # BIOS toggles screen state ++0xB9 brightnessup # does nothing in BIOS ++0xBA brightnessdown # does nothing in BIOS ++0xF1 camera # BIOS toggles camera power ++0xf2 unknown # trackpad enable/disable (does nothing in BIOS) +-- +1.7.2.2 + diff --git a/0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch b/0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch new file mode 100644 index 0000000..d476ee5 --- /dev/null +++ b/0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch @@ -0,0 +1,34 @@ +From b367a1c9d8a0f565effcdb45f86a365be1c8b622 Mon Sep 17 00:00:00 2001 +From: Jan Drzewiecki +Date: Fri, 13 Aug 2010 07:24:29 +0200 +Subject: [PATCH 03/23] cdrom_id: Drop MEDIA_SESSION_NEXT for DVD-RW-RO + +Commit cf2205a fixed the media status for fresh DVD-RW in restricted overwrite +mode, but missed a detail: We should not report the ID_CDROM_MEDIA_SESSION_NEXT +property either, since in that mode you can never append tracks/sessions; this +just works in sequential mode. + +Signed-off-by: Martin Pitt +--- + extras/cdrom_id/cdrom_id.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c +index d59991c..f9d6e0b 100644 +--- a/extras/cdrom_id/cdrom_id.c ++++ b/extras/cdrom_id/cdrom_id.c +@@ -690,8 +690,9 @@ static int cd_media_info(struct udev *udev, int fd) + } + + determined: +- /* "other" is e. g. DVD-RAM, can't append sessions there either */ +- if ((header[2] & 3) < 2) ++ /* "other" is e. g. DVD-RAM, can't append sessions there; DVDs in ++ * restricted overwrite mode can never append, only in sequential mode */ ++ if ((header[2] & 3) < 2 && !cd_media_dvd_rw_ro) + cd_media_session_next = header[10] << 8 | header[5]; + cd_media_session_count = header[9] << 8 | header[4]; + cd_media_track_count = header[11] << 8 | header[6]; +-- +1.7.2.2 + diff --git a/0004-init-update-systemd-service-files.patch b/0004-init-update-systemd-service-files.patch new file mode 100644 index 0000000..a68e467 --- /dev/null +++ b/0004-init-update-systemd-service-files.patch @@ -0,0 +1,42 @@ +From 68bc0d7963a22967cc00244c4fad96fb45870712 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Tue, 17 Aug 2010 09:37:57 +0200 +Subject: [PATCH 04/23] init: update systemd service files + +--- + init/udev-retry.service.in | 4 ++-- + init/udev-settle.service.in | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in +index 7667899..d8ed8a8 100644 +--- a/init/udev-retry.service.in ++++ b/init/udev-retry.service.in +@@ -4,9 +4,9 @@ DefaultDependencies=no + After=local-fs.target udev.service + + [Service] +-Type=finish ++Type=oneshot + ValidNoProcess=yes +-ExecStart=@sbindir@/udevadm trigger --type=failed ++ExecStart=@sbindir@/udevadm trigger --type=failed --action=add + + [Install] + WantedBy=sysinit.target +diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in +index 0594d72..4db61f2 100644 +--- a/init/udev-settle.service.in ++++ b/init/udev-settle.service.in +@@ -4,7 +4,7 @@ DefaultDependencies=no + After=udev.service + + [Service] +-Type=finish ++Type=oneshot + ValidNoProcess=yes + ExecStart=@sbindir@/udevadm settle + +-- +1.7.2.2 + diff --git a/0005-init-update-systemd-service-files.patch b/0005-init-update-systemd-service-files.patch new file mode 100644 index 0000000..e7865d7 --- /dev/null +++ b/0005-init-update-systemd-service-files.patch @@ -0,0 +1,38 @@ +From bd078c90b97c73ba5fe7475947e6ecd20e2eb048 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Tue, 17 Aug 2010 18:53:57 +0200 +Subject: [PATCH 05/23] init: update systemd service files + +--- + init/udev-retry.service.in | 1 - + init/udev-settle.service.in | 2 +- + 2 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in +index d8ed8a8..7a0819c 100644 +--- a/init/udev-retry.service.in ++++ b/init/udev-retry.service.in +@@ -5,7 +5,6 @@ After=local-fs.target udev.service + + [Service] + Type=oneshot +-ValidNoProcess=yes + ExecStart=@sbindir@/udevadm trigger --type=failed --action=add + + [Install] +diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in +index 4db61f2..4cb33aa 100644 +--- a/init/udev-settle.service.in ++++ b/init/udev-settle.service.in +@@ -5,7 +5,7 @@ After=udev.service + + [Service] + Type=oneshot +-ValidNoProcess=yes ++RemainAfterExit=yes + ExecStart=@sbindir@/udevadm settle + + [Install] +-- +1.7.2.2 + diff --git a/0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch b/0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch new file mode 100644 index 0000000..0864ad4 --- /dev/null +++ b/0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch @@ -0,0 +1,33 @@ +From 3bd7b89dc40c4a0440ee5fce2ea907971bfcfb10 Mon Sep 17 00:00:00 2001 +From: Marco d'Itri +Date: Wed, 18 Aug 2010 13:35:25 +0200 +Subject: [PATCH 06/23] udev-acl: do not mistake all SCSI "processor" devices for scanner + +Both rules can be removed since now libsane sets libsane_matched also +for SCSI scanners. + +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589751 +--- + extras/udev-acl/70-acl.rules | 6 +----- + 1 files changed, 1 insertions(+), 5 deletions(-) + +diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules +index 6ec04ee..c7134bc 100644 +--- a/extras/udev-acl/70-acl.rules ++++ b/extras/udev-acl/70-acl.rules +@@ -13,11 +13,7 @@ SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="udev-acl" + # digicams with proprietary protocol + ENV{ID_GPHOTO2}=="*?", TAG+="udev-acl" + +-# SCSI scanners +-KERNEL=="sg[0-9]*", ATTRS{type}=="6", TAG+="udev-acl" +-KERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="HP|EPSON|Epson", TAG+="udev-acl" +- +-# USB scanners ++# SCSI and USB scanners + ENV{libsane_matched}=="yes", TAG+="udev-acl" + + # HPLIP devices (necessary for ink level check and HP tool maintenance) +-- +1.7.2.2 + diff --git a/0007-init-add-udev-to-description-in-systemd-service-file.patch b/0007-init-add-udev-to-description-in-systemd-service-file.patch new file mode 100644 index 0000000..bb13a7b --- /dev/null +++ b/0007-init-add-udev-to-description-in-systemd-service-file.patch @@ -0,0 +1,47 @@ +From d15b727ef1375c665057c0fa278b2ea3778b8d3d Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Thu, 19 Aug 2010 08:48:44 +0200 +Subject: [PATCH 07/23] init: add 'udev -' to description in systemd service files + +--- + init/udev-retry.service.in | 2 +- + init/udev-settle.service.in | 2 +- + init/udev.service.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in +index 7a0819c..a6612da 100644 +--- a/init/udev-retry.service.in ++++ b/init/udev-retry.service.in +@@ -1,5 +1,5 @@ + [Unit] +-Description=re-trigger failed events after filesystems are available ++Description=udev - re-trigger failed events after filesystems are available + DefaultDependencies=no + After=local-fs.target udev.service + +diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in +index 4cb33aa..578a24f 100644 +--- a/init/udev-settle.service.in ++++ b/init/udev-settle.service.in +@@ -1,5 +1,5 @@ + [Unit] +-Description=wait until full initialization ++Description=udev - wait until full initialization + DefaultDependencies=no + After=udev.service + +diff --git a/init/udev.service.in b/init/udev.service.in +index e95cb47..5a63b77 100644 +--- a/init/udev.service.in ++++ b/init/udev.service.in +@@ -1,5 +1,5 @@ + [Unit] +-Description=/dev and kernel device manager ++Description=udev - /dev and kernel device manager + DefaultDependencies=no + Before=sysinit.target + +-- +1.7.2.2 + diff --git a/0008-udevd-add-pid-to-kmsg-logs.patch b/0008-udevd-add-pid-to-kmsg-logs.patch new file mode 100644 index 0000000..5b7a8df --- /dev/null +++ b/0008-udevd-add-pid-to-kmsg-logs.patch @@ -0,0 +1,41 @@ +From c25bfbfb1b20781698ff3c8cbc884a9e190052ee Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Thu, 19 Aug 2010 08:49:43 +0200 +Subject: [PATCH 08/23] udevd: add pid to kmsg logs + +--- + udev/udev-event.c | 4 ++-- + udev/udevd.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/udev/udev-event.c b/udev/udev-event.c +index 9b5326b..ae523f8 100644 +--- a/udev/udev-event.c ++++ b/udev/udev-event.c +@@ -454,8 +454,8 @@ static void rename_netif_kernel_log(struct ifreq ifr) + return; + } + +- fprintf(f, "<6>udev: renamed network interface %s to %s\n", +- ifr.ifr_name, ifr.ifr_newname); ++ fprintf(f, "<6>udev[%u]: renamed network interface %s to %s\n", ++ getpid(), ifr.ifr_name, ifr.ifr_newname); + fclose(f); + } + +diff --git a/udev/udevd.c b/udev/udevd.c +index 61b76f5..ad2ca3b 100644 +--- a/udev/udevd.c ++++ b/udev/udevd.c +@@ -1298,7 +1298,7 @@ int main(int argc, char *argv[]) + + f = fopen("/dev/kmsg", "w"); + if (f != NULL) { +- fprintf(f, "<6>udev: starting version " VERSION "\n"); ++ fprintf(f, "<6>udev[%u]: starting version " VERSION "\n", getpid()); + fclose(f); + } + +-- +1.7.2.2 + diff --git a/0009-init-edit-systemd-service-descriptions.patch b/0009-init-edit-systemd-service-descriptions.patch new file mode 100644 index 0000000..45b8119 --- /dev/null +++ b/0009-init-edit-systemd-service-descriptions.patch @@ -0,0 +1,47 @@ +From 4c9b12a7aa57e43e568b78da9cbed4138b1292df Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Thu, 19 Aug 2010 18:02:20 +0200 +Subject: [PATCH 09/23] init: edit systemd service descriptions + +--- + init/udev-retry.service.in | 2 +- + init/udev-settle.service.in | 2 +- + init/udev.service.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in +index a6612da..ab8241b 100644 +--- a/init/udev-retry.service.in ++++ b/init/udev-retry.service.in +@@ -1,5 +1,5 @@ + [Unit] +-Description=udev - re-trigger failed events after filesystems are available ++Description=udev Retry Failed Events + DefaultDependencies=no + After=local-fs.target udev.service + +diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in +index 578a24f..d58ea9c 100644 +--- a/init/udev-settle.service.in ++++ b/init/udev-settle.service.in +@@ -1,5 +1,5 @@ + [Unit] +-Description=udev - wait until full initialization ++Description=udev Wait for Complete Device Initialization + DefaultDependencies=no + After=udev.service + +diff --git a/init/udev.service.in b/init/udev.service.in +index 5a63b77..b07f4db 100644 +--- a/init/udev.service.in ++++ b/init/udev.service.in +@@ -1,5 +1,5 @@ + [Unit] +-Description=udev - /dev and kernel device manager ++Description=udev Kernel Device Manager + DefaultDependencies=no + Before=sysinit.target + +-- +1.7.2.2 + diff --git a/0011-udev-7-Point-out-required-extension-and-remove-some-.patch b/0011-udev-7-Point-out-required-extension-and-remove-some-.patch new file mode 100644 index 0000000..bd75f26 --- /dev/null +++ b/0011-udev-7-Point-out-required-extension-and-remove-some-.patch @@ -0,0 +1,42 @@ +From 6593e8961afbe0b74d5a67c545a991c7733e88df Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Fri, 20 Aug 2010 12:19:23 +0200 +Subject: [PATCH 11/23] udev(7): Point out required extension, and remove some confusion + +Rules files must end in .rules. + +Also drop the redundant and confusing sentence about "file names must be +unique". What is really meant is explained in a better way in the paragraph +above. + +https://launchpad.net/bugs/616108 +--- + udev/udev.xml | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/udev/udev.xml b/udev/udev.xml +index 20c394c..336b203 100644 +--- a/udev/udev.xml ++++ b/udev/udev.xml +@@ -75,12 +75,13 @@ + the custom rules directory /etc/udev/rules.d/ + and the temporary rules directory /dev/.udev/rules.d/. + All rule files are sorted and processed in lexical order, regardless +- in which of these directories they live. ++ in which of these directories they live. Files in ++ /etc/udev/rules.d/ have precedence over files with ++ the same name in /lib/udev/rules.d/. This can be ++ used to ignore a default rules file if needed. + +- Rule files are required to have a unique name, duplicate file names +- are ignored. Files in /etc/udev/rules.d/ have precedence +- over files with the same name in /lib/udev/rules.d/. This +- can be used to ignore a default rules file if needed. ++ Rule files must end in .rules, other extensions ++ are ignored. + + Every line in the rules file contains at least one key value pair. + There are two kind of keys, match and assignment keys. +-- +1.7.2.2 + diff --git a/0012-keymap-Add-Onkyo-PC.patch b/0012-keymap-Add-Onkyo-PC.patch new file mode 100644 index 0000000..e7b283b --- /dev/null +++ b/0012-keymap-Add-Onkyo-PC.patch @@ -0,0 +1,63 @@ +From acf865b68e1a5c78677537b373b6e082c287fc27 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Sun, 22 Aug 2010 11:00:34 +0200 +Subject: [PATCH 12/23] keymap: Add Onkyo PC + +Thanks to Pau Oliva! + +https://launchpad.net/bugs/612529 +--- + Makefile.am | 1 + + extras/keymap/95-keymap.rules | 2 ++ + extras/keymap/keymaps/onkyo | 14 ++++++++++++++ + 3 files changed, 17 insertions(+), 0 deletions(-) + create mode 100644 extras/keymap/keymaps/onkyo + +diff --git a/Makefile.am b/Makefile.am +index 77df6ab..512de34 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -555,6 +555,7 @@ dist_udevkeymap_DATA = \ + extras/keymap/keymaps/module-sony \ + extras/keymap/keymaps/module-sony-old \ + extras/keymap/keymaps/olpc-xo \ ++ extras/keymap/keymaps/onkyo \ + extras/keymap/keymaps/oqo-model2 \ + extras/keymap/keymaps/samsung-other \ + extras/keymap/keymaps/samsung-sq1us \ +diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules +index 2241422..e9d5721 100644 +--- a/extras/keymap/95-keymap.rules ++++ b/extras/keymap/95-keymap.rules +@@ -127,6 +127,8 @@ ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="Satellite M30X", RUN+=" + + ENV{DMI_VENDOR}=="OQO Inc.*", ATTR{[dmi/id]product_name}=="OQO Model 2*", RUN+="keymap $name oqo-model2" + ++ENV{DMI_VENDOR}=="ONKYO CORPORATION", ATTR{[dmi/id]product_name}=="ONKYOPC", RUN+="keymap $name onkyo" ++ + ENV{DMI_VENDOR}=="ASUS", RUN+="keymap $name asus" + + ENV{DMI_VENDOR}=="VIA", ATTR{[dmi/id]product_name}=="K8N800", ATTR{[dmi/id]product_version}=="VT8204B", RUN+="keymap $name 0x81 prog1" +diff --git a/extras/keymap/keymaps/onkyo b/extras/keymap/keymaps/onkyo +new file mode 100644 +index 0000000..7dd80a1 +--- /dev/null ++++ b/extras/keymap/keymaps/onkyo +@@ -0,0 +1,14 @@ ++0xA0 mute # Fn+D ++0xAE volumedown # Fn+F ++0xB0 volumeup # Fn+G ++0xDF sleep # Fn+W ++0xE0 bluetooth # Fn+H ++0xE2 cyclewindows # Fn+Esc ++0xEE battery # Fn+Q ++0xF0 media # Fn+R ++0xF5 switchvideomode # Fn+E ++0xF6 camera # Fn+T ++0xF7 f22 # Fn+Y (touchpad toggle) ++0xF8 brightnessup # Fn+S ++0xF9 brightnessdown # Fn+A ++0xFB wlan # Fn+J +-- +1.7.2.2 + diff --git a/0013-keymap-Add-HP-G60.patch b/0013-keymap-Add-HP-G60.patch new file mode 100644 index 0000000..cbeb33c --- /dev/null +++ b/0013-keymap-Add-HP-G60.patch @@ -0,0 +1,26 @@ +From 92cffb0bd18bd8fd245666a519ad0e54dc537031 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Mon, 23 Aug 2010 10:47:28 +0200 +Subject: [PATCH 13/23] keymap: Add HP G60 + +https://launchpad.net/bugs/554944 +--- + extras/keymap/95-keymap.rules | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules +index e9d5721..5656de9 100644 +--- a/extras/keymap/95-keymap.rules ++++ b/extras/keymap/95-keymap.rules +@@ -72,7 +72,7 @@ ENV{DMI_VENDOR}=="Hewlett-Packard*", RUN+="keymap $name hewlett-packard" + ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][aA][bB][lL][eE][tT]*", RUN+="keymap $name hewlett-packard-tablet" + ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[pP][aA][vV][iI][lL][iI][oO][nN]*", RUN+="keymap $name hewlett-packard-pavilion" + ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*Compaq*|*EliteBook*|*2230s*", RUN+="keymap $name hewlett-packard-compaq_elitebook" +-ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*", RUN+="keymap $name hewlett-packard-2510p_2530p" ++ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*|HP G60 Notebook PC", RUN+="keymap $name hewlett-packard-2510p_2530p" + ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][xX]2*", RUN+="keymap $name hewlett-packard-tx2" + ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="Presario 2100*", RUN+="keymap $name hewlett-packard-presario-2100" + # HP Pavillion dv6315ea has empty DMI_VENDOR +-- +1.7.2.2 + diff --git a/0014-udevd-remove-unneeded-credential-passing-from-init_n.patch b/0014-udevd-remove-unneeded-credential-passing-from-init_n.patch new file mode 100644 index 0000000..858371b --- /dev/null +++ b/0014-udevd-remove-unneeded-credential-passing-from-init_n.patch @@ -0,0 +1,58 @@ +From 13f90be7a33353fdbcd4a389630a05c608bdf2a4 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Wed, 25 Aug 2010 16:26:54 +0200 +Subject: [PATCH 14/23] udevd: remove unneeded credential passing from init_notify() + +--- + udev/udevd.c | 17 ----------------- + 1 files changed, 0 insertions(+), 17 deletions(-) + +diff --git a/udev/udevd.c b/udev/udevd.c +index ad2ca3b..374a4e0 100644 +--- a/udev/udevd.c ++++ b/udev/udevd.c +@@ -964,15 +964,10 @@ static int init_notify(const char *state) + int fd = -1, r; + struct msghdr msghdr; + struct iovec iovec; +- struct ucred *ucred; + union { + struct sockaddr sa; + struct sockaddr_un un; + } sockaddr; +- union { +- struct cmsghdr cmsghdr; +- uint8_t buf[CMSG_SPACE(sizeof(struct ucred))]; +- } control; + const char *e; + + if (!(e = getenv("NOTIFY_SOCKET"))) { +@@ -1002,16 +997,6 @@ static int init_notify(const char *state) + iovec.iov_base = (char*) state; + iovec.iov_len = strlen(state); + +- memset(&control, 0, sizeof(control)); +- control.cmsghdr.cmsg_level = SOL_SOCKET; +- control.cmsghdr.cmsg_type = SCM_CREDENTIALS; +- control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred)); +- +- ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr); +- ucred->pid = getpid(); +- ucred->uid = getuid(); +- ucred->gid = getgid(); +- + memset(&msghdr, 0, sizeof(msghdr)); + msghdr.msg_name = &sockaddr; + msghdr.msg_namelen = sizeof(sa_family_t) + strlen(e); +@@ -1019,8 +1004,6 @@ static int init_notify(const char *state) + msghdr.msg_namelen = sizeof(struct sockaddr_un); + msghdr.msg_iov = &iovec; + msghdr.msg_iovlen = 1; +- msghdr.msg_control = &control; +- msghdr.msg_controllen = control.cmsghdr.cmsg_len; + + if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { + r = -errno; +-- +1.7.2.2 + diff --git a/0015-Add-support-for-oom_score_adj.patch b/0015-Add-support-for-oom_score_adj.patch new file mode 100644 index 0000000..e00e50d --- /dev/null +++ b/0015-Add-support-for-oom_score_adj.patch @@ -0,0 +1,48 @@ +From c61eea9459045c2c9032a0c98234985a371fac58 Mon Sep 17 00:00:00 2001 +From: Luca Tettamanti +Date: Mon, 23 Aug 2010 14:35:37 +0200 +Subject: [PATCH 15/23] Add support for oom_score_adj + +/proc//oom_adj has been deprecated (kernel v2.6.36) due to the +rework of the badness heuristic; oom_score_adj is the replacement. +Keep a fallback to the old interface for compatibility with older +kernels. + +See http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a63d83f427fbce97a6cea0db2e64b0eb8435cd10 + +Signed-off-by: Martin Pitt +--- + udev/udevd.c | 15 +++++++++++---- + 1 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/udev/udevd.c b/udev/udevd.c +index 374a4e0..0ec3c3d 100644 +--- a/udev/udevd.c ++++ b/udev/udevd.c +@@ -1285,12 +1285,19 @@ int main(int argc, char *argv[]) + fclose(f); + } + +- /* OOM_DISABLE == -17 */ +- fd = open("/proc/self/oom_adj", O_RDWR); ++ fd = open("/proc/self/oom_score_adj", O_RDWR); + if (fd < 0) { +- err(udev, "error disabling OOM: %m\n"); ++ /* Fallback to old interface */ ++ fd = open("/proc/self/oom_adj", O_RDWR); ++ if (fd < 0) { ++ err(udev, "error disabling OOM: %m\n"); ++ } else { ++ /* OOM_DISABLE == -17 */ ++ write(fd, "-17", 3); ++ close(fd); ++ } + } else { +- write(fd, "-17", 3); ++ write(fd, "-1000", 5); + close(fd); + } + +-- +1.7.2.2 + diff --git a/0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch b/0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch new file mode 100644 index 0000000..d5c7fff --- /dev/null +++ b/0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch @@ -0,0 +1,28 @@ +From 38b5ccbcf7f3643ea8180a8186cfe3e5fa9cb983 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Wed, 25 Aug 2010 17:02:51 +0200 +Subject: [PATCH 16/23] keymap: Fix Sony VAIO VGN-SZ2HP/B + +Reportedly this needs the module-sony keymap, not the -old one. + +https://launchpad.net/bugs/613578 +--- + extras/keymap/95-keymap.rules | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules +index 5656de9..cb066bd 100644 +--- a/extras/keymap/95-keymap.rules ++++ b/extras/keymap/95-keymap.rules +@@ -46,7 +46,7 @@ ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Extra Buttons", + ENV{DMI_VENDOR}=="Sony*", KERNELS=="input*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony" + + # Older Vaios have some different keys +-ENV{DMI_VENDOR}=="Sony*", ATTR{[dmi/id]product_name}=="*PCG-C1*|*PCG-K25*|*PCG-F1*|*PCG-F2*|*PCG-F3*|*PCG-F4*|*PCG-F5*|*PCG-F6*|*PCG-FX*|*PCG-FRV*|*PCG-GR*|*PCG-TR*|*PCG-NV*|*PCG-Z*|*VGN-S360*|*VGN-SZ2HP_B*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony-old" ++ENV{DMI_VENDOR}=="Sony*", ATTR{[dmi/id]product_name}=="*PCG-C1*|*PCG-K25*|*PCG-F1*|*PCG-F2*|*PCG-F3*|*PCG-F4*|*PCG-F5*|*PCG-F6*|*PCG-FX*|*PCG-FRV*|*PCG-GR*|*PCG-TR*|*PCG-NV*|*PCG-Z*|*VGN-S360*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony-old" + + # + # The following rules belong to standard i8042 AT keyboard with high key codes. +-- +1.7.2.2 + diff --git a/0017-udev-7-manpage-Fix-description-of-attr.patch b/0017-udev-7-manpage-Fix-description-of-attr.patch new file mode 100644 index 0000000..6b41ecf --- /dev/null +++ b/0017-udev-7-manpage-Fix-description-of-attr.patch @@ -0,0 +1,32 @@ +From 83184d008ba23724fd30996440534c0633a0d0aa Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Fri, 27 Aug 2010 16:54:52 +0200 +Subject: [PATCH 17/23] udev(7) manpage: Fix description of $attr + +Fix the manpage to describe the real behaviour of $attr: It doesn't search all +parent devices any more, just the one selected by KERNELS etc. + +https://launchpad.net/bugs/348513 +--- + udev/udev.xml | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/udev/udev.xml b/udev/udev.xml +index 336b203..6085dff 100644 +--- a/udev/udev.xml ++++ b/udev/udev.xml +@@ -578,8 +578,9 @@ + + The value of a sysfs attribute found at the device, where + all keys of the rule have matched. If the matching device does not have +- such an attribute, follow the chain of parent devices and use the value +- of the first attribute that matches. ++ such an attribute, and a previous KERNELS, SUBSYSTEMS, DRIVERS, or ++ ATTRS test selected a parent device, use the attribute from that ++ parent device. + If the attribute is a symlink, the last element of the symlink target is + returned as the value. + +-- +1.7.2.2 + diff --git a/0018-gudev-fix-crash-if-netlink-is-not-available.patch b/0018-gudev-fix-crash-if-netlink-is-not-available.patch new file mode 100644 index 0000000..2a5872e --- /dev/null +++ b/0018-gudev-fix-crash-if-netlink-is-not-available.patch @@ -0,0 +1,57 @@ +From e4dcdc4ab232bcbbe61a2026c16e647d9302cdd2 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Fri, 27 Aug 2010 18:12:59 +0200 +Subject: [PATCH 18/23] gudev: fix crash if netlink is not available + +gudev_client_new() assumes that priv->monitor is never NULL, but this happens +on older kernels. Let's not crash client programs because of that. + +https://launchpad.net/bugs/581527 +--- + extras/gudev/gudevclient.c | 18 ++++++++++++------ + 1 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/extras/gudev/gudevclient.c b/extras/gudev/gudevclient.c +index fa31f70..f5f7a19 100644 +--- a/extras/gudev/gudevclient.c ++++ b/extras/gudev/gudevclient.c +@@ -93,6 +93,8 @@ monitor_event (GIOChannel *source, + GUdevDevice *device; + struct udev_device *udevice; + ++ if (client->priv->monitor == NULL) ++ goto out; + udevice = udev_monitor_receive_device (client->priv->monitor); + if (udevice == NULL) + goto out; +@@ -216,17 +218,21 @@ g_udev_client_constructed (GObject *object) + *s = '\0'; + } + +- udev_monitor_filter_add_match_subsystem_devtype (client->priv->monitor, subsystem, devtype); ++ if (client->priv->monitor != NULL) ++ udev_monitor_filter_add_match_subsystem_devtype (client->priv->monitor, subsystem, devtype); + + g_free (subsystem); + } + + /* listen to events, and buffer them */ +- udev_monitor_enable_receiving (client->priv->monitor); +- +- channel = g_io_channel_unix_new (udev_monitor_get_fd (client->priv->monitor)); +- client->priv->watch_id = g_io_add_watch (channel, G_IO_IN, monitor_event, client); +- g_io_channel_unref (channel); ++ if (client->priv->monitor != NULL) ++ { ++ udev_monitor_enable_receiving (client->priv->monitor); ++ channel = g_io_channel_unix_new (udev_monitor_get_fd (client->priv->monitor)); ++ client->priv->watch_id = g_io_add_watch (channel, G_IO_IN, monitor_event, client); ++ g_io_channel_unref (channel); ++ } else ++ client->priv->watch_id = NULL; + } + + if (G_OBJECT_CLASS (g_udev_client_parent_class)->constructed != NULL) +-- +1.7.2.2 + diff --git a/0019-keymap-Fix-Acer-TravelMate-4720.patch b/0019-keymap-Fix-Acer-TravelMate-4720.patch new file mode 100644 index 0000000..35a9922 --- /dev/null +++ b/0019-keymap-Fix-Acer-TravelMate-4720.patch @@ -0,0 +1,28 @@ +From d17c065e28fa4baac90b02b4913c7ef32d54f3c7 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Fri, 27 Aug 2010 18:48:53 +0200 +Subject: [PATCH 19/23] keymap: Fix Acer TravelMate 4720 + +The previous change just fixed the Bluetooth key, but Screen Lock and Browser +also need to be changed. + +https://launchpad.net/bugs/569815 +--- + extras/keymap/95-keymap.rules | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules +index cb066bd..913b380 100644 +--- a/extras/keymap/95-keymap.rules ++++ b/extras/keymap/95-keymap.rules +@@ -85,6 +85,7 @@ ENV{DMI_VENDOR}=="Acer*", RUN+="keymap $name acer" + ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Extensa*", ATTR{[dmi/id]product_name}=="*5210*|*5220*|*5610*|*5620*|*5720*", RUN+="keymap $name 0xEE screenlock" + ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="TravelMate*C300*", RUN+="keymap $name acer-travelmate_c300" + ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="TravelMate*6292*|TravelMate*8471*|TravelMate*4720*|Aspire 1810T*|AO751h|AO531h", RUN+="keymap $name 0xD9 bluetooth" ++ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="TravelMate*4720*", RUN+="keymap $name 0xB2 www 0xEE screenlock" + ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="TravelMate 6593|Aspire 1640", RUN+="keymap $name 0xB2 www 0xEE screenlock" + ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 6920", RUN+="keymap $name acer-aspire_6920" + ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 5920G", RUN+="keymap $name acer-aspire_5920g" +-- +1.7.2.2 + diff --git a/0020-cdrom_id-Fix-DVD-RW-media-detection.patch b/0020-cdrom_id-Fix-DVD-RW-media-detection.patch new file mode 100644 index 0000000..4a91a4e --- /dev/null +++ b/0020-cdrom_id-Fix-DVD-RW-media-detection.patch @@ -0,0 +1,53 @@ +From 2458db3edd8d66827b34978ff471dff8f879e9ab Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Mon, 30 Aug 2010 15:33:26 +0200 +Subject: [PATCH 20/23] cdrom_id: Fix DVD-RW media detection + +Commit cf2205a19 applied the "restricted overwrite" vs. "sequential" DVD-RW +test to feature_profiles() (which reads the drive capabilities), which caused +every DVD medium to be detected as ID_CDROM_MEDIA_DVD_RW. Now apply it to +cd_profiles() instead, to just check the current profile. +--- + extras/cdrom_id/cdrom_id.c | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c +index f9d6e0b..8480d7b 100644 +--- a/extras/cdrom_id/cdrom_id.c ++++ b/extras/cdrom_id/cdrom_id.c +@@ -297,14 +297,9 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si + cd_dvd_ram = 1; + break; + case 0x13: +- info(udev, "profile 0x%02x media_dvd_rw\n", profile); +- cd_media_dvd_rw = 1; +- cd_media_dvd_rw_ro = 1; +- break; + case 0x14: + info(udev, "profile 0x%02x dvd_rw\n", profile); + cd_dvd_rw = 1; +- cd_media_dvd_rw_seq = 1; + break; + case 0x1B: + info(udev, "profile 0x%02x dvd_plus_r\n", profile); +@@ -486,10 +481,16 @@ static int cd_profiles(struct udev *udev, int fd) + cd_media_dvd_ram = 1; + break; + case 0x13: ++ info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_rw = 1; ++ cd_media_dvd_rw_ro = 1; ++ break; + case 0x14: +- info(udev, "profile 0x%02x media_dvd_rw\n", cur_profile); ++ info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); + cd_media = 1; + cd_media_dvd_rw = 1; ++ cd_media_dvd_rw_seq = 1; + break; + case 0x1B: + info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); +-- +1.7.2.2 + diff --git a/0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch b/0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch new file mode 100644 index 0000000..d033307 --- /dev/null +++ b/0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch @@ -0,0 +1,42 @@ +From 5e267ea5a36de0b2a9a8965ca93dd45bbd6b1a8b Mon Sep 17 00:00:00 2001 +From: Jan Drzewiecki +Date: Tue, 31 Aug 2010 00:37:28 +0200 +Subject: [PATCH 21/23] cdrom_id: Fix DVD blank detection for sloppy firmware + +Reportedly, many CD drive firmwares will only consider the MSB in a READ +command, thus if we request 17 blocks to be read, we'll actually only get 16 in +many cases, and thus miss out the interesting sector #17. This would lead to +falsely considering nonempty DVDs as blank. + +Fetch 32 blocks now, which should work everywhere. + +Signed-off-by: Martin Pitt +--- + extras/cdrom_id/cdrom_id.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c +index 8480d7b..0153af6 100644 +--- a/extras/cdrom_id/cdrom_id.c ++++ b/extras/cdrom_id/cdrom_id.c +@@ -590,7 +590,7 @@ static int cd_media_info(struct udev *udev, int fd) + * always "complete", DVD-RAM are "other" or "complete" if the disc is + * write protected; we need to check the contents if it is blank */ + if ((cd_media_dvd_rw_ro || cd_media_dvd_plus_rw || cd_media_dvd_plus_rw_dl || cd_media_dvd_ram) && (header[2] & 3) > 1) { +- unsigned char buffer[17 * 2048]; ++ unsigned char buffer[32 * 2048]; + unsigned char result, len; + int block, offset; + +@@ -661,7 +661,7 @@ static int cd_media_info(struct udev *udev, int fd) + scsi_cmd_init(udev, &sc, buffer, sizeof(buffer)); + scsi_cmd_set(udev, &sc, 0, 0x28); + scsi_cmd_set(udev, &sc, 5, 0); +- scsi_cmd_set(udev, &sc, 8, 17); ++ scsi_cmd_set(udev, &sc, 8, 32); + scsi_cmd_set(udev, &sc, 9, 0); + err = scsi_cmd_run(udev, &sc, fd, buffer, sizeof(buffer)); + if ((err != 0)) { +-- +1.7.2.2 + diff --git a/0022-set-SELinux-context-on-add-but-not-on-change-events.patch b/0022-set-SELinux-context-on-add-but-not-on-change-events.patch new file mode 100644 index 0000000..aa99300 --- /dev/null +++ b/0022-set-SELinux-context-on-add-but-not-on-change-events.patch @@ -0,0 +1,35 @@ +From 326c5fc3ea684825629eccaf33a548759162a539 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Tue, 31 Aug 2010 21:29:21 +0200 +Subject: [PATCH 22/23] set SELinux context on 'add' but not on 'change' events + +--- + udev/udev-node.c | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/udev/udev-node.c b/udev/udev-node.c +index 228b3eb..c8113f1 100644 +--- a/udev/udev-node.c ++++ b/udev/udev-node.c +@@ -56,10 +56,17 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_ + info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid); + chmod(file, mode); + chown(file, uid, gid); +- udev_selinux_lsetfilecon(udev, file, mode); + } else { + info(udev, "preserve permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid); + } ++ /* ++ * Set initial selinux file context only on add events. ++ * We set the proper context on bootup (triger) or for newly ++ * added devices, but we don't change it later, in case ++ * something else has set a custom context in the meantime. ++ */ ++ if (strcmp(udev_device_get_action(dev), "add") == 0) ++ udev_selinux_lsetfilecon(udev, file, mode); + /* always update timestamp when we re-use the node, like on media change events */ + utimensat(AT_FDCWD, file, NULL, 0); + } else { +-- +1.7.2.2 + diff --git a/0023-do-not-create-persistent-name-rules-for-KVM-network-.patch b/0023-do-not-create-persistent-name-rules-for-KVM-network-.patch new file mode 100644 index 0000000..16b7dab --- /dev/null +++ b/0023-do-not-create-persistent-name-rules-for-KVM-network-.patch @@ -0,0 +1,28 @@ +From af29bf0966994bc233282148f519e12ea29e1c5a Mon Sep 17 00:00:00 2001 +From: Marco d'Itri +Date: Tue, 31 Aug 2010 21:44:34 +0200 +Subject: [PATCH 23/23] do not create persistent name rules for KVM network interfaces + +The virtual interfaces created by KVM are stable, 54:52:00 is the MAC-48 +range of KVM. +--- + .../75-persistent-net-generator.rules | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules +index a9dfdce..8119d0e 100644 +--- a/extras/rule_generator/75-persistent-net-generator.rules ++++ b/extras/rule_generator/75-persistent-net-generator.rules +@@ -29,6 +29,9 @@ ENV{MATCHADDR}="$attr{address}" + # match interface type + ENV{MATCHIFTYPE}="$attr{type}" + ++# ignore KVM virtual interfaces ++ENV{MATCHADDR}=="54:52:00:*", GOTO="persistent_net_generator_end" ++ + # These vendors are known to violate the local MAC address assignment scheme + # Interlan, DEC (UNIBUS or QBUS), Apollo, Cisco, Racal-Datacom + ENV{MATCHADDR}=="02:07:01:*", GOTO="globally_administered_whitelist" +-- +1.7.2.2 + diff --git a/udev.spec b/udev.spec index 8b8febb..6fc041f 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 161 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -17,6 +17,29 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t Source1: start_udev Source2: udev-post.init +Patch1: 0001-cdrom_id-Add-media-status-debugging.patch +Patch2: 0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch +Patch3: 0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch +Patch4: 0004-init-update-systemd-service-files.patch +Patch5: 0005-init-update-systemd-service-files.patch +Patch6: 0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch +Patch7: 0007-init-add-udev-to-description-in-systemd-service-file.patch +Patch8: 0008-udevd-add-pid-to-kmsg-logs.patch +Patch9: 0009-init-edit-systemd-service-descriptions.patch +Patch11: 0011-udev-7-Point-out-required-extension-and-remove-some-.patch +Patch12: 0012-keymap-Add-Onkyo-PC.patch +Patch13: 0013-keymap-Add-HP-G60.patch +Patch14: 0014-udevd-remove-unneeded-credential-passing-from-init_n.patch +Patch15: 0015-Add-support-for-oom_score_adj.patch +Patch16: 0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch +Patch17: 0017-udev-7-manpage-Fix-description-of-attr.patch +Patch18: 0018-gudev-fix-crash-if-netlink-is-not-available.patch +Patch19: 0019-keymap-Fix-Acer-TravelMate-4720.patch +Patch20: 0020-cdrom_id-Fix-DVD-RW-media-detection.patch +Patch21: 0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch +Patch22: 0022-set-SELinux-context-on-add-but-not-on-change-events.patch +Patch23: 0023-do-not-create-persistent-name-rules-for-KVM-network-.patch + ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -113,6 +136,28 @@ glib-based applications using libudev functionality. %prep %setup -q +%patch1 -p1 -b .git1 +%patch2 -p1 -b .git2 +%patch3 -p1 -b .git3 +%patch4 -p1 -b .git4 +%patch5 -p1 -b .git5 +%patch6 -p1 -b .git6 +%patch7 -p1 -b .git7 +%patch8 -p1 -b .git8 +%patch9 -p1 -b .git9 +%patch11 -p1 -b .git11 +%patch12 -p1 -b .git12 +%patch13 -p1 -b .git13 +%patch14 -p1 -b .git14 +%patch15 -p1 -b .git15 +%patch16 -p1 -b .git16 +%patch17 -p1 -b .git17 +%patch18 -p1 -b .git18 +%patch19 -p1 -b .git19 +%patch20 -p1 -b .git20 +%patch21 -p1 -b .git21 +%patch22 -p1 -b .git22 +%patch23 -p1 -b .git23 %build libtoolize -f -c @@ -349,6 +394,11 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Sep 01 2010 Harald Hoyer 161-2 +- bugfixes for systemd service files +- bugfix for selinux labeling +- bugfixes for cdrom_id + * Tue Aug 17 2010 Harald Hoyer 161-1 - udev-161 with an upstream quirk for the qemu cdrom and more cdrom handling bugfixes From d8bca2a5df480f6b3e69d57ef3a60029c300504d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 21 Sep 2010 20:18:19 -0400 Subject: [PATCH 03/66] Rebuild --- udev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index 6fc041f..01b6f16 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 161 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -394,6 +394,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Tue Sep 21 2010 Matthias Clasen 161-3 +- Rebuild against newer gobject-introspection + * Wed Sep 01 2010 Harald Hoyer 161-2 - bugfixes for systemd service files - bugfix for selinux labeling From 94c7d90643db70fb052ceb4c80b866e6099d86eb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 15:24:41 -0700 Subject: [PATCH 04/66] - Rebuilt for gcc bug 634757 --- udev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index 01b6f16..d727903 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 161 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -394,6 +394,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Sep 29 2010 jkeating - 161-4 +- Rebuilt for gcc bug 634757 + * Tue Sep 21 2010 Matthias Clasen 161-3 - Rebuild against newer gobject-introspection From 8fcb6e53edbe03b884264d643e56562732df50e2 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 29 Oct 2010 10:55:52 +0200 Subject: [PATCH 05/66] - version 164 - skip start_udev with systemd --- .gitignore | 2 ++ sources | 4 ++-- start_udev | 4 ++++ udev.spec | 59 ++++++++++-------------------------------------------- 4 files changed, 19 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 22be2f6..65d08f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ udev-160.tar.bz2 +/udev-164.tar.bz2 +/udev-164.tar.bz2.sign diff --git a/sources b/sources index f53200e..8dc2880 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2f42aff9f8c7258fecde71df321032b7 udev-161.tar.bz2.sign -95b6a0ffc9913f3e8021c65f51eb4f88 udev-161.tar.bz2 +cd285a85f969518a671834de2f4d6614 udev-164.tar.bz2 +43b3842a00854e712b1d58af3a03e4ed udev-164.tar.bz2.sign diff --git a/start_udev b/start_udev index 49fc286..ebb9cb6 100755 --- a/start_udev +++ b/start_udev @@ -22,6 +22,10 @@ # # don't use udev if sysfs is not mounted. +# if we run with systemctl, just wait for settle +if [ -x "$(type -P systemctl)" ]; then + systemctl start udev-settle.service &>/dev/null && exit 0 +fi export TZ=/etc/localtime diff --git a/udev.spec b/udev.spec index d727903..d38aa03 100644 --- a/udev.spec +++ b/udev.spec @@ -6,8 +6,8 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 161 -Release: 4%{?dist} +Version: 164 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -17,29 +17,6 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t Source1: start_udev Source2: udev-post.init -Patch1: 0001-cdrom_id-Add-media-status-debugging.patch -Patch2: 0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch -Patch3: 0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch -Patch4: 0004-init-update-systemd-service-files.patch -Patch5: 0005-init-update-systemd-service-files.patch -Patch6: 0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch -Patch7: 0007-init-add-udev-to-description-in-systemd-service-file.patch -Patch8: 0008-udevd-add-pid-to-kmsg-logs.patch -Patch9: 0009-init-edit-systemd-service-descriptions.patch -Patch11: 0011-udev-7-Point-out-required-extension-and-remove-some-.patch -Patch12: 0012-keymap-Add-Onkyo-PC.patch -Patch13: 0013-keymap-Add-HP-G60.patch -Patch14: 0014-udevd-remove-unneeded-credential-passing-from-init_n.patch -Patch15: 0015-Add-support-for-oom_score_adj.patch -Patch16: 0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch -Patch17: 0017-udev-7-manpage-Fix-description-of-attr.patch -Patch18: 0018-gudev-fix-crash-if-netlink-is-not-available.patch -Patch19: 0019-keymap-Fix-Acer-TravelMate-4720.patch -Patch20: 0020-cdrom_id-Fix-DVD-RW-media-detection.patch -Patch21: 0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch -Patch22: 0022-set-SELinux-context-on-add-but-not-on-change-events.patch -Patch23: 0023-do-not-create-persistent-name-rules-for-KVM-network-.patch - ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -136,28 +113,6 @@ glib-based applications using libudev functionality. %prep %setup -q -%patch1 -p1 -b .git1 -%patch2 -p1 -b .git2 -%patch3 -p1 -b .git3 -%patch4 -p1 -b .git4 -%patch5 -p1 -b .git5 -%patch6 -p1 -b .git6 -%patch7 -p1 -b .git7 -%patch8 -p1 -b .git8 -%patch9 -p1 -b .git9 -%patch11 -p1 -b .git11 -%patch12 -p1 -b .git12 -%patch13 -p1 -b .git13 -%patch14 -p1 -b .git14 -%patch15 -p1 -b .git15 -%patch16 -p1 -b .git16 -%patch17 -p1 -b .git17 -%patch18 -p1 -b .git18 -%patch19 -p1 -b .git19 -%patch20 -p1 -b .git20 -%patch21 -p1 -b .git21 -%patch22 -p1 -b .git22 -%patch23 -p1 -b .git23 %build libtoolize -f -c @@ -354,6 +309,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{systemdsystemunitdir}/udev-retry.service %attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service %attr(0644,root,root) %{systemdsystemunitdir}/udev.service +%{systemdsystemunitdir}/basic.target.wants/udev-retry.service +%{systemdsystemunitdir}/basic.target.wants/udev-settle.service +%{systemdsystemunitdir}/basic.target.wants/udev.service + # Deprecated, but keep the ownership %ghost %dir /var/lib/udev @@ -378,7 +337,7 @@ rm -rf $RPM_BUILD_ROOT %files -n libgudev1 %defattr(0644, root, root, 0755) %doc extras/gudev/COPYING -%attr(0755,root,root) %{_libdir}/libgudev-1.0.so.* +%attr(0755,root,root) /%{_lib}/libgudev-1.0.so.* %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib %files -n libgudev1-devel @@ -394,6 +353,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri Oct 29 2010 Harald Hoyer 164-1 +- version 164 +- skip start_udev with systemd + * Wed Sep 29 2010 jkeating - 161-4 - Rebuilt for gcc bug 634757 From 3ce9b8531482cea88827ccfa89ac371af06abdfc Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 29 Oct 2010 10:56:18 +0200 Subject: [PATCH 06/66] - version 164 - skip start_udev with systemd --- ...-cdrom_id-Add-media-status-debugging.patch | 26 -------- ...-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch | 56 ----------------- ...rop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch | 34 ---------- 0004-init-update-systemd-service-files.patch | 42 ------------- 0005-init-update-systemd-service-files.patch | 38 ----------- ...mistake-all-SCSI-processor-devices-f.patch | 33 ---------- ...-description-in-systemd-service-file.patch | 47 -------------- 0008-udevd-add-pid-to-kmsg-logs.patch | 41 ------------ ...it-edit-systemd-service-descriptions.patch | 47 -------------- ...-required-extension-and-remove-some-.patch | 42 ------------- 0012-keymap-Add-Onkyo-PC.patch | 63 ------------------- 0013-keymap-Add-HP-G60.patch | 26 -------- ...eeded-credential-passing-from-init_n.patch | 58 ----------------- 0015-Add-support-for-oom_score_adj.patch | 48 -------------- 0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch | 28 --------- ...ev-7-manpage-Fix-description-of-attr.patch | 32 ---------- ...ix-crash-if-netlink-is-not-available.patch | 57 ----------------- 0019-keymap-Fix-Acer-TravelMate-4720.patch | 28 --------- ...-cdrom_id-Fix-DVD-RW-media-detection.patch | 53 ---------------- ...-blank-detection-for-sloppy-firmware.patch | 42 ------------- ...text-on-add-but-not-on-change-events.patch | 35 ----------- ...rsistent-name-rules-for-KVM-network-.patch | 28 --------- 22 files changed, 904 deletions(-) delete mode 100644 0001-cdrom_id-Add-media-status-debugging.patch delete mode 100644 0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch delete mode 100644 0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch delete mode 100644 0004-init-update-systemd-service-files.patch delete mode 100644 0005-init-update-systemd-service-files.patch delete mode 100644 0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch delete mode 100644 0007-init-add-udev-to-description-in-systemd-service-file.patch delete mode 100644 0008-udevd-add-pid-to-kmsg-logs.patch delete mode 100644 0009-init-edit-systemd-service-descriptions.patch delete mode 100644 0011-udev-7-Point-out-required-extension-and-remove-some-.patch delete mode 100644 0012-keymap-Add-Onkyo-PC.patch delete mode 100644 0013-keymap-Add-HP-G60.patch delete mode 100644 0014-udevd-remove-unneeded-credential-passing-from-init_n.patch delete mode 100644 0015-Add-support-for-oom_score_adj.patch delete mode 100644 0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch delete mode 100644 0017-udev-7-manpage-Fix-description-of-attr.patch delete mode 100644 0018-gudev-fix-crash-if-netlink-is-not-available.patch delete mode 100644 0019-keymap-Fix-Acer-TravelMate-4720.patch delete mode 100644 0020-cdrom_id-Fix-DVD-RW-media-detection.patch delete mode 100644 0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch delete mode 100644 0022-set-SELinux-context-on-add-but-not-on-change-events.patch delete mode 100644 0023-do-not-create-persistent-name-rules-for-KVM-network-.patch diff --git a/0001-cdrom_id-Add-media-status-debugging.patch b/0001-cdrom_id-Add-media-status-debugging.patch deleted file mode 100644 index f282114..0000000 --- a/0001-cdrom_id-Add-media-status-debugging.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 24af530a543c70ac59fdd244377d648ef77a0e21 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Thu, 12 Aug 2010 07:10:12 +0200 -Subject: [PATCH 01/23] cdrom_id: Add media status debugging - -Show which media status the hardware originally reports, since we mangle it in -some cases. ---- - extras/cdrom_id/cdrom_id.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c -index 83e95d5..d59991c 100644 ---- a/extras/cdrom_id/cdrom_id.c -+++ b/extras/cdrom_id/cdrom_id.c -@@ -573,6 +573,7 @@ static int cd_media_info(struct udev *udev, int fd) - - cd_media = 1; - info(udev, "disk type %02x\n", header[8]); -+ info(udev, "hardware reported media status: %s\n", media_status[header[2] & 3]); - - /* exclude plain CDROM, some fake cdroms return 0 for "blank" media here */ - if (!cd_media_cd_rom) --- -1.7.2.2 - diff --git a/0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch b/0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch deleted file mode 100644 index 486c148..0000000 --- a/0002-Add-keymap-for-Lenovo-IdeaPad-S10-3.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9cd075e35b8f660c75b0d72d4bea496fd6459f29 Mon Sep 17 00:00:00 2001 -From: David Woodhouse -Date: Thu, 12 Aug 2010 17:04:55 +0100 -Subject: [PATCH 02/23] Add keymap for Lenovo IdeaPad S10-3 - -Tested on S10-3, but presumably applicable to all IdeaPads. - -Signed-off-by: Martin Pitt ---- - Makefile.am | 1 + - extras/keymap/95-keymap.rules | 2 ++ - extras/keymap/keymaps/lenovo-ideapad | 7 +++++++ - 3 files changed, 10 insertions(+), 0 deletions(-) - create mode 100644 extras/keymap/keymaps/lenovo-ideapad - -diff --git a/Makefile.am b/Makefile.am -index c16b259..77df6ab 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -537,6 +537,7 @@ dist_udevkeymap_DATA = \ - extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ - extras/keymap/keymaps/inventec-symphony_6.0_7.0 \ - extras/keymap/keymaps/lenovo-3000 \ -+ extras/keymap/keymaps/lenovo-ideapad \ - extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ - extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \ - extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \ -diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules -index 13b5571..2241422 100644 ---- a/extras/keymap/95-keymap.rules -+++ b/extras/keymap/95-keymap.rules -@@ -65,6 +65,8 @@ ENV{DMI_VENDOR}=="Compaq*", ATTR{[dmi/id]product_name}=="*E500*|*Evo N*", RUN+=" - ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="*3000*", RUN+="keymap $name lenovo-3000" - ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="ThinkPad X6*", ATTR{[dmi/id]product_version}=="* Tablet" RUN+="keymap $name lenovo-thinkpad_x6_tablet" - ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="ThinkPad X200 Tablet*", ATTR{[dmi/id]product_version}=="* Tablet" RUN+="keymap $name lenovo-thinkpad_x200_tablet" -+ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_version}=="*IdeaPad*", RUN+="keymap $name lenovo-ideapad" -+ENV{DMI_VENDOR}=="LENOVO*", ATTR{[dmi/id]product_name}=="S10-*", RUN+="keymap $name lenovo-ideapad" - - ENV{DMI_VENDOR}=="Hewlett-Packard*", RUN+="keymap $name hewlett-packard" - ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][aA][bB][lL][eE][tT]*", RUN+="keymap $name hewlett-packard-tablet" -diff --git a/extras/keymap/keymaps/lenovo-ideapad b/extras/keymap/keymaps/lenovo-ideapad -new file mode 100644 -index 0000000..d5f2567 ---- /dev/null -+++ b/extras/keymap/keymaps/lenovo-ideapad -@@ -0,0 +1,7 @@ -+# Key codes observed on S10-3, assumed valid on other IdeaPad models -+0x81 rfkill # does nothing in BIOS -+0x83 display_off # BIOS toggles screen state -+0xB9 brightnessup # does nothing in BIOS -+0xBA brightnessdown # does nothing in BIOS -+0xF1 camera # BIOS toggles camera power -+0xf2 unknown # trackpad enable/disable (does nothing in BIOS) --- -1.7.2.2 - diff --git a/0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch b/0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch deleted file mode 100644 index d476ee5..0000000 --- a/0003-cdrom_id-Drop-MEDIA_SESSION_NEXT-for-DVD-RW-RO.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b367a1c9d8a0f565effcdb45f86a365be1c8b622 Mon Sep 17 00:00:00 2001 -From: Jan Drzewiecki -Date: Fri, 13 Aug 2010 07:24:29 +0200 -Subject: [PATCH 03/23] cdrom_id: Drop MEDIA_SESSION_NEXT for DVD-RW-RO - -Commit cf2205a fixed the media status for fresh DVD-RW in restricted overwrite -mode, but missed a detail: We should not report the ID_CDROM_MEDIA_SESSION_NEXT -property either, since in that mode you can never append tracks/sessions; this -just works in sequential mode. - -Signed-off-by: Martin Pitt ---- - extras/cdrom_id/cdrom_id.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c -index d59991c..f9d6e0b 100644 ---- a/extras/cdrom_id/cdrom_id.c -+++ b/extras/cdrom_id/cdrom_id.c -@@ -690,8 +690,9 @@ static int cd_media_info(struct udev *udev, int fd) - } - - determined: -- /* "other" is e. g. DVD-RAM, can't append sessions there either */ -- if ((header[2] & 3) < 2) -+ /* "other" is e. g. DVD-RAM, can't append sessions there; DVDs in -+ * restricted overwrite mode can never append, only in sequential mode */ -+ if ((header[2] & 3) < 2 && !cd_media_dvd_rw_ro) - cd_media_session_next = header[10] << 8 | header[5]; - cd_media_session_count = header[9] << 8 | header[4]; - cd_media_track_count = header[11] << 8 | header[6]; --- -1.7.2.2 - diff --git a/0004-init-update-systemd-service-files.patch b/0004-init-update-systemd-service-files.patch deleted file mode 100644 index a68e467..0000000 --- a/0004-init-update-systemd-service-files.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 68bc0d7963a22967cc00244c4fad96fb45870712 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Tue, 17 Aug 2010 09:37:57 +0200 -Subject: [PATCH 04/23] init: update systemd service files - ---- - init/udev-retry.service.in | 4 ++-- - init/udev-settle.service.in | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in -index 7667899..d8ed8a8 100644 ---- a/init/udev-retry.service.in -+++ b/init/udev-retry.service.in -@@ -4,9 +4,9 @@ DefaultDependencies=no - After=local-fs.target udev.service - - [Service] --Type=finish -+Type=oneshot - ValidNoProcess=yes --ExecStart=@sbindir@/udevadm trigger --type=failed -+ExecStart=@sbindir@/udevadm trigger --type=failed --action=add - - [Install] - WantedBy=sysinit.target -diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in -index 0594d72..4db61f2 100644 ---- a/init/udev-settle.service.in -+++ b/init/udev-settle.service.in -@@ -4,7 +4,7 @@ DefaultDependencies=no - After=udev.service - - [Service] --Type=finish -+Type=oneshot - ValidNoProcess=yes - ExecStart=@sbindir@/udevadm settle - --- -1.7.2.2 - diff --git a/0005-init-update-systemd-service-files.patch b/0005-init-update-systemd-service-files.patch deleted file mode 100644 index e7865d7..0000000 --- a/0005-init-update-systemd-service-files.patch +++ /dev/null @@ -1,38 +0,0 @@ -From bd078c90b97c73ba5fe7475947e6ecd20e2eb048 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Tue, 17 Aug 2010 18:53:57 +0200 -Subject: [PATCH 05/23] init: update systemd service files - ---- - init/udev-retry.service.in | 1 - - init/udev-settle.service.in | 2 +- - 2 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in -index d8ed8a8..7a0819c 100644 ---- a/init/udev-retry.service.in -+++ b/init/udev-retry.service.in -@@ -5,7 +5,6 @@ After=local-fs.target udev.service - - [Service] - Type=oneshot --ValidNoProcess=yes - ExecStart=@sbindir@/udevadm trigger --type=failed --action=add - - [Install] -diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in -index 4db61f2..4cb33aa 100644 ---- a/init/udev-settle.service.in -+++ b/init/udev-settle.service.in -@@ -5,7 +5,7 @@ After=udev.service - - [Service] - Type=oneshot --ValidNoProcess=yes -+RemainAfterExit=yes - ExecStart=@sbindir@/udevadm settle - - [Install] --- -1.7.2.2 - diff --git a/0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch b/0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch deleted file mode 100644 index 0864ad4..0000000 --- a/0006-udev-acl-do-not-mistake-all-SCSI-processor-devices-f.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3bd7b89dc40c4a0440ee5fce2ea907971bfcfb10 Mon Sep 17 00:00:00 2001 -From: Marco d'Itri -Date: Wed, 18 Aug 2010 13:35:25 +0200 -Subject: [PATCH 06/23] udev-acl: do not mistake all SCSI "processor" devices for scanner - -Both rules can be removed since now libsane sets libsane_matched also -for SCSI scanners. - -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=589751 ---- - extras/udev-acl/70-acl.rules | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules -index 6ec04ee..c7134bc 100644 ---- a/extras/udev-acl/70-acl.rules -+++ b/extras/udev-acl/70-acl.rules -@@ -13,11 +13,7 @@ SUBSYSTEM=="usb", ENV{ID_USB_INTERFACES}=="*:060101:*", TAG+="udev-acl" - # digicams with proprietary protocol - ENV{ID_GPHOTO2}=="*?", TAG+="udev-acl" - --# SCSI scanners --KERNEL=="sg[0-9]*", ATTRS{type}=="6", TAG+="udev-acl" --KERNEL=="sg[0-9]*", ATTRS{type}=="3", ATTRS{vendor}=="HP|EPSON|Epson", TAG+="udev-acl" -- --# USB scanners -+# SCSI and USB scanners - ENV{libsane_matched}=="yes", TAG+="udev-acl" - - # HPLIP devices (necessary for ink level check and HP tool maintenance) --- -1.7.2.2 - diff --git a/0007-init-add-udev-to-description-in-systemd-service-file.patch b/0007-init-add-udev-to-description-in-systemd-service-file.patch deleted file mode 100644 index bb13a7b..0000000 --- a/0007-init-add-udev-to-description-in-systemd-service-file.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d15b727ef1375c665057c0fa278b2ea3778b8d3d Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Thu, 19 Aug 2010 08:48:44 +0200 -Subject: [PATCH 07/23] init: add 'udev -' to description in systemd service files - ---- - init/udev-retry.service.in | 2 +- - init/udev-settle.service.in | 2 +- - init/udev.service.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in -index 7a0819c..a6612da 100644 ---- a/init/udev-retry.service.in -+++ b/init/udev-retry.service.in -@@ -1,5 +1,5 @@ - [Unit] --Description=re-trigger failed events after filesystems are available -+Description=udev - re-trigger failed events after filesystems are available - DefaultDependencies=no - After=local-fs.target udev.service - -diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in -index 4cb33aa..578a24f 100644 ---- a/init/udev-settle.service.in -+++ b/init/udev-settle.service.in -@@ -1,5 +1,5 @@ - [Unit] --Description=wait until full initialization -+Description=udev - wait until full initialization - DefaultDependencies=no - After=udev.service - -diff --git a/init/udev.service.in b/init/udev.service.in -index e95cb47..5a63b77 100644 ---- a/init/udev.service.in -+++ b/init/udev.service.in -@@ -1,5 +1,5 @@ - [Unit] --Description=/dev and kernel device manager -+Description=udev - /dev and kernel device manager - DefaultDependencies=no - Before=sysinit.target - --- -1.7.2.2 - diff --git a/0008-udevd-add-pid-to-kmsg-logs.patch b/0008-udevd-add-pid-to-kmsg-logs.patch deleted file mode 100644 index 5b7a8df..0000000 --- a/0008-udevd-add-pid-to-kmsg-logs.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c25bfbfb1b20781698ff3c8cbc884a9e190052ee Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Thu, 19 Aug 2010 08:49:43 +0200 -Subject: [PATCH 08/23] udevd: add pid to kmsg logs - ---- - udev/udev-event.c | 4 ++-- - udev/udevd.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/udev/udev-event.c b/udev/udev-event.c -index 9b5326b..ae523f8 100644 ---- a/udev/udev-event.c -+++ b/udev/udev-event.c -@@ -454,8 +454,8 @@ static void rename_netif_kernel_log(struct ifreq ifr) - return; - } - -- fprintf(f, "<6>udev: renamed network interface %s to %s\n", -- ifr.ifr_name, ifr.ifr_newname); -+ fprintf(f, "<6>udev[%u]: renamed network interface %s to %s\n", -+ getpid(), ifr.ifr_name, ifr.ifr_newname); - fclose(f); - } - -diff --git a/udev/udevd.c b/udev/udevd.c -index 61b76f5..ad2ca3b 100644 ---- a/udev/udevd.c -+++ b/udev/udevd.c -@@ -1298,7 +1298,7 @@ int main(int argc, char *argv[]) - - f = fopen("/dev/kmsg", "w"); - if (f != NULL) { -- fprintf(f, "<6>udev: starting version " VERSION "\n"); -+ fprintf(f, "<6>udev[%u]: starting version " VERSION "\n", getpid()); - fclose(f); - } - --- -1.7.2.2 - diff --git a/0009-init-edit-systemd-service-descriptions.patch b/0009-init-edit-systemd-service-descriptions.patch deleted file mode 100644 index 45b8119..0000000 --- a/0009-init-edit-systemd-service-descriptions.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4c9b12a7aa57e43e568b78da9cbed4138b1292df Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Thu, 19 Aug 2010 18:02:20 +0200 -Subject: [PATCH 09/23] init: edit systemd service descriptions - ---- - init/udev-retry.service.in | 2 +- - init/udev-settle.service.in | 2 +- - init/udev.service.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/init/udev-retry.service.in b/init/udev-retry.service.in -index a6612da..ab8241b 100644 ---- a/init/udev-retry.service.in -+++ b/init/udev-retry.service.in -@@ -1,5 +1,5 @@ - [Unit] --Description=udev - re-trigger failed events after filesystems are available -+Description=udev Retry Failed Events - DefaultDependencies=no - After=local-fs.target udev.service - -diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in -index 578a24f..d58ea9c 100644 ---- a/init/udev-settle.service.in -+++ b/init/udev-settle.service.in -@@ -1,5 +1,5 @@ - [Unit] --Description=udev - wait until full initialization -+Description=udev Wait for Complete Device Initialization - DefaultDependencies=no - After=udev.service - -diff --git a/init/udev.service.in b/init/udev.service.in -index 5a63b77..b07f4db 100644 ---- a/init/udev.service.in -+++ b/init/udev.service.in -@@ -1,5 +1,5 @@ - [Unit] --Description=udev - /dev and kernel device manager -+Description=udev Kernel Device Manager - DefaultDependencies=no - Before=sysinit.target - --- -1.7.2.2 - diff --git a/0011-udev-7-Point-out-required-extension-and-remove-some-.patch b/0011-udev-7-Point-out-required-extension-and-remove-some-.patch deleted file mode 100644 index bd75f26..0000000 --- a/0011-udev-7-Point-out-required-extension-and-remove-some-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6593e8961afbe0b74d5a67c545a991c7733e88df Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Fri, 20 Aug 2010 12:19:23 +0200 -Subject: [PATCH 11/23] udev(7): Point out required extension, and remove some confusion - -Rules files must end in .rules. - -Also drop the redundant and confusing sentence about "file names must be -unique". What is really meant is explained in a better way in the paragraph -above. - -https://launchpad.net/bugs/616108 ---- - udev/udev.xml | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/udev/udev.xml b/udev/udev.xml -index 20c394c..336b203 100644 ---- a/udev/udev.xml -+++ b/udev/udev.xml -@@ -75,12 +75,13 @@ - the custom rules directory /etc/udev/rules.d/ - and the temporary rules directory /dev/.udev/rules.d/. - All rule files are sorted and processed in lexical order, regardless -- in which of these directories they live. -+ in which of these directories they live. Files in -+ /etc/udev/rules.d/ have precedence over files with -+ the same name in /lib/udev/rules.d/. This can be -+ used to ignore a default rules file if needed. - -- Rule files are required to have a unique name, duplicate file names -- are ignored. Files in /etc/udev/rules.d/ have precedence -- over files with the same name in /lib/udev/rules.d/. This -- can be used to ignore a default rules file if needed. -+ Rule files must end in .rules, other extensions -+ are ignored. - - Every line in the rules file contains at least one key value pair. - There are two kind of keys, match and assignment keys. --- -1.7.2.2 - diff --git a/0012-keymap-Add-Onkyo-PC.patch b/0012-keymap-Add-Onkyo-PC.patch deleted file mode 100644 index e7b283b..0000000 --- a/0012-keymap-Add-Onkyo-PC.patch +++ /dev/null @@ -1,63 +0,0 @@ -From acf865b68e1a5c78677537b373b6e082c287fc27 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Sun, 22 Aug 2010 11:00:34 +0200 -Subject: [PATCH 12/23] keymap: Add Onkyo PC - -Thanks to Pau Oliva! - -https://launchpad.net/bugs/612529 ---- - Makefile.am | 1 + - extras/keymap/95-keymap.rules | 2 ++ - extras/keymap/keymaps/onkyo | 14 ++++++++++++++ - 3 files changed, 17 insertions(+), 0 deletions(-) - create mode 100644 extras/keymap/keymaps/onkyo - -diff --git a/Makefile.am b/Makefile.am -index 77df6ab..512de34 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -555,6 +555,7 @@ dist_udevkeymap_DATA = \ - extras/keymap/keymaps/module-sony \ - extras/keymap/keymaps/module-sony-old \ - extras/keymap/keymaps/olpc-xo \ -+ extras/keymap/keymaps/onkyo \ - extras/keymap/keymaps/oqo-model2 \ - extras/keymap/keymaps/samsung-other \ - extras/keymap/keymaps/samsung-sq1us \ -diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules -index 2241422..e9d5721 100644 ---- a/extras/keymap/95-keymap.rules -+++ b/extras/keymap/95-keymap.rules -@@ -127,6 +127,8 @@ ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="Satellite M30X", RUN+=" - - ENV{DMI_VENDOR}=="OQO Inc.*", ATTR{[dmi/id]product_name}=="OQO Model 2*", RUN+="keymap $name oqo-model2" - -+ENV{DMI_VENDOR}=="ONKYO CORPORATION", ATTR{[dmi/id]product_name}=="ONKYOPC", RUN+="keymap $name onkyo" -+ - ENV{DMI_VENDOR}=="ASUS", RUN+="keymap $name asus" - - ENV{DMI_VENDOR}=="VIA", ATTR{[dmi/id]product_name}=="K8N800", ATTR{[dmi/id]product_version}=="VT8204B", RUN+="keymap $name 0x81 prog1" -diff --git a/extras/keymap/keymaps/onkyo b/extras/keymap/keymaps/onkyo -new file mode 100644 -index 0000000..7dd80a1 ---- /dev/null -+++ b/extras/keymap/keymaps/onkyo -@@ -0,0 +1,14 @@ -+0xA0 mute # Fn+D -+0xAE volumedown # Fn+F -+0xB0 volumeup # Fn+G -+0xDF sleep # Fn+W -+0xE0 bluetooth # Fn+H -+0xE2 cyclewindows # Fn+Esc -+0xEE battery # Fn+Q -+0xF0 media # Fn+R -+0xF5 switchvideomode # Fn+E -+0xF6 camera # Fn+T -+0xF7 f22 # Fn+Y (touchpad toggle) -+0xF8 brightnessup # Fn+S -+0xF9 brightnessdown # Fn+A -+0xFB wlan # Fn+J --- -1.7.2.2 - diff --git a/0013-keymap-Add-HP-G60.patch b/0013-keymap-Add-HP-G60.patch deleted file mode 100644 index cbeb33c..0000000 --- a/0013-keymap-Add-HP-G60.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 92cffb0bd18bd8fd245666a519ad0e54dc537031 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Mon, 23 Aug 2010 10:47:28 +0200 -Subject: [PATCH 13/23] keymap: Add HP G60 - -https://launchpad.net/bugs/554944 ---- - extras/keymap/95-keymap.rules | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules -index e9d5721..5656de9 100644 ---- a/extras/keymap/95-keymap.rules -+++ b/extras/keymap/95-keymap.rules -@@ -72,7 +72,7 @@ ENV{DMI_VENDOR}=="Hewlett-Packard*", RUN+="keymap $name hewlett-packard" - ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][aA][bB][lL][eE][tT]*", RUN+="keymap $name hewlett-packard-tablet" - ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[pP][aA][vV][iI][lL][iI][oO][nN]*", RUN+="keymap $name hewlett-packard-pavilion" - ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*Compaq*|*EliteBook*|*2230s*", RUN+="keymap $name hewlett-packard-compaq_elitebook" --ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*", RUN+="keymap $name hewlett-packard-2510p_2530p" -+ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*|HP G60 Notebook PC", RUN+="keymap $name hewlett-packard-2510p_2530p" - ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][xX]2*", RUN+="keymap $name hewlett-packard-tx2" - ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="Presario 2100*", RUN+="keymap $name hewlett-packard-presario-2100" - # HP Pavillion dv6315ea has empty DMI_VENDOR --- -1.7.2.2 - diff --git a/0014-udevd-remove-unneeded-credential-passing-from-init_n.patch b/0014-udevd-remove-unneeded-credential-passing-from-init_n.patch deleted file mode 100644 index 858371b..0000000 --- a/0014-udevd-remove-unneeded-credential-passing-from-init_n.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 13f90be7a33353fdbcd4a389630a05c608bdf2a4 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Wed, 25 Aug 2010 16:26:54 +0200 -Subject: [PATCH 14/23] udevd: remove unneeded credential passing from init_notify() - ---- - udev/udevd.c | 17 ----------------- - 1 files changed, 0 insertions(+), 17 deletions(-) - -diff --git a/udev/udevd.c b/udev/udevd.c -index ad2ca3b..374a4e0 100644 ---- a/udev/udevd.c -+++ b/udev/udevd.c -@@ -964,15 +964,10 @@ static int init_notify(const char *state) - int fd = -1, r; - struct msghdr msghdr; - struct iovec iovec; -- struct ucred *ucred; - union { - struct sockaddr sa; - struct sockaddr_un un; - } sockaddr; -- union { -- struct cmsghdr cmsghdr; -- uint8_t buf[CMSG_SPACE(sizeof(struct ucred))]; -- } control; - const char *e; - - if (!(e = getenv("NOTIFY_SOCKET"))) { -@@ -1002,16 +997,6 @@ static int init_notify(const char *state) - iovec.iov_base = (char*) state; - iovec.iov_len = strlen(state); - -- memset(&control, 0, sizeof(control)); -- control.cmsghdr.cmsg_level = SOL_SOCKET; -- control.cmsghdr.cmsg_type = SCM_CREDENTIALS; -- control.cmsghdr.cmsg_len = CMSG_LEN(sizeof(struct ucred)); -- -- ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr); -- ucred->pid = getpid(); -- ucred->uid = getuid(); -- ucred->gid = getgid(); -- - memset(&msghdr, 0, sizeof(msghdr)); - msghdr.msg_name = &sockaddr; - msghdr.msg_namelen = sizeof(sa_family_t) + strlen(e); -@@ -1019,8 +1004,6 @@ static int init_notify(const char *state) - msghdr.msg_namelen = sizeof(struct sockaddr_un); - msghdr.msg_iov = &iovec; - msghdr.msg_iovlen = 1; -- msghdr.msg_control = &control; -- msghdr.msg_controllen = control.cmsghdr.cmsg_len; - - if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) { - r = -errno; --- -1.7.2.2 - diff --git a/0015-Add-support-for-oom_score_adj.patch b/0015-Add-support-for-oom_score_adj.patch deleted file mode 100644 index e00e50d..0000000 --- a/0015-Add-support-for-oom_score_adj.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c61eea9459045c2c9032a0c98234985a371fac58 Mon Sep 17 00:00:00 2001 -From: Luca Tettamanti -Date: Mon, 23 Aug 2010 14:35:37 +0200 -Subject: [PATCH 15/23] Add support for oom_score_adj - -/proc//oom_adj has been deprecated (kernel v2.6.36) due to the -rework of the badness heuristic; oom_score_adj is the replacement. -Keep a fallback to the old interface for compatibility with older -kernels. - -See http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=a63d83f427fbce97a6cea0db2e64b0eb8435cd10 - -Signed-off-by: Martin Pitt ---- - udev/udevd.c | 15 +++++++++++---- - 1 files changed, 11 insertions(+), 4 deletions(-) - -diff --git a/udev/udevd.c b/udev/udevd.c -index 374a4e0..0ec3c3d 100644 ---- a/udev/udevd.c -+++ b/udev/udevd.c -@@ -1285,12 +1285,19 @@ int main(int argc, char *argv[]) - fclose(f); - } - -- /* OOM_DISABLE == -17 */ -- fd = open("/proc/self/oom_adj", O_RDWR); -+ fd = open("/proc/self/oom_score_adj", O_RDWR); - if (fd < 0) { -- err(udev, "error disabling OOM: %m\n"); -+ /* Fallback to old interface */ -+ fd = open("/proc/self/oom_adj", O_RDWR); -+ if (fd < 0) { -+ err(udev, "error disabling OOM: %m\n"); -+ } else { -+ /* OOM_DISABLE == -17 */ -+ write(fd, "-17", 3); -+ close(fd); -+ } - } else { -- write(fd, "-17", 3); -+ write(fd, "-1000", 5); - close(fd); - } - --- -1.7.2.2 - diff --git a/0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch b/0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch deleted file mode 100644 index d5c7fff..0000000 --- a/0016-keymap-Fix-Sony-VAIO-VGN-SZ2HP-B.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 38b5ccbcf7f3643ea8180a8186cfe3e5fa9cb983 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Wed, 25 Aug 2010 17:02:51 +0200 -Subject: [PATCH 16/23] keymap: Fix Sony VAIO VGN-SZ2HP/B - -Reportedly this needs the module-sony keymap, not the -old one. - -https://launchpad.net/bugs/613578 ---- - extras/keymap/95-keymap.rules | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules -index 5656de9..cb066bd 100644 ---- a/extras/keymap/95-keymap.rules -+++ b/extras/keymap/95-keymap.rules -@@ -46,7 +46,7 @@ ENV{DMI_VENDOR}=="ASUS*", KERNELS=="input*", ATTRS{name}=="Asus Extra Buttons", - ENV{DMI_VENDOR}=="Sony*", KERNELS=="input*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony" - - # Older Vaios have some different keys --ENV{DMI_VENDOR}=="Sony*", ATTR{[dmi/id]product_name}=="*PCG-C1*|*PCG-K25*|*PCG-F1*|*PCG-F2*|*PCG-F3*|*PCG-F4*|*PCG-F5*|*PCG-F6*|*PCG-FX*|*PCG-FRV*|*PCG-GR*|*PCG-TR*|*PCG-NV*|*PCG-Z*|*VGN-S360*|*VGN-SZ2HP_B*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony-old" -+ENV{DMI_VENDOR}=="Sony*", ATTR{[dmi/id]product_name}=="*PCG-C1*|*PCG-K25*|*PCG-F1*|*PCG-F2*|*PCG-F3*|*PCG-F4*|*PCG-F5*|*PCG-F6*|*PCG-FX*|*PCG-FRV*|*PCG-GR*|*PCG-TR*|*PCG-NV*|*PCG-Z*|*VGN-S360*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony-old" - - # - # The following rules belong to standard i8042 AT keyboard with high key codes. --- -1.7.2.2 - diff --git a/0017-udev-7-manpage-Fix-description-of-attr.patch b/0017-udev-7-manpage-Fix-description-of-attr.patch deleted file mode 100644 index 6b41ecf..0000000 --- a/0017-udev-7-manpage-Fix-description-of-attr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 83184d008ba23724fd30996440534c0633a0d0aa Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Fri, 27 Aug 2010 16:54:52 +0200 -Subject: [PATCH 17/23] udev(7) manpage: Fix description of $attr - -Fix the manpage to describe the real behaviour of $attr: It doesn't search all -parent devices any more, just the one selected by KERNELS etc. - -https://launchpad.net/bugs/348513 ---- - udev/udev.xml | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/udev/udev.xml b/udev/udev.xml -index 336b203..6085dff 100644 ---- a/udev/udev.xml -+++ b/udev/udev.xml -@@ -578,8 +578,9 @@ - - The value of a sysfs attribute found at the device, where - all keys of the rule have matched. If the matching device does not have -- such an attribute, follow the chain of parent devices and use the value -- of the first attribute that matches. -+ such an attribute, and a previous KERNELS, SUBSYSTEMS, DRIVERS, or -+ ATTRS test selected a parent device, use the attribute from that -+ parent device. - If the attribute is a symlink, the last element of the symlink target is - returned as the value. - --- -1.7.2.2 - diff --git a/0018-gudev-fix-crash-if-netlink-is-not-available.patch b/0018-gudev-fix-crash-if-netlink-is-not-available.patch deleted file mode 100644 index 2a5872e..0000000 --- a/0018-gudev-fix-crash-if-netlink-is-not-available.patch +++ /dev/null @@ -1,57 +0,0 @@ -From e4dcdc4ab232bcbbe61a2026c16e647d9302cdd2 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Fri, 27 Aug 2010 18:12:59 +0200 -Subject: [PATCH 18/23] gudev: fix crash if netlink is not available - -gudev_client_new() assumes that priv->monitor is never NULL, but this happens -on older kernels. Let's not crash client programs because of that. - -https://launchpad.net/bugs/581527 ---- - extras/gudev/gudevclient.c | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/extras/gudev/gudevclient.c b/extras/gudev/gudevclient.c -index fa31f70..f5f7a19 100644 ---- a/extras/gudev/gudevclient.c -+++ b/extras/gudev/gudevclient.c -@@ -93,6 +93,8 @@ monitor_event (GIOChannel *source, - GUdevDevice *device; - struct udev_device *udevice; - -+ if (client->priv->monitor == NULL) -+ goto out; - udevice = udev_monitor_receive_device (client->priv->monitor); - if (udevice == NULL) - goto out; -@@ -216,17 +218,21 @@ g_udev_client_constructed (GObject *object) - *s = '\0'; - } - -- udev_monitor_filter_add_match_subsystem_devtype (client->priv->monitor, subsystem, devtype); -+ if (client->priv->monitor != NULL) -+ udev_monitor_filter_add_match_subsystem_devtype (client->priv->monitor, subsystem, devtype); - - g_free (subsystem); - } - - /* listen to events, and buffer them */ -- udev_monitor_enable_receiving (client->priv->monitor); -- -- channel = g_io_channel_unix_new (udev_monitor_get_fd (client->priv->monitor)); -- client->priv->watch_id = g_io_add_watch (channel, G_IO_IN, monitor_event, client); -- g_io_channel_unref (channel); -+ if (client->priv->monitor != NULL) -+ { -+ udev_monitor_enable_receiving (client->priv->monitor); -+ channel = g_io_channel_unix_new (udev_monitor_get_fd (client->priv->monitor)); -+ client->priv->watch_id = g_io_add_watch (channel, G_IO_IN, monitor_event, client); -+ g_io_channel_unref (channel); -+ } else -+ client->priv->watch_id = NULL; - } - - if (G_OBJECT_CLASS (g_udev_client_parent_class)->constructed != NULL) --- -1.7.2.2 - diff --git a/0019-keymap-Fix-Acer-TravelMate-4720.patch b/0019-keymap-Fix-Acer-TravelMate-4720.patch deleted file mode 100644 index 35a9922..0000000 --- a/0019-keymap-Fix-Acer-TravelMate-4720.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d17c065e28fa4baac90b02b4913c7ef32d54f3c7 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Fri, 27 Aug 2010 18:48:53 +0200 -Subject: [PATCH 19/23] keymap: Fix Acer TravelMate 4720 - -The previous change just fixed the Bluetooth key, but Screen Lock and Browser -also need to be changed. - -https://launchpad.net/bugs/569815 ---- - extras/keymap/95-keymap.rules | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules -index cb066bd..913b380 100644 ---- a/extras/keymap/95-keymap.rules -+++ b/extras/keymap/95-keymap.rules -@@ -85,6 +85,7 @@ ENV{DMI_VENDOR}=="Acer*", RUN+="keymap $name acer" - ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Extensa*", ATTR{[dmi/id]product_name}=="*5210*|*5220*|*5610*|*5620*|*5720*", RUN+="keymap $name 0xEE screenlock" - ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="TravelMate*C300*", RUN+="keymap $name acer-travelmate_c300" - ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="TravelMate*6292*|TravelMate*8471*|TravelMate*4720*|Aspire 1810T*|AO751h|AO531h", RUN+="keymap $name 0xD9 bluetooth" -+ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="TravelMate*4720*", RUN+="keymap $name 0xB2 www 0xEE screenlock" - ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="TravelMate 6593|Aspire 1640", RUN+="keymap $name 0xB2 www 0xEE screenlock" - ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 6920", RUN+="keymap $name acer-aspire_6920" - ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 5920G", RUN+="keymap $name acer-aspire_5920g" --- -1.7.2.2 - diff --git a/0020-cdrom_id-Fix-DVD-RW-media-detection.patch b/0020-cdrom_id-Fix-DVD-RW-media-detection.patch deleted file mode 100644 index 4a91a4e..0000000 --- a/0020-cdrom_id-Fix-DVD-RW-media-detection.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2458db3edd8d66827b34978ff471dff8f879e9ab Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Mon, 30 Aug 2010 15:33:26 +0200 -Subject: [PATCH 20/23] cdrom_id: Fix DVD-RW media detection - -Commit cf2205a19 applied the "restricted overwrite" vs. "sequential" DVD-RW -test to feature_profiles() (which reads the drive capabilities), which caused -every DVD medium to be detected as ID_CDROM_MEDIA_DVD_RW. Now apply it to -cd_profiles() instead, to just check the current profile. ---- - extras/cdrom_id/cdrom_id.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c -index f9d6e0b..8480d7b 100644 ---- a/extras/cdrom_id/cdrom_id.c -+++ b/extras/cdrom_id/cdrom_id.c -@@ -297,14 +297,9 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si - cd_dvd_ram = 1; - break; - case 0x13: -- info(udev, "profile 0x%02x media_dvd_rw\n", profile); -- cd_media_dvd_rw = 1; -- cd_media_dvd_rw_ro = 1; -- break; - case 0x14: - info(udev, "profile 0x%02x dvd_rw\n", profile); - cd_dvd_rw = 1; -- cd_media_dvd_rw_seq = 1; - break; - case 0x1B: - info(udev, "profile 0x%02x dvd_plus_r\n", profile); -@@ -486,10 +481,16 @@ static int cd_profiles(struct udev *udev, int fd) - cd_media_dvd_ram = 1; - break; - case 0x13: -+ info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_rw = 1; -+ cd_media_dvd_rw_ro = 1; -+ break; - case 0x14: -- info(udev, "profile 0x%02x media_dvd_rw\n", cur_profile); -+ info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); - cd_media = 1; - cd_media_dvd_rw = 1; -+ cd_media_dvd_rw_seq = 1; - break; - case 0x1B: - info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); --- -1.7.2.2 - diff --git a/0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch b/0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch deleted file mode 100644 index d033307..0000000 --- a/0021-cdrom_id-Fix-DVD-blank-detection-for-sloppy-firmware.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5e267ea5a36de0b2a9a8965ca93dd45bbd6b1a8b Mon Sep 17 00:00:00 2001 -From: Jan Drzewiecki -Date: Tue, 31 Aug 2010 00:37:28 +0200 -Subject: [PATCH 21/23] cdrom_id: Fix DVD blank detection for sloppy firmware - -Reportedly, many CD drive firmwares will only consider the MSB in a READ -command, thus if we request 17 blocks to be read, we'll actually only get 16 in -many cases, and thus miss out the interesting sector #17. This would lead to -falsely considering nonempty DVDs as blank. - -Fetch 32 blocks now, which should work everywhere. - -Signed-off-by: Martin Pitt ---- - extras/cdrom_id/cdrom_id.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c -index 8480d7b..0153af6 100644 ---- a/extras/cdrom_id/cdrom_id.c -+++ b/extras/cdrom_id/cdrom_id.c -@@ -590,7 +590,7 @@ static int cd_media_info(struct udev *udev, int fd) - * always "complete", DVD-RAM are "other" or "complete" if the disc is - * write protected; we need to check the contents if it is blank */ - if ((cd_media_dvd_rw_ro || cd_media_dvd_plus_rw || cd_media_dvd_plus_rw_dl || cd_media_dvd_ram) && (header[2] & 3) > 1) { -- unsigned char buffer[17 * 2048]; -+ unsigned char buffer[32 * 2048]; - unsigned char result, len; - int block, offset; - -@@ -661,7 +661,7 @@ static int cd_media_info(struct udev *udev, int fd) - scsi_cmd_init(udev, &sc, buffer, sizeof(buffer)); - scsi_cmd_set(udev, &sc, 0, 0x28); - scsi_cmd_set(udev, &sc, 5, 0); -- scsi_cmd_set(udev, &sc, 8, 17); -+ scsi_cmd_set(udev, &sc, 8, 32); - scsi_cmd_set(udev, &sc, 9, 0); - err = scsi_cmd_run(udev, &sc, fd, buffer, sizeof(buffer)); - if ((err != 0)) { --- -1.7.2.2 - diff --git a/0022-set-SELinux-context-on-add-but-not-on-change-events.patch b/0022-set-SELinux-context-on-add-but-not-on-change-events.patch deleted file mode 100644 index aa99300..0000000 --- a/0022-set-SELinux-context-on-add-but-not-on-change-events.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 326c5fc3ea684825629eccaf33a548759162a539 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Tue, 31 Aug 2010 21:29:21 +0200 -Subject: [PATCH 22/23] set SELinux context on 'add' but not on 'change' events - ---- - udev/udev-node.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -diff --git a/udev/udev-node.c b/udev/udev-node.c -index 228b3eb..c8113f1 100644 ---- a/udev/udev-node.c -+++ b/udev/udev-node.c -@@ -56,10 +56,17 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_ - info(udev, "set permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid); - chmod(file, mode); - chown(file, uid, gid); -- udev_selinux_lsetfilecon(udev, file, mode); - } else { - info(udev, "preserve permissions %s, %#o, uid=%u, gid=%u\n", file, mode, uid, gid); - } -+ /* -+ * Set initial selinux file context only on add events. -+ * We set the proper context on bootup (triger) or for newly -+ * added devices, but we don't change it later, in case -+ * something else has set a custom context in the meantime. -+ */ -+ if (strcmp(udev_device_get_action(dev), "add") == 0) -+ udev_selinux_lsetfilecon(udev, file, mode); - /* always update timestamp when we re-use the node, like on media change events */ - utimensat(AT_FDCWD, file, NULL, 0); - } else { --- -1.7.2.2 - diff --git a/0023-do-not-create-persistent-name-rules-for-KVM-network-.patch b/0023-do-not-create-persistent-name-rules-for-KVM-network-.patch deleted file mode 100644 index 16b7dab..0000000 --- a/0023-do-not-create-persistent-name-rules-for-KVM-network-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From af29bf0966994bc233282148f519e12ea29e1c5a Mon Sep 17 00:00:00 2001 -From: Marco d'Itri -Date: Tue, 31 Aug 2010 21:44:34 +0200 -Subject: [PATCH 23/23] do not create persistent name rules for KVM network interfaces - -The virtual interfaces created by KVM are stable, 54:52:00 is the MAC-48 -range of KVM. ---- - .../75-persistent-net-generator.rules | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/extras/rule_generator/75-persistent-net-generator.rules -index a9dfdce..8119d0e 100644 ---- a/extras/rule_generator/75-persistent-net-generator.rules -+++ b/extras/rule_generator/75-persistent-net-generator.rules -@@ -29,6 +29,9 @@ ENV{MATCHADDR}="$attr{address}" - # match interface type - ENV{MATCHIFTYPE}="$attr{type}" - -+# ignore KVM virtual interfaces -+ENV{MATCHADDR}=="54:52:00:*", GOTO="persistent_net_generator_end" -+ - # These vendors are known to violate the local MAC address assignment scheme - # Interlan, DEC (UNIBUS or QBUS), Apollo, Cisco, Racal-Datacom - ENV{MATCHADDR}=="02:07:01:*", GOTO="globally_administered_whitelist" --- -1.7.2.2 - From dfa8b8fed24b48109bfa560c4fdc83a508174402 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 12 Nov 2010 14:20:37 +0100 Subject: [PATCH 07/66] - do not create mount point dirs in /dev --- udev.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/udev.spec b/udev.spec index d38aa03..8f6eb58 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 164 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -263,9 +263,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %dir %{udev_scriptdir}/ %attr(0755,root,root) %dir %{udev_scriptdir}/devices/ %attr(0755,root,root) %dir %{udev_scriptdir}/devices/net -%attr(0755,root,root) %dir %{udev_scriptdir}/devices/hugepages -%attr(0755,root,root) %dir %{udev_scriptdir}/devices/pts -%attr(0755,root,root) %dir %{udev_scriptdir}/devices/shm %{udev_scriptdir}/devices/MAKEDEV %attr(666,root,root) %dev(c,10,200) %{udev_scriptdir}/devices/net/tun %attr(600,root,root) %dev(c,108,0) %{udev_scriptdir}/devices/ppp @@ -353,6 +350,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri Nov 12 2010 Harald Hoyer 164-2 +- do not create mount point dirs in /dev + * Fri Oct 29 2010 Harald Hoyer 164-1 - version 164 - skip start_udev with systemd From 1efa3f58ceeab69ecf402bc1be624b73b17d454f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 12 Nov 2010 15:29:16 +0100 Subject: [PATCH 08/66] - enlarged the import buffer to fix the ressize bugs Resolves: rhbz#652318 --- udev-ressize.patch | 24 ++++++++++++++++++++++++ udev.spec | 9 ++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 udev-ressize.patch diff --git a/udev-ressize.patch b/udev-ressize.patch new file mode 100644 index 0000000..788b859 --- /dev/null +++ b/udev-ressize.patch @@ -0,0 +1,24 @@ +commit 851dd4ddc5aeb1ee517145d9e3334c2017595321 +Author: Harald Hoyer +Date: Fri Nov 12 14:39:14 2010 +0100 + + udev-rules.c: change import property buffer to 16384 bytes + + import_program_into_properties() should have the same line length as + import_file_into_properties() + + see also https://bugzilla.redhat.com/show_bug.cgi?id=652318 + +diff --git a/udev/udev-rules.c b/udev/udev-rules.c +index 52f121c..ab7b6ae 100644 +--- a/udev/udev-rules.c ++++ b/udev/udev-rules.c +@@ -751,7 +751,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p + { + struct udev *udev = udev_device_get_udev(dev); + char **envp; +- char result[4096]; ++ char result[UTIL_LINE_SIZE]; + size_t reslen; + char *line; + diff --git a/udev.spec b/udev.spec index 8f6eb58..15dda4c 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 164 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -17,6 +17,8 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t Source1: start_udev Source2: udev-post.init +Patch1: udev-ressize.patch + ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -113,6 +115,7 @@ glib-based applications using libudev functionality. %prep %setup -q +%patch1 -p1 %build libtoolize -f -c @@ -350,6 +353,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri Nov 12 2010 Harald Hoyer 164-3 +- enlarged the import buffer to fix the ressize bugs +Resolves: rhbz#652318 + * Fri Nov 12 2010 Harald Hoyer 164-2 - do not create mount point dirs in /dev From 9a010ac3e50b5c293aa0bb23d67a1b440b796867 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 12 Nov 2010 15:49:43 +0100 Subject: [PATCH 09/66] - add ACLs for PDA devices Resolves: rhbz#642435 --- udev-pda-acl.patch | 20 ++++++++++++++++++++ udev.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 udev-pda-acl.patch diff --git a/udev-pda-acl.patch b/udev-pda-acl.patch new file mode 100644 index 0000000..b48103a --- /dev/null +++ b/udev-pda-acl.patch @@ -0,0 +1,20 @@ +commit d69207c3f20f0af2a5e510515ae5473f4fe54476 +Author: Harald Hoyer +Date: Fri Nov 12 15:44:34 2010 +0100 + + 70-acl.rules: add ACLs for ID_PDA devices + +diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules +index c7134bc..66375de 100644 +--- a/extras/udev-acl/70-acl.rules ++++ b/extras/udev-acl/70-acl.rules +@@ -47,6 +47,9 @@ SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="udev-acl" + # smart-card readers + ENV{ID_SMARTCARD_READER}=="*?", TAG+="udev-acl" + ++# PDA devices ++ENV{ID_PDA}=="*?", TAG+="udev-acl" ++ + # joysticks + SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl" + diff --git a/udev.spec b/udev.spec index 15dda4c..0ae5b6b 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 164 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -18,6 +18,7 @@ Source1: start_udev Source2: udev-post.init Patch1: udev-ressize.patch +Patch2: udev-pda-acl.patch ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -116,6 +117,7 @@ glib-based applications using libudev functionality. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build libtoolize -f -c @@ -353,6 +355,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri Nov 12 2010 Harald Hoyer 164-4 +- add ACLs for PDA devices +Resolves: rhbz#642435 + * Fri Nov 12 2010 Harald Hoyer 164-3 - enlarged the import buffer to fix the ressize bugs Resolves: rhbz#652318 From 3f6713d0dfc903fd176e3e6731feb0905ce3400e Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 25 Nov 2010 16:05:53 +0000 Subject: [PATCH 10/66] - Add patches to fix touchpad toggle key handling --- ...map-Make-touchpad-buttons-consistent.patch | 232 ++++++++++++++++++ ...dd-force-release-for-HP-touchpad-off.patch | 56 +++++ udev.spec | 9 +- 3 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 0001-extras-keymap-Make-touchpad-buttons-consistent.patch create mode 100644 0001-keymap-Add-force-release-for-HP-touchpad-off.patch diff --git a/0001-extras-keymap-Make-touchpad-buttons-consistent.patch b/0001-extras-keymap-Make-touchpad-buttons-consistent.patch new file mode 100644 index 0000000..bd36b5f --- /dev/null +++ b/0001-extras-keymap-Make-touchpad-buttons-consistent.patch @@ -0,0 +1,232 @@ +From a1ca5f60e0770299c5c5f21bd371f5823802412b Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Thu, 4 Nov 2010 23:58:56 +0000 +Subject: [PATCH] extras/keymap: Make touchpad buttons consistent + +We'll need to standardise on the Touchpad related keys in udev, kernel, and +X.org. I selected F21 for XF86TouchpadToggle, F22 for XF86TouchpadOn and F23 +for XF86TouchpadOff. + +See: +https://bugs.freedesktop.org/show_bug.cgi?id=31333 + +Signed-off-by: Martin Pitt +--- + extras/keymap/keymaps/acer | 2 +- + extras/keymap/keymaps/dell | 4 ++-- + extras/keymap/keymaps/everex-xt5000 | 2 +- + extras/keymap/keymaps/hewlett-packard-2510p_2530p | 4 ++-- + extras/keymap/keymaps/hewlett-packard-pavilion | 4 ++-- + extras/keymap/keymaps/hewlett-packard-tx2 | 2 +- + .../lenovo-thinkpad-usb-keyboard-trackpoint | 2 +- + extras/keymap/keymaps/lg-x110 | 4 ++-- + extras/keymap/keymaps/micro-star | 2 +- + extras/keymap/keymaps/module-lenovo | 2 +- + extras/keymap/keymaps/onkyo | 2 +- + extras/keymap/keymaps/samsung-other | 2 +- + extras/keymap/keymaps/samsung-sx20s | 4 ++-- + extras/keymap/keymaps/toshiba-satellite_a110 | 4 ++-- + extras/keymap/keymaps/toshiba-satellite_m30x | 4 ++-- + extras/keymap/keymaps/zepto-znote | 2 +- + 16 files changed, 23 insertions(+), 23 deletions(-) + +diff --git a/extras/keymap/keymaps/acer b/extras/keymap/keymaps/acer +index 6abe39c..4e7c297 100644 +--- a/extras/keymap/keymaps/acer ++++ b/extras/keymap/keymaps/acer +@@ -14,7 +14,7 @@ + 0xEE brightnessup # Fn+Right + 0xEF brightnessdown # Fn+Left + 0xF1 f22 # Fn+F7 Touchpad toggle (off-to-on) +-0xF2 f22 # Fn+F7 Touchpad toggle (on-to-off) ++0xF2 f23 # Fn+F7 Touchpad toggle (on-to-off) + 0xF3 prog2 # "P2" programmable button + 0xF4 prog1 # "P1" programmable button + 0xF5 presentation +diff --git a/extras/keymap/keymaps/dell b/extras/keymap/keymaps/dell +index 1a2e433..fbbb903 100644 +--- a/extras/keymap/keymaps/dell ++++ b/extras/keymap/keymaps/dell +@@ -21,9 +21,9 @@ + 0x99 nextsong # Front panel next song + 0x9A setup # Tablet tools button + 0x9B switchvideomode # Display Toggle button +-0x9E f22 #touchpad toggle ++0x9E f21 #touchpad toggle + 0xA2 playpause # Front panel play/pause + 0xA4 stopcd # Front panel stop + 0xED media # MediaDirect button + 0xD8 screenlock # FIXME: Tablet lock button +-0xD9 f22 # touchpad toggle ++0xD9 f21 # touchpad toggle +diff --git a/extras/keymap/keymaps/everex-xt5000 b/extras/keymap/keymaps/everex-xt5000 +index 53bdd7a..4823a83 100644 +--- a/extras/keymap/keymaps/everex-xt5000 ++++ b/extras/keymap/keymaps/everex-xt5000 +@@ -1,5 +1,5 @@ + 0x5C media +-0x65 f22 # Fn+F5 Touchpad toggle ++0x65 f21 # Fn+F5 Touchpad toggle + 0x67 prog3 # Fan Speed Control button + 0x6F brightnessup + 0x7F brightnessdown +diff --git a/extras/keymap/keymaps/hewlett-packard-2510p_2530p b/extras/keymap/keymaps/hewlett-packard-2510p_2530p +index 2bc70c2..41ad2e9 100644 +--- a/extras/keymap/keymaps/hewlett-packard-2510p_2530p ++++ b/extras/keymap/keymaps/hewlett-packard-2510p_2530p +@@ -1,2 +1,2 @@ +-0xD8 f22 # touchpad off +-0xD9 f23 # touchpad on ++0xD8 f23 # touchpad off ++0xD9 f22 # touchpad on +diff --git a/extras/keymap/keymaps/hewlett-packard-pavilion b/extras/keymap/keymaps/hewlett-packard-pavilion +index a55d2b7..3d3cefc 100644 +--- a/extras/keymap/keymaps/hewlett-packard-pavilion ++++ b/extras/keymap/keymaps/hewlett-packard-pavilion +@@ -1,3 +1,3 @@ + 0x88 media # FIXME: quick play +-0xD8 f22 # touchpad off +-0xD9 f23 # touchpad on ++0xD8 f23 # touchpad off ++0xD9 f22 # touchpad on +diff --git a/extras/keymap/keymaps/hewlett-packard-tx2 b/extras/keymap/keymaps/hewlett-packard-tx2 +index 206c004..36a690f 100644 +--- a/extras/keymap/keymaps/hewlett-packard-tx2 ++++ b/extras/keymap/keymaps/hewlett-packard-tx2 +@@ -1,3 +1,3 @@ + 0xC2 media +-0xD8 f22 # Toggle touchpad button on tx2 (OFF) ++0xD8 f23 # Toggle touchpad button on tx2 (OFF) + 0xD9 f22 # Toggle touchpad button on tx2 (ON) +diff --git a/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint +index 7612f79..bc91470 100644 +--- a/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint ++++ b/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint +@@ -2,7 +2,7 @@ + 0x90013 battery # Fn+F3 + 0x90014 wlan # Fn+F5 + 0x90016 switchvideomode # Fn+F7 +-0x90017 f22 # Fn+F8 touchpadtoggle ++0x90017 f21 # Fn+F8 touchpadtoggle + 0x90019 suspend # Fn+F12 + 0x9001A brightnessup # Fn+Home + 0x9001B brightnessdown # Fn+End +diff --git a/extras/keymap/keymaps/lg-x110 b/extras/keymap/keymaps/lg-x110 +index a61cf3d..ba08cba 100644 +--- a/extras/keymap/keymaps/lg-x110 ++++ b/extras/keymap/keymaps/lg-x110 +@@ -6,7 +6,7 @@ + 0xB3 suspend # Fn-F12 + 0xDF sleep # Fn-F4 + # 0xE2 bluetooth # satellite dish2 +-0xE4 f22 # Fn-F5 Touchpad disable ++0xE4 f21 # Fn-F5 Touchpad disable + 0xF6 wlan # Fn-F6 + 0xF7 reserved # brightnessdown # Fn-Down +-0xF8 reserved # brightnessup # Fn-Up +\ No newline at end of file ++0xF8 reserved # brightnessup # Fn-Up +diff --git a/extras/keymap/keymaps/micro-star b/extras/keymap/keymaps/micro-star +index 0de5ae6..4a43869 100644 +--- a/extras/keymap/keymaps/micro-star ++++ b/extras/keymap/keymaps/micro-star +@@ -4,7 +4,7 @@ + 0xB2 www # e button + 0xDF sleep # Fn-F12 + 0xE2 bluetooth # satellite dish2 +-0xE4 f22 # Fn-F3 Touchpad disable ++0xE4 f21 # Fn-F3 Touchpad disable + 0xEC email # envelope button + 0xEE camera # Fn-F6 camera disable + 0xF6 wlan # satellite dish1 +diff --git a/extras/keymap/keymaps/module-lenovo b/extras/keymap/keymaps/module-lenovo +index 7c597bd..9cb74b2 100644 +--- a/extras/keymap/keymaps/module-lenovo ++++ b/extras/keymap/keymaps/module-lenovo +@@ -3,7 +3,7 @@ + 0x3 sleep # Fn+F4 + 0x4 wlan # Fn+F5 + 0x6 switchvideomode # Fn+F7 +-0x7 f22 # Fn+F8 touchpadtoggle ++0x7 f21 # Fn+F8 touchpadtoggle + 0x8 f24 # Fn+F9 undock + 0xB suspend # Fn+F12 + 0xF brightnessup # Fn+Home +diff --git a/extras/keymap/keymaps/onkyo b/extras/keymap/keymaps/onkyo +index 7dd80a1..ee864ad 100644 +--- a/extras/keymap/keymaps/onkyo ++++ b/extras/keymap/keymaps/onkyo +@@ -8,7 +8,7 @@ + 0xF0 media # Fn+R + 0xF5 switchvideomode # Fn+E + 0xF6 camera # Fn+T +-0xF7 f22 # Fn+Y (touchpad toggle) ++0xF7 f21 # Fn+Y (touchpad toggle) + 0xF8 brightnessup # Fn+S + 0xF9 brightnessdown # Fn+A + 0xFB wlan # Fn+J +diff --git a/extras/keymap/keymaps/samsung-other b/extras/keymap/keymaps/samsung-other +index 6a0928c..3ac0c2f 100644 +--- a/extras/keymap/keymaps/samsung-other ++++ b/extras/keymap/keymaps/samsung-other +@@ -11,4 +11,4 @@ + 0xB3 prog3 # Fn+F8 switch power mode (battery/dynamic/performance) + 0xB4 wlan # Fn+F9 (X60P) + 0xF7 f22 # Fn+F10 Touchpad on +-0xF9 f22 # Fn+F10 Touchpad off ++0xF9 f23 # Fn+F10 Touchpad off +diff --git a/extras/keymap/keymaps/samsung-sx20s b/extras/keymap/keymaps/samsung-sx20s +index daf7d3e..9d954ee 100644 +--- a/extras/keymap/keymaps/samsung-sx20s ++++ b/extras/keymap/keymaps/samsung-sx20s +@@ -1,4 +1,4 @@ + 0x74 mute + 0x75 mute +-0x77 f21 # FIXME: Touchpad on +-0x79 f21 # FIXME: Touchpad off ++0x77 f22 # Touchpad on ++0x79 f23 # Touchpad off +diff --git a/extras/keymap/keymaps/toshiba-satellite_a110 b/extras/keymap/keymaps/toshiba-satellite_a110 +index 0f2aaec..1429409 100644 +--- a/extras/keymap/keymaps/toshiba-satellite_a110 ++++ b/extras/keymap/keymaps/toshiba-satellite_a110 +@@ -1,8 +1,8 @@ + 0x92 stop + 0x93 www + 0x94 media +-0x9E f21 # FIXME: Touchpad on +-0x9F f21 # FIXME: Touchpad off ++0x9E f22 # Touchpad on ++0x9F f23 # Touchpad off + 0xB9 nextsong + 0xD9 brightnessup + 0xEE screenlock +diff --git a/extras/keymap/keymaps/toshiba-satellite_m30x b/extras/keymap/keymaps/toshiba-satellite_m30x +index cf6d912..9280ae0 100644 +--- a/extras/keymap/keymaps/toshiba-satellite_m30x ++++ b/extras/keymap/keymaps/toshiba-satellite_m30x +@@ -2,6 +2,6 @@ + 0xd9 brightnessup + 0xee screenlock + 0x93 media +-0x9e prog1 #touchpad_enable +-0x9f prog2 #touchpad_disable ++0x9e f22 #touchpad_enable ++0x9f f23 #touchpad_disable + +diff --git a/extras/keymap/keymaps/zepto-znote b/extras/keymap/keymaps/zepto-znote +index e076516..cf72fda 100644 +--- a/extras/keymap/keymaps/zepto-znote ++++ b/extras/keymap/keymaps/zepto-znote +@@ -1,7 +1,7 @@ + 0x93 switchvideomode # Fn+F3 Toggle Video Output + 0x95 brightnessdown # Fn+F4 Brightness Down + 0x91 brightnessup # Fn+F5 Brightness Up +-0xA5 f22 # Fn+F6 Disable Touchpad ++0xA5 f23 # Fn+F6 Disable Touchpad + 0xA6 f22 # Fn+F6 Enable Touchpad + 0xA7 bluetooth # Fn+F10 Enable Bluetooth + 0XA9 bluetooth # Fn+F10 Disable Bluetooth +-- +1.7.3.2 + diff --git a/0001-keymap-Add-force-release-for-HP-touchpad-off.patch b/0001-keymap-Add-force-release-for-HP-touchpad-off.patch new file mode 100644 index 0000000..1ba3551 --- /dev/null +++ b/0001-keymap-Add-force-release-for-HP-touchpad-off.patch @@ -0,0 +1,56 @@ +From ecfad20871e855d9e54d3a528cf9219ce5c93626 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Mon, 1 Nov 2010 16:29:09 +0000 +Subject: [PATCH] keymap: Add force release for HP touchpad off + +Force the touchpad off/on keys getting released, as they usually +only send a "repeat". + +https://bugzilla.redhat.com/show_bug.cgi?id=623239 + +Signed-off-by: Martin Pitt +--- + Makefile.am | 1 + + extras/keymap/95-keyboard-force-release.rules | 5 +++++ + extras/keymap/force-release-maps/hp-other | 3 +++ + 3 files changed, 9 insertions(+), 0 deletions(-) + create mode 100644 extras/keymap/force-release-maps/hp-other + +diff --git a/Makefile.am b/Makefile.am +index 3a95046..032eb28 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -601,6 +601,7 @@ dist_udevkeymap_DATA = \ + + udevkeymapforcereldir = $(libexecdir)/keymaps/force-release + dist_udevkeymapforcerel_DATA = \ ++ extras/keymap/force-release-maps/hp-other \ + extras/keymap/force-release-maps/samsung-other \ + extras/keymap/force-release-maps/common-volume-keys + +diff --git a/extras/keymap/95-keyboard-force-release.rules b/extras/keymap/95-keyboard-force-release.rules +index 562dc8d..6f7c0fd 100644 +--- a/extras/keymap/95-keyboard-force-release.rules ++++ b/extras/keymap/95-keyboard-force-release.rules +@@ -35,4 +35,9 @@ ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="Satellite U300|Satellit + + ENV{DMI_VENDOR}=="Viooo Corporation", ATTR{[dmi/id]product_name}=="PT17", RUN+="keyboard-force-release.sh $devpath common-volume-keys" + ++# These are all the HP laptops that setup a touchpad toggle key ++ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[pP][aA][vV][iI][lL][iI][oO][nN]*", RUN+="keyboard-force-release.sh $devpath hp-other" ++ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][xX]2*", RUN+="keyboard-force-release.sh $devpath hp-other" ++ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*|HP G60 Notebook PC", RUN+="keyboard-force-release.sh $devpath hp-other" ++ + LABEL="force_release_end" +diff --git a/extras/keymap/force-release-maps/hp-other b/extras/keymap/force-release-maps/hp-other +new file mode 100644 +index 0000000..6621370 +--- /dev/null ++++ b/extras/keymap/force-release-maps/hp-other +@@ -0,0 +1,3 @@ ++# list of scancodes (hex or decimal), optional comment ++0xd8 # Touchpad off ++0xd9 # Touchpad on +-- +1.7.3.2 + diff --git a/udev.spec b/udev.spec index 0ae5b6b..5ca3750 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 164 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -19,6 +19,8 @@ Source2: udev-post.init Patch1: udev-ressize.patch Patch2: udev-pda-acl.patch +Patch3: 0001-keymap-Add-force-release-for-HP-touchpad-off.patch +Patch4: 0001-extras-keymap-Make-touchpad-buttons-consistent.patch ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -118,6 +120,8 @@ glib-based applications using libudev functionality. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build libtoolize -f -c @@ -355,6 +359,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Thu Nov 25 2010 Bastien Nocera 164-5 +- Add patches to fix touchpad toggle key handling + * Fri Nov 12 2010 Harald Hoyer 164-4 - add ACLs for PDA devices Resolves: rhbz#642435 From 15fa57fca0f4a9d31950a71f325f0638bdd329c1 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 6 Dec 2010 09:50:38 +0100 Subject: [PATCH 11/66] udev.spec: fixed pre/post udev kill loop --- udev.spec | 58 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 23 deletions(-) diff --git a/udev.spec b/udev.spec index 5ca3750..823fa5d 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 164 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -181,17 +181,24 @@ install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post %preun if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then - if [ -x /sbin/pidof ]; then - pid=$(/sbin/pidof -c udevd) - if [ -n "$pid" ]; then - kill $pid - fi - fi - /sbin/chkconfig --del udev + if test -x /usr/bin/stat -a \ + "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then + if [ -x /sbin/pidof ]; then + pid=$(/sbin/pidof -c udevd) + while [ -n "$pid" ]; do + for p in $pid; do + kill $hard $p 2>/dev/null + done + sleep 0.2 + pid=$(/sbin/pidof -c udevd) + hard="-9" + done + fi + fi + /sbin/chkconfig --del udev fi if [ "$1" -eq 0 ]; then - /sbin/chkconfig --del udev-post -# /usr/bin/systemd-install --system --realize disable udev.service >/dev/null 2>&1 || : + /sbin/chkconfig --del udev-post fi exit 0 @@ -203,19 +210,21 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then - if test -x /usr/bin/stat -a "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - if test -x /sbin/udevd -a -x /sbin/pidof ; then - /sbin/udevadm control --stop-exec-queue - pid=$(/sbin/pidof -c udevd) - while [ -n "$pid" ]; do - for p in $pid; do - kill $hard $p; - done - pid=$(/sbin/pidof -c udevd) - hard="-9" - done - fi - fi + if test -x /usr/bin/stat -a \ + "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then + if test -x /sbin/udevd -a -x /sbin/pidof ; then + /sbin/udevadm control --stop-exec-queue + pid=$(/sbin/pidof -c udevd) + while [ -n "$pid" ]; do + for p in $pid; do + kill $hard $p 2>/dev/null + done + sleep 0.2 + pid=$(/sbin/pidof -c udevd) + hard="-9" + done + fi + fi fi exit 0 @@ -359,6 +368,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Mon Dec 06 2010 Harald Hoyer 164-6 +- fixed kill loop + * Thu Nov 25 2010 Bastien Nocera 164-5 - Add patches to fix touchpad toggle key handling From ad72e1d94476392befa54e773acf746b7f6eabc7 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 6 Dec 2010 10:20:50 +0100 Subject: [PATCH 12/66] udev.spec: removed MAKEDEV symlink --- udev.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/udev.spec b/udev.spec index 823fa5d..95eaf57 100644 --- a/udev.spec +++ b/udev.spec @@ -169,8 +169,6 @@ done mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices,devices/net,devices/pts,devices/shm,devices/hugepages} -ln -s /sbin/MAKEDEV $RPM_BUILD_ROOT%{udev_scriptdir}/devices/MAKEDEV - mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev @@ -281,7 +279,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %dir %{udev_scriptdir}/ %attr(0755,root,root) %dir %{udev_scriptdir}/devices/ %attr(0755,root,root) %dir %{udev_scriptdir}/devices/net -%{udev_scriptdir}/devices/MAKEDEV %attr(666,root,root) %dev(c,10,200) %{udev_scriptdir}/devices/net/tun %attr(600,root,root) %dev(c,108,0) %{udev_scriptdir}/devices/ppp %attr(666,root,root) %dev(c,10,229) %{udev_scriptdir}/devices/fuse @@ -369,7 +366,10 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Dec 06 2010 Harald Hoyer 164-6 +- removed MAKEDEV symlink +Resolves: rhbz#660091 - fixed kill loop +Resolves: rhbz#657651 * Thu Nov 25 2010 Bastien Nocera 164-5 - Add patches to fix touchpad toggle key handling From 863c17e8e2af04abcb2b8c32f813072e72c79a24 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 2 Feb 2011 18:35:27 +0100 Subject: [PATCH 13/66] - fixed: network device renaming 2-step exceeds IFNAMSIZ Resolves: rhbz#673675 --- udev.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/udev.spec b/udev.spec index 95eaf57..d744c3a 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 164 -Release: 6%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -21,6 +21,7 @@ Patch1: udev-ressize.patch Patch2: udev-pda-acl.patch Patch3: 0001-keymap-Add-force-release-for-HP-touchpad-off.patch Patch4: 0001-extras-keymap-Make-touchpad-buttons-consistent.patch +Patch5: udev-random_temporary_ifname.patch ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -122,6 +123,7 @@ glib-based applications using libudev functionality. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build libtoolize -f -c @@ -278,14 +280,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ %attr(0755,root,root) %dir %{udev_scriptdir}/ %attr(0755,root,root) %dir %{udev_scriptdir}/devices/ -%attr(0755,root,root) %dir %{udev_scriptdir}/devices/net -%attr(666,root,root) %dev(c,10,200) %{udev_scriptdir}/devices/net/tun -%attr(600,root,root) %dev(c,108,0) %{udev_scriptdir}/devices/ppp -%attr(666,root,root) %dev(c,10,229) %{udev_scriptdir}/devices/fuse -%attr(660,root,lp) %dev(c,6,0) %{udev_scriptdir}/devices/lp0 -%attr(660,root,lp) %dev(c,6,1) %{udev_scriptdir}/devices/lp1 -%attr(660,root,lp) %dev(c,6,2) %{udev_scriptdir}/devices/lp2 -%attr(660,root,lp) %dev(c,6,3) %{udev_scriptdir}/devices/lp3 %attr(640,root,disk) %dev(b,7,0) %{udev_scriptdir}/devices/loop0 %attr(640,root,disk) %dev(b,7,1) %{udev_scriptdir}/devices/loop1 %attr(640,root,disk) %dev(b,7,2) %{udev_scriptdir}/devices/loop2 @@ -365,6 +359,13 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Feb 02 2011 Harald Hoyer 164-8 +- fixed: network device renaming 2-step exceeds IFNAMSIZ +Resolves: rhbz#673675 + +* Fri Jan 21 2011 Harald Hoyer 164-7 +- removed unnecessary devices from /lib/udev/devices + * Mon Dec 06 2010 Harald Hoyer 164-6 - removed MAKEDEV symlink Resolves: rhbz#660091 From c67280da85d933b01462fc718d8b421a1c22aa7e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 2 Feb 2011 18:35:54 +0100 Subject: [PATCH 14/66] - fixed: network device renaming 2-step exceeds IFNAMSIZ Resolves: rhbz#673675 --- udev-random_temporary_ifname.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 udev-random_temporary_ifname.patch diff --git a/udev-random_temporary_ifname.patch b/udev-random_temporary_ifname.patch new file mode 100644 index 0000000..ff5ad5c --- /dev/null +++ b/udev-random_temporary_ifname.patch @@ -0,0 +1,22 @@ +diff --git a/udev/udev-event.c b/udev/udev-event.c +index 0648735..5387c00 100644 +--- a/udev/udev-event.c ++++ b/udev/udev-event.c +@@ -462,6 +462,7 @@ static void rename_netif_kernel_log(struct ifreq ifr) + static int rename_netif(struct udev_event *event) + { + struct udev_device *dev = event->dev; ++ char iftmp[IFNAMSIZ]; + int sk; + struct ifreq ifr; + int loop; +@@ -492,7 +493,8 @@ static int rename_netif(struct udev_event *event) + goto out; + + /* free our own name, another process may wait for us */ +- util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL); ++ util_strscpyl(iftmp, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL); ++ sprintf(ifr.ifr_newname, "eth_%X",util_string_hash32(iftmp)); + err = ioctl(sk, SIOCSIFNAME, &ifr); + if (err < 0) { + err = -errno; From 243a0734e5ca5fe6e4170f552ee735a95501bdbf Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 2 Feb 2011 18:59:23 +0100 Subject: [PATCH 15/66] - fixed: network device renaming 2-step exceeds IFNAMSIZ Resolves: rhbz#673675 --- udev-164-no-v4l1.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ udev.spec | 3 +++ 2 files changed, 45 insertions(+) create mode 100644 udev-164-no-v4l1.patch diff --git a/udev-164-no-v4l1.patch b/udev-164-no-v4l1.patch new file mode 100644 index 0000000..9d9ef7c --- /dev/null +++ b/udev-164-no-v4l1.patch @@ -0,0 +1,42 @@ +diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c +index d530a6d..e4b22bf 100644 +--- a/extras/v4l_id/v4l_id.c ++++ b/extras/v4l_id/v4l_id.c +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + #include + + int main (int argc, char *argv[]) +@@ -39,7 +38,6 @@ int main (int argc, char *argv[]) + }; + int fd; + char *device; +- struct video_capability v1cap; + struct v4l2_capability v2cap; + + while (1) { +@@ -82,20 +80,7 @@ int main (int argc, char *argv[]) + if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) + printf("radio:"); + printf("\n"); +- } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { +- printf("ID_V4L_VERSION=1\n"); +- printf("ID_V4L_PRODUCT=%s\n", v1cap.name); +- printf("ID_V4L_CAPABILITIES=:"); +- if ((v1cap.type & VID_TYPE_CAPTURE) > 0) +- printf("capture:"); +- if ((v1cap.type & VID_TYPE_OVERLAY) > 0) +- printf("video_overlay:"); +- if (v1cap.audios > 0) +- printf("audio:"); +- if ((v1cap.type & VID_TYPE_TUNER) > 0) +- printf("tuner:"); +- printf("\n"); +- } ++ } + + close (fd); + return 0; diff --git a/udev.spec b/udev.spec index d744c3a..24ca8bd 100644 --- a/udev.spec +++ b/udev.spec @@ -22,6 +22,7 @@ Patch2: udev-pda-acl.patch Patch3: 0001-keymap-Add-force-release-for-HP-touchpad-off.patch Patch4: 0001-extras-keymap-Make-touchpad-buttons-consistent.patch Patch5: udev-random_temporary_ifname.patch +Patch6: udev-164-no-v4l1.patch ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -124,6 +125,7 @@ glib-based applications using libudev functionality. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build libtoolize -f -c @@ -362,6 +364,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Feb 02 2011 Harald Hoyer 164-8 - fixed: network device renaming 2-step exceeds IFNAMSIZ Resolves: rhbz#673675 +- removed v4l version 1 * Fri Jan 21 2011 Harald Hoyer 164-7 - removed unnecessary devices from /lib/udev/devices From 61095fb1d9852e736147097627a51714fff7754f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 17:57:39 -0600 Subject: [PATCH 16/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- udev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index 24ca8bd..49dfbb6 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 164 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -361,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 164-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Feb 02 2011 Harald Hoyer 164-8 - fixed: network device renaming 2-step exceeds IFNAMSIZ Resolves: rhbz#673675 From 57a491c1af046cbe4c2c8b7740cc855de4cc2224 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 16 Feb 2011 18:26:09 +0100 Subject: [PATCH 17/66] - renamed udev-post initscript to udev-retry to match upstream systemd service name - version 166 --- .gitignore | 2 + ...map-Make-touchpad-buttons-consistent.patch | 232 ------------------ ...dd-force-release-for-HP-touchpad-off.patch | 56 ----- sources | 4 +- udev-pda-acl.patch | 20 -- udev-random_temporary_ifname.patch | 22 -- udev-ressize.patch | 24 -- udev-post.init => udev-retry.init | 8 +- udev.spec | 42 ++-- 9 files changed, 31 insertions(+), 379 deletions(-) delete mode 100644 0001-extras-keymap-Make-touchpad-buttons-consistent.patch delete mode 100644 0001-keymap-Add-force-release-for-HP-touchpad-off.patch delete mode 100644 udev-pda-acl.patch delete mode 100644 udev-random_temporary_ifname.patch delete mode 100644 udev-ressize.patch rename udev-post.init => udev-retry.init (89%) diff --git a/.gitignore b/.gitignore index 65d08f4..ff4586d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ udev-160.tar.bz2 /udev-164.tar.bz2 /udev-164.tar.bz2.sign +/udev-166.tar.bz2 +/udev-166.tar.bz2.sign diff --git a/0001-extras-keymap-Make-touchpad-buttons-consistent.patch b/0001-extras-keymap-Make-touchpad-buttons-consistent.patch deleted file mode 100644 index bd36b5f..0000000 --- a/0001-extras-keymap-Make-touchpad-buttons-consistent.patch +++ /dev/null @@ -1,232 +0,0 @@ -From a1ca5f60e0770299c5c5f21bd371f5823802412b Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 4 Nov 2010 23:58:56 +0000 -Subject: [PATCH] extras/keymap: Make touchpad buttons consistent - -We'll need to standardise on the Touchpad related keys in udev, kernel, and -X.org. I selected F21 for XF86TouchpadToggle, F22 for XF86TouchpadOn and F23 -for XF86TouchpadOff. - -See: -https://bugs.freedesktop.org/show_bug.cgi?id=31333 - -Signed-off-by: Martin Pitt ---- - extras/keymap/keymaps/acer | 2 +- - extras/keymap/keymaps/dell | 4 ++-- - extras/keymap/keymaps/everex-xt5000 | 2 +- - extras/keymap/keymaps/hewlett-packard-2510p_2530p | 4 ++-- - extras/keymap/keymaps/hewlett-packard-pavilion | 4 ++-- - extras/keymap/keymaps/hewlett-packard-tx2 | 2 +- - .../lenovo-thinkpad-usb-keyboard-trackpoint | 2 +- - extras/keymap/keymaps/lg-x110 | 4 ++-- - extras/keymap/keymaps/micro-star | 2 +- - extras/keymap/keymaps/module-lenovo | 2 +- - extras/keymap/keymaps/onkyo | 2 +- - extras/keymap/keymaps/samsung-other | 2 +- - extras/keymap/keymaps/samsung-sx20s | 4 ++-- - extras/keymap/keymaps/toshiba-satellite_a110 | 4 ++-- - extras/keymap/keymaps/toshiba-satellite_m30x | 4 ++-- - extras/keymap/keymaps/zepto-znote | 2 +- - 16 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/extras/keymap/keymaps/acer b/extras/keymap/keymaps/acer -index 6abe39c..4e7c297 100644 ---- a/extras/keymap/keymaps/acer -+++ b/extras/keymap/keymaps/acer -@@ -14,7 +14,7 @@ - 0xEE brightnessup # Fn+Right - 0xEF brightnessdown # Fn+Left - 0xF1 f22 # Fn+F7 Touchpad toggle (off-to-on) --0xF2 f22 # Fn+F7 Touchpad toggle (on-to-off) -+0xF2 f23 # Fn+F7 Touchpad toggle (on-to-off) - 0xF3 prog2 # "P2" programmable button - 0xF4 prog1 # "P1" programmable button - 0xF5 presentation -diff --git a/extras/keymap/keymaps/dell b/extras/keymap/keymaps/dell -index 1a2e433..fbbb903 100644 ---- a/extras/keymap/keymaps/dell -+++ b/extras/keymap/keymaps/dell -@@ -21,9 +21,9 @@ - 0x99 nextsong # Front panel next song - 0x9A setup # Tablet tools button - 0x9B switchvideomode # Display Toggle button --0x9E f22 #touchpad toggle -+0x9E f21 #touchpad toggle - 0xA2 playpause # Front panel play/pause - 0xA4 stopcd # Front panel stop - 0xED media # MediaDirect button - 0xD8 screenlock # FIXME: Tablet lock button --0xD9 f22 # touchpad toggle -+0xD9 f21 # touchpad toggle -diff --git a/extras/keymap/keymaps/everex-xt5000 b/extras/keymap/keymaps/everex-xt5000 -index 53bdd7a..4823a83 100644 ---- a/extras/keymap/keymaps/everex-xt5000 -+++ b/extras/keymap/keymaps/everex-xt5000 -@@ -1,5 +1,5 @@ - 0x5C media --0x65 f22 # Fn+F5 Touchpad toggle -+0x65 f21 # Fn+F5 Touchpad toggle - 0x67 prog3 # Fan Speed Control button - 0x6F brightnessup - 0x7F brightnessdown -diff --git a/extras/keymap/keymaps/hewlett-packard-2510p_2530p b/extras/keymap/keymaps/hewlett-packard-2510p_2530p -index 2bc70c2..41ad2e9 100644 ---- a/extras/keymap/keymaps/hewlett-packard-2510p_2530p -+++ b/extras/keymap/keymaps/hewlett-packard-2510p_2530p -@@ -1,2 +1,2 @@ --0xD8 f22 # touchpad off --0xD9 f23 # touchpad on -+0xD8 f23 # touchpad off -+0xD9 f22 # touchpad on -diff --git a/extras/keymap/keymaps/hewlett-packard-pavilion b/extras/keymap/keymaps/hewlett-packard-pavilion -index a55d2b7..3d3cefc 100644 ---- a/extras/keymap/keymaps/hewlett-packard-pavilion -+++ b/extras/keymap/keymaps/hewlett-packard-pavilion -@@ -1,3 +1,3 @@ - 0x88 media # FIXME: quick play --0xD8 f22 # touchpad off --0xD9 f23 # touchpad on -+0xD8 f23 # touchpad off -+0xD9 f22 # touchpad on -diff --git a/extras/keymap/keymaps/hewlett-packard-tx2 b/extras/keymap/keymaps/hewlett-packard-tx2 -index 206c004..36a690f 100644 ---- a/extras/keymap/keymaps/hewlett-packard-tx2 -+++ b/extras/keymap/keymaps/hewlett-packard-tx2 -@@ -1,3 +1,3 @@ - 0xC2 media --0xD8 f22 # Toggle touchpad button on tx2 (OFF) -+0xD8 f23 # Toggle touchpad button on tx2 (OFF) - 0xD9 f22 # Toggle touchpad button on tx2 (ON) -diff --git a/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint -index 7612f79..bc91470 100644 ---- a/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint -+++ b/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint -@@ -2,7 +2,7 @@ - 0x90013 battery # Fn+F3 - 0x90014 wlan # Fn+F5 - 0x90016 switchvideomode # Fn+F7 --0x90017 f22 # Fn+F8 touchpadtoggle -+0x90017 f21 # Fn+F8 touchpadtoggle - 0x90019 suspend # Fn+F12 - 0x9001A brightnessup # Fn+Home - 0x9001B brightnessdown # Fn+End -diff --git a/extras/keymap/keymaps/lg-x110 b/extras/keymap/keymaps/lg-x110 -index a61cf3d..ba08cba 100644 ---- a/extras/keymap/keymaps/lg-x110 -+++ b/extras/keymap/keymaps/lg-x110 -@@ -6,7 +6,7 @@ - 0xB3 suspend # Fn-F12 - 0xDF sleep # Fn-F4 - # 0xE2 bluetooth # satellite dish2 --0xE4 f22 # Fn-F5 Touchpad disable -+0xE4 f21 # Fn-F5 Touchpad disable - 0xF6 wlan # Fn-F6 - 0xF7 reserved # brightnessdown # Fn-Down --0xF8 reserved # brightnessup # Fn-Up -\ No newline at end of file -+0xF8 reserved # brightnessup # Fn-Up -diff --git a/extras/keymap/keymaps/micro-star b/extras/keymap/keymaps/micro-star -index 0de5ae6..4a43869 100644 ---- a/extras/keymap/keymaps/micro-star -+++ b/extras/keymap/keymaps/micro-star -@@ -4,7 +4,7 @@ - 0xB2 www # e button - 0xDF sleep # Fn-F12 - 0xE2 bluetooth # satellite dish2 --0xE4 f22 # Fn-F3 Touchpad disable -+0xE4 f21 # Fn-F3 Touchpad disable - 0xEC email # envelope button - 0xEE camera # Fn-F6 camera disable - 0xF6 wlan # satellite dish1 -diff --git a/extras/keymap/keymaps/module-lenovo b/extras/keymap/keymaps/module-lenovo -index 7c597bd..9cb74b2 100644 ---- a/extras/keymap/keymaps/module-lenovo -+++ b/extras/keymap/keymaps/module-lenovo -@@ -3,7 +3,7 @@ - 0x3 sleep # Fn+F4 - 0x4 wlan # Fn+F5 - 0x6 switchvideomode # Fn+F7 --0x7 f22 # Fn+F8 touchpadtoggle -+0x7 f21 # Fn+F8 touchpadtoggle - 0x8 f24 # Fn+F9 undock - 0xB suspend # Fn+F12 - 0xF brightnessup # Fn+Home -diff --git a/extras/keymap/keymaps/onkyo b/extras/keymap/keymaps/onkyo -index 7dd80a1..ee864ad 100644 ---- a/extras/keymap/keymaps/onkyo -+++ b/extras/keymap/keymaps/onkyo -@@ -8,7 +8,7 @@ - 0xF0 media # Fn+R - 0xF5 switchvideomode # Fn+E - 0xF6 camera # Fn+T --0xF7 f22 # Fn+Y (touchpad toggle) -+0xF7 f21 # Fn+Y (touchpad toggle) - 0xF8 brightnessup # Fn+S - 0xF9 brightnessdown # Fn+A - 0xFB wlan # Fn+J -diff --git a/extras/keymap/keymaps/samsung-other b/extras/keymap/keymaps/samsung-other -index 6a0928c..3ac0c2f 100644 ---- a/extras/keymap/keymaps/samsung-other -+++ b/extras/keymap/keymaps/samsung-other -@@ -11,4 +11,4 @@ - 0xB3 prog3 # Fn+F8 switch power mode (battery/dynamic/performance) - 0xB4 wlan # Fn+F9 (X60P) - 0xF7 f22 # Fn+F10 Touchpad on --0xF9 f22 # Fn+F10 Touchpad off -+0xF9 f23 # Fn+F10 Touchpad off -diff --git a/extras/keymap/keymaps/samsung-sx20s b/extras/keymap/keymaps/samsung-sx20s -index daf7d3e..9d954ee 100644 ---- a/extras/keymap/keymaps/samsung-sx20s -+++ b/extras/keymap/keymaps/samsung-sx20s -@@ -1,4 +1,4 @@ - 0x74 mute - 0x75 mute --0x77 f21 # FIXME: Touchpad on --0x79 f21 # FIXME: Touchpad off -+0x77 f22 # Touchpad on -+0x79 f23 # Touchpad off -diff --git a/extras/keymap/keymaps/toshiba-satellite_a110 b/extras/keymap/keymaps/toshiba-satellite_a110 -index 0f2aaec..1429409 100644 ---- a/extras/keymap/keymaps/toshiba-satellite_a110 -+++ b/extras/keymap/keymaps/toshiba-satellite_a110 -@@ -1,8 +1,8 @@ - 0x92 stop - 0x93 www - 0x94 media --0x9E f21 # FIXME: Touchpad on --0x9F f21 # FIXME: Touchpad off -+0x9E f22 # Touchpad on -+0x9F f23 # Touchpad off - 0xB9 nextsong - 0xD9 brightnessup - 0xEE screenlock -diff --git a/extras/keymap/keymaps/toshiba-satellite_m30x b/extras/keymap/keymaps/toshiba-satellite_m30x -index cf6d912..9280ae0 100644 ---- a/extras/keymap/keymaps/toshiba-satellite_m30x -+++ b/extras/keymap/keymaps/toshiba-satellite_m30x -@@ -2,6 +2,6 @@ - 0xd9 brightnessup - 0xee screenlock - 0x93 media --0x9e prog1 #touchpad_enable --0x9f prog2 #touchpad_disable -+0x9e f22 #touchpad_enable -+0x9f f23 #touchpad_disable - -diff --git a/extras/keymap/keymaps/zepto-znote b/extras/keymap/keymaps/zepto-znote -index e076516..cf72fda 100644 ---- a/extras/keymap/keymaps/zepto-znote -+++ b/extras/keymap/keymaps/zepto-znote -@@ -1,7 +1,7 @@ - 0x93 switchvideomode # Fn+F3 Toggle Video Output - 0x95 brightnessdown # Fn+F4 Brightness Down - 0x91 brightnessup # Fn+F5 Brightness Up --0xA5 f22 # Fn+F6 Disable Touchpad -+0xA5 f23 # Fn+F6 Disable Touchpad - 0xA6 f22 # Fn+F6 Enable Touchpad - 0xA7 bluetooth # Fn+F10 Enable Bluetooth - 0XA9 bluetooth # Fn+F10 Disable Bluetooth --- -1.7.3.2 - diff --git a/0001-keymap-Add-force-release-for-HP-touchpad-off.patch b/0001-keymap-Add-force-release-for-HP-touchpad-off.patch deleted file mode 100644 index 1ba3551..0000000 --- a/0001-keymap-Add-force-release-for-HP-touchpad-off.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ecfad20871e855d9e54d3a528cf9219ce5c93626 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 1 Nov 2010 16:29:09 +0000 -Subject: [PATCH] keymap: Add force release for HP touchpad off - -Force the touchpad off/on keys getting released, as they usually -only send a "repeat". - -https://bugzilla.redhat.com/show_bug.cgi?id=623239 - -Signed-off-by: Martin Pitt ---- - Makefile.am | 1 + - extras/keymap/95-keyboard-force-release.rules | 5 +++++ - extras/keymap/force-release-maps/hp-other | 3 +++ - 3 files changed, 9 insertions(+), 0 deletions(-) - create mode 100644 extras/keymap/force-release-maps/hp-other - -diff --git a/Makefile.am b/Makefile.am -index 3a95046..032eb28 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -601,6 +601,7 @@ dist_udevkeymap_DATA = \ - - udevkeymapforcereldir = $(libexecdir)/keymaps/force-release - dist_udevkeymapforcerel_DATA = \ -+ extras/keymap/force-release-maps/hp-other \ - extras/keymap/force-release-maps/samsung-other \ - extras/keymap/force-release-maps/common-volume-keys - -diff --git a/extras/keymap/95-keyboard-force-release.rules b/extras/keymap/95-keyboard-force-release.rules -index 562dc8d..6f7c0fd 100644 ---- a/extras/keymap/95-keyboard-force-release.rules -+++ b/extras/keymap/95-keyboard-force-release.rules -@@ -35,4 +35,9 @@ ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="Satellite U300|Satellit - - ENV{DMI_VENDOR}=="Viooo Corporation", ATTR{[dmi/id]product_name}=="PT17", RUN+="keyboard-force-release.sh $devpath common-volume-keys" - -+# These are all the HP laptops that setup a touchpad toggle key -+ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[pP][aA][vV][iI][lL][iI][oO][nN]*", RUN+="keyboard-force-release.sh $devpath hp-other" -+ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][xX]2*", RUN+="keyboard-force-release.sh $devpath hp-other" -+ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*|HP G60 Notebook PC", RUN+="keyboard-force-release.sh $devpath hp-other" -+ - LABEL="force_release_end" -diff --git a/extras/keymap/force-release-maps/hp-other b/extras/keymap/force-release-maps/hp-other -new file mode 100644 -index 0000000..6621370 ---- /dev/null -+++ b/extras/keymap/force-release-maps/hp-other -@@ -0,0 +1,3 @@ -+# list of scancodes (hex or decimal), optional comment -+0xd8 # Touchpad off -+0xd9 # Touchpad on --- -1.7.3.2 - diff --git a/sources b/sources index 8dc2880..871f305 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -cd285a85f969518a671834de2f4d6614 udev-164.tar.bz2 -43b3842a00854e712b1d58af3a03e4ed udev-164.tar.bz2.sign +4db27d73fdbe94f47fd89fdd105c2dfb udev-166.tar.bz2 +3cb37564a589d4fedd6e7e3e178698d4 udev-166.tar.bz2.sign diff --git a/udev-pda-acl.patch b/udev-pda-acl.patch deleted file mode 100644 index b48103a..0000000 --- a/udev-pda-acl.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit d69207c3f20f0af2a5e510515ae5473f4fe54476 -Author: Harald Hoyer -Date: Fri Nov 12 15:44:34 2010 +0100 - - 70-acl.rules: add ACLs for ID_PDA devices - -diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules -index c7134bc..66375de 100644 ---- a/extras/udev-acl/70-acl.rules -+++ b/extras/udev-acl/70-acl.rules -@@ -47,6 +47,9 @@ SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="udev-acl" - # smart-card readers - ENV{ID_SMARTCARD_READER}=="*?", TAG+="udev-acl" - -+# PDA devices -+ENV{ID_PDA}=="*?", TAG+="udev-acl" -+ - # joysticks - SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl" - diff --git a/udev-random_temporary_ifname.patch b/udev-random_temporary_ifname.patch deleted file mode 100644 index ff5ad5c..0000000 --- a/udev-random_temporary_ifname.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/udev/udev-event.c b/udev/udev-event.c -index 0648735..5387c00 100644 ---- a/udev/udev-event.c -+++ b/udev/udev-event.c -@@ -462,6 +462,7 @@ static void rename_netif_kernel_log(struct ifreq ifr) - static int rename_netif(struct udev_event *event) - { - struct udev_device *dev = event->dev; -+ char iftmp[IFNAMSIZ]; - int sk; - struct ifreq ifr; - int loop; -@@ -492,7 +493,8 @@ static int rename_netif(struct udev_event *event) - goto out; - - /* free our own name, another process may wait for us */ -- util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL); -+ util_strscpyl(iftmp, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL); -+ sprintf(ifr.ifr_newname, "eth_%X",util_string_hash32(iftmp)); - err = ioctl(sk, SIOCSIFNAME, &ifr); - if (err < 0) { - err = -errno; diff --git a/udev-ressize.patch b/udev-ressize.patch deleted file mode 100644 index 788b859..0000000 --- a/udev-ressize.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 851dd4ddc5aeb1ee517145d9e3334c2017595321 -Author: Harald Hoyer -Date: Fri Nov 12 14:39:14 2010 +0100 - - udev-rules.c: change import property buffer to 16384 bytes - - import_program_into_properties() should have the same line length as - import_file_into_properties() - - see also https://bugzilla.redhat.com/show_bug.cgi?id=652318 - -diff --git a/udev/udev-rules.c b/udev/udev-rules.c -index 52f121c..ab7b6ae 100644 ---- a/udev/udev-rules.c -+++ b/udev/udev-rules.c -@@ -751,7 +751,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p - { - struct udev *udev = udev_device_get_udev(dev); - char **envp; -- char result[4096]; -+ char result[UTIL_LINE_SIZE]; - size_t reslen; - char *line; - diff --git a/udev-post.init b/udev-retry.init similarity index 89% rename from udev-post.init rename to udev-retry.init index f882e0d..b4cb201 100644 --- a/udev-post.init +++ b/udev-retry.init @@ -1,6 +1,6 @@ #!/bin/bash # -# udev-post Post script for udev, after all filesystems are mounted +# udev-retry Post script for udev, after all filesystems are mounted # # Authors: Harald Hoyer # @@ -14,7 +14,7 @@ # Required-Stop: # Short-Description: Moves the generated persistent udev rules to /etc/udev/rules.d # Description: Moves the generated persistent udev rules to /etc/udev/rules.d -# Provides: udev-post +# Provides: udev-retry ### END INIT INFO . /etc/rc.d/init.d/functions @@ -49,12 +49,12 @@ case "$1" in fi done - touch /var/lock/subsys/udev-post + touch /var/lock/subsys/udev-retry exit 0 ;; stop) [ -w /var/lock/subsys ] || exit 4 - rm -f /var/lock/subsys/udev-post + rm -f /var/lock/subsys/udev-retry exit 0 ;; status) diff --git a/udev.spec b/udev.spec index 49dfbb6..be272ad 100644 --- a/udev.spec +++ b/udev.spec @@ -6,8 +6,8 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 164 -Release: 9%{?dist} +Version: 166 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -15,13 +15,8 @@ Obsoletes: udev-persistent < 0:030-5 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 Source1: start_udev -Source2: udev-post.init +Source2: udev-retry.init -Patch1: udev-ressize.patch -Patch2: udev-pda-acl.patch -Patch3: 0001-keymap-Add-force-release-for-HP-touchpad-off.patch -Patch4: 0001-extras-keymap-Make-touchpad-buttons-consistent.patch -Patch5: udev-random_temporary_ifname.patch Patch6: udev-164-no-v4l1.patch ExclusiveOS: Linux @@ -120,14 +115,15 @@ glib-based applications using libudev functionality. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %patch6 -p1 %build +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" + +# prevent man pages from re-building (xmlto) +find . -name "*.[1-8]" -exec touch '{}' \; +export V=1 + libtoolize -f -c %configure --with-selinux --prefix=%{_prefix} --exec-prefix="" \ --sysconfdir=%{_sysconfdir} \ @@ -179,7 +175,7 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d -install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post +install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-retry %preun if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then @@ -200,8 +196,9 @@ if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then /sbin/chkconfig --del udev fi if [ "$1" -eq 0 ]; then - /sbin/chkconfig --del udev-post + /sbin/chkconfig --del udev-retry fi +/sbin/chkconfig --del udev-post >/dev/null 2>&1 || : exit 0 %pre @@ -231,15 +228,17 @@ fi exit 0 %post +# convert old database files +/sbin/udevadm info --convert-db >/dev/null 2>&1 || : + # start daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then /sbin/udevd -d - /sbin/udevadm control --start-exec-queue + /sbin/udevadm control --start-exec-queue || : fi fi -/sbin/chkconfig --add udev-post -#/usr/bin/systemd-install --system --realize=minimal enable udev.service >/dev/null 2>&1 || : +/sbin/chkconfig --add udev-retry exit 0 @@ -277,7 +276,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{udev_scriptdir}/mtd_probe %attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/ -%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post +%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-retry %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ %attr(0755,root,root) %dir %{udev_scriptdir}/ @@ -361,6 +360,11 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Feb 16 2011 Harald Hoyer 166-1 +- renamed udev-post initscript to udev-retry to match + upstream systemd service name +- version 166 + * Mon Feb 07 2011 Fedora Release Engineering - 164-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 400c0eaaaae00808c3a5a259ac14788289ab5aa0 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 16 Feb 2011 18:26:09 +0100 Subject: [PATCH 18/66] - renamed udev-post initscript to udev-retry to match upstream systemd service name - version 166 --- .gitignore | 2 + ...map-Make-touchpad-buttons-consistent.patch | 232 ------------------ ...dd-force-release-for-HP-touchpad-off.patch | 56 ----- sources | 4 +- udev-pda-acl.patch | 20 -- udev-random_temporary_ifname.patch | 22 -- udev-ressize.patch | 24 -- udev-post.init => udev-retry.init | 8 +- udev.spec | 42 ++-- 9 files changed, 31 insertions(+), 379 deletions(-) delete mode 100644 0001-extras-keymap-Make-touchpad-buttons-consistent.patch delete mode 100644 0001-keymap-Add-force-release-for-HP-touchpad-off.patch delete mode 100644 udev-pda-acl.patch delete mode 100644 udev-random_temporary_ifname.patch delete mode 100644 udev-ressize.patch rename udev-post.init => udev-retry.init (89%) diff --git a/.gitignore b/.gitignore index 65d08f4..ff4586d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ udev-160.tar.bz2 /udev-164.tar.bz2 /udev-164.tar.bz2.sign +/udev-166.tar.bz2 +/udev-166.tar.bz2.sign diff --git a/0001-extras-keymap-Make-touchpad-buttons-consistent.patch b/0001-extras-keymap-Make-touchpad-buttons-consistent.patch deleted file mode 100644 index bd36b5f..0000000 --- a/0001-extras-keymap-Make-touchpad-buttons-consistent.patch +++ /dev/null @@ -1,232 +0,0 @@ -From a1ca5f60e0770299c5c5f21bd371f5823802412b Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Thu, 4 Nov 2010 23:58:56 +0000 -Subject: [PATCH] extras/keymap: Make touchpad buttons consistent - -We'll need to standardise on the Touchpad related keys in udev, kernel, and -X.org. I selected F21 for XF86TouchpadToggle, F22 for XF86TouchpadOn and F23 -for XF86TouchpadOff. - -See: -https://bugs.freedesktop.org/show_bug.cgi?id=31333 - -Signed-off-by: Martin Pitt ---- - extras/keymap/keymaps/acer | 2 +- - extras/keymap/keymaps/dell | 4 ++-- - extras/keymap/keymaps/everex-xt5000 | 2 +- - extras/keymap/keymaps/hewlett-packard-2510p_2530p | 4 ++-- - extras/keymap/keymaps/hewlett-packard-pavilion | 4 ++-- - extras/keymap/keymaps/hewlett-packard-tx2 | 2 +- - .../lenovo-thinkpad-usb-keyboard-trackpoint | 2 +- - extras/keymap/keymaps/lg-x110 | 4 ++-- - extras/keymap/keymaps/micro-star | 2 +- - extras/keymap/keymaps/module-lenovo | 2 +- - extras/keymap/keymaps/onkyo | 2 +- - extras/keymap/keymaps/samsung-other | 2 +- - extras/keymap/keymaps/samsung-sx20s | 4 ++-- - extras/keymap/keymaps/toshiba-satellite_a110 | 4 ++-- - extras/keymap/keymaps/toshiba-satellite_m30x | 4 ++-- - extras/keymap/keymaps/zepto-znote | 2 +- - 16 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/extras/keymap/keymaps/acer b/extras/keymap/keymaps/acer -index 6abe39c..4e7c297 100644 ---- a/extras/keymap/keymaps/acer -+++ b/extras/keymap/keymaps/acer -@@ -14,7 +14,7 @@ - 0xEE brightnessup # Fn+Right - 0xEF brightnessdown # Fn+Left - 0xF1 f22 # Fn+F7 Touchpad toggle (off-to-on) --0xF2 f22 # Fn+F7 Touchpad toggle (on-to-off) -+0xF2 f23 # Fn+F7 Touchpad toggle (on-to-off) - 0xF3 prog2 # "P2" programmable button - 0xF4 prog1 # "P1" programmable button - 0xF5 presentation -diff --git a/extras/keymap/keymaps/dell b/extras/keymap/keymaps/dell -index 1a2e433..fbbb903 100644 ---- a/extras/keymap/keymaps/dell -+++ b/extras/keymap/keymaps/dell -@@ -21,9 +21,9 @@ - 0x99 nextsong # Front panel next song - 0x9A setup # Tablet tools button - 0x9B switchvideomode # Display Toggle button --0x9E f22 #touchpad toggle -+0x9E f21 #touchpad toggle - 0xA2 playpause # Front panel play/pause - 0xA4 stopcd # Front panel stop - 0xED media # MediaDirect button - 0xD8 screenlock # FIXME: Tablet lock button --0xD9 f22 # touchpad toggle -+0xD9 f21 # touchpad toggle -diff --git a/extras/keymap/keymaps/everex-xt5000 b/extras/keymap/keymaps/everex-xt5000 -index 53bdd7a..4823a83 100644 ---- a/extras/keymap/keymaps/everex-xt5000 -+++ b/extras/keymap/keymaps/everex-xt5000 -@@ -1,5 +1,5 @@ - 0x5C media --0x65 f22 # Fn+F5 Touchpad toggle -+0x65 f21 # Fn+F5 Touchpad toggle - 0x67 prog3 # Fan Speed Control button - 0x6F brightnessup - 0x7F brightnessdown -diff --git a/extras/keymap/keymaps/hewlett-packard-2510p_2530p b/extras/keymap/keymaps/hewlett-packard-2510p_2530p -index 2bc70c2..41ad2e9 100644 ---- a/extras/keymap/keymaps/hewlett-packard-2510p_2530p -+++ b/extras/keymap/keymaps/hewlett-packard-2510p_2530p -@@ -1,2 +1,2 @@ --0xD8 f22 # touchpad off --0xD9 f23 # touchpad on -+0xD8 f23 # touchpad off -+0xD9 f22 # touchpad on -diff --git a/extras/keymap/keymaps/hewlett-packard-pavilion b/extras/keymap/keymaps/hewlett-packard-pavilion -index a55d2b7..3d3cefc 100644 ---- a/extras/keymap/keymaps/hewlett-packard-pavilion -+++ b/extras/keymap/keymaps/hewlett-packard-pavilion -@@ -1,3 +1,3 @@ - 0x88 media # FIXME: quick play --0xD8 f22 # touchpad off --0xD9 f23 # touchpad on -+0xD8 f23 # touchpad off -+0xD9 f22 # touchpad on -diff --git a/extras/keymap/keymaps/hewlett-packard-tx2 b/extras/keymap/keymaps/hewlett-packard-tx2 -index 206c004..36a690f 100644 ---- a/extras/keymap/keymaps/hewlett-packard-tx2 -+++ b/extras/keymap/keymaps/hewlett-packard-tx2 -@@ -1,3 +1,3 @@ - 0xC2 media --0xD8 f22 # Toggle touchpad button on tx2 (OFF) -+0xD8 f23 # Toggle touchpad button on tx2 (OFF) - 0xD9 f22 # Toggle touchpad button on tx2 (ON) -diff --git a/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint -index 7612f79..bc91470 100644 ---- a/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint -+++ b/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint -@@ -2,7 +2,7 @@ - 0x90013 battery # Fn+F3 - 0x90014 wlan # Fn+F5 - 0x90016 switchvideomode # Fn+F7 --0x90017 f22 # Fn+F8 touchpadtoggle -+0x90017 f21 # Fn+F8 touchpadtoggle - 0x90019 suspend # Fn+F12 - 0x9001A brightnessup # Fn+Home - 0x9001B brightnessdown # Fn+End -diff --git a/extras/keymap/keymaps/lg-x110 b/extras/keymap/keymaps/lg-x110 -index a61cf3d..ba08cba 100644 ---- a/extras/keymap/keymaps/lg-x110 -+++ b/extras/keymap/keymaps/lg-x110 -@@ -6,7 +6,7 @@ - 0xB3 suspend # Fn-F12 - 0xDF sleep # Fn-F4 - # 0xE2 bluetooth # satellite dish2 --0xE4 f22 # Fn-F5 Touchpad disable -+0xE4 f21 # Fn-F5 Touchpad disable - 0xF6 wlan # Fn-F6 - 0xF7 reserved # brightnessdown # Fn-Down --0xF8 reserved # brightnessup # Fn-Up -\ No newline at end of file -+0xF8 reserved # brightnessup # Fn-Up -diff --git a/extras/keymap/keymaps/micro-star b/extras/keymap/keymaps/micro-star -index 0de5ae6..4a43869 100644 ---- a/extras/keymap/keymaps/micro-star -+++ b/extras/keymap/keymaps/micro-star -@@ -4,7 +4,7 @@ - 0xB2 www # e button - 0xDF sleep # Fn-F12 - 0xE2 bluetooth # satellite dish2 --0xE4 f22 # Fn-F3 Touchpad disable -+0xE4 f21 # Fn-F3 Touchpad disable - 0xEC email # envelope button - 0xEE camera # Fn-F6 camera disable - 0xF6 wlan # satellite dish1 -diff --git a/extras/keymap/keymaps/module-lenovo b/extras/keymap/keymaps/module-lenovo -index 7c597bd..9cb74b2 100644 ---- a/extras/keymap/keymaps/module-lenovo -+++ b/extras/keymap/keymaps/module-lenovo -@@ -3,7 +3,7 @@ - 0x3 sleep # Fn+F4 - 0x4 wlan # Fn+F5 - 0x6 switchvideomode # Fn+F7 --0x7 f22 # Fn+F8 touchpadtoggle -+0x7 f21 # Fn+F8 touchpadtoggle - 0x8 f24 # Fn+F9 undock - 0xB suspend # Fn+F12 - 0xF brightnessup # Fn+Home -diff --git a/extras/keymap/keymaps/onkyo b/extras/keymap/keymaps/onkyo -index 7dd80a1..ee864ad 100644 ---- a/extras/keymap/keymaps/onkyo -+++ b/extras/keymap/keymaps/onkyo -@@ -8,7 +8,7 @@ - 0xF0 media # Fn+R - 0xF5 switchvideomode # Fn+E - 0xF6 camera # Fn+T --0xF7 f22 # Fn+Y (touchpad toggle) -+0xF7 f21 # Fn+Y (touchpad toggle) - 0xF8 brightnessup # Fn+S - 0xF9 brightnessdown # Fn+A - 0xFB wlan # Fn+J -diff --git a/extras/keymap/keymaps/samsung-other b/extras/keymap/keymaps/samsung-other -index 6a0928c..3ac0c2f 100644 ---- a/extras/keymap/keymaps/samsung-other -+++ b/extras/keymap/keymaps/samsung-other -@@ -11,4 +11,4 @@ - 0xB3 prog3 # Fn+F8 switch power mode (battery/dynamic/performance) - 0xB4 wlan # Fn+F9 (X60P) - 0xF7 f22 # Fn+F10 Touchpad on --0xF9 f22 # Fn+F10 Touchpad off -+0xF9 f23 # Fn+F10 Touchpad off -diff --git a/extras/keymap/keymaps/samsung-sx20s b/extras/keymap/keymaps/samsung-sx20s -index daf7d3e..9d954ee 100644 ---- a/extras/keymap/keymaps/samsung-sx20s -+++ b/extras/keymap/keymaps/samsung-sx20s -@@ -1,4 +1,4 @@ - 0x74 mute - 0x75 mute --0x77 f21 # FIXME: Touchpad on --0x79 f21 # FIXME: Touchpad off -+0x77 f22 # Touchpad on -+0x79 f23 # Touchpad off -diff --git a/extras/keymap/keymaps/toshiba-satellite_a110 b/extras/keymap/keymaps/toshiba-satellite_a110 -index 0f2aaec..1429409 100644 ---- a/extras/keymap/keymaps/toshiba-satellite_a110 -+++ b/extras/keymap/keymaps/toshiba-satellite_a110 -@@ -1,8 +1,8 @@ - 0x92 stop - 0x93 www - 0x94 media --0x9E f21 # FIXME: Touchpad on --0x9F f21 # FIXME: Touchpad off -+0x9E f22 # Touchpad on -+0x9F f23 # Touchpad off - 0xB9 nextsong - 0xD9 brightnessup - 0xEE screenlock -diff --git a/extras/keymap/keymaps/toshiba-satellite_m30x b/extras/keymap/keymaps/toshiba-satellite_m30x -index cf6d912..9280ae0 100644 ---- a/extras/keymap/keymaps/toshiba-satellite_m30x -+++ b/extras/keymap/keymaps/toshiba-satellite_m30x -@@ -2,6 +2,6 @@ - 0xd9 brightnessup - 0xee screenlock - 0x93 media --0x9e prog1 #touchpad_enable --0x9f prog2 #touchpad_disable -+0x9e f22 #touchpad_enable -+0x9f f23 #touchpad_disable - -diff --git a/extras/keymap/keymaps/zepto-znote b/extras/keymap/keymaps/zepto-znote -index e076516..cf72fda 100644 ---- a/extras/keymap/keymaps/zepto-znote -+++ b/extras/keymap/keymaps/zepto-znote -@@ -1,7 +1,7 @@ - 0x93 switchvideomode # Fn+F3 Toggle Video Output - 0x95 brightnessdown # Fn+F4 Brightness Down - 0x91 brightnessup # Fn+F5 Brightness Up --0xA5 f22 # Fn+F6 Disable Touchpad -+0xA5 f23 # Fn+F6 Disable Touchpad - 0xA6 f22 # Fn+F6 Enable Touchpad - 0xA7 bluetooth # Fn+F10 Enable Bluetooth - 0XA9 bluetooth # Fn+F10 Disable Bluetooth --- -1.7.3.2 - diff --git a/0001-keymap-Add-force-release-for-HP-touchpad-off.patch b/0001-keymap-Add-force-release-for-HP-touchpad-off.patch deleted file mode 100644 index 1ba3551..0000000 --- a/0001-keymap-Add-force-release-for-HP-touchpad-off.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ecfad20871e855d9e54d3a528cf9219ce5c93626 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 1 Nov 2010 16:29:09 +0000 -Subject: [PATCH] keymap: Add force release for HP touchpad off - -Force the touchpad off/on keys getting released, as they usually -only send a "repeat". - -https://bugzilla.redhat.com/show_bug.cgi?id=623239 - -Signed-off-by: Martin Pitt ---- - Makefile.am | 1 + - extras/keymap/95-keyboard-force-release.rules | 5 +++++ - extras/keymap/force-release-maps/hp-other | 3 +++ - 3 files changed, 9 insertions(+), 0 deletions(-) - create mode 100644 extras/keymap/force-release-maps/hp-other - -diff --git a/Makefile.am b/Makefile.am -index 3a95046..032eb28 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -601,6 +601,7 @@ dist_udevkeymap_DATA = \ - - udevkeymapforcereldir = $(libexecdir)/keymaps/force-release - dist_udevkeymapforcerel_DATA = \ -+ extras/keymap/force-release-maps/hp-other \ - extras/keymap/force-release-maps/samsung-other \ - extras/keymap/force-release-maps/common-volume-keys - -diff --git a/extras/keymap/95-keyboard-force-release.rules b/extras/keymap/95-keyboard-force-release.rules -index 562dc8d..6f7c0fd 100644 ---- a/extras/keymap/95-keyboard-force-release.rules -+++ b/extras/keymap/95-keyboard-force-release.rules -@@ -35,4 +35,9 @@ ENV{DMI_VENDOR}=="TOSHIBA", ATTR{[dmi/id]product_name}=="Satellite U300|Satellit - - ENV{DMI_VENDOR}=="Viooo Corporation", ATTR{[dmi/id]product_name}=="PT17", RUN+="keyboard-force-release.sh $devpath common-volume-keys" - -+# These are all the HP laptops that setup a touchpad toggle key -+ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[pP][aA][vV][iI][lL][iI][oO][nN]*", RUN+="keyboard-force-release.sh $devpath hp-other" -+ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*[tT][xX]2*", RUN+="keyboard-force-release.sh $devpath hp-other" -+ENV{DMI_VENDOR}=="Hewlett-Packard*", ATTR{[dmi/id]product_name}=="*2510p*|*2530p*|HP G60 Notebook PC", RUN+="keyboard-force-release.sh $devpath hp-other" -+ - LABEL="force_release_end" -diff --git a/extras/keymap/force-release-maps/hp-other b/extras/keymap/force-release-maps/hp-other -new file mode 100644 -index 0000000..6621370 ---- /dev/null -+++ b/extras/keymap/force-release-maps/hp-other -@@ -0,0 +1,3 @@ -+# list of scancodes (hex or decimal), optional comment -+0xd8 # Touchpad off -+0xd9 # Touchpad on --- -1.7.3.2 - diff --git a/sources b/sources index 8dc2880..871f305 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -cd285a85f969518a671834de2f4d6614 udev-164.tar.bz2 -43b3842a00854e712b1d58af3a03e4ed udev-164.tar.bz2.sign +4db27d73fdbe94f47fd89fdd105c2dfb udev-166.tar.bz2 +3cb37564a589d4fedd6e7e3e178698d4 udev-166.tar.bz2.sign diff --git a/udev-pda-acl.patch b/udev-pda-acl.patch deleted file mode 100644 index b48103a..0000000 --- a/udev-pda-acl.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit d69207c3f20f0af2a5e510515ae5473f4fe54476 -Author: Harald Hoyer -Date: Fri Nov 12 15:44:34 2010 +0100 - - 70-acl.rules: add ACLs for ID_PDA devices - -diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules -index c7134bc..66375de 100644 ---- a/extras/udev-acl/70-acl.rules -+++ b/extras/udev-acl/70-acl.rules -@@ -47,6 +47,9 @@ SUBSYSTEM=="misc", KERNEL=="kvm", TAG+="udev-acl" - # smart-card readers - ENV{ID_SMARTCARD_READER}=="*?", TAG+="udev-acl" - -+# PDA devices -+ENV{ID_PDA}=="*?", TAG+="udev-acl" -+ - # joysticks - SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl" - diff --git a/udev-random_temporary_ifname.patch b/udev-random_temporary_ifname.patch deleted file mode 100644 index ff5ad5c..0000000 --- a/udev-random_temporary_ifname.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/udev/udev-event.c b/udev/udev-event.c -index 0648735..5387c00 100644 ---- a/udev/udev-event.c -+++ b/udev/udev-event.c -@@ -462,6 +462,7 @@ static void rename_netif_kernel_log(struct ifreq ifr) - static int rename_netif(struct udev_event *event) - { - struct udev_device *dev = event->dev; -+ char iftmp[IFNAMSIZ]; - int sk; - struct ifreq ifr; - int loop; -@@ -492,7 +493,8 @@ static int rename_netif(struct udev_event *event) - goto out; - - /* free our own name, another process may wait for us */ -- util_strscpyl(ifr.ifr_newname, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL); -+ util_strscpyl(iftmp, IFNAMSIZ, udev_device_get_sysname(dev), "-", event->name, NULL); -+ sprintf(ifr.ifr_newname, "eth_%X",util_string_hash32(iftmp)); - err = ioctl(sk, SIOCSIFNAME, &ifr); - if (err < 0) { - err = -errno; diff --git a/udev-ressize.patch b/udev-ressize.patch deleted file mode 100644 index 788b859..0000000 --- a/udev-ressize.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 851dd4ddc5aeb1ee517145d9e3334c2017595321 -Author: Harald Hoyer -Date: Fri Nov 12 14:39:14 2010 +0100 - - udev-rules.c: change import property buffer to 16384 bytes - - import_program_into_properties() should have the same line length as - import_file_into_properties() - - see also https://bugzilla.redhat.com/show_bug.cgi?id=652318 - -diff --git a/udev/udev-rules.c b/udev/udev-rules.c -index 52f121c..ab7b6ae 100644 ---- a/udev/udev-rules.c -+++ b/udev/udev-rules.c -@@ -751,7 +751,7 @@ static int import_program_into_properties(struct udev_device *dev, const char *p - { - struct udev *udev = udev_device_get_udev(dev); - char **envp; -- char result[4096]; -+ char result[UTIL_LINE_SIZE]; - size_t reslen; - char *line; - diff --git a/udev-post.init b/udev-retry.init similarity index 89% rename from udev-post.init rename to udev-retry.init index f882e0d..b4cb201 100644 --- a/udev-post.init +++ b/udev-retry.init @@ -1,6 +1,6 @@ #!/bin/bash # -# udev-post Post script for udev, after all filesystems are mounted +# udev-retry Post script for udev, after all filesystems are mounted # # Authors: Harald Hoyer # @@ -14,7 +14,7 @@ # Required-Stop: # Short-Description: Moves the generated persistent udev rules to /etc/udev/rules.d # Description: Moves the generated persistent udev rules to /etc/udev/rules.d -# Provides: udev-post +# Provides: udev-retry ### END INIT INFO . /etc/rc.d/init.d/functions @@ -49,12 +49,12 @@ case "$1" in fi done - touch /var/lock/subsys/udev-post + touch /var/lock/subsys/udev-retry exit 0 ;; stop) [ -w /var/lock/subsys ] || exit 4 - rm -f /var/lock/subsys/udev-post + rm -f /var/lock/subsys/udev-retry exit 0 ;; status) diff --git a/udev.spec b/udev.spec index 49dfbb6..be272ad 100644 --- a/udev.spec +++ b/udev.spec @@ -6,8 +6,8 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 164 -Release: 9%{?dist} +Version: 166 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -15,13 +15,8 @@ Obsoletes: udev-persistent < 0:030-5 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 Source1: start_udev -Source2: udev-post.init +Source2: udev-retry.init -Patch1: udev-ressize.patch -Patch2: udev-pda-acl.patch -Patch3: 0001-keymap-Add-force-release-for-HP-touchpad-off.patch -Patch4: 0001-extras-keymap-Make-touchpad-buttons-consistent.patch -Patch5: udev-random_temporary_ifname.patch Patch6: udev-164-no-v4l1.patch ExclusiveOS: Linux @@ -120,14 +115,15 @@ glib-based applications using libudev functionality. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %patch6 -p1 %build +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" + +# prevent man pages from re-building (xmlto) +find . -name "*.[1-8]" -exec touch '{}' \; +export V=1 + libtoolize -f -c %configure --with-selinux --prefix=%{_prefix} --exec-prefix="" \ --sysconfdir=%{_sysconfdir} \ @@ -179,7 +175,7 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d -install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post +install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-retry %preun if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then @@ -200,8 +196,9 @@ if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then /sbin/chkconfig --del udev fi if [ "$1" -eq 0 ]; then - /sbin/chkconfig --del udev-post + /sbin/chkconfig --del udev-retry fi +/sbin/chkconfig --del udev-post >/dev/null 2>&1 || : exit 0 %pre @@ -231,15 +228,17 @@ fi exit 0 %post +# convert old database files +/sbin/udevadm info --convert-db >/dev/null 2>&1 || : + # start daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then /sbin/udevd -d - /sbin/udevadm control --start-exec-queue + /sbin/udevadm control --start-exec-queue || : fi fi -/sbin/chkconfig --add udev-post -#/usr/bin/systemd-install --system --realize=minimal enable udev.service >/dev/null 2>&1 || : +/sbin/chkconfig --add udev-retry exit 0 @@ -277,7 +276,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{udev_scriptdir}/mtd_probe %attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/ -%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-post +%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-retry %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ %attr(0755,root,root) %dir %{udev_scriptdir}/ @@ -361,6 +360,11 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Feb 16 2011 Harald Hoyer 166-1 +- renamed udev-post initscript to udev-retry to match + upstream systemd service name +- version 166 + * Mon Feb 07 2011 Fedora Release Engineering - 164-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 99318e91b4c0852f5c359dda15e6e1c22a910fe7 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 23 Mar 2011 13:35:43 +0100 Subject: [PATCH 19/66] - add ACLs for harmony remote controls Resolves: rhbz#559412 - fixed CDROM profile handling --- ...9245f2d2fd03c2586a7f1140300b073a4abe.patch | 25 ++ ...6a377285d5943563cfa397e8b350e43878ec.patch | 345 ++++++++++++++++++ udev.spec | 12 +- 3 files changed, 381 insertions(+), 1 deletion(-) create mode 100644 udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch create mode 100644 udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch diff --git a/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch b/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch new file mode 100644 index 0000000..83d2c11 --- /dev/null +++ b/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch @@ -0,0 +1,25 @@ +commit 5e199245f2d2fd03c2586a7f1140300b073a4abe +Author: Harald Hoyer +Date: Thu Mar 17 20:36:20 2011 +0100 + + udev-acl/70-acl.rules: tag ID_REMOTE_CONTROL with acl + + Used by "concordance" to access Logitech Harmony programmable remote + controls. + + http://www.phildev.net/concordance/ + +diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules +index dd5a7ab..037349d 100644 +--- a/extras/udev-acl/70-acl.rules ++++ b/extras/udev-acl/70-acl.rules +@@ -52,6 +52,9 @@ ENV{ID_SMARTCARD_READER}=="*?", TAG+="udev-acl" + # PDA devices + ENV{ID_PDA}=="*?", TAG+="udev-acl" + ++# Programmable remote control ++ENV{ID_REMOTE_CONTROL}=="1", TAG+="udev-acl" ++ + # joysticks + SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl" + diff --git a/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch b/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch new file mode 100644 index 0000000..699add5 --- /dev/null +++ b/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch @@ -0,0 +1,345 @@ +commit 98ab6a377285d5943563cfa397e8b350e43878ec +Author: David Zeuthen +Date: Tue Mar 15 12:05:00 2011 -0400 + + cdrom_id: Don't ignore profiles when there is no media available + + Just because the GET CONFIGURATION MMC-2 command returns the current + profile as 0 does not mean that we can ignore the profiles describing + the capabilities of the drive - it only means that there currently is + no recognized media in the drive. Therefore, do process the returned + profiles even when cur_profile is 0. + + This fixes a bug where only + + ID_CDROM=1 + ID_CDROM_CD_R=1 + ID_CDROM_CD_RW=1 + ID_CDROM_DVD=1 + ID_CDROM_DVD_R=1 + ID_CDROM_DVD_RAM=1 + + was returned when there is no media in the drive instead of + + ID_CDROM=1 + ID_CDROM_CD=1 + ID_CDROM_CD_R=1 + ID_CDROM_CD_RW=1 + ID_CDROM_DVD=1 + ID_CDROM_DVD_R=1 + ID_CDROM_DVD_RW=1 + ID_CDROM_DVD_RAM=1 + ID_CDROM_DVD_PLUS_R=1 + ID_CDROM_DVD_PLUS_RW=1 + ID_CDROM_DVD_PLUS_R_DL=1 + ID_CDROM_BD=1 + ID_CDROM_BD_R=1 + ID_CDROM_BD_RE=1 + ID_CDROM_HDDVD=1 + + as is returned now. + + Signed-off-by: David Zeuthen + +diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c +index 4a58a49..b2f897e 100644 +--- a/extras/cdrom_id/cdrom_id.c ++++ b/extras/cdrom_id/cdrom_id.c +@@ -261,6 +261,115 @@ static int cd_inquiry(struct udev *udev, int fd) { + return 0; + } + ++static void feature_profile_media(struct udev *udev, int cur_profile) ++{ ++ switch (cur_profile) { ++ case 0x03: ++ case 0x04: ++ case 0x05: ++ info(udev, "profile 0x%02x \n", cur_profile); ++ cd_media = 1; ++ cd_media_mo = 1; ++ break; ++ case 0x08: ++ info(udev, "profile 0x%02x media_cd_rom\n", cur_profile); ++ cd_media = 1; ++ cd_media_cd_rom = 1; ++ break; ++ case 0x09: ++ info(udev, "profile 0x%02x media_cd_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_cd_r = 1; ++ break; ++ case 0x0a: ++ info(udev, "profile 0x%02x media_cd_rw\n", cur_profile); ++ cd_media = 1; ++ cd_media_cd_rw = 1; ++ break; ++ case 0x10: ++ info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_rom = 1; ++ break; ++ case 0x11: ++ info(udev, "profile 0x%02x media_dvd_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_r = 1; ++ break; ++ case 0x12: ++ info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_ram = 1; ++ break; ++ case 0x13: ++ info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_rw = 1; ++ cd_media_dvd_rw_ro = 1; ++ break; ++ case 0x14: ++ info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_rw = 1; ++ cd_media_dvd_rw_seq = 1; ++ break; ++ case 0x1B: ++ info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_plus_r = 1; ++ break; ++ case 0x1A: ++ info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_plus_rw = 1; ++ break; ++ case 0x2A: ++ info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_plus_rw_dl = 1; ++ break; ++ case 0x2B: ++ info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_plus_r_dl = 1; ++ break; ++ case 0x40: ++ info(udev, "profile 0x%02x media_bd\n", cur_profile); ++ cd_media = 1; ++ cd_media_bd = 1; ++ break; ++ case 0x41: ++ case 0x42: ++ info(udev, "profile 0x%02x media_bd_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_bd_r = 1; ++ break; ++ case 0x43: ++ info(udev, "profile 0x%02x media_bd_re\n", cur_profile); ++ cd_media = 1; ++ cd_media_bd_re = 1; ++ break; ++ case 0x50: ++ info(udev, "profile 0x%02x media_hddvd\n", cur_profile); ++ cd_media = 1; ++ cd_media_hddvd = 1; ++ break; ++ case 0x51: ++ info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_hddvd_r = 1; ++ break; ++ case 0x52: ++ info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile); ++ cd_media = 1; ++ cd_media_hddvd_rw = 1; ++ break; ++ default: ++ info(udev, "profile 0x%02x \n", cur_profile); ++ break; ++ } ++} ++ + static int feature_profiles(struct udev *udev, const unsigned char *profiles, size_t size) + { + unsigned int i; +@@ -350,6 +459,7 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si + return 0; + } + ++/* returns 0 if media was detected */ + static int cd_profiles_old_mmc(struct udev *udev, int fd) + { + struct scsi_cmd sc; +@@ -389,6 +499,7 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd) + return 0; + } + ++/* returns 0 if media was detected */ + static int cd_profiles(struct udev *udev, int fd) + { + struct scsi_cmd sc; +@@ -397,6 +508,9 @@ static int cd_profiles(struct udev *udev, int fd) + unsigned int len; + unsigned int i; + int err; ++ int ret; ++ ++ ret = -1; + + /* First query the current profile */ + scsi_cmd_init(udev, &sc, features, sizeof(features)); +@@ -410,126 +524,20 @@ static int cd_profiles(struct udev *udev, int fd) + if (SK(err) == 0x5 && ASC(err) == 0x20) { + info(udev, "drive is pre-MMC2 and does not support 46h get configuration command\n"); + info(udev, "trying to work around the problem\n"); +- return cd_profiles_old_mmc(udev, fd); ++ ret = cd_profiles_old_mmc(udev, fd); + } +- return -1; ++ goto out; + } + + cur_profile = features[6] << 8 | features[7]; + if (cur_profile > 0) { + info(udev, "current profile 0x%02x\n", cur_profile); ++ feature_profile_media (udev, cur_profile); ++ ret = 0; /* we have media */ + } else { + info(udev, "no current profile, assuming no media\n"); +- return -1; + } + +- switch (cur_profile) { +- case 0x03: +- case 0x04: +- case 0x05: +- info(udev, "profile 0x%02x \n", cur_profile); +- cd_media = 1; +- cd_media_mo = 1; +- break; +- case 0x08: +- info(udev, "profile 0x%02x media_cd_rom\n", cur_profile); +- cd_media = 1; +- cd_media_cd_rom = 1; +- break; +- case 0x09: +- info(udev, "profile 0x%02x media_cd_r\n", cur_profile); +- cd_media = 1; +- cd_media_cd_r = 1; +- break; +- case 0x0a: +- info(udev, "profile 0x%02x media_cd_rw\n", cur_profile); +- cd_media = 1; +- cd_media_cd_rw = 1; +- break; +- case 0x10: +- info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_rom = 1; +- break; +- case 0x11: +- info(udev, "profile 0x%02x media_dvd_r\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_r = 1; +- break; +- case 0x12: +- info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_ram = 1; +- break; +- case 0x13: +- info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_rw = 1; +- cd_media_dvd_rw_ro = 1; +- break; +- case 0x14: +- info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_rw = 1; +- cd_media_dvd_rw_seq = 1; +- break; +- case 0x1B: +- info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_plus_r = 1; +- break; +- case 0x1A: +- info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_plus_rw = 1; +- break; +- case 0x2A: +- info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_plus_rw_dl = 1; +- break; +- case 0x2B: +- info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_plus_r_dl = 1; +- break; +- case 0x40: +- info(udev, "profile 0x%02x media_bd\n", cur_profile); +- cd_media = 1; +- cd_media_bd = 1; +- break; +- case 0x41: +- case 0x42: +- info(udev, "profile 0x%02x media_bd_r\n", cur_profile); +- cd_media = 1; +- cd_media_bd_r = 1; +- break; +- case 0x43: +- info(udev, "profile 0x%02x media_bd_re\n", cur_profile); +- cd_media = 1; +- cd_media_bd_re = 1; +- break; +- case 0x50: +- info(udev, "profile 0x%02x media_hddvd\n", cur_profile); +- cd_media = 1; +- cd_media_hddvd = 1; +- break; +- case 0x51: +- info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile); +- cd_media = 1; +- cd_media_hddvd_r = 1; +- break; +- case 0x52: +- info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile); +- cd_media = 1; +- cd_media_hddvd_rw = 1; +- break; +- default: +- info(udev, "profile 0x%02x \n", cur_profile); +- break; +- } +- +- + len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3]; + info(udev, "GET CONFIGURATION: size of features buffer 0x%04x\n", len); + +@@ -577,8 +585,8 @@ static int cd_profiles(struct udev *udev, int fd) + break; + } + } +- +- return 0; ++out: ++ return ret; + } + + static int cd_media_info(struct udev *udev, int fd) +@@ -905,9 +913,12 @@ int main(int argc, char *argv[]) + goto print; + + /* read drive and possibly current profile */ +- if (cd_profiles(udev, fd) < 0) ++ if (cd_profiles(udev, fd) != 0) + goto print; + ++ /* at this point we are guaranteed to have media in the ++ * drive - find out more about it */ ++ + /* get session/track info */ + cd_media_toc(udev, fd); + diff --git a/udev.spec b/udev.spec index be272ad..105de70 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 166 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -18,6 +18,9 @@ Source1: start_udev Source2: udev-retry.init Patch6: udev-164-no-v4l1.patch +Patch7: udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch +Patch8: udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch + ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -116,6 +119,8 @@ glib-based applications using libudev functionality. %prep %setup -q %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" @@ -360,6 +365,11 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Mar 23 2011 Harald Hoyer 166-2 +- add ACLs for harmony remote controls +Resolves: rhbz#559412 +- fixed CDROM profile handling + * Wed Feb 16 2011 Harald Hoyer 166-1 - renamed udev-post initscript to udev-retry to match upstream systemd service name From 545bd16ca5fdbd22a9e385941b04ca3ba2c93d87 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 23 Mar 2011 13:35:43 +0100 Subject: [PATCH 20/66] - add ACLs for harmony remote controls Resolves: rhbz#559412 - fixed CDROM profile handling --- ...9245f2d2fd03c2586a7f1140300b073a4abe.patch | 25 ++ ...6a377285d5943563cfa397e8b350e43878ec.patch | 345 ++++++++++++++++++ udev.spec | 12 +- 3 files changed, 381 insertions(+), 1 deletion(-) create mode 100644 udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch create mode 100644 udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch diff --git a/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch b/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch new file mode 100644 index 0000000..83d2c11 --- /dev/null +++ b/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch @@ -0,0 +1,25 @@ +commit 5e199245f2d2fd03c2586a7f1140300b073a4abe +Author: Harald Hoyer +Date: Thu Mar 17 20:36:20 2011 +0100 + + udev-acl/70-acl.rules: tag ID_REMOTE_CONTROL with acl + + Used by "concordance" to access Logitech Harmony programmable remote + controls. + + http://www.phildev.net/concordance/ + +diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules +index dd5a7ab..037349d 100644 +--- a/extras/udev-acl/70-acl.rules ++++ b/extras/udev-acl/70-acl.rules +@@ -52,6 +52,9 @@ ENV{ID_SMARTCARD_READER}=="*?", TAG+="udev-acl" + # PDA devices + ENV{ID_PDA}=="*?", TAG+="udev-acl" + ++# Programmable remote control ++ENV{ID_REMOTE_CONTROL}=="1", TAG+="udev-acl" ++ + # joysticks + SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl" + diff --git a/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch b/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch new file mode 100644 index 0000000..699add5 --- /dev/null +++ b/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch @@ -0,0 +1,345 @@ +commit 98ab6a377285d5943563cfa397e8b350e43878ec +Author: David Zeuthen +Date: Tue Mar 15 12:05:00 2011 -0400 + + cdrom_id: Don't ignore profiles when there is no media available + + Just because the GET CONFIGURATION MMC-2 command returns the current + profile as 0 does not mean that we can ignore the profiles describing + the capabilities of the drive - it only means that there currently is + no recognized media in the drive. Therefore, do process the returned + profiles even when cur_profile is 0. + + This fixes a bug where only + + ID_CDROM=1 + ID_CDROM_CD_R=1 + ID_CDROM_CD_RW=1 + ID_CDROM_DVD=1 + ID_CDROM_DVD_R=1 + ID_CDROM_DVD_RAM=1 + + was returned when there is no media in the drive instead of + + ID_CDROM=1 + ID_CDROM_CD=1 + ID_CDROM_CD_R=1 + ID_CDROM_CD_RW=1 + ID_CDROM_DVD=1 + ID_CDROM_DVD_R=1 + ID_CDROM_DVD_RW=1 + ID_CDROM_DVD_RAM=1 + ID_CDROM_DVD_PLUS_R=1 + ID_CDROM_DVD_PLUS_RW=1 + ID_CDROM_DVD_PLUS_R_DL=1 + ID_CDROM_BD=1 + ID_CDROM_BD_R=1 + ID_CDROM_BD_RE=1 + ID_CDROM_HDDVD=1 + + as is returned now. + + Signed-off-by: David Zeuthen + +diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c +index 4a58a49..b2f897e 100644 +--- a/extras/cdrom_id/cdrom_id.c ++++ b/extras/cdrom_id/cdrom_id.c +@@ -261,6 +261,115 @@ static int cd_inquiry(struct udev *udev, int fd) { + return 0; + } + ++static void feature_profile_media(struct udev *udev, int cur_profile) ++{ ++ switch (cur_profile) { ++ case 0x03: ++ case 0x04: ++ case 0x05: ++ info(udev, "profile 0x%02x \n", cur_profile); ++ cd_media = 1; ++ cd_media_mo = 1; ++ break; ++ case 0x08: ++ info(udev, "profile 0x%02x media_cd_rom\n", cur_profile); ++ cd_media = 1; ++ cd_media_cd_rom = 1; ++ break; ++ case 0x09: ++ info(udev, "profile 0x%02x media_cd_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_cd_r = 1; ++ break; ++ case 0x0a: ++ info(udev, "profile 0x%02x media_cd_rw\n", cur_profile); ++ cd_media = 1; ++ cd_media_cd_rw = 1; ++ break; ++ case 0x10: ++ info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_rom = 1; ++ break; ++ case 0x11: ++ info(udev, "profile 0x%02x media_dvd_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_r = 1; ++ break; ++ case 0x12: ++ info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_ram = 1; ++ break; ++ case 0x13: ++ info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_rw = 1; ++ cd_media_dvd_rw_ro = 1; ++ break; ++ case 0x14: ++ info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_rw = 1; ++ cd_media_dvd_rw_seq = 1; ++ break; ++ case 0x1B: ++ info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_plus_r = 1; ++ break; ++ case 0x1A: ++ info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_plus_rw = 1; ++ break; ++ case 0x2A: ++ info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_plus_rw_dl = 1; ++ break; ++ case 0x2B: ++ info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile); ++ cd_media = 1; ++ cd_media_dvd_plus_r_dl = 1; ++ break; ++ case 0x40: ++ info(udev, "profile 0x%02x media_bd\n", cur_profile); ++ cd_media = 1; ++ cd_media_bd = 1; ++ break; ++ case 0x41: ++ case 0x42: ++ info(udev, "profile 0x%02x media_bd_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_bd_r = 1; ++ break; ++ case 0x43: ++ info(udev, "profile 0x%02x media_bd_re\n", cur_profile); ++ cd_media = 1; ++ cd_media_bd_re = 1; ++ break; ++ case 0x50: ++ info(udev, "profile 0x%02x media_hddvd\n", cur_profile); ++ cd_media = 1; ++ cd_media_hddvd = 1; ++ break; ++ case 0x51: ++ info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile); ++ cd_media = 1; ++ cd_media_hddvd_r = 1; ++ break; ++ case 0x52: ++ info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile); ++ cd_media = 1; ++ cd_media_hddvd_rw = 1; ++ break; ++ default: ++ info(udev, "profile 0x%02x \n", cur_profile); ++ break; ++ } ++} ++ + static int feature_profiles(struct udev *udev, const unsigned char *profiles, size_t size) + { + unsigned int i; +@@ -350,6 +459,7 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si + return 0; + } + ++/* returns 0 if media was detected */ + static int cd_profiles_old_mmc(struct udev *udev, int fd) + { + struct scsi_cmd sc; +@@ -389,6 +499,7 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd) + return 0; + } + ++/* returns 0 if media was detected */ + static int cd_profiles(struct udev *udev, int fd) + { + struct scsi_cmd sc; +@@ -397,6 +508,9 @@ static int cd_profiles(struct udev *udev, int fd) + unsigned int len; + unsigned int i; + int err; ++ int ret; ++ ++ ret = -1; + + /* First query the current profile */ + scsi_cmd_init(udev, &sc, features, sizeof(features)); +@@ -410,126 +524,20 @@ static int cd_profiles(struct udev *udev, int fd) + if (SK(err) == 0x5 && ASC(err) == 0x20) { + info(udev, "drive is pre-MMC2 and does not support 46h get configuration command\n"); + info(udev, "trying to work around the problem\n"); +- return cd_profiles_old_mmc(udev, fd); ++ ret = cd_profiles_old_mmc(udev, fd); + } +- return -1; ++ goto out; + } + + cur_profile = features[6] << 8 | features[7]; + if (cur_profile > 0) { + info(udev, "current profile 0x%02x\n", cur_profile); ++ feature_profile_media (udev, cur_profile); ++ ret = 0; /* we have media */ + } else { + info(udev, "no current profile, assuming no media\n"); +- return -1; + } + +- switch (cur_profile) { +- case 0x03: +- case 0x04: +- case 0x05: +- info(udev, "profile 0x%02x \n", cur_profile); +- cd_media = 1; +- cd_media_mo = 1; +- break; +- case 0x08: +- info(udev, "profile 0x%02x media_cd_rom\n", cur_profile); +- cd_media = 1; +- cd_media_cd_rom = 1; +- break; +- case 0x09: +- info(udev, "profile 0x%02x media_cd_r\n", cur_profile); +- cd_media = 1; +- cd_media_cd_r = 1; +- break; +- case 0x0a: +- info(udev, "profile 0x%02x media_cd_rw\n", cur_profile); +- cd_media = 1; +- cd_media_cd_rw = 1; +- break; +- case 0x10: +- info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_rom = 1; +- break; +- case 0x11: +- info(udev, "profile 0x%02x media_dvd_r\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_r = 1; +- break; +- case 0x12: +- info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_ram = 1; +- break; +- case 0x13: +- info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_rw = 1; +- cd_media_dvd_rw_ro = 1; +- break; +- case 0x14: +- info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_rw = 1; +- cd_media_dvd_rw_seq = 1; +- break; +- case 0x1B: +- info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_plus_r = 1; +- break; +- case 0x1A: +- info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_plus_rw = 1; +- break; +- case 0x2A: +- info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_plus_rw_dl = 1; +- break; +- case 0x2B: +- info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile); +- cd_media = 1; +- cd_media_dvd_plus_r_dl = 1; +- break; +- case 0x40: +- info(udev, "profile 0x%02x media_bd\n", cur_profile); +- cd_media = 1; +- cd_media_bd = 1; +- break; +- case 0x41: +- case 0x42: +- info(udev, "profile 0x%02x media_bd_r\n", cur_profile); +- cd_media = 1; +- cd_media_bd_r = 1; +- break; +- case 0x43: +- info(udev, "profile 0x%02x media_bd_re\n", cur_profile); +- cd_media = 1; +- cd_media_bd_re = 1; +- break; +- case 0x50: +- info(udev, "profile 0x%02x media_hddvd\n", cur_profile); +- cd_media = 1; +- cd_media_hddvd = 1; +- break; +- case 0x51: +- info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile); +- cd_media = 1; +- cd_media_hddvd_r = 1; +- break; +- case 0x52: +- info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile); +- cd_media = 1; +- cd_media_hddvd_rw = 1; +- break; +- default: +- info(udev, "profile 0x%02x \n", cur_profile); +- break; +- } +- +- + len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3]; + info(udev, "GET CONFIGURATION: size of features buffer 0x%04x\n", len); + +@@ -577,8 +585,8 @@ static int cd_profiles(struct udev *udev, int fd) + break; + } + } +- +- return 0; ++out: ++ return ret; + } + + static int cd_media_info(struct udev *udev, int fd) +@@ -905,9 +913,12 @@ int main(int argc, char *argv[]) + goto print; + + /* read drive and possibly current profile */ +- if (cd_profiles(udev, fd) < 0) ++ if (cd_profiles(udev, fd) != 0) + goto print; + ++ /* at this point we are guaranteed to have media in the ++ * drive - find out more about it */ ++ + /* get session/track info */ + cd_media_toc(udev, fd); + diff --git a/udev.spec b/udev.spec index be272ad..105de70 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 166 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -18,6 +18,9 @@ Source1: start_udev Source2: udev-retry.init Patch6: udev-164-no-v4l1.patch +Patch7: udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch +Patch8: udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch + ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -116,6 +119,8 @@ glib-based applications using libudev functionality. %prep %setup -q %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" @@ -360,6 +365,11 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Mar 23 2011 Harald Hoyer 166-2 +- add ACLs for harmony remote controls +Resolves: rhbz#559412 +- fixed CDROM profile handling + * Wed Feb 16 2011 Harald Hoyer 166-1 - renamed udev-post initscript to udev-retry to match upstream systemd service name From a8dfb502d8fa50964e6a4d38d8a755e2ad8f0f17 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 30 Mar 2011 16:50:28 +0200 Subject: [PATCH 21/66] - version 167 --- .gitignore | 1 + sources | 3 +- udev-160.tar.bz2.sign | 8 - udev-164-no-v4l1.patch | 42 --- ...9245f2d2fd03c2586a7f1140300b073a4abe.patch | 25 -- ...6a377285d5943563cfa397e8b350e43878ec.patch | 345 ------------------ udev-retry.init | 67 ---- udev.spec | 28 +- upstream | 1 - upstream-key.gpg | 54 --- 10 files changed, 11 insertions(+), 563 deletions(-) delete mode 100644 udev-160.tar.bz2.sign delete mode 100644 udev-164-no-v4l1.patch delete mode 100644 udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch delete mode 100644 udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch delete mode 100644 udev-retry.init delete mode 100644 upstream delete mode 100644 upstream-key.gpg diff --git a/.gitignore b/.gitignore index ff4586d..80bcd9e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ udev-160.tar.bz2 /udev-164.tar.bz2.sign /udev-166.tar.bz2 /udev-166.tar.bz2.sign +/udev-167.tar.bz2 diff --git a/sources b/sources index 871f305..db4315b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4db27d73fdbe94f47fd89fdd105c2dfb udev-166.tar.bz2 -3cb37564a589d4fedd6e7e3e178698d4 udev-166.tar.bz2.sign +4b37e1222f06c14c24147de346aa0bad udev-167.tar.bz2 diff --git a/udev-160.tar.bz2.sign b/udev-160.tar.bz2.sign deleted file mode 100644 index f5465a6..0000000 --- a/udev-160.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBMOkG1yGugalF9Dw4RAjB0AJ9ftRX/zmCiRcSyQWhcWJXsnXDn3gCeMFbR -KdR80Jxmitbil01dFfPzwEE= -=8B8M ------END PGP SIGNATURE----- diff --git a/udev-164-no-v4l1.patch b/udev-164-no-v4l1.patch deleted file mode 100644 index 9d9ef7c..0000000 --- a/udev-164-no-v4l1.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c -index d530a6d..e4b22bf 100644 ---- a/extras/v4l_id/v4l_id.c -+++ b/extras/v4l_id/v4l_id.c -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - - int main (int argc, char *argv[]) -@@ -39,7 +38,6 @@ int main (int argc, char *argv[]) - }; - int fd; - char *device; -- struct video_capability v1cap; - struct v4l2_capability v2cap; - - while (1) { -@@ -82,20 +80,7 @@ int main (int argc, char *argv[]) - if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) - printf("radio:"); - printf("\n"); -- } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { -- printf("ID_V4L_VERSION=1\n"); -- printf("ID_V4L_PRODUCT=%s\n", v1cap.name); -- printf("ID_V4L_CAPABILITIES=:"); -- if ((v1cap.type & VID_TYPE_CAPTURE) > 0) -- printf("capture:"); -- if ((v1cap.type & VID_TYPE_OVERLAY) > 0) -- printf("video_overlay:"); -- if (v1cap.audios > 0) -- printf("audio:"); -- if ((v1cap.type & VID_TYPE_TUNER) > 0) -- printf("tuner:"); -- printf("\n"); -- } -+ } - - close (fd); - return 0; diff --git a/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch b/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch deleted file mode 100644 index 83d2c11..0000000 --- a/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 5e199245f2d2fd03c2586a7f1140300b073a4abe -Author: Harald Hoyer -Date: Thu Mar 17 20:36:20 2011 +0100 - - udev-acl/70-acl.rules: tag ID_REMOTE_CONTROL with acl - - Used by "concordance" to access Logitech Harmony programmable remote - controls. - - http://www.phildev.net/concordance/ - -diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules -index dd5a7ab..037349d 100644 ---- a/extras/udev-acl/70-acl.rules -+++ b/extras/udev-acl/70-acl.rules -@@ -52,6 +52,9 @@ ENV{ID_SMARTCARD_READER}=="*?", TAG+="udev-acl" - # PDA devices - ENV{ID_PDA}=="*?", TAG+="udev-acl" - -+# Programmable remote control -+ENV{ID_REMOTE_CONTROL}=="1", TAG+="udev-acl" -+ - # joysticks - SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl" - diff --git a/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch b/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch deleted file mode 100644 index 699add5..0000000 --- a/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch +++ /dev/null @@ -1,345 +0,0 @@ -commit 98ab6a377285d5943563cfa397e8b350e43878ec -Author: David Zeuthen -Date: Tue Mar 15 12:05:00 2011 -0400 - - cdrom_id: Don't ignore profiles when there is no media available - - Just because the GET CONFIGURATION MMC-2 command returns the current - profile as 0 does not mean that we can ignore the profiles describing - the capabilities of the drive - it only means that there currently is - no recognized media in the drive. Therefore, do process the returned - profiles even when cur_profile is 0. - - This fixes a bug where only - - ID_CDROM=1 - ID_CDROM_CD_R=1 - ID_CDROM_CD_RW=1 - ID_CDROM_DVD=1 - ID_CDROM_DVD_R=1 - ID_CDROM_DVD_RAM=1 - - was returned when there is no media in the drive instead of - - ID_CDROM=1 - ID_CDROM_CD=1 - ID_CDROM_CD_R=1 - ID_CDROM_CD_RW=1 - ID_CDROM_DVD=1 - ID_CDROM_DVD_R=1 - ID_CDROM_DVD_RW=1 - ID_CDROM_DVD_RAM=1 - ID_CDROM_DVD_PLUS_R=1 - ID_CDROM_DVD_PLUS_RW=1 - ID_CDROM_DVD_PLUS_R_DL=1 - ID_CDROM_BD=1 - ID_CDROM_BD_R=1 - ID_CDROM_BD_RE=1 - ID_CDROM_HDDVD=1 - - as is returned now. - - Signed-off-by: David Zeuthen - -diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c -index 4a58a49..b2f897e 100644 ---- a/extras/cdrom_id/cdrom_id.c -+++ b/extras/cdrom_id/cdrom_id.c -@@ -261,6 +261,115 @@ static int cd_inquiry(struct udev *udev, int fd) { - return 0; - } - -+static void feature_profile_media(struct udev *udev, int cur_profile) -+{ -+ switch (cur_profile) { -+ case 0x03: -+ case 0x04: -+ case 0x05: -+ info(udev, "profile 0x%02x \n", cur_profile); -+ cd_media = 1; -+ cd_media_mo = 1; -+ break; -+ case 0x08: -+ info(udev, "profile 0x%02x media_cd_rom\n", cur_profile); -+ cd_media = 1; -+ cd_media_cd_rom = 1; -+ break; -+ case 0x09: -+ info(udev, "profile 0x%02x media_cd_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_cd_r = 1; -+ break; -+ case 0x0a: -+ info(udev, "profile 0x%02x media_cd_rw\n", cur_profile); -+ cd_media = 1; -+ cd_media_cd_rw = 1; -+ break; -+ case 0x10: -+ info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_rom = 1; -+ break; -+ case 0x11: -+ info(udev, "profile 0x%02x media_dvd_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_r = 1; -+ break; -+ case 0x12: -+ info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_ram = 1; -+ break; -+ case 0x13: -+ info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_rw = 1; -+ cd_media_dvd_rw_ro = 1; -+ break; -+ case 0x14: -+ info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_rw = 1; -+ cd_media_dvd_rw_seq = 1; -+ break; -+ case 0x1B: -+ info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_plus_r = 1; -+ break; -+ case 0x1A: -+ info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_plus_rw = 1; -+ break; -+ case 0x2A: -+ info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_plus_rw_dl = 1; -+ break; -+ case 0x2B: -+ info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_plus_r_dl = 1; -+ break; -+ case 0x40: -+ info(udev, "profile 0x%02x media_bd\n", cur_profile); -+ cd_media = 1; -+ cd_media_bd = 1; -+ break; -+ case 0x41: -+ case 0x42: -+ info(udev, "profile 0x%02x media_bd_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_bd_r = 1; -+ break; -+ case 0x43: -+ info(udev, "profile 0x%02x media_bd_re\n", cur_profile); -+ cd_media = 1; -+ cd_media_bd_re = 1; -+ break; -+ case 0x50: -+ info(udev, "profile 0x%02x media_hddvd\n", cur_profile); -+ cd_media = 1; -+ cd_media_hddvd = 1; -+ break; -+ case 0x51: -+ info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_hddvd_r = 1; -+ break; -+ case 0x52: -+ info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile); -+ cd_media = 1; -+ cd_media_hddvd_rw = 1; -+ break; -+ default: -+ info(udev, "profile 0x%02x \n", cur_profile); -+ break; -+ } -+} -+ - static int feature_profiles(struct udev *udev, const unsigned char *profiles, size_t size) - { - unsigned int i; -@@ -350,6 +459,7 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si - return 0; - } - -+/* returns 0 if media was detected */ - static int cd_profiles_old_mmc(struct udev *udev, int fd) - { - struct scsi_cmd sc; -@@ -389,6 +499,7 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd) - return 0; - } - -+/* returns 0 if media was detected */ - static int cd_profiles(struct udev *udev, int fd) - { - struct scsi_cmd sc; -@@ -397,6 +508,9 @@ static int cd_profiles(struct udev *udev, int fd) - unsigned int len; - unsigned int i; - int err; -+ int ret; -+ -+ ret = -1; - - /* First query the current profile */ - scsi_cmd_init(udev, &sc, features, sizeof(features)); -@@ -410,126 +524,20 @@ static int cd_profiles(struct udev *udev, int fd) - if (SK(err) == 0x5 && ASC(err) == 0x20) { - info(udev, "drive is pre-MMC2 and does not support 46h get configuration command\n"); - info(udev, "trying to work around the problem\n"); -- return cd_profiles_old_mmc(udev, fd); -+ ret = cd_profiles_old_mmc(udev, fd); - } -- return -1; -+ goto out; - } - - cur_profile = features[6] << 8 | features[7]; - if (cur_profile > 0) { - info(udev, "current profile 0x%02x\n", cur_profile); -+ feature_profile_media (udev, cur_profile); -+ ret = 0; /* we have media */ - } else { - info(udev, "no current profile, assuming no media\n"); -- return -1; - } - -- switch (cur_profile) { -- case 0x03: -- case 0x04: -- case 0x05: -- info(udev, "profile 0x%02x \n", cur_profile); -- cd_media = 1; -- cd_media_mo = 1; -- break; -- case 0x08: -- info(udev, "profile 0x%02x media_cd_rom\n", cur_profile); -- cd_media = 1; -- cd_media_cd_rom = 1; -- break; -- case 0x09: -- info(udev, "profile 0x%02x media_cd_r\n", cur_profile); -- cd_media = 1; -- cd_media_cd_r = 1; -- break; -- case 0x0a: -- info(udev, "profile 0x%02x media_cd_rw\n", cur_profile); -- cd_media = 1; -- cd_media_cd_rw = 1; -- break; -- case 0x10: -- info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_rom = 1; -- break; -- case 0x11: -- info(udev, "profile 0x%02x media_dvd_r\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_r = 1; -- break; -- case 0x12: -- info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_ram = 1; -- break; -- case 0x13: -- info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_rw = 1; -- cd_media_dvd_rw_ro = 1; -- break; -- case 0x14: -- info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_rw = 1; -- cd_media_dvd_rw_seq = 1; -- break; -- case 0x1B: -- info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_plus_r = 1; -- break; -- case 0x1A: -- info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_plus_rw = 1; -- break; -- case 0x2A: -- info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_plus_rw_dl = 1; -- break; -- case 0x2B: -- info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_plus_r_dl = 1; -- break; -- case 0x40: -- info(udev, "profile 0x%02x media_bd\n", cur_profile); -- cd_media = 1; -- cd_media_bd = 1; -- break; -- case 0x41: -- case 0x42: -- info(udev, "profile 0x%02x media_bd_r\n", cur_profile); -- cd_media = 1; -- cd_media_bd_r = 1; -- break; -- case 0x43: -- info(udev, "profile 0x%02x media_bd_re\n", cur_profile); -- cd_media = 1; -- cd_media_bd_re = 1; -- break; -- case 0x50: -- info(udev, "profile 0x%02x media_hddvd\n", cur_profile); -- cd_media = 1; -- cd_media_hddvd = 1; -- break; -- case 0x51: -- info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile); -- cd_media = 1; -- cd_media_hddvd_r = 1; -- break; -- case 0x52: -- info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile); -- cd_media = 1; -- cd_media_hddvd_rw = 1; -- break; -- default: -- info(udev, "profile 0x%02x \n", cur_profile); -- break; -- } -- -- - len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3]; - info(udev, "GET CONFIGURATION: size of features buffer 0x%04x\n", len); - -@@ -577,8 +585,8 @@ static int cd_profiles(struct udev *udev, int fd) - break; - } - } -- -- return 0; -+out: -+ return ret; - } - - static int cd_media_info(struct udev *udev, int fd) -@@ -905,9 +913,12 @@ int main(int argc, char *argv[]) - goto print; - - /* read drive and possibly current profile */ -- if (cd_profiles(udev, fd) < 0) -+ if (cd_profiles(udev, fd) != 0) - goto print; - -+ /* at this point we are guaranteed to have media in the -+ * drive - find out more about it */ -+ - /* get session/track info */ - cd_media_toc(udev, fd); - diff --git a/udev-retry.init b/udev-retry.init deleted file mode 100644 index b4cb201..0000000 --- a/udev-retry.init +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# -# udev-retry Post script for udev, after all filesystems are mounted -# -# Authors: Harald Hoyer -# -# chkconfig: 12345 26 75 -# description: Moves the generated persistent udev rules to /etc/udev/rules.d -# -### BEGIN INIT INFO -# Default-Start: 12345 -# Default-Stop: 0 6 -# Required-Start: $local_fs -# Required-Stop: -# Short-Description: Moves the generated persistent udev rules to /etc/udev/rules.d -# Description: Moves the generated persistent udev rules to /etc/udev/rules.d -# Provides: udev-retry -### END INIT INFO - -. /etc/rc.d/init.d/functions - -# See how we were called. -case "$1" in - start|reload) - [ -w /var/lock/subsys ] || exit 4 - STRING=$"Retrigger failed udev events" - echo -n $STRING - /sbin/udevadm trigger --type=failed - success "$STRING" - echo - - STRING=$"Adding udev persistent rules" - - # copy the rules generated before / was mounted read-write - for file in /dev/.udev/tmp-rules--*; do - dest=${file##*tmp-rules--} - # check, if anything is todo - [ "$dest" = '*' ] && exit 0 - echo -n $STRING - cat $file >> /etc/udev/rules.d/$dest - rc=$? - rm -f $file - if [ "$rc" -eq "0" ]; then - success "$STRING" - echo - elif [ "$rc" -eq "1" ]; then - failure "$STRING" - echo - fi - done - - touch /var/lock/subsys/udev-retry - exit 0 - ;; - stop) - [ -w /var/lock/subsys ] || exit 4 - rm -f /var/lock/subsys/udev-retry - exit 0 - ;; - status) - exit 3 - ;; - *) - echo $"Usage: $0 {start|stop|reload}" - exit 2 -esac -exit 0 diff --git a/udev.spec b/udev.spec index 105de70..35c5349 100644 --- a/udev.spec +++ b/udev.spec @@ -6,8 +6,8 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 166 -Release: 2%{?dist} +Version: 167 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -15,12 +15,6 @@ Obsoletes: udev-persistent < 0:030-5 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 Source1: start_udev -Source2: udev-retry.init - -Patch6: udev-164-no-v4l1.patch -Patch7: udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch -Patch8: udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch - ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -118,9 +112,6 @@ glib-based applications using libudev functionality. %prep %setup -q -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" @@ -180,7 +171,6 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d -install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-retry %preun if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then @@ -243,7 +233,6 @@ if test -f /proc/1/exe -a -d /proc/1/root; then /sbin/udevadm control --start-exec-queue || : fi fi -/sbin/chkconfig --add udev-retry exit 0 @@ -275,13 +264,11 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{udev_scriptdir}/write_cd_rules %attr(0755,root,root) %{udev_scriptdir}/write_net_rules %attr(0755,root,root) %{udev_scriptdir}/collect -%attr(0755,root,root) %{udev_scriptdir}/fstab_import %attr(0755,root,root) %{udev_scriptdir}/input_id %attr(0755,root,root) %{udev_scriptdir}/keyboard-force-release.sh %attr(0755,root,root) %{udev_scriptdir}/mtd_probe %attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/ -%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-retry %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ %attr(0755,root,root) %dir %{udev_scriptdir}/ @@ -318,13 +305,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pkgconfig/udev.pc %attr(0755,root,root) /sbin/start_udev -%attr(0644,root,root) %{systemdsystemunitdir}/udev-retry.service %attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service +%attr(0644,root,root) %{systemdsystemunitdir}/udev-trigger.service %attr(0644,root,root) %{systemdsystemunitdir}/udev.service -%{systemdsystemunitdir}/basic.target.wants/udev-retry.service -%{systemdsystemunitdir}/basic.target.wants/udev-settle.service +%attr(0644,root,root) %{systemdsystemunitdir}/udev.socket %{systemdsystemunitdir}/basic.target.wants/udev.service - +%{systemdsystemunitdir}/basic.target.wants/udev-trigger.service +%{systemdsystemunitdir}/sockets.target.wants/udev.socket # Deprecated, but keep the ownership %ghost %dir /var/lib/udev @@ -365,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Mar 30 2011 Harald Hoyer 167-1 +- version 167 + * Wed Mar 23 2011 Harald Hoyer 166-2 - add ACLs for harmony remote controls Resolves: rhbz#559412 diff --git a/upstream b/upstream deleted file mode 100644 index 287b708..0000000 --- a/upstream +++ /dev/null @@ -1 +0,0 @@ -udev-145.tar.bz2 diff --git a/upstream-key.gpg b/upstream-key.gpg deleted file mode 100644 index 81cd947..0000000 --- a/upstream-key.gpg +++ /dev/null @@ -1,54 +0,0 @@ -pub 1024D/517D0F0E 2000-10-10 Linux Kernel Archives Verification Key - Key fingerprint = C75D C40A 11D7 AF88 9981 ED5B C86B A06A 517D 0F0E -sub 4096g/E50A8F2A 2000-10-10 - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.3 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -mQGiBDnirDkRBADCTL/iUTeZKb0tiAcKdZdsUP/KSnrGGjlinolUAsUC0D6/hUB1 -RdCpJOOERTIEr1yvehqDM7veRhNMoxJNQxa/sSrkywey5qc8uaskUNEqenimq/70 -bahWJeoWXjad68mQFh65lULnHQrrioeJnh9UpyGJppNb/yIjdnymH9aYEwCglgP7 -UegBzH22h8NVQEK2PWWbyUUD/jQA4lI0wRWcL9HpkYkHcH0LTKRB9zYpQYtyvzJi -yTGwJyFMfYNXy0RT11dICeLkf3HMR84hkPERKMhALobLxVUbfc7j2AygmzGphWGy -DH/xjptQP/zrsq87ylYRONK18w1J42cm+yZa4XThMDPJMrb9/l8qnxU1JnW7W1al -HKTpBACbs+91KLqrnIGcF44TMwxgUj5CUrayPoEnLU+ZMBqfSjmu8RqEYmTxJCKv -7erBFSuazBGj5X7twunrtrW3bxO63MbLbHjfXSRrMnKOb8dRULIg6eWAnoAx8VVZ -YjrOpwAntU3WxYOpbiCHt9kLbb+N5rvNtFcmOqRRQaCIUFOOaLQ8TGludXggS2Vy -bmVsIEFyY2hpdmVzIFZlcmlmaWNhdGlvbiBLZXkgPGZ0cGFkbWluQGtlcm5lbC5v -cmc+iFUEExECABUFAjnirDkDCwoDAxUDAgMWAgECF4AACgkQyGugalF9Dw4MNACe -JiQTyCmQzPGou2cl/RyOXj79kYYAnAsT6xt72hp/PFiywYM9vBsDVv9niQEVAwUQ -OeKwNWx5eAAqlgcFAQEdZgf/Vn2dMKrn8021NhavP0uA3pHGRmdKQ2WJBdLiN2tv -LkpAioZtho+op+xBz8j1zdIJQ/7XWko869KHge2BAFwA8rWDzjtaAWdE0Jo/NiAR -epUwV2FdRRwSxIcNG2CCPyJnfPokRqjdl2z9k2PkwidHSq+2k6JxCWnOcIXChSKf -kHnemtA65ixAlhuxvyN3MPuYs1jAHyDGcyMfomp1qH9tXFQhhyXRrG2eMAfslstC -XGXLcoLN3O2BMR/fG2GlV6kOqGOvoMIW3clVeQLQ9B1yyekKiVY6Vg+CgK5qhg8z -9tjH4f33zzNDwsx1WSCOU/1LIPzFBNbR9QtTF2XmOUfRs4hGBBARAgAGBQI54rBc -AAoJEH2d7s4ry8YhmjsAoMUW9RxfXBSos0A6LwGd+5pXv/MRAKCYFLG2T4GSV+qf -iRsXnrgDHQHD04hGBBARAgAGBQI54rOZAAoJEPKlddweGoeC/+sAoL5f7JF21mRe -Z8VV4nhh7prm+idSAKCMXDWW/tBOeJDYpiEhgyGSGgJJWrkEDQQ54q+cEBAAjRmb -txamcZ9EYsQTnQvVL2l6vY5Rnbc1JDdcyHEV1kH5OwZWqvckL4QgKKBbTQwyB9pC -o0nGK4PkBbrwL0outfHQ5jl9DUzTKIu+asWUyf3fxfUV6j2A6BMo59KNnJzUyJ2+ -B5na6NN8nEqEtmogROtjT8LkOvYwqD4A/5re2vwtie+h5yU6A+JbyGQF6lFxThZj -4WGctBgCcDBqRkPAG8DFFAdeN5SMAArktCYuUGXi2q88EDoOs3Ykw0kB8+ZFECz/ -4/b93so5Wt2hC15cxAJoXFfR3mXHm40EHzMdEublWV4blB2KvFocQC74/H74QPUk -cWlc6EhPodKvcuOfTimDxXaiGNFONUPgNAmCXeVoOapdWpb3x7iOHPwSaXeJSrO9 -fc4GtVjDv90DT2ekK7cvYk8s6B3t7p7W21Xi+hRgrw63B3HElr01gdMZY5XA5ey/ -WmnyBS6LOxXlnVBE+2uSQ+aZHqrLpXcRvq2ZonOziDSE0i940ZvIwlSzn0U5BQWl -9hBDQw78RacYqaFvlpcGiPj75bScB4eemxV6Wdo9mtK0Vrr+9bWScXHEv7did4X+ -7tBWKbA8M+g290OSzjeQBGLuPmbjxzEKH9jcUumzBzzC5x5GFh7On9TLXQ4K/oRT -6QQpS93YrTVbR60G4MKsePWLJmg7IgYUtNdLGjsAAwUP/0aAAq8CmWtourj1XxNY -pFmOAU45d65fPWVadKyF++B+uDyRNYN7HQCqrJ7ddn0sH7OBtlE8yaBYgR0TFly9 -9+LqQO4r4IGCw2TBgA5tKnOWoPGEzvrLeoxR3SnPrKBlDvx6Rr9h3OJ9UV5u/NLh -mCP9iN10gWCGzsWbONc6qD6PugbTur44D6s4CRK9xfliSrtG3GBHW914UKjJeB9s -e3oc1rkmNv39kKcu33w4XVETAj4qpXnwoJvy639dfvnQt1TWFjIt20iP7m+jkT3B -b526uJ5GuJl6r8sm5OYYRs5cLigvUzRZVgYnjjqlRRACx0WcinKK55Li2Pq4qcRV -vSE5Tr3kTUTGxdmy113FbscrhLhesGALv3Hb7jeeWC8jviGEaHppgUumR6v0hsI1 -rZ3K8kCjFRAYV8OKtcEeMqjouArGi5dn0ClmG4lwH4SEdqC/TRNWGG+iVpWf5yCj -9mvtvUhLtl6QjXHLrJdSGyafvqR1EQMJadFt4URvx0M7tqZIcwPUnb+7Oc+J96po -e/EQmnm6rFnTpWz0BbY4mbJC7vUH4JyLs0nlxiKrBjaO9C1DSAKBpjqaga8dQe1Z -kLOI2F7IWFeKV2LaMl+ZvvfWMECNcqNW2fkCuP9Fpz5K+xg21TwovVy93aWKgFL6 -06jK51oQp3fW86xXK9ZGKYqQiEYEGBECAAYFAjnir5wACgkQyGugalF9Dw5M9QCg -hhmHalzWf8B3AVrjPrtrRHA1vlgAn3YRlU5l0V5W1iXvHXQCUHIESpgm -=SZZb ------END PGP PUBLIC KEY BLOCK----- From 9ecfc0140b6e3248a8428d1fe42411439cd6a47e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 30 Mar 2011 17:18:01 +0200 Subject: [PATCH 22/66] - version 167 --- udev.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/udev.spec b/udev.spec index 35c5349..b88a4da 100644 --- a/udev.spec +++ b/udev.spec @@ -206,6 +206,7 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : if test -f /proc/1/exe -a -d /proc/1/root; then if test -x /usr/bin/stat -a \ "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then + /bin/systemctl stop udev.service >/dev/null 2>&1 || : if test -x /sbin/udevd -a -x /sbin/pidof ; then /sbin/udevadm control --stop-exec-queue pid=$(/sbin/pidof -c udevd) @@ -223,19 +224,22 @@ fi exit 0 %post -# convert old database files -/sbin/udevadm info --convert-db >/dev/null 2>&1 || : +/bin/systemctl daemon-reload >/dev/null 2>&1 || : # start daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - /sbin/udevd -d + /bin/systemctl start udev.service >/dev/null 2>&1 || : + /sbin/udevd -d >/dev/null 2>&1 || : /sbin/udevadm control --start-exec-queue || : fi fi exit 0 +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + %post -n libudev -p /sbin/ldconfig %postun -n libudev -p /sbin/ldconfig From 7d03ac0923bbc8941f0faad2f23cd66d36094150 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 30 Mar 2011 16:50:28 +0200 Subject: [PATCH 23/66] - version 167 --- .gitignore | 1 + sources | 3 +- udev-160.tar.bz2.sign | 8 - udev-164-no-v4l1.patch | 42 --- ...9245f2d2fd03c2586a7f1140300b073a4abe.patch | 25 -- ...6a377285d5943563cfa397e8b350e43878ec.patch | 345 ------------------ udev-retry.init | 67 ---- udev.spec | 28 +- upstream | 1 - upstream-key.gpg | 54 --- 10 files changed, 11 insertions(+), 563 deletions(-) delete mode 100644 udev-160.tar.bz2.sign delete mode 100644 udev-164-no-v4l1.patch delete mode 100644 udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch delete mode 100644 udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch delete mode 100644 udev-retry.init delete mode 100644 upstream delete mode 100644 upstream-key.gpg diff --git a/.gitignore b/.gitignore index ff4586d..80bcd9e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ udev-160.tar.bz2 /udev-164.tar.bz2.sign /udev-166.tar.bz2 /udev-166.tar.bz2.sign +/udev-167.tar.bz2 diff --git a/sources b/sources index 871f305..db4315b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -4db27d73fdbe94f47fd89fdd105c2dfb udev-166.tar.bz2 -3cb37564a589d4fedd6e7e3e178698d4 udev-166.tar.bz2.sign +4b37e1222f06c14c24147de346aa0bad udev-167.tar.bz2 diff --git a/udev-160.tar.bz2.sign b/udev-160.tar.bz2.sign deleted file mode 100644 index f5465a6..0000000 --- a/udev-160.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBMOkG1yGugalF9Dw4RAjB0AJ9ftRX/zmCiRcSyQWhcWJXsnXDn3gCeMFbR -KdR80Jxmitbil01dFfPzwEE= -=8B8M ------END PGP SIGNATURE----- diff --git a/udev-164-no-v4l1.patch b/udev-164-no-v4l1.patch deleted file mode 100644 index 9d9ef7c..0000000 --- a/udev-164-no-v4l1.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/extras/v4l_id/v4l_id.c b/extras/v4l_id/v4l_id.c -index d530a6d..e4b22bf 100644 ---- a/extras/v4l_id/v4l_id.c -+++ b/extras/v4l_id/v4l_id.c -@@ -28,7 +28,6 @@ - #include - #include - #include --#include - #include - - int main (int argc, char *argv[]) -@@ -39,7 +38,6 @@ int main (int argc, char *argv[]) - }; - int fd; - char *device; -- struct video_capability v1cap; - struct v4l2_capability v2cap; - - while (1) { -@@ -82,20 +80,7 @@ int main (int argc, char *argv[]) - if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0) - printf("radio:"); - printf("\n"); -- } else if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) { -- printf("ID_V4L_VERSION=1\n"); -- printf("ID_V4L_PRODUCT=%s\n", v1cap.name); -- printf("ID_V4L_CAPABILITIES=:"); -- if ((v1cap.type & VID_TYPE_CAPTURE) > 0) -- printf("capture:"); -- if ((v1cap.type & VID_TYPE_OVERLAY) > 0) -- printf("video_overlay:"); -- if (v1cap.audios > 0) -- printf("audio:"); -- if ((v1cap.type & VID_TYPE_TUNER) > 0) -- printf("tuner:"); -- printf("\n"); -- } -+ } - - close (fd); - return 0; diff --git a/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch b/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch deleted file mode 100644 index 83d2c11..0000000 --- a/udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 5e199245f2d2fd03c2586a7f1140300b073a4abe -Author: Harald Hoyer -Date: Thu Mar 17 20:36:20 2011 +0100 - - udev-acl/70-acl.rules: tag ID_REMOTE_CONTROL with acl - - Used by "concordance" to access Logitech Harmony programmable remote - controls. - - http://www.phildev.net/concordance/ - -diff --git a/extras/udev-acl/70-acl.rules b/extras/udev-acl/70-acl.rules -index dd5a7ab..037349d 100644 ---- a/extras/udev-acl/70-acl.rules -+++ b/extras/udev-acl/70-acl.rules -@@ -52,6 +52,9 @@ ENV{ID_SMARTCARD_READER}=="*?", TAG+="udev-acl" - # PDA devices - ENV{ID_PDA}=="*?", TAG+="udev-acl" - -+# Programmable remote control -+ENV{ID_REMOTE_CONTROL}=="1", TAG+="udev-acl" -+ - # joysticks - SUBSYSTEM=="input", ENV{ID_INPUT_JOYSTICK}=="?*", TAG+="udev-acl" - diff --git a/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch b/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch deleted file mode 100644 index 699add5..0000000 --- a/udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch +++ /dev/null @@ -1,345 +0,0 @@ -commit 98ab6a377285d5943563cfa397e8b350e43878ec -Author: David Zeuthen -Date: Tue Mar 15 12:05:00 2011 -0400 - - cdrom_id: Don't ignore profiles when there is no media available - - Just because the GET CONFIGURATION MMC-2 command returns the current - profile as 0 does not mean that we can ignore the profiles describing - the capabilities of the drive - it only means that there currently is - no recognized media in the drive. Therefore, do process the returned - profiles even when cur_profile is 0. - - This fixes a bug where only - - ID_CDROM=1 - ID_CDROM_CD_R=1 - ID_CDROM_CD_RW=1 - ID_CDROM_DVD=1 - ID_CDROM_DVD_R=1 - ID_CDROM_DVD_RAM=1 - - was returned when there is no media in the drive instead of - - ID_CDROM=1 - ID_CDROM_CD=1 - ID_CDROM_CD_R=1 - ID_CDROM_CD_RW=1 - ID_CDROM_DVD=1 - ID_CDROM_DVD_R=1 - ID_CDROM_DVD_RW=1 - ID_CDROM_DVD_RAM=1 - ID_CDROM_DVD_PLUS_R=1 - ID_CDROM_DVD_PLUS_RW=1 - ID_CDROM_DVD_PLUS_R_DL=1 - ID_CDROM_BD=1 - ID_CDROM_BD_R=1 - ID_CDROM_BD_RE=1 - ID_CDROM_HDDVD=1 - - as is returned now. - - Signed-off-by: David Zeuthen - -diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c -index 4a58a49..b2f897e 100644 ---- a/extras/cdrom_id/cdrom_id.c -+++ b/extras/cdrom_id/cdrom_id.c -@@ -261,6 +261,115 @@ static int cd_inquiry(struct udev *udev, int fd) { - return 0; - } - -+static void feature_profile_media(struct udev *udev, int cur_profile) -+{ -+ switch (cur_profile) { -+ case 0x03: -+ case 0x04: -+ case 0x05: -+ info(udev, "profile 0x%02x \n", cur_profile); -+ cd_media = 1; -+ cd_media_mo = 1; -+ break; -+ case 0x08: -+ info(udev, "profile 0x%02x media_cd_rom\n", cur_profile); -+ cd_media = 1; -+ cd_media_cd_rom = 1; -+ break; -+ case 0x09: -+ info(udev, "profile 0x%02x media_cd_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_cd_r = 1; -+ break; -+ case 0x0a: -+ info(udev, "profile 0x%02x media_cd_rw\n", cur_profile); -+ cd_media = 1; -+ cd_media_cd_rw = 1; -+ break; -+ case 0x10: -+ info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_rom = 1; -+ break; -+ case 0x11: -+ info(udev, "profile 0x%02x media_dvd_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_r = 1; -+ break; -+ case 0x12: -+ info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_ram = 1; -+ break; -+ case 0x13: -+ info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_rw = 1; -+ cd_media_dvd_rw_ro = 1; -+ break; -+ case 0x14: -+ info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_rw = 1; -+ cd_media_dvd_rw_seq = 1; -+ break; -+ case 0x1B: -+ info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_plus_r = 1; -+ break; -+ case 0x1A: -+ info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_plus_rw = 1; -+ break; -+ case 0x2A: -+ info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_plus_rw_dl = 1; -+ break; -+ case 0x2B: -+ info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile); -+ cd_media = 1; -+ cd_media_dvd_plus_r_dl = 1; -+ break; -+ case 0x40: -+ info(udev, "profile 0x%02x media_bd\n", cur_profile); -+ cd_media = 1; -+ cd_media_bd = 1; -+ break; -+ case 0x41: -+ case 0x42: -+ info(udev, "profile 0x%02x media_bd_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_bd_r = 1; -+ break; -+ case 0x43: -+ info(udev, "profile 0x%02x media_bd_re\n", cur_profile); -+ cd_media = 1; -+ cd_media_bd_re = 1; -+ break; -+ case 0x50: -+ info(udev, "profile 0x%02x media_hddvd\n", cur_profile); -+ cd_media = 1; -+ cd_media_hddvd = 1; -+ break; -+ case 0x51: -+ info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile); -+ cd_media = 1; -+ cd_media_hddvd_r = 1; -+ break; -+ case 0x52: -+ info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile); -+ cd_media = 1; -+ cd_media_hddvd_rw = 1; -+ break; -+ default: -+ info(udev, "profile 0x%02x \n", cur_profile); -+ break; -+ } -+} -+ - static int feature_profiles(struct udev *udev, const unsigned char *profiles, size_t size) - { - unsigned int i; -@@ -350,6 +459,7 @@ static int feature_profiles(struct udev *udev, const unsigned char *profiles, si - return 0; - } - -+/* returns 0 if media was detected */ - static int cd_profiles_old_mmc(struct udev *udev, int fd) - { - struct scsi_cmd sc; -@@ -389,6 +499,7 @@ static int cd_profiles_old_mmc(struct udev *udev, int fd) - return 0; - } - -+/* returns 0 if media was detected */ - static int cd_profiles(struct udev *udev, int fd) - { - struct scsi_cmd sc; -@@ -397,6 +508,9 @@ static int cd_profiles(struct udev *udev, int fd) - unsigned int len; - unsigned int i; - int err; -+ int ret; -+ -+ ret = -1; - - /* First query the current profile */ - scsi_cmd_init(udev, &sc, features, sizeof(features)); -@@ -410,126 +524,20 @@ static int cd_profiles(struct udev *udev, int fd) - if (SK(err) == 0x5 && ASC(err) == 0x20) { - info(udev, "drive is pre-MMC2 and does not support 46h get configuration command\n"); - info(udev, "trying to work around the problem\n"); -- return cd_profiles_old_mmc(udev, fd); -+ ret = cd_profiles_old_mmc(udev, fd); - } -- return -1; -+ goto out; - } - - cur_profile = features[6] << 8 | features[7]; - if (cur_profile > 0) { - info(udev, "current profile 0x%02x\n", cur_profile); -+ feature_profile_media (udev, cur_profile); -+ ret = 0; /* we have media */ - } else { - info(udev, "no current profile, assuming no media\n"); -- return -1; - } - -- switch (cur_profile) { -- case 0x03: -- case 0x04: -- case 0x05: -- info(udev, "profile 0x%02x \n", cur_profile); -- cd_media = 1; -- cd_media_mo = 1; -- break; -- case 0x08: -- info(udev, "profile 0x%02x media_cd_rom\n", cur_profile); -- cd_media = 1; -- cd_media_cd_rom = 1; -- break; -- case 0x09: -- info(udev, "profile 0x%02x media_cd_r\n", cur_profile); -- cd_media = 1; -- cd_media_cd_r = 1; -- break; -- case 0x0a: -- info(udev, "profile 0x%02x media_cd_rw\n", cur_profile); -- cd_media = 1; -- cd_media_cd_rw = 1; -- break; -- case 0x10: -- info(udev, "profile 0x%02x media_dvd_ro\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_rom = 1; -- break; -- case 0x11: -- info(udev, "profile 0x%02x media_dvd_r\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_r = 1; -- break; -- case 0x12: -- info(udev, "profile 0x%02x media_dvd_ram\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_ram = 1; -- break; -- case 0x13: -- info(udev, "profile 0x%02x media_dvd_rw_ro\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_rw = 1; -- cd_media_dvd_rw_ro = 1; -- break; -- case 0x14: -- info(udev, "profile 0x%02x media_dvd_rw_seq\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_rw = 1; -- cd_media_dvd_rw_seq = 1; -- break; -- case 0x1B: -- info(udev, "profile 0x%02x media_dvd_plus_r\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_plus_r = 1; -- break; -- case 0x1A: -- info(udev, "profile 0x%02x media_dvd_plus_rw\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_plus_rw = 1; -- break; -- case 0x2A: -- info(udev, "profile 0x%02x media_dvd_plus_rw_dl\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_plus_rw_dl = 1; -- break; -- case 0x2B: -- info(udev, "profile 0x%02x media_dvd_plus_r_dl\n", cur_profile); -- cd_media = 1; -- cd_media_dvd_plus_r_dl = 1; -- break; -- case 0x40: -- info(udev, "profile 0x%02x media_bd\n", cur_profile); -- cd_media = 1; -- cd_media_bd = 1; -- break; -- case 0x41: -- case 0x42: -- info(udev, "profile 0x%02x media_bd_r\n", cur_profile); -- cd_media = 1; -- cd_media_bd_r = 1; -- break; -- case 0x43: -- info(udev, "profile 0x%02x media_bd_re\n", cur_profile); -- cd_media = 1; -- cd_media_bd_re = 1; -- break; -- case 0x50: -- info(udev, "profile 0x%02x media_hddvd\n", cur_profile); -- cd_media = 1; -- cd_media_hddvd = 1; -- break; -- case 0x51: -- info(udev, "profile 0x%02x media_hddvd_r\n", cur_profile); -- cd_media = 1; -- cd_media_hddvd_r = 1; -- break; -- case 0x52: -- info(udev, "profile 0x%02x media_hddvd_rw\n", cur_profile); -- cd_media = 1; -- cd_media_hddvd_rw = 1; -- break; -- default: -- info(udev, "profile 0x%02x \n", cur_profile); -- break; -- } -- -- - len = features[0] << 24 | features[1] << 16 | features[2] << 8 | features[3]; - info(udev, "GET CONFIGURATION: size of features buffer 0x%04x\n", len); - -@@ -577,8 +585,8 @@ static int cd_profiles(struct udev *udev, int fd) - break; - } - } -- -- return 0; -+out: -+ return ret; - } - - static int cd_media_info(struct udev *udev, int fd) -@@ -905,9 +913,12 @@ int main(int argc, char *argv[]) - goto print; - - /* read drive and possibly current profile */ -- if (cd_profiles(udev, fd) < 0) -+ if (cd_profiles(udev, fd) != 0) - goto print; - -+ /* at this point we are guaranteed to have media in the -+ * drive - find out more about it */ -+ - /* get session/track info */ - cd_media_toc(udev, fd); - diff --git a/udev-retry.init b/udev-retry.init deleted file mode 100644 index b4cb201..0000000 --- a/udev-retry.init +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# -# udev-retry Post script for udev, after all filesystems are mounted -# -# Authors: Harald Hoyer -# -# chkconfig: 12345 26 75 -# description: Moves the generated persistent udev rules to /etc/udev/rules.d -# -### BEGIN INIT INFO -# Default-Start: 12345 -# Default-Stop: 0 6 -# Required-Start: $local_fs -# Required-Stop: -# Short-Description: Moves the generated persistent udev rules to /etc/udev/rules.d -# Description: Moves the generated persistent udev rules to /etc/udev/rules.d -# Provides: udev-retry -### END INIT INFO - -. /etc/rc.d/init.d/functions - -# See how we were called. -case "$1" in - start|reload) - [ -w /var/lock/subsys ] || exit 4 - STRING=$"Retrigger failed udev events" - echo -n $STRING - /sbin/udevadm trigger --type=failed - success "$STRING" - echo - - STRING=$"Adding udev persistent rules" - - # copy the rules generated before / was mounted read-write - for file in /dev/.udev/tmp-rules--*; do - dest=${file##*tmp-rules--} - # check, if anything is todo - [ "$dest" = '*' ] && exit 0 - echo -n $STRING - cat $file >> /etc/udev/rules.d/$dest - rc=$? - rm -f $file - if [ "$rc" -eq "0" ]; then - success "$STRING" - echo - elif [ "$rc" -eq "1" ]; then - failure "$STRING" - echo - fi - done - - touch /var/lock/subsys/udev-retry - exit 0 - ;; - stop) - [ -w /var/lock/subsys ] || exit 4 - rm -f /var/lock/subsys/udev-retry - exit 0 - ;; - status) - exit 3 - ;; - *) - echo $"Usage: $0 {start|stop|reload}" - exit 2 -esac -exit 0 diff --git a/udev.spec b/udev.spec index 105de70..35c5349 100644 --- a/udev.spec +++ b/udev.spec @@ -6,8 +6,8 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 166 -Release: 2%{?dist} +Version: 167 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -15,12 +15,6 @@ Obsoletes: udev-persistent < 0:030-5 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 Source1: start_udev -Source2: udev-retry.init - -Patch6: udev-164-no-v4l1.patch -Patch7: udev-5e199245f2d2fd03c2586a7f1140300b073a4abe.patch -Patch8: udev-98ab6a377285d5943563cfa397e8b350e43878ec.patch - ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -118,9 +112,6 @@ glib-based applications using libudev functionality. %prep %setup -q -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" @@ -180,7 +171,6 @@ install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d -install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-retry %preun if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then @@ -243,7 +233,6 @@ if test -f /proc/1/exe -a -d /proc/1/root; then /sbin/udevadm control --start-exec-queue || : fi fi -/sbin/chkconfig --add udev-retry exit 0 @@ -275,13 +264,11 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{udev_scriptdir}/write_cd_rules %attr(0755,root,root) %{udev_scriptdir}/write_net_rules %attr(0755,root,root) %{udev_scriptdir}/collect -%attr(0755,root,root) %{udev_scriptdir}/fstab_import %attr(0755,root,root) %{udev_scriptdir}/input_id %attr(0755,root,root) %{udev_scriptdir}/keyboard-force-release.sh %attr(0755,root,root) %{udev_scriptdir}/mtd_probe %attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/ -%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/udev-retry %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ %attr(0755,root,root) %dir %{udev_scriptdir}/ @@ -318,13 +305,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pkgconfig/udev.pc %attr(0755,root,root) /sbin/start_udev -%attr(0644,root,root) %{systemdsystemunitdir}/udev-retry.service %attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service +%attr(0644,root,root) %{systemdsystemunitdir}/udev-trigger.service %attr(0644,root,root) %{systemdsystemunitdir}/udev.service -%{systemdsystemunitdir}/basic.target.wants/udev-retry.service -%{systemdsystemunitdir}/basic.target.wants/udev-settle.service +%attr(0644,root,root) %{systemdsystemunitdir}/udev.socket %{systemdsystemunitdir}/basic.target.wants/udev.service - +%{systemdsystemunitdir}/basic.target.wants/udev-trigger.service +%{systemdsystemunitdir}/sockets.target.wants/udev.socket # Deprecated, but keep the ownership %ghost %dir /var/lib/udev @@ -365,6 +352,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Mar 30 2011 Harald Hoyer 167-1 +- version 167 + * Wed Mar 23 2011 Harald Hoyer 166-2 - add ACLs for harmony remote controls Resolves: rhbz#559412 diff --git a/upstream b/upstream deleted file mode 100644 index 287b708..0000000 --- a/upstream +++ /dev/null @@ -1 +0,0 @@ -udev-145.tar.bz2 diff --git a/upstream-key.gpg b/upstream-key.gpg deleted file mode 100644 index 81cd947..0000000 --- a/upstream-key.gpg +++ /dev/null @@ -1,54 +0,0 @@ -pub 1024D/517D0F0E 2000-10-10 Linux Kernel Archives Verification Key - Key fingerprint = C75D C40A 11D7 AF88 9981 ED5B C86B A06A 517D 0F0E -sub 4096g/E50A8F2A 2000-10-10 - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.0.3 (GNU/Linux) -Comment: For info see http://www.gnupg.org - -mQGiBDnirDkRBADCTL/iUTeZKb0tiAcKdZdsUP/KSnrGGjlinolUAsUC0D6/hUB1 -RdCpJOOERTIEr1yvehqDM7veRhNMoxJNQxa/sSrkywey5qc8uaskUNEqenimq/70 -bahWJeoWXjad68mQFh65lULnHQrrioeJnh9UpyGJppNb/yIjdnymH9aYEwCglgP7 -UegBzH22h8NVQEK2PWWbyUUD/jQA4lI0wRWcL9HpkYkHcH0LTKRB9zYpQYtyvzJi -yTGwJyFMfYNXy0RT11dICeLkf3HMR84hkPERKMhALobLxVUbfc7j2AygmzGphWGy -DH/xjptQP/zrsq87ylYRONK18w1J42cm+yZa4XThMDPJMrb9/l8qnxU1JnW7W1al -HKTpBACbs+91KLqrnIGcF44TMwxgUj5CUrayPoEnLU+ZMBqfSjmu8RqEYmTxJCKv -7erBFSuazBGj5X7twunrtrW3bxO63MbLbHjfXSRrMnKOb8dRULIg6eWAnoAx8VVZ -YjrOpwAntU3WxYOpbiCHt9kLbb+N5rvNtFcmOqRRQaCIUFOOaLQ8TGludXggS2Vy -bmVsIEFyY2hpdmVzIFZlcmlmaWNhdGlvbiBLZXkgPGZ0cGFkbWluQGtlcm5lbC5v -cmc+iFUEExECABUFAjnirDkDCwoDAxUDAgMWAgECF4AACgkQyGugalF9Dw4MNACe -JiQTyCmQzPGou2cl/RyOXj79kYYAnAsT6xt72hp/PFiywYM9vBsDVv9niQEVAwUQ -OeKwNWx5eAAqlgcFAQEdZgf/Vn2dMKrn8021NhavP0uA3pHGRmdKQ2WJBdLiN2tv -LkpAioZtho+op+xBz8j1zdIJQ/7XWko869KHge2BAFwA8rWDzjtaAWdE0Jo/NiAR -epUwV2FdRRwSxIcNG2CCPyJnfPokRqjdl2z9k2PkwidHSq+2k6JxCWnOcIXChSKf -kHnemtA65ixAlhuxvyN3MPuYs1jAHyDGcyMfomp1qH9tXFQhhyXRrG2eMAfslstC -XGXLcoLN3O2BMR/fG2GlV6kOqGOvoMIW3clVeQLQ9B1yyekKiVY6Vg+CgK5qhg8z -9tjH4f33zzNDwsx1WSCOU/1LIPzFBNbR9QtTF2XmOUfRs4hGBBARAgAGBQI54rBc -AAoJEH2d7s4ry8YhmjsAoMUW9RxfXBSos0A6LwGd+5pXv/MRAKCYFLG2T4GSV+qf -iRsXnrgDHQHD04hGBBARAgAGBQI54rOZAAoJEPKlddweGoeC/+sAoL5f7JF21mRe -Z8VV4nhh7prm+idSAKCMXDWW/tBOeJDYpiEhgyGSGgJJWrkEDQQ54q+cEBAAjRmb -txamcZ9EYsQTnQvVL2l6vY5Rnbc1JDdcyHEV1kH5OwZWqvckL4QgKKBbTQwyB9pC -o0nGK4PkBbrwL0outfHQ5jl9DUzTKIu+asWUyf3fxfUV6j2A6BMo59KNnJzUyJ2+ -B5na6NN8nEqEtmogROtjT8LkOvYwqD4A/5re2vwtie+h5yU6A+JbyGQF6lFxThZj -4WGctBgCcDBqRkPAG8DFFAdeN5SMAArktCYuUGXi2q88EDoOs3Ykw0kB8+ZFECz/ -4/b93so5Wt2hC15cxAJoXFfR3mXHm40EHzMdEublWV4blB2KvFocQC74/H74QPUk -cWlc6EhPodKvcuOfTimDxXaiGNFONUPgNAmCXeVoOapdWpb3x7iOHPwSaXeJSrO9 -fc4GtVjDv90DT2ekK7cvYk8s6B3t7p7W21Xi+hRgrw63B3HElr01gdMZY5XA5ey/ -WmnyBS6LOxXlnVBE+2uSQ+aZHqrLpXcRvq2ZonOziDSE0i940ZvIwlSzn0U5BQWl -9hBDQw78RacYqaFvlpcGiPj75bScB4eemxV6Wdo9mtK0Vrr+9bWScXHEv7did4X+ -7tBWKbA8M+g290OSzjeQBGLuPmbjxzEKH9jcUumzBzzC5x5GFh7On9TLXQ4K/oRT -6QQpS93YrTVbR60G4MKsePWLJmg7IgYUtNdLGjsAAwUP/0aAAq8CmWtourj1XxNY -pFmOAU45d65fPWVadKyF++B+uDyRNYN7HQCqrJ7ddn0sH7OBtlE8yaBYgR0TFly9 -9+LqQO4r4IGCw2TBgA5tKnOWoPGEzvrLeoxR3SnPrKBlDvx6Rr9h3OJ9UV5u/NLh -mCP9iN10gWCGzsWbONc6qD6PugbTur44D6s4CRK9xfliSrtG3GBHW914UKjJeB9s -e3oc1rkmNv39kKcu33w4XVETAj4qpXnwoJvy639dfvnQt1TWFjIt20iP7m+jkT3B -b526uJ5GuJl6r8sm5OYYRs5cLigvUzRZVgYnjjqlRRACx0WcinKK55Li2Pq4qcRV -vSE5Tr3kTUTGxdmy113FbscrhLhesGALv3Hb7jeeWC8jviGEaHppgUumR6v0hsI1 -rZ3K8kCjFRAYV8OKtcEeMqjouArGi5dn0ClmG4lwH4SEdqC/TRNWGG+iVpWf5yCj -9mvtvUhLtl6QjXHLrJdSGyafvqR1EQMJadFt4URvx0M7tqZIcwPUnb+7Oc+J96po -e/EQmnm6rFnTpWz0BbY4mbJC7vUH4JyLs0nlxiKrBjaO9C1DSAKBpjqaga8dQe1Z -kLOI2F7IWFeKV2LaMl+ZvvfWMECNcqNW2fkCuP9Fpz5K+xg21TwovVy93aWKgFL6 -06jK51oQp3fW86xXK9ZGKYqQiEYEGBECAAYFAjnir5wACgkQyGugalF9Dw5M9QCg -hhmHalzWf8B3AVrjPrtrRHA1vlgAn3YRlU5l0V5W1iXvHXQCUHIESpgm -=SZZb ------END PGP PUBLIC KEY BLOCK----- From 90347b2001f3341d541e9cad71c5f557d67d8403 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 30 Mar 2011 17:18:01 +0200 Subject: [PATCH 24/66] - version 167 --- udev.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/udev.spec b/udev.spec index 35c5349..b88a4da 100644 --- a/udev.spec +++ b/udev.spec @@ -206,6 +206,7 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : if test -f /proc/1/exe -a -d /proc/1/root; then if test -x /usr/bin/stat -a \ "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then + /bin/systemctl stop udev.service >/dev/null 2>&1 || : if test -x /sbin/udevd -a -x /sbin/pidof ; then /sbin/udevadm control --stop-exec-queue pid=$(/sbin/pidof -c udevd) @@ -223,19 +224,22 @@ fi exit 0 %post -# convert old database files -/sbin/udevadm info --convert-db >/dev/null 2>&1 || : +/bin/systemctl daemon-reload >/dev/null 2>&1 || : # start daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - /sbin/udevd -d + /bin/systemctl start udev.service >/dev/null 2>&1 || : + /sbin/udevd -d >/dev/null 2>&1 || : /sbin/udevadm control --start-exec-queue || : fi fi exit 0 +%postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + %post -n libudev -p /sbin/ldconfig %postun -n libudev -p /sbin/ldconfig From 21ab8351360f598421e83c6ca1a5077b160b779f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 30 Mar 2011 17:36:11 +0200 Subject: [PATCH 25/66] removed libxslt buildreq and touch man pages, to prevent rebuild --- udev.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index b88a4da..55d4f63 100644 --- a/udev.spec +++ b/udev.spec @@ -36,7 +36,6 @@ BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel BuildRequires: glib2-devel bison findutils BuildRequires: gperf libtool BuildRequires: libusb-devel libacl-devel -BuildRequires: libxslt BuildRequires: hwdata BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: gtk-doc @@ -114,6 +113,9 @@ glib-based applications using libudev functionality. %setup -q %build +# prevent man pages from re-building (xmlto) +find . -name "*.[1-8]" -exec touch '{}' \; + export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" # prevent man pages from re-building (xmlto) From 0b0304cfe18782b99aaa0814f9610d7ec91fcc2b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 31 Mar 2011 17:58:51 +0200 Subject: [PATCH 26/66] - fixed udev-trigger.service --- ...le-depend-on-trigger-do-not-block-ba.patch | 51 +++++++++++++++++++ udev.spec | 8 ++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch diff --git a/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch b/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch new file mode 100644 index 0000000..aa67cf1 --- /dev/null +++ b/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch @@ -0,0 +1,51 @@ +From daf32d32172e19e78754999b41c27b45e3629326 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Thu, 31 Mar 2011 13:15:47 +0200 +Subject: [PATCH] systemd: let settle depend on trigger, do not block basic with trigger + +--- + init/udev-settle.service.in | 15 +++++++++------ + init/udev-trigger.service.in | 1 - + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in +index be06a39..bda8626 100644 +--- a/init/udev-settle.service.in ++++ b/init/udev-settle.service.in +@@ -1,15 +1,18 @@ +-# This barrier service is usually not enabled by default. If enabled, +-# it acts as a barrier for basic.target -- so all later services will ++# This service is usually not enabled by default. If enabled, it ++# acts as a barrier for basic.target -- so all later services will + # wait for udev completely finishing its coldplug run. + # +-# It might be enabled just unconditionally, or pulled-in on-demand by +-# broken or non-hotplug-aware services that assume a fully populated +-# /dev at startup. ++# If needed, to work around broken or non-hotplug-aware services, ++# it might be enabled unconditionally, or pulled-in on-demand by ++# the services that assume a fully populated /dev at startup. It ++# should not be used or pulled-in ever on systems without such ++# legacy services running. + + [Unit] + Description=udev Wait for Complete Device Initialization + DefaultDependencies=no +-After=udev.service ++Requires=udev.service ++After=udev-trigger.service + Before=basic.target + + [Service] +diff --git a/init/udev-trigger.service.in b/init/udev-trigger.service.in +index 0ede317..745974a 100644 +--- a/init/udev-trigger.service.in ++++ b/init/udev-trigger.service.in +@@ -2,7 +2,6 @@ + Description=udev Coldplug all Devices + Requires=udev.service + After=udev.service +-Before=basic.target + DefaultDependencies=no + + [Service] diff --git a/udev.spec b/udev.spec index 55d4f63..223ac87 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 167 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -16,6 +16,8 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t Source1: start_udev +Patch3: 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch + ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -111,6 +113,7 @@ glib-based applications using libudev functionality. %prep %setup -q +%patch3 -p1 -b .git3 %build # prevent man pages from re-building (xmlto) @@ -358,6 +361,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Thu Mar 31 2011 Harald Hoyer 167-2 +- fixed udev-trigger.service + * Wed Mar 30 2011 Harald Hoyer 167-1 - version 167 From 8cf0c7defa5e033369d66ac319ed380c3fe73882 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 31 Mar 2011 17:58:51 +0200 Subject: [PATCH 27/66] - fixed udev-trigger.service --- ...le-depend-on-trigger-do-not-block-ba.patch | 51 +++++++++++++++++++ udev.spec | 8 ++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch diff --git a/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch b/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch new file mode 100644 index 0000000..aa67cf1 --- /dev/null +++ b/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch @@ -0,0 +1,51 @@ +From daf32d32172e19e78754999b41c27b45e3629326 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Thu, 31 Mar 2011 13:15:47 +0200 +Subject: [PATCH] systemd: let settle depend on trigger, do not block basic with trigger + +--- + init/udev-settle.service.in | 15 +++++++++------ + init/udev-trigger.service.in | 1 - + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in +index be06a39..bda8626 100644 +--- a/init/udev-settle.service.in ++++ b/init/udev-settle.service.in +@@ -1,15 +1,18 @@ +-# This barrier service is usually not enabled by default. If enabled, +-# it acts as a barrier for basic.target -- so all later services will ++# This service is usually not enabled by default. If enabled, it ++# acts as a barrier for basic.target -- so all later services will + # wait for udev completely finishing its coldplug run. + # +-# It might be enabled just unconditionally, or pulled-in on-demand by +-# broken or non-hotplug-aware services that assume a fully populated +-# /dev at startup. ++# If needed, to work around broken or non-hotplug-aware services, ++# it might be enabled unconditionally, or pulled-in on-demand by ++# the services that assume a fully populated /dev at startup. It ++# should not be used or pulled-in ever on systems without such ++# legacy services running. + + [Unit] + Description=udev Wait for Complete Device Initialization + DefaultDependencies=no +-After=udev.service ++Requires=udev.service ++After=udev-trigger.service + Before=basic.target + + [Service] +diff --git a/init/udev-trigger.service.in b/init/udev-trigger.service.in +index 0ede317..745974a 100644 +--- a/init/udev-trigger.service.in ++++ b/init/udev-trigger.service.in +@@ -2,7 +2,6 @@ + Description=udev Coldplug all Devices + Requires=udev.service + After=udev.service +-Before=basic.target + DefaultDependencies=no + + [Service] diff --git a/udev.spec b/udev.spec index b88a4da..195364c 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 167 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -16,6 +16,8 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t Source1: start_udev +Patch3: 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch + ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -112,6 +114,7 @@ glib-based applications using libudev functionality. %prep %setup -q +%patch3 -p1 -b .git3 %build export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" @@ -356,6 +359,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Thu Mar 31 2011 Harald Hoyer 167-2 +- fixed udev-trigger.service + * Wed Mar 30 2011 Harald Hoyer 167-1 - version 167 From cbf7ac132cb5c8c9c7169c763df6714c5ad45b17 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 30 Mar 2011 17:36:11 +0200 Subject: [PATCH 28/66] removed libxslt buildreq and touch man pages, to prevent rebuild --- udev.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index 195364c..223ac87 100644 --- a/udev.spec +++ b/udev.spec @@ -38,7 +38,6 @@ BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel BuildRequires: glib2-devel bison findutils BuildRequires: gperf libtool BuildRequires: libusb-devel libacl-devel -BuildRequires: libxslt BuildRequires: hwdata BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: gtk-doc @@ -117,6 +116,9 @@ glib-based applications using libudev functionality. %patch3 -p1 -b .git3 %build +# prevent man pages from re-building (xmlto) +find . -name "*.[1-8]" -exec touch '{}' \; + export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" # prevent man pages from re-building (xmlto) From 58624e426ed9b5d2b26f4a428cdc5cb8e4e6d4bf Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 31 Mar 2011 18:30:08 +0200 Subject: [PATCH 29/66] udev.spec: removed gtk-doc --- udev.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/udev.spec b/udev.spec index 223ac87..c557701 100644 --- a/udev.spec +++ b/udev.spec @@ -40,7 +40,6 @@ BuildRequires: gperf libtool BuildRequires: libusb-devel libacl-devel BuildRequires: hwdata BuildRequires: gobject-introspection-devel >= 0.6.2 -BuildRequires: gtk-doc BuildRequires: usbutils >= 0.82 BuildRequires: libtool >= 2.2.6 BuildRequires: pkgconfig From cef722535fe5217175547110e8d11e7dfdbbea2d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 7 Apr 2011 17:19:42 -0700 Subject: [PATCH 30/66] selinux_label.patch: don't label files outside of /dev --- udev-167-selinux_label.patch | 208 +++++++++++++++++++++++++++++++++++ udev.spec | 9 +- 2 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 udev-167-selinux_label.patch diff --git a/udev-167-selinux_label.patch b/udev-167-selinux_label.patch new file mode 100644 index 0000000..f583f0f --- /dev/null +++ b/udev-167-selinux_label.patch @@ -0,0 +1,208 @@ +From 51f43b53293c4cc64c2a55598491c6cbf27b6bd5 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Fri, 8 Apr 2011 01:03:49 +0200 +Subject: [PATCH] selinux: do not label files in runtime dir + +Do not label any files in the udev runtime directory, but only nodes, +links and directories below /dev. + +In case the runtime directory falls back to /dev/.udev, label this +directory once at udevd startup, but never anything below it. +--- + libudev/libudev-private.h | 1 + + libudev/libudev-queue-private.c | 2 -- + libudev/libudev-util-private.c | 18 +++++++++++++++--- + udev/udev-node.c | 6 +++--- + udev/udevd.c | 18 ++++++++---------- + 5 files changed, 27 insertions(+), 18 deletions(-) + +diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h +index 7078b0f..8495f9a 100644 +--- a/libudev/libudev-private.h ++++ b/libudev/libudev-private.h +@@ -220,6 +220,7 @@ uint64_t util_string_bloom64(const char *str); + + /* libudev-util-private.c */ + int util_create_path(struct udev *udev, const char *path); ++int util_create_path_selinux(struct udev *udev, const char *path); + int util_delete_path(struct udev *udev, const char *path); + int util_unlink_secure(struct udev *udev, const char *filename); + uid_t util_lookup_user(struct udev *udev, const char *user); +diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c +index a714572..2f1afec 100644 +--- a/libudev/libudev-queue-private.c ++++ b/libudev/libudev-queue-private.c +@@ -409,9 +409,7 @@ static void update_failed(struct udev_queue_export *udev_queue_export, + /* record event in the failed directory */ + udev_queue_export->failed_count++; + util_create_path(udev, filename); +- udev_selinux_setfscreatecon(udev, filename, S_IFLNK); + symlink(udev_device_get_devpath(udev_device), filename); +- udev_selinux_resetfscreatecon(udev); + break; + + case DEVICE_QUEUED: +diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c +index 6b68b6a..19f979e 100644 +--- a/libudev/libudev-util-private.c ++++ b/libudev/libudev-util-private.c +@@ -25,7 +25,7 @@ + #include "libudev.h" + #include "libudev-private.h" + +-int util_create_path(struct udev *udev, const char *path) ++static int create_path(struct udev *udev, const char *path, bool selinux) + { + char p[UTIL_PATH_SIZE]; + char *pos; +@@ -55,7 +55,8 @@ int util_create_path(struct udev *udev, const char *path) + return err; + + dbg(udev, "mkdir '%s'\n", p); +- udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755); ++ if (selinux) ++ udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755); + err = mkdir(p, 0755); + if (err != 0) { + err = -errno; +@@ -66,10 +67,21 @@ int util_create_path(struct udev *udev, const char *path) + err = -ENOTDIR; + } + } +- udev_selinux_resetfscreatecon(udev); ++ if (selinux) ++ udev_selinux_resetfscreatecon(udev); + return err; + } + ++int util_create_path(struct udev *udev, const char *path) ++{ ++ return create_path(udev, path, false); ++} ++ ++int util_create_path_selinux(struct udev *udev, const char *path) ++{ ++ return create_path(udev, path, true); ++} ++ + int util_delete_path(struct udev *udev, const char *path) + { + char p[UTIL_PATH_SIZE]; +diff --git a/udev/udev-node.c b/udev/udev-node.c +index ab4e932..5e791ff 100644 +--- a/udev/udev-node.c ++++ b/udev/udev-node.c +@@ -96,7 +96,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_ + } else { + info(udev, "mknod '%s' %u:%u %#o\n", file, major(devnum), minor(devnum), mode); + do { +- err = util_create_path(udev, file); ++ err = util_create_path_selinux(udev, file); + if (err != 0 && err != -ENOENT) + break; + udev_selinux_setfscreatecon(udev, file, mode); +@@ -184,7 +184,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) + } else { + info(udev, "creating symlink '%s' to '%s'\n", slink, target); + do { +- err = util_create_path(udev, slink); ++ err = util_create_path_selinux(udev, slink); + if (err != 0 && err != -ENOENT) + break; + udev_selinux_setfscreatecon(udev, slink, S_IFLNK); +@@ -201,7 +201,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) + util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL); + unlink(slink_tmp); + do { +- err = util_create_path(udev, slink_tmp); ++ err = util_create_path_selinux(udev, slink_tmp); + if (err != 0 && err != -ENOENT) + break; + udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK); +diff --git a/udev/udevd.c b/udev/udevd.c +index a8b339f..df5c199 100644 +--- a/udev/udevd.c ++++ b/udev/udevd.c +@@ -822,7 +822,7 @@ static void static_dev_create_from_modules(struct udev *udev) + continue; + + util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/", devname, NULL); +- util_create_path(udev, filename); ++ util_create_path_selinux(udev, filename); + udev_selinux_setfscreatecon(udev, filename, mode); + info(udev, "mknod '%s' %c%u:%u\n", filename, type, maj, min); + if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST) +@@ -833,7 +833,7 @@ static void static_dev_create_from_modules(struct udev *udev) + fclose(f); + } + +-static int copy_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) ++static int copy_dev_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) + { + struct dirent *dent; + +@@ -886,7 +886,7 @@ static int copy_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) + continue; + } + +- copy_dir(udev, dir2_from, dir2_to, maxdepth-1); ++ copy_dev_dir(udev, dir2_from, dir2_to, maxdepth-1); + + closedir(dir2_to); + closedir(dir2_from); +@@ -930,7 +930,7 @@ static void static_dev_create_from_devices(struct udev *udev, DIR *dir) + dir_from = opendir(LIBEXECDIR "/devices"); + if (dir_from == NULL) + return; +- copy_dir(udev, dir_from, dir, 8); ++ copy_dev_dir(udev, dir_from, dir, 8); + closedir(dir_from); + } + +@@ -985,9 +985,7 @@ static int convert_db(struct udev *udev) + + /* make sure we do not get here again */ + util_create_path(udev, filename); +- udev_selinux_setfscreatecon(udev, udev_get_run_path(udev), S_IFDIR|0755); + mkdir(filename, 0755); +- udev_selinux_resetfscreatecon(udev); + + /* old database */ + util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db", NULL); +@@ -1097,9 +1095,7 @@ int main(int argc, char *argv[]) + /* make sure, that our runtime dir exists and is writable */ + if (utimensat(AT_FDCWD, udev_get_run_config_path(udev), NULL, 0) < 0) { + /* try to create our own subdirectory, do not create parent directories */ +- udev_selinux_setfscreatecon(udev, udev_get_run_config_path(udev), S_IFDIR|0755); + mkdir(udev_get_run_config_path(udev), 0755); +- udev_selinux_resetfscreatecon(udev); + + if (utimensat(AT_FDCWD, udev_get_run_config_path(udev), NULL, 0) >= 0) { + /* directory seems writable now */ +@@ -1111,8 +1107,12 @@ int main(int argc, char *argv[]) + util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev", NULL); + if (udev_set_run_path(udev, filename) == NULL) + goto exit; ++ mkdir(udev_get_run_path(udev), 0755); + } + } ++ /* relabel runtime dir only if it resides below /dev */ ++ if (strncmp(udev_get_run_path(udev), udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) == 0) ++ udev_selinux_lsetfilecon(udev, udev_get_run_path(udev), 0755); + info(udev, "runtime dir '%s'\n", udev_get_run_path(udev)); + + for (;;) { +@@ -1281,9 +1281,7 @@ int main(int argc, char *argv[]) + util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL); + if (stat(filename, &statbuf) != 0) { + util_create_path(udev, filename); +- udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755); + mkdir(filename, 0755); +- udev_selinux_resetfscreatecon(udev); + } + inotify_add_watch(pfd[FD_INOTIFY].fd, filename, + IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); +-- +1.7.4.4 + + diff --git a/udev.spec b/udev.spec index 195364c..f5117a2 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 167 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -17,6 +17,9 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t Source1: start_udev Patch3: 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch +# Upstream 51f43b53293c4cc64c2a55598491c6cbf27b6bd5: don't SELinux label +# files outside of /dev. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=693247 +Patch4: udev-167-selinux_label.patch ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -115,6 +118,7 @@ glib-based applications using libudev functionality. %prep %setup -q %patch3 -p1 -b .git3 +%patch4 -p1 -b .label %build export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" @@ -359,6 +363,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Thu Apr 7 2011 Adam Williamson - 167-3 +- selinux_label.patch: from upstream, don't label files outside of /dev + * Thu Mar 31 2011 Harald Hoyer 167-2 - fixed udev-trigger.service From b52809d0defa175a70ac097d5457cae865eea42b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 1 Apr 2011 09:40:44 +0200 Subject: [PATCH 31/66] udev.spec: untabify --- udev.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/udev.spec b/udev.spec index c557701..f963cff 100644 --- a/udev.spec +++ b/udev.spec @@ -179,7 +179,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d %preun if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then if test -x /usr/bin/stat -a \ - "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then + "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then if [ -x /sbin/pidof ]; then pid=$(/sbin/pidof -c udevd) while [ -n "$pid" ]; do @@ -189,7 +189,7 @@ if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then sleep 0.2 pid=$(/sbin/pidof -c udevd) hard="-9" - done + done fi fi /sbin/chkconfig --del udev @@ -209,8 +209,8 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test -x /usr/bin/stat -a \ - "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - /bin/systemctl stop udev.service >/dev/null 2>&1 || : + "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then + /bin/systemctl stop udev.service >/dev/null 2>&1 || : if test -x /sbin/udevd -a -x /sbin/pidof ; then /sbin/udevadm control --stop-exec-queue pid=$(/sbin/pidof -c udevd) @@ -233,7 +233,7 @@ exit 0 # start daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - /bin/systemctl start udev.service >/dev/null 2>&1 || : + /bin/systemctl start udev.service >/dev/null 2>&1 || : /sbin/udevd -d >/dev/null 2>&1 || : /sbin/udevadm control --start-exec-queue || : fi From 83891f63812610132f33ce33d91d53e097539216 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 11 Apr 2011 12:15:57 +0200 Subject: [PATCH 32/66] - more selinux fixes --- ...-ata_id-on-non-removable-USB-devices.patch | 56 +++++ ...r-Aspire-One-ZG8-to-use-acer-aspire_.patch | 29 +++ ...vd-add-N-to-optstring-in-getopt_long.patch | 22 ++ ...not-build-extras-with-disable-extras.patch | 34 +++ ...nning-up-CD-on-pressing-eject-button.patch | 45 ++++ ...ell-Latitude-XT2-tablet-mode-navigat.patch | 56 +++++ ...ux-do-not-label-files-in-runtime-dir.patch | 204 ++++++++++++++++++ ...re-do-not-label-files-in-runtime-dir.patch | 25 +++ udev.spec | 26 ++- 9 files changed, 492 insertions(+), 5 deletions(-) create mode 100644 0002-Run-ata_id-on-non-removable-USB-devices.patch create mode 100644 0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch create mode 100644 0005-udevd-add-N-to-optstring-in-getopt_long.patch create mode 100644 0006-Revert-Do-not-build-extras-with-disable-extras.patch create mode 100644 0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch create mode 100644 0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch create mode 100644 0009-selinux-do-not-label-files-in-runtime-dir.patch create mode 100644 0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch diff --git a/0002-Run-ata_id-on-non-removable-USB-devices.patch b/0002-Run-ata_id-on-non-removable-USB-devices.patch new file mode 100644 index 0000000..e58c4aa --- /dev/null +++ b/0002-Run-ata_id-on-non-removable-USB-devices.patch @@ -0,0 +1,56 @@ +From 42b9482ab2da64b4c2f254c227c0efaf83988a84 Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Wed, 30 Mar 2011 08:11:03 -0400 +Subject: [PATCH] Run ata_id on non-removable USB devices + +If a USB device is marked as removable, it is often a SATA/PATA disk +in an enclosure (note that flash card readers and usb storage sticks +are always marked as removable). In this case, try running ata_id +(which sends ATA commands wrapped in SCSI ATA PASS THROUGH commands) +to get information about the disk. If this fails, just fall back to +running usb_id since it could be the device isn't an ATA device at +all or the device doesn't have a SAT layer. + +This extra information is nice to have as it indicates if it is +suitable to send e.g. SMART commands to the disk, whether the disk +supports power management and so on. Additionally, the VPD and serial +number returned by ata_id is usually more accurate as it stems from +the disk itself instead of the enclosure. + +Note that udisks has been doing this for a while + + KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="usb", ENV{DEVTYPE}=="disk", IMPORT{program}="udisks-probe-ata-smart $tempnode" + +so this change shouldn't be too disruptive (udisks-probe-ata-smart +also sends ATA commands via the ATA PASS THROUGH command). + +Signed-off-by: David Zeuthen +--- + rules/rules.d/60-persistent-storage.rules | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules +index 6a9abdd..12fabef 100644 +--- a/rules/rules.d/60-persistent-storage.rules ++++ b/rules/rules.d/60-persistent-storage.rules +@@ -22,14 +22,18 @@ ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" + KERNEL=="vd*[!0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}" + KERNEL=="vd*[0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}-part%n" + +-# USB devices use their own serial number +-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p" + # ATA devices with their own "ata" kernel subsystem + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="ata", IMPORT{program}="ata_id --export $tempnode" + # ATA devices using the "scsi" subsystem + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", IMPORT{program}="ata_id --export $tempnode" + # ATA/ATAPI devices (SPC-3 or later) using the "scsi" subsystem + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}=="5", ATTRS{scsi_level}=="[6-9]*", IMPORT{program}="ata_id --export $tempnode" ++ ++# Run ata_id on non-removable USB Mass Storage (SATA/PATA disks in enclosures) ++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", ATTR{removable}=="0", SUBSYSTEMS=="usb", IMPORT{program}="ata_id --export $tempnode" ++# Otherwise fall back to using usb_id for USB devices ++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p" ++ + # scsi devices + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="scsi" + KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="cciss" diff --git a/0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch b/0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch new file mode 100644 index 0000000..b343faf --- /dev/null +++ b/0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch @@ -0,0 +1,29 @@ +From ff4a035a8aaba6a7b5b85c4b348886d72c42e84c Mon Sep 17 00:00:00 2001 +From: Lee, Chun-Yi +Date: Thu, 31 Mar 2011 18:01:05 +0800 +Subject: [PATCH] Add rule for Acer Aspire One ZG8 to use acer-aspire_5720 keymap + +Acer Aspire One ZG8's bluetooth HW key emit 0xD9 scancode, it must map +to KEY_BLUETOOTH like Acer Aspire 5720. So, add rule for Acer Aspire One +ZG8 use acer-aspire_5720 keymap. + +Tested on Acer Aspire One ZG8 netbook. + +Signed-off-by: Lee, Chun-Yi +Signed-off-by: Martin Pitt +--- + extras/keymap/95-keymap.rules | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules +index 0c3ae38..44d5064 100644 +--- a/extras/keymap/95-keymap.rules ++++ b/extras/keymap/95-keymap.rules +@@ -100,6 +100,7 @@ ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 6920", RUN+="keyma + ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 5920G", RUN+="keymap $name acer-aspire_5920g" + ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 5720*", RUN+="keymap $name acer-aspire_5720" + ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 8930", RUN+="keymap $name acer-aspire_8930" ++ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_serial}=="ZG8*", RUN+="keymap $name acer-aspire_5720" + + ENV{DMI_VENDOR}=="*BenQ*", ATTR{[dmi/id]product_name}=="*Joybook R22*", RUN+="keymap $name 0x6E wlan" + diff --git a/0005-udevd-add-N-to-optstring-in-getopt_long.patch b/0005-udevd-add-N-to-optstring-in-getopt_long.patch new file mode 100644 index 0000000..c8ca5c6 --- /dev/null +++ b/0005-udevd-add-N-to-optstring-in-getopt_long.patch @@ -0,0 +1,22 @@ +From 6ee9b2cb8cf023253853f1c80e707598685b11f3 Mon Sep 17 00:00:00 2001 +From: Thomas Egerer +Date: Thu, 31 Mar 2011 17:25:31 +0200 +Subject: [PATCH] udevd: add 'N:' to optstring in getopt_long + +--- + udev/udevd.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/udev/udevd.c b/udev/udevd.c +index 1871474..a8b339f 100644 +--- a/udev/udevd.c ++++ b/udev/udevd.c +@@ -1118,7 +1118,7 @@ int main(int argc, char *argv[]) + for (;;) { + int option; + +- option = getopt_long(argc, argv, "c:deDthV", options, NULL); ++ option = getopt_long(argc, argv, "c:deDtN:hV", options, NULL); + if (option == -1) + break; + diff --git a/0006-Revert-Do-not-build-extras-with-disable-extras.patch b/0006-Revert-Do-not-build-extras-with-disable-extras.patch new file mode 100644 index 0000000..a7f4f96 --- /dev/null +++ b/0006-Revert-Do-not-build-extras-with-disable-extras.patch @@ -0,0 +1,34 @@ +From 9bb54267a1483e8f3b2de352c7be433f625e5606 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Thu, 31 Mar 2011 19:23:19 +0200 +Subject: [PATCH] Revert "Do not build extras with --disable-extras" + +This reverts commit 905818f5961446ac32d1b2d165185fffddc4915a. + +We do want to build some extras, just not the ones with extra dependencies. +Thanks to Juergen Daubert for pointing this out. +--- + Makefile.am | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index df70bf7..2c20f46 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -225,7 +225,6 @@ dist_udevrules_DATA += \ + extras/rule_generator/75-cd-aliases-generator.rules \ + extras/rule_generator/75-persistent-net-generator.rules + +-if ENABLE_EXTRAS + # ------------------------------------------------------------------------------ + # firmware - firmware loading + # ------------------------------------------------------------------------------ +@@ -314,8 +313,6 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la + libexec_PROGRAMS += extras/v4l_id/v4l_id + dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules + +-endif # ENABLE_EXTRAS +- + # ------------------------------------------------------------------------------ + # qemu -- qemu/kvm guest tweaks + # ------------------------------------------------------------------------------ diff --git a/0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch b/0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch new file mode 100644 index 0000000..efeecfe --- /dev/null +++ b/0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch @@ -0,0 +1,45 @@ +From 55eb500cc5465babf1fd773dbcceeb90eeefd997 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Mon, 4 Apr 2011 11:47:54 +0200 +Subject: [PATCH] Avoid spinning up CD on pressing eject button + +When the CD tray door is locked and the hardware eject button is pressed, newer +kernels (2.6.38+) will send out a change event with a DISK_EJECT_REQUEST==1 +property. Do not run cdrom_id and blkid in this case, as the media state and +contents does not change, and this only needlessly spins up the drive again +right before ejection. +--- + extras/cdrom_id/60-cdrom_id.rules | 3 +++ + rules/rules.d/60-persistent-storage.rules | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules +index b3109f1..aedf6f0 100644 +--- a/extras/cdrom_id/60-cdrom_id.rules ++++ b/extras/cdrom_id/60-cdrom_id.rules +@@ -5,6 +5,9 @@ SUBSYSTEM!="block", GOTO="cdrom_end" + KERNEL!="sr[0-9]*|xvd*", GOTO="cdrom_end" + ENV{DEVTYPE}!="disk", GOTO="cdrom_end" + ++# this is only a button press event ++ENV{DISK_EJECT_REQUEST}=="?*", GOTO="cdrom_end" ++ + KERNEL=="sr[0-9]*", ENV{ID_CDROM}="1" + IMPORT{program}="cdrom_id --export $tempnode" + +diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules +index 12fabef..05a405f 100644 +--- a/rules/rules.d/60-persistent-storage.rules ++++ b/rules/rules.d/60-persistent-storage.rules +@@ -62,9 +62,9 @@ ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PA + ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end" + + # probe filesystem metadata of optical drives which have a media inserted +-KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode" ++KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode" + # single-session CDs do not have ID_CDROM_MEDIA_SESSION_LAST_OFFSET +-KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode" ++KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode" + + # probe filesystem metadata of disks + KERNEL!="sr*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode" diff --git a/0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch b/0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch new file mode 100644 index 0000000..f8e7404 --- /dev/null +++ b/0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch @@ -0,0 +1,56 @@ +From 5e0ec43fc40e3e6dd0e44a7d617846879e1dac9e Mon Sep 17 00:00:00 2001 +From: Seth Forshee +Date: Tue, 5 Apr 2011 11:43:00 -0500 +Subject: [PATCH] keymap: Support Dell Latitude XT2 tablet-mode navigation keys + +The XT2 has a rocker (up/down/enter) and back button on the side +in tablet mode, none of which work currently. Add entries for +these keys. + +There is some overlap here with scan codes used in other Dell +models, so these buttons are put in a new file specific to this +model. + +Signed-off-by: Seth Forshee +Signed-off-by: Martin Pitt +--- + Makefile.am | 1 + + extras/keymap/95-keymap.rules | 1 + + extras/keymap/keymaps/dell-latitude-xt2 | 4 ++++ + 3 files changed, 6 insertions(+), 0 deletions(-) + create mode 100644 extras/keymap/keymaps/dell-latitude-xt2 + +diff --git a/Makefile.am b/Makefile.am +index 2c20f46..4244089 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -568,6 +568,7 @@ dist_udevkeymap_DATA = \ + extras/keymap/keymaps/asus \ + extras/keymap/keymaps/compaq-e_evo \ + extras/keymap/keymaps/dell \ ++ extras/keymap/keymaps/dell-latitude-xt2 \ + extras/keymap/keymaps/everex-xt5000 \ + extras/keymap/keymaps/fujitsu-amilo_pa_2548 \ + extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ +diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules +index 44d5064..350f111 100644 +--- a/extras/keymap/95-keymap.rules ++++ b/extras/keymap/95-keymap.rules +@@ -67,6 +67,7 @@ LABEL="keyboard_vendorcheck" + + ENV{DMI_VENDOR}=="Dell*", RUN+="keymap $name dell" + ENV{DMI_VENDOR}=="Dell*", ATTR{[dmi/id]product_name}=="Inspiron 910|Inspiron 1010|Inspiron 1011|Inspiron 1012|Inspiron 1110|Inspiron 1210", RUN+="keymap $name 0x84 wlan" ++ENV{DMI_VENDOR}=="Dell*", ATTR{[dmi/id]product_name}=="Latitude XT2", RUN+="keymap $name dell-latitude-xt2" + + ENV{DMI_VENDOR}=="Compaq*", ATTR{[dmi/id]product_name}=="*E500*|*Evo N*", RUN+="keymap $name compaq-e_evo" + +diff --git a/extras/keymap/keymaps/dell-latitude-xt2 b/extras/keymap/keymaps/dell-latitude-xt2 +new file mode 100644 +index 0000000..39872f5 +--- /dev/null ++++ b/extras/keymap/keymaps/dell-latitude-xt2 +@@ -0,0 +1,4 @@ ++0x9B up # tablet rocker up ++0x9E enter # tablet rocker press ++0x9F back # tablet back ++0xA3 down # tablet rocker down diff --git a/0009-selinux-do-not-label-files-in-runtime-dir.patch b/0009-selinux-do-not-label-files-in-runtime-dir.patch new file mode 100644 index 0000000..56d16ac --- /dev/null +++ b/0009-selinux-do-not-label-files-in-runtime-dir.patch @@ -0,0 +1,204 @@ +From 51f43b53293c4cc64c2a55598491c6cbf27b6bd5 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Fri, 8 Apr 2011 01:03:49 +0200 +Subject: [PATCH] selinux: do not label files in runtime dir + +Do not label any files in the udev runtime directory, but only nodes, +links and directories below /dev. + +In case the runtime directory falls back to /dev/.udev, label this +directory once at udevd startup, but never anything below it. +--- + libudev/libudev-private.h | 1 + + libudev/libudev-queue-private.c | 2 -- + libudev/libudev-util-private.c | 18 +++++++++++++++--- + udev/udev-node.c | 6 +++--- + udev/udevd.c | 18 ++++++++---------- + 5 files changed, 27 insertions(+), 18 deletions(-) + +diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h +index 7078b0f..8495f9a 100644 +--- a/libudev/libudev-private.h ++++ b/libudev/libudev-private.h +@@ -220,6 +220,7 @@ uint64_t util_string_bloom64(const char *str); + + /* libudev-util-private.c */ + int util_create_path(struct udev *udev, const char *path); ++int util_create_path_selinux(struct udev *udev, const char *path); + int util_delete_path(struct udev *udev, const char *path); + int util_unlink_secure(struct udev *udev, const char *filename); + uid_t util_lookup_user(struct udev *udev, const char *user); +diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c +index a714572..2f1afec 100644 +--- a/libudev/libudev-queue-private.c ++++ b/libudev/libudev-queue-private.c +@@ -409,9 +409,7 @@ static void update_failed(struct udev_queue_export *udev_queue_export, + /* record event in the failed directory */ + udev_queue_export->failed_count++; + util_create_path(udev, filename); +- udev_selinux_setfscreatecon(udev, filename, S_IFLNK); + symlink(udev_device_get_devpath(udev_device), filename); +- udev_selinux_resetfscreatecon(udev); + break; + + case DEVICE_QUEUED: +diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c +index 6b68b6a..19f979e 100644 +--- a/libudev/libudev-util-private.c ++++ b/libudev/libudev-util-private.c +@@ -25,7 +25,7 @@ + #include "libudev.h" + #include "libudev-private.h" + +-int util_create_path(struct udev *udev, const char *path) ++static int create_path(struct udev *udev, const char *path, bool selinux) + { + char p[UTIL_PATH_SIZE]; + char *pos; +@@ -55,7 +55,8 @@ int util_create_path(struct udev *udev, const char *path) + return err; + + dbg(udev, "mkdir '%s'\n", p); +- udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755); ++ if (selinux) ++ udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755); + err = mkdir(p, 0755); + if (err != 0) { + err = -errno; +@@ -66,10 +67,21 @@ int util_create_path(struct udev *udev, const char *path) + err = -ENOTDIR; + } + } +- udev_selinux_resetfscreatecon(udev); ++ if (selinux) ++ udev_selinux_resetfscreatecon(udev); + return err; + } + ++int util_create_path(struct udev *udev, const char *path) ++{ ++ return create_path(udev, path, false); ++} ++ ++int util_create_path_selinux(struct udev *udev, const char *path) ++{ ++ return create_path(udev, path, true); ++} ++ + int util_delete_path(struct udev *udev, const char *path) + { + char p[UTIL_PATH_SIZE]; +diff --git a/udev/udev-node.c b/udev/udev-node.c +index ab4e932..5e791ff 100644 +--- a/udev/udev-node.c ++++ b/udev/udev-node.c +@@ -96,7 +96,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_ + } else { + info(udev, "mknod '%s' %u:%u %#o\n", file, major(devnum), minor(devnum), mode); + do { +- err = util_create_path(udev, file); ++ err = util_create_path_selinux(udev, file); + if (err != 0 && err != -ENOENT) + break; + udev_selinux_setfscreatecon(udev, file, mode); +@@ -184,7 +184,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) + } else { + info(udev, "creating symlink '%s' to '%s'\n", slink, target); + do { +- err = util_create_path(udev, slink); ++ err = util_create_path_selinux(udev, slink); + if (err != 0 && err != -ENOENT) + break; + udev_selinux_setfscreatecon(udev, slink, S_IFLNK); +@@ -201,7 +201,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) + util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL); + unlink(slink_tmp); + do { +- err = util_create_path(udev, slink_tmp); ++ err = util_create_path_selinux(udev, slink_tmp); + if (err != 0 && err != -ENOENT) + break; + udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK); +diff --git a/udev/udevd.c b/udev/udevd.c +index a8b339f..df5c199 100644 +--- a/udev/udevd.c ++++ b/udev/udevd.c +@@ -822,7 +822,7 @@ static void static_dev_create_from_modules(struct udev *udev) + continue; + + util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/", devname, NULL); +- util_create_path(udev, filename); ++ util_create_path_selinux(udev, filename); + udev_selinux_setfscreatecon(udev, filename, mode); + info(udev, "mknod '%s' %c%u:%u\n", filename, type, maj, min); + if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST) +@@ -833,7 +833,7 @@ static void static_dev_create_from_modules(struct udev *udev) + fclose(f); + } + +-static int copy_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) ++static int copy_dev_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) + { + struct dirent *dent; + +@@ -886,7 +886,7 @@ static int copy_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) + continue; + } + +- copy_dir(udev, dir2_from, dir2_to, maxdepth-1); ++ copy_dev_dir(udev, dir2_from, dir2_to, maxdepth-1); + + closedir(dir2_to); + closedir(dir2_from); +@@ -930,7 +930,7 @@ static void static_dev_create_from_devices(struct udev *udev, DIR *dir) + dir_from = opendir(LIBEXECDIR "/devices"); + if (dir_from == NULL) + return; +- copy_dir(udev, dir_from, dir, 8); ++ copy_dev_dir(udev, dir_from, dir, 8); + closedir(dir_from); + } + +@@ -985,9 +985,7 @@ static int convert_db(struct udev *udev) + + /* make sure we do not get here again */ + util_create_path(udev, filename); +- udev_selinux_setfscreatecon(udev, udev_get_run_path(udev), S_IFDIR|0755); + mkdir(filename, 0755); +- udev_selinux_resetfscreatecon(udev); + + /* old database */ + util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db", NULL); +@@ -1097,9 +1095,7 @@ int main(int argc, char *argv[]) + /* make sure, that our runtime dir exists and is writable */ + if (utimensat(AT_FDCWD, udev_get_run_config_path(udev), NULL, 0) < 0) { + /* try to create our own subdirectory, do not create parent directories */ +- udev_selinux_setfscreatecon(udev, udev_get_run_config_path(udev), S_IFDIR|0755); + mkdir(udev_get_run_config_path(udev), 0755); +- udev_selinux_resetfscreatecon(udev); + + if (utimensat(AT_FDCWD, udev_get_run_config_path(udev), NULL, 0) >= 0) { + /* directory seems writable now */ +@@ -1111,8 +1107,12 @@ int main(int argc, char *argv[]) + util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev", NULL); + if (udev_set_run_path(udev, filename) == NULL) + goto exit; ++ mkdir(udev_get_run_path(udev), 0755); + } + } ++ /* relabel runtime dir only if it resides below /dev */ ++ if (strncmp(udev_get_run_path(udev), udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) == 0) ++ udev_selinux_lsetfilecon(udev, udev_get_run_path(udev), 0755); + info(udev, "runtime dir '%s'\n", udev_get_run_path(udev)); + + for (;;) { +@@ -1281,9 +1281,7 @@ int main(int argc, char *argv[]) + util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL); + if (stat(filename, &statbuf) != 0) { + util_create_path(udev, filename); +- udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755); + mkdir(filename, 0755); +- udev_selinux_resetfscreatecon(udev); + } + inotify_add_watch(pfd[FD_INOTIFY].fd, filename, + IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); diff --git a/0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch b/0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch new file mode 100644 index 0000000..a14e5d4 --- /dev/null +++ b/0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch @@ -0,0 +1,25 @@ +From 960250952193db522b8ced336bf998bd7e8e4a31 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Fri, 8 Apr 2011 03:08:16 +0200 +Subject: [PATCH] selinux: firmware - do not label files in runtime dir + +--- + extras/firmware/firmware.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c +index 8199820..f2df76c 100644 +--- a/extras/firmware/firmware.c ++++ b/extras/firmware/firmware.c +@@ -159,11 +159,9 @@ int main(int argc, char **argv) + err = util_create_path(udev, misspath); + if (err != 0 && err != -ENOENT) + break; +- udev_selinux_setfscreatecon(udev, misspath, S_IFLNK); + err = symlink(devpath, misspath); + if (err != 0) + err = -errno; +- udev_selinux_resetfscreatecon(udev); + } while (err == -ENOENT); + rc = 2; + set_loading(udev, loadpath, "-1"); diff --git a/udev.spec b/udev.spec index a1bf568..6b402b4 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 167 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -16,10 +16,16 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t Source1: start_udev +Patch2: 0002-Run-ata_id-on-non-removable-USB-devices.patch Patch3: 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch -# Upstream 51f43b53293c4cc64c2a55598491c6cbf27b6bd5: don't SELinux label -# files outside of /dev. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=693247 -Patch4: udev-167-selinux_label.patch +Patch4: 0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch +Patch5: 0005-udevd-add-N-to-optstring-in-getopt_long.patch +Patch6: 0006-Revert-Do-not-build-extras-with-disable-extras.patch +Patch7: 0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch +Patch8: 0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch +Patch9: 0009-selinux-do-not-label-files-in-runtime-dir.patch +Patch10: 0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch + ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html @@ -115,8 +121,15 @@ glib-based applications using libudev functionality. %prep %setup -q +%patch2 -p1 -b .git2 %patch3 -p1 -b .git3 -%patch4 -p1 -b .label +%patch4 -p1 -b .git4 +%patch5 -p1 -b .git5 +%patch6 -p1 -b .git6 +%patch7 -p1 -b .git7 +%patch8 -p1 -b .git8 +%patch9 -p1 -b .git9 +%patch10 -p1 -b .git10 %build # prevent man pages from re-building (xmlto) @@ -364,6 +377,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Mon Apr 11 2011 Harald Hoyer 167-4 +- more selinux fixes + * Thu Apr 7 2011 Adam Williamson - 167-3 - selinux_label.patch: from upstream, don't label files outside of /dev From e70c43125b3db3ddd6c0678655428f33d40e6191 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 20 May 2011 14:40:12 +0200 Subject: [PATCH 33/66] version 170 removed /sbin/start_udev --- ...-ata_id-on-non-removable-USB-devices.patch | 56 ----- ...le-depend-on-trigger-do-not-block-ba.patch | 51 ----- ...r-Aspire-One-ZG8-to-use-acer-aspire_.patch | 29 --- ...vd-add-N-to-optstring-in-getopt_long.patch | 22 -- ...not-build-extras-with-disable-extras.patch | 34 --- ...nning-up-CD-on-pressing-eject-button.patch | 45 ---- ...ell-Latitude-XT2-tablet-mode-navigat.patch | 56 ----- ...ux-do-not-label-files-in-runtime-dir.patch | 204 ----------------- ...re-do-not-label-files-in-runtime-dir.patch | 25 --- start_udev | 82 ------- udev-167-selinux_label.patch | 208 ------------------ udev.spec | 91 +++----- 12 files changed, 27 insertions(+), 876 deletions(-) delete mode 100644 0002-Run-ata_id-on-non-removable-USB-devices.patch delete mode 100644 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch delete mode 100644 0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch delete mode 100644 0005-udevd-add-N-to-optstring-in-getopt_long.patch delete mode 100644 0006-Revert-Do-not-build-extras-with-disable-extras.patch delete mode 100644 0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch delete mode 100644 0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch delete mode 100644 0009-selinux-do-not-label-files-in-runtime-dir.patch delete mode 100644 0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch delete mode 100755 start_udev delete mode 100644 udev-167-selinux_label.patch diff --git a/0002-Run-ata_id-on-non-removable-USB-devices.patch b/0002-Run-ata_id-on-non-removable-USB-devices.patch deleted file mode 100644 index e58c4aa..0000000 --- a/0002-Run-ata_id-on-non-removable-USB-devices.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 42b9482ab2da64b4c2f254c227c0efaf83988a84 Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Wed, 30 Mar 2011 08:11:03 -0400 -Subject: [PATCH] Run ata_id on non-removable USB devices - -If a USB device is marked as removable, it is often a SATA/PATA disk -in an enclosure (note that flash card readers and usb storage sticks -are always marked as removable). In this case, try running ata_id -(which sends ATA commands wrapped in SCSI ATA PASS THROUGH commands) -to get information about the disk. If this fails, just fall back to -running usb_id since it could be the device isn't an ATA device at -all or the device doesn't have a SAT layer. - -This extra information is nice to have as it indicates if it is -suitable to send e.g. SMART commands to the disk, whether the disk -supports power management and so on. Additionally, the VPD and serial -number returned by ata_id is usually more accurate as it stems from -the disk itself instead of the enclosure. - -Note that udisks has been doing this for a while - - KERNEL=="sd*[!0-9]", ATTR{removable}=="0", ENV{ID_BUS}=="usb", ENV{DEVTYPE}=="disk", IMPORT{program}="udisks-probe-ata-smart $tempnode" - -so this change shouldn't be too disruptive (udisks-probe-ata-smart -also sends ATA commands via the ATA PASS THROUGH command). - -Signed-off-by: David Zeuthen ---- - rules/rules.d/60-persistent-storage.rules | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules -index 6a9abdd..12fabef 100644 ---- a/rules/rules.d/60-persistent-storage.rules -+++ b/rules/rules.d/60-persistent-storage.rules -@@ -22,14 +22,18 @@ ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*" - KERNEL=="vd*[!0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}" - KERNEL=="vd*[0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}-part%n" - --# USB devices use their own serial number --KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p" - # ATA devices with their own "ata" kernel subsystem - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="ata", IMPORT{program}="ata_id --export $tempnode" - # ATA devices using the "scsi" subsystem - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", IMPORT{program}="ata_id --export $tempnode" - # ATA/ATAPI devices (SPC-3 or later) using the "scsi" subsystem - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}=="5", ATTRS{scsi_level}=="[6-9]*", IMPORT{program}="ata_id --export $tempnode" -+ -+# Run ata_id on non-removable USB Mass Storage (SATA/PATA disks in enclosures) -+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", ATTR{removable}=="0", SUBSYSTEMS=="usb", IMPORT{program}="ata_id --export $tempnode" -+# Otherwise fall back to using usb_id for USB devices -+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p" -+ - # scsi devices - KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="scsi" - KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="cciss" diff --git a/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch b/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch deleted file mode 100644 index aa67cf1..0000000 --- a/0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch +++ /dev/null @@ -1,51 +0,0 @@ -From daf32d32172e19e78754999b41c27b45e3629326 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Thu, 31 Mar 2011 13:15:47 +0200 -Subject: [PATCH] systemd: let settle depend on trigger, do not block basic with trigger - ---- - init/udev-settle.service.in | 15 +++++++++------ - init/udev-trigger.service.in | 1 - - 2 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in -index be06a39..bda8626 100644 ---- a/init/udev-settle.service.in -+++ b/init/udev-settle.service.in -@@ -1,15 +1,18 @@ --# This barrier service is usually not enabled by default. If enabled, --# it acts as a barrier for basic.target -- so all later services will -+# This service is usually not enabled by default. If enabled, it -+# acts as a barrier for basic.target -- so all later services will - # wait for udev completely finishing its coldplug run. - # --# It might be enabled just unconditionally, or pulled-in on-demand by --# broken or non-hotplug-aware services that assume a fully populated --# /dev at startup. -+# If needed, to work around broken or non-hotplug-aware services, -+# it might be enabled unconditionally, or pulled-in on-demand by -+# the services that assume a fully populated /dev at startup. It -+# should not be used or pulled-in ever on systems without such -+# legacy services running. - - [Unit] - Description=udev Wait for Complete Device Initialization - DefaultDependencies=no --After=udev.service -+Requires=udev.service -+After=udev-trigger.service - Before=basic.target - - [Service] -diff --git a/init/udev-trigger.service.in b/init/udev-trigger.service.in -index 0ede317..745974a 100644 ---- a/init/udev-trigger.service.in -+++ b/init/udev-trigger.service.in -@@ -2,7 +2,6 @@ - Description=udev Coldplug all Devices - Requires=udev.service - After=udev.service --Before=basic.target - DefaultDependencies=no - - [Service] diff --git a/0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch b/0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch deleted file mode 100644 index b343faf..0000000 --- a/0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ff4a035a8aaba6a7b5b85c4b348886d72c42e84c Mon Sep 17 00:00:00 2001 -From: Lee, Chun-Yi -Date: Thu, 31 Mar 2011 18:01:05 +0800 -Subject: [PATCH] Add rule for Acer Aspire One ZG8 to use acer-aspire_5720 keymap - -Acer Aspire One ZG8's bluetooth HW key emit 0xD9 scancode, it must map -to KEY_BLUETOOTH like Acer Aspire 5720. So, add rule for Acer Aspire One -ZG8 use acer-aspire_5720 keymap. - -Tested on Acer Aspire One ZG8 netbook. - -Signed-off-by: Lee, Chun-Yi -Signed-off-by: Martin Pitt ---- - extras/keymap/95-keymap.rules | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules -index 0c3ae38..44d5064 100644 ---- a/extras/keymap/95-keymap.rules -+++ b/extras/keymap/95-keymap.rules -@@ -100,6 +100,7 @@ ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 6920", RUN+="keyma - ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 5920G", RUN+="keymap $name acer-aspire_5920g" - ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 5720*", RUN+="keymap $name acer-aspire_5720" - ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_name}=="Aspire 8930", RUN+="keymap $name acer-aspire_8930" -+ENV{DMI_VENDOR}=="Acer*", ATTR{[dmi/id]product_serial}=="ZG8*", RUN+="keymap $name acer-aspire_5720" - - ENV{DMI_VENDOR}=="*BenQ*", ATTR{[dmi/id]product_name}=="*Joybook R22*", RUN+="keymap $name 0x6E wlan" - diff --git a/0005-udevd-add-N-to-optstring-in-getopt_long.patch b/0005-udevd-add-N-to-optstring-in-getopt_long.patch deleted file mode 100644 index c8ca5c6..0000000 --- a/0005-udevd-add-N-to-optstring-in-getopt_long.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 6ee9b2cb8cf023253853f1c80e707598685b11f3 Mon Sep 17 00:00:00 2001 -From: Thomas Egerer -Date: Thu, 31 Mar 2011 17:25:31 +0200 -Subject: [PATCH] udevd: add 'N:' to optstring in getopt_long - ---- - udev/udevd.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/udev/udevd.c b/udev/udevd.c -index 1871474..a8b339f 100644 ---- a/udev/udevd.c -+++ b/udev/udevd.c -@@ -1118,7 +1118,7 @@ int main(int argc, char *argv[]) - for (;;) { - int option; - -- option = getopt_long(argc, argv, "c:deDthV", options, NULL); -+ option = getopt_long(argc, argv, "c:deDtN:hV", options, NULL); - if (option == -1) - break; - diff --git a/0006-Revert-Do-not-build-extras-with-disable-extras.patch b/0006-Revert-Do-not-build-extras-with-disable-extras.patch deleted file mode 100644 index a7f4f96..0000000 --- a/0006-Revert-Do-not-build-extras-with-disable-extras.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9bb54267a1483e8f3b2de352c7be433f625e5606 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Thu, 31 Mar 2011 19:23:19 +0200 -Subject: [PATCH] Revert "Do not build extras with --disable-extras" - -This reverts commit 905818f5961446ac32d1b2d165185fffddc4915a. - -We do want to build some extras, just not the ones with extra dependencies. -Thanks to Juergen Daubert for pointing this out. ---- - Makefile.am | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index df70bf7..2c20f46 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -225,7 +225,6 @@ dist_udevrules_DATA += \ - extras/rule_generator/75-cd-aliases-generator.rules \ - extras/rule_generator/75-persistent-net-generator.rules - --if ENABLE_EXTRAS - # ------------------------------------------------------------------------------ - # firmware - firmware loading - # ------------------------------------------------------------------------------ -@@ -314,8 +313,6 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la - libexec_PROGRAMS += extras/v4l_id/v4l_id - dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules - --endif # ENABLE_EXTRAS -- - # ------------------------------------------------------------------------------ - # qemu -- qemu/kvm guest tweaks - # ------------------------------------------------------------------------------ diff --git a/0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch b/0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch deleted file mode 100644 index efeecfe..0000000 --- a/0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 55eb500cc5465babf1fd773dbcceeb90eeefd997 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Mon, 4 Apr 2011 11:47:54 +0200 -Subject: [PATCH] Avoid spinning up CD on pressing eject button - -When the CD tray door is locked and the hardware eject button is pressed, newer -kernels (2.6.38+) will send out a change event with a DISK_EJECT_REQUEST==1 -property. Do not run cdrom_id and blkid in this case, as the media state and -contents does not change, and this only needlessly spins up the drive again -right before ejection. ---- - extras/cdrom_id/60-cdrom_id.rules | 3 +++ - rules/rules.d/60-persistent-storage.rules | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/extras/cdrom_id/60-cdrom_id.rules b/extras/cdrom_id/60-cdrom_id.rules -index b3109f1..aedf6f0 100644 ---- a/extras/cdrom_id/60-cdrom_id.rules -+++ b/extras/cdrom_id/60-cdrom_id.rules -@@ -5,6 +5,9 @@ SUBSYSTEM!="block", GOTO="cdrom_end" - KERNEL!="sr[0-9]*|xvd*", GOTO="cdrom_end" - ENV{DEVTYPE}!="disk", GOTO="cdrom_end" - -+# this is only a button press event -+ENV{DISK_EJECT_REQUEST}=="?*", GOTO="cdrom_end" -+ - KERNEL=="sr[0-9]*", ENV{ID_CDROM}="1" - IMPORT{program}="cdrom_id --export $tempnode" - -diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules -index 12fabef..05a405f 100644 ---- a/rules/rules.d/60-persistent-storage.rules -+++ b/rules/rules.d/60-persistent-storage.rules -@@ -62,9 +62,9 @@ ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PA - ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end" - - # probe filesystem metadata of optical drives which have a media inserted --KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode" -+KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode" - # single-session CDs do not have ID_CDROM_MEDIA_SESSION_LAST_OFFSET --KERNEL=="sr*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode" -+KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode" - - # probe filesystem metadata of disks - KERNEL!="sr*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode" diff --git a/0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch b/0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch deleted file mode 100644 index f8e7404..0000000 --- a/0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5e0ec43fc40e3e6dd0e44a7d617846879e1dac9e Mon Sep 17 00:00:00 2001 -From: Seth Forshee -Date: Tue, 5 Apr 2011 11:43:00 -0500 -Subject: [PATCH] keymap: Support Dell Latitude XT2 tablet-mode navigation keys - -The XT2 has a rocker (up/down/enter) and back button on the side -in tablet mode, none of which work currently. Add entries for -these keys. - -There is some overlap here with scan codes used in other Dell -models, so these buttons are put in a new file specific to this -model. - -Signed-off-by: Seth Forshee -Signed-off-by: Martin Pitt ---- - Makefile.am | 1 + - extras/keymap/95-keymap.rules | 1 + - extras/keymap/keymaps/dell-latitude-xt2 | 4 ++++ - 3 files changed, 6 insertions(+), 0 deletions(-) - create mode 100644 extras/keymap/keymaps/dell-latitude-xt2 - -diff --git a/Makefile.am b/Makefile.am -index 2c20f46..4244089 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -568,6 +568,7 @@ dist_udevkeymap_DATA = \ - extras/keymap/keymaps/asus \ - extras/keymap/keymaps/compaq-e_evo \ - extras/keymap/keymaps/dell \ -+ extras/keymap/keymaps/dell-latitude-xt2 \ - extras/keymap/keymaps/everex-xt5000 \ - extras/keymap/keymaps/fujitsu-amilo_pa_2548 \ - extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ -diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules -index 44d5064..350f111 100644 ---- a/extras/keymap/95-keymap.rules -+++ b/extras/keymap/95-keymap.rules -@@ -67,6 +67,7 @@ LABEL="keyboard_vendorcheck" - - ENV{DMI_VENDOR}=="Dell*", RUN+="keymap $name dell" - ENV{DMI_VENDOR}=="Dell*", ATTR{[dmi/id]product_name}=="Inspiron 910|Inspiron 1010|Inspiron 1011|Inspiron 1012|Inspiron 1110|Inspiron 1210", RUN+="keymap $name 0x84 wlan" -+ENV{DMI_VENDOR}=="Dell*", ATTR{[dmi/id]product_name}=="Latitude XT2", RUN+="keymap $name dell-latitude-xt2" - - ENV{DMI_VENDOR}=="Compaq*", ATTR{[dmi/id]product_name}=="*E500*|*Evo N*", RUN+="keymap $name compaq-e_evo" - -diff --git a/extras/keymap/keymaps/dell-latitude-xt2 b/extras/keymap/keymaps/dell-latitude-xt2 -new file mode 100644 -index 0000000..39872f5 ---- /dev/null -+++ b/extras/keymap/keymaps/dell-latitude-xt2 -@@ -0,0 +1,4 @@ -+0x9B up # tablet rocker up -+0x9E enter # tablet rocker press -+0x9F back # tablet back -+0xA3 down # tablet rocker down diff --git a/0009-selinux-do-not-label-files-in-runtime-dir.patch b/0009-selinux-do-not-label-files-in-runtime-dir.patch deleted file mode 100644 index 56d16ac..0000000 --- a/0009-selinux-do-not-label-files-in-runtime-dir.patch +++ /dev/null @@ -1,204 +0,0 @@ -From 51f43b53293c4cc64c2a55598491c6cbf27b6bd5 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Fri, 8 Apr 2011 01:03:49 +0200 -Subject: [PATCH] selinux: do not label files in runtime dir - -Do not label any files in the udev runtime directory, but only nodes, -links and directories below /dev. - -In case the runtime directory falls back to /dev/.udev, label this -directory once at udevd startup, but never anything below it. ---- - libudev/libudev-private.h | 1 + - libudev/libudev-queue-private.c | 2 -- - libudev/libudev-util-private.c | 18 +++++++++++++++--- - udev/udev-node.c | 6 +++--- - udev/udevd.c | 18 ++++++++---------- - 5 files changed, 27 insertions(+), 18 deletions(-) - -diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h -index 7078b0f..8495f9a 100644 ---- a/libudev/libudev-private.h -+++ b/libudev/libudev-private.h -@@ -220,6 +220,7 @@ uint64_t util_string_bloom64(const char *str); - - /* libudev-util-private.c */ - int util_create_path(struct udev *udev, const char *path); -+int util_create_path_selinux(struct udev *udev, const char *path); - int util_delete_path(struct udev *udev, const char *path); - int util_unlink_secure(struct udev *udev, const char *filename); - uid_t util_lookup_user(struct udev *udev, const char *user); -diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c -index a714572..2f1afec 100644 ---- a/libudev/libudev-queue-private.c -+++ b/libudev/libudev-queue-private.c -@@ -409,9 +409,7 @@ static void update_failed(struct udev_queue_export *udev_queue_export, - /* record event in the failed directory */ - udev_queue_export->failed_count++; - util_create_path(udev, filename); -- udev_selinux_setfscreatecon(udev, filename, S_IFLNK); - symlink(udev_device_get_devpath(udev_device), filename); -- udev_selinux_resetfscreatecon(udev); - break; - - case DEVICE_QUEUED: -diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c -index 6b68b6a..19f979e 100644 ---- a/libudev/libudev-util-private.c -+++ b/libudev/libudev-util-private.c -@@ -25,7 +25,7 @@ - #include "libudev.h" - #include "libudev-private.h" - --int util_create_path(struct udev *udev, const char *path) -+static int create_path(struct udev *udev, const char *path, bool selinux) - { - char p[UTIL_PATH_SIZE]; - char *pos; -@@ -55,7 +55,8 @@ int util_create_path(struct udev *udev, const char *path) - return err; - - dbg(udev, "mkdir '%s'\n", p); -- udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755); -+ if (selinux) -+ udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755); - err = mkdir(p, 0755); - if (err != 0) { - err = -errno; -@@ -66,10 +67,21 @@ int util_create_path(struct udev *udev, const char *path) - err = -ENOTDIR; - } - } -- udev_selinux_resetfscreatecon(udev); -+ if (selinux) -+ udev_selinux_resetfscreatecon(udev); - return err; - } - -+int util_create_path(struct udev *udev, const char *path) -+{ -+ return create_path(udev, path, false); -+} -+ -+int util_create_path_selinux(struct udev *udev, const char *path) -+{ -+ return create_path(udev, path, true); -+} -+ - int util_delete_path(struct udev *udev, const char *path) - { - char p[UTIL_PATH_SIZE]; -diff --git a/udev/udev-node.c b/udev/udev-node.c -index ab4e932..5e791ff 100644 ---- a/udev/udev-node.c -+++ b/udev/udev-node.c -@@ -96,7 +96,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_ - } else { - info(udev, "mknod '%s' %u:%u %#o\n", file, major(devnum), minor(devnum), mode); - do { -- err = util_create_path(udev, file); -+ err = util_create_path_selinux(udev, file); - if (err != 0 && err != -ENOENT) - break; - udev_selinux_setfscreatecon(udev, file, mode); -@@ -184,7 +184,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) - } else { - info(udev, "creating symlink '%s' to '%s'\n", slink, target); - do { -- err = util_create_path(udev, slink); -+ err = util_create_path_selinux(udev, slink); - if (err != 0 && err != -ENOENT) - break; - udev_selinux_setfscreatecon(udev, slink, S_IFLNK); -@@ -201,7 +201,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) - util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL); - unlink(slink_tmp); - do { -- err = util_create_path(udev, slink_tmp); -+ err = util_create_path_selinux(udev, slink_tmp); - if (err != 0 && err != -ENOENT) - break; - udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK); -diff --git a/udev/udevd.c b/udev/udevd.c -index a8b339f..df5c199 100644 ---- a/udev/udevd.c -+++ b/udev/udevd.c -@@ -822,7 +822,7 @@ static void static_dev_create_from_modules(struct udev *udev) - continue; - - util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/", devname, NULL); -- util_create_path(udev, filename); -+ util_create_path_selinux(udev, filename); - udev_selinux_setfscreatecon(udev, filename, mode); - info(udev, "mknod '%s' %c%u:%u\n", filename, type, maj, min); - if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST) -@@ -833,7 +833,7 @@ static void static_dev_create_from_modules(struct udev *udev) - fclose(f); - } - --static int copy_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) -+static int copy_dev_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) - { - struct dirent *dent; - -@@ -886,7 +886,7 @@ static int copy_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) - continue; - } - -- copy_dir(udev, dir2_from, dir2_to, maxdepth-1); -+ copy_dev_dir(udev, dir2_from, dir2_to, maxdepth-1); - - closedir(dir2_to); - closedir(dir2_from); -@@ -930,7 +930,7 @@ static void static_dev_create_from_devices(struct udev *udev, DIR *dir) - dir_from = opendir(LIBEXECDIR "/devices"); - if (dir_from == NULL) - return; -- copy_dir(udev, dir_from, dir, 8); -+ copy_dev_dir(udev, dir_from, dir, 8); - closedir(dir_from); - } - -@@ -985,9 +985,7 @@ static int convert_db(struct udev *udev) - - /* make sure we do not get here again */ - util_create_path(udev, filename); -- udev_selinux_setfscreatecon(udev, udev_get_run_path(udev), S_IFDIR|0755); - mkdir(filename, 0755); -- udev_selinux_resetfscreatecon(udev); - - /* old database */ - util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db", NULL); -@@ -1097,9 +1095,7 @@ int main(int argc, char *argv[]) - /* make sure, that our runtime dir exists and is writable */ - if (utimensat(AT_FDCWD, udev_get_run_config_path(udev), NULL, 0) < 0) { - /* try to create our own subdirectory, do not create parent directories */ -- udev_selinux_setfscreatecon(udev, udev_get_run_config_path(udev), S_IFDIR|0755); - mkdir(udev_get_run_config_path(udev), 0755); -- udev_selinux_resetfscreatecon(udev); - - if (utimensat(AT_FDCWD, udev_get_run_config_path(udev), NULL, 0) >= 0) { - /* directory seems writable now */ -@@ -1111,8 +1107,12 @@ int main(int argc, char *argv[]) - util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev", NULL); - if (udev_set_run_path(udev, filename) == NULL) - goto exit; -+ mkdir(udev_get_run_path(udev), 0755); - } - } -+ /* relabel runtime dir only if it resides below /dev */ -+ if (strncmp(udev_get_run_path(udev), udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) == 0) -+ udev_selinux_lsetfilecon(udev, udev_get_run_path(udev), 0755); - info(udev, "runtime dir '%s'\n", udev_get_run_path(udev)); - - for (;;) { -@@ -1281,9 +1281,7 @@ int main(int argc, char *argv[]) - util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL); - if (stat(filename, &statbuf) != 0) { - util_create_path(udev, filename); -- udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755); - mkdir(filename, 0755); -- udev_selinux_resetfscreatecon(udev); - } - inotify_add_watch(pfd[FD_INOTIFY].fd, filename, - IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); diff --git a/0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch b/0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch deleted file mode 100644 index a14e5d4..0000000 --- a/0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 960250952193db522b8ced336bf998bd7e8e4a31 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Fri, 8 Apr 2011 03:08:16 +0200 -Subject: [PATCH] selinux: firmware - do not label files in runtime dir - ---- - extras/firmware/firmware.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c -index 8199820..f2df76c 100644 ---- a/extras/firmware/firmware.c -+++ b/extras/firmware/firmware.c -@@ -159,11 +159,9 @@ int main(int argc, char **argv) - err = util_create_path(udev, misspath); - if (err != 0 && err != -ENOENT) - break; -- udev_selinux_setfscreatecon(udev, misspath, S_IFLNK); - err = symlink(devpath, misspath); - if (err != 0) - err = -errno; -- udev_selinux_resetfscreatecon(udev); - } while (err == -ENOENT); - rc = 2; - set_loading(udev, loadpath, "-1"); diff --git a/start_udev b/start_udev deleted file mode 100755 index ebb9cb6..0000000 --- a/start_udev +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -# -# start_udev -# -# script to initialize /dev by using udev. -# -# Copyright (C) 2004 Greg Kroah-Hartman -# -# Released under the GPL v2 only. -# -# This needs to be run at the earliest possible point in the boot -# process. -# -# Based on the udev init.d script -# -# Thanks go out to the Gentoo developers for proving -# that this is possible to do. -# -# Yes, it's very verbose, feel free to turn off all of the echo calls, -# they were there to make me feel better that everything was working -# properly during development... -# -# don't use udev if sysfs is not mounted. - -# if we run with systemctl, just wait for settle -if [ -x "$(type -P systemctl)" ]; then - systemctl start udev-settle.service &>/dev/null && exit 0 -fi - -export TZ=/etc/localtime - -[ -d /sys/class ] || exit 1 -[ -r /proc/mounts ] || exit 1 -[ -x /sbin/udevd ] || exit 1 - -. /etc/init.d/functions - -prog=udev - -touch_recursive() { - ( cd $1; - for i in *; do - [[ -c "$i" || -b "$i" ]] && touch --no-create "$i" - [ -d "$i" ] && touch_recursive "$i" - done ) - return 0 -} - -ret=0 -STRING=$"Starting $prog: " -# propagate /dev from /sys -echo -n "$STRING" - -# turn off hotplug binary calling -if ! [ -x /sbin/hotplug ]; then - if [ -e /sys/kernel/uevent_helper ]; then - echo -e '\000\000\000\000' > /sys/kernel/uevent_helper - elif [ -e /proc/sys/kernel/hotplug ]; then - echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug - fi -fi - -/sbin/udevd -d - -ret=$[$ret + $?] - -/sbin/udevadm trigger --type=subsystems --action=add -/sbin/udevadm trigger --type=devices --action=add -/sbin/udevadm settle -ret=$[$ret + $?] - -# touch all device files for timezone glitches -# "find" is in /usr/bin and might not be available -if [ -f /etc/sysconfig/clock ]; then - . /etc/sysconfig/clock - [[ "$UTC" == "false" || "$UTC" == "no" ]] \ - && touch_recursive /dev > "/dev/null" 2>&1 -fi - -[ $ret -eq 0 ] && success $"$STRING" || failure $"$STRING" -echo -exit 0 diff --git a/udev-167-selinux_label.patch b/udev-167-selinux_label.patch deleted file mode 100644 index f583f0f..0000000 --- a/udev-167-selinux_label.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 51f43b53293c4cc64c2a55598491c6cbf27b6bd5 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Fri, 8 Apr 2011 01:03:49 +0200 -Subject: [PATCH] selinux: do not label files in runtime dir - -Do not label any files in the udev runtime directory, but only nodes, -links and directories below /dev. - -In case the runtime directory falls back to /dev/.udev, label this -directory once at udevd startup, but never anything below it. ---- - libudev/libudev-private.h | 1 + - libudev/libudev-queue-private.c | 2 -- - libudev/libudev-util-private.c | 18 +++++++++++++++--- - udev/udev-node.c | 6 +++--- - udev/udevd.c | 18 ++++++++---------- - 5 files changed, 27 insertions(+), 18 deletions(-) - -diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h -index 7078b0f..8495f9a 100644 ---- a/libudev/libudev-private.h -+++ b/libudev/libudev-private.h -@@ -220,6 +220,7 @@ uint64_t util_string_bloom64(const char *str); - - /* libudev-util-private.c */ - int util_create_path(struct udev *udev, const char *path); -+int util_create_path_selinux(struct udev *udev, const char *path); - int util_delete_path(struct udev *udev, const char *path); - int util_unlink_secure(struct udev *udev, const char *filename); - uid_t util_lookup_user(struct udev *udev, const char *user); -diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c -index a714572..2f1afec 100644 ---- a/libudev/libudev-queue-private.c -+++ b/libudev/libudev-queue-private.c -@@ -409,9 +409,7 @@ static void update_failed(struct udev_queue_export *udev_queue_export, - /* record event in the failed directory */ - udev_queue_export->failed_count++; - util_create_path(udev, filename); -- udev_selinux_setfscreatecon(udev, filename, S_IFLNK); - symlink(udev_device_get_devpath(udev_device), filename); -- udev_selinux_resetfscreatecon(udev); - break; - - case DEVICE_QUEUED: -diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c -index 6b68b6a..19f979e 100644 ---- a/libudev/libudev-util-private.c -+++ b/libudev/libudev-util-private.c -@@ -25,7 +25,7 @@ - #include "libudev.h" - #include "libudev-private.h" - --int util_create_path(struct udev *udev, const char *path) -+static int create_path(struct udev *udev, const char *path, bool selinux) - { - char p[UTIL_PATH_SIZE]; - char *pos; -@@ -55,7 +55,8 @@ int util_create_path(struct udev *udev, const char *path) - return err; - - dbg(udev, "mkdir '%s'\n", p); -- udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755); -+ if (selinux) -+ udev_selinux_setfscreatecon(udev, p, S_IFDIR|0755); - err = mkdir(p, 0755); - if (err != 0) { - err = -errno; -@@ -66,10 +67,21 @@ int util_create_path(struct udev *udev, const char *path) - err = -ENOTDIR; - } - } -- udev_selinux_resetfscreatecon(udev); -+ if (selinux) -+ udev_selinux_resetfscreatecon(udev); - return err; - } - -+int util_create_path(struct udev *udev, const char *path) -+{ -+ return create_path(udev, path, false); -+} -+ -+int util_create_path_selinux(struct udev *udev, const char *path) -+{ -+ return create_path(udev, path, true); -+} -+ - int util_delete_path(struct udev *udev, const char *path) - { - char p[UTIL_PATH_SIZE]; -diff --git a/udev/udev-node.c b/udev/udev-node.c -index ab4e932..5e791ff 100644 ---- a/udev/udev-node.c -+++ b/udev/udev-node.c -@@ -96,7 +96,7 @@ int udev_node_mknod(struct udev_device *dev, const char *file, mode_t mode, uid_ - } else { - info(udev, "mknod '%s' %u:%u %#o\n", file, major(devnum), minor(devnum), mode); - do { -- err = util_create_path(udev, file); -+ err = util_create_path_selinux(udev, file); - if (err != 0 && err != -ENOENT) - break; - udev_selinux_setfscreatecon(udev, file, mode); -@@ -184,7 +184,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) - } else { - info(udev, "creating symlink '%s' to '%s'\n", slink, target); - do { -- err = util_create_path(udev, slink); -+ err = util_create_path_selinux(udev, slink); - if (err != 0 && err != -ENOENT) - break; - udev_selinux_setfscreatecon(udev, slink, S_IFLNK); -@@ -201,7 +201,7 @@ static int node_symlink(struct udev *udev, const char *node, const char *slink) - util_strscpyl(slink_tmp, sizeof(slink_tmp), slink, TMP_FILE_EXT, NULL); - unlink(slink_tmp); - do { -- err = util_create_path(udev, slink_tmp); -+ err = util_create_path_selinux(udev, slink_tmp); - if (err != 0 && err != -ENOENT) - break; - udev_selinux_setfscreatecon(udev, slink_tmp, S_IFLNK); -diff --git a/udev/udevd.c b/udev/udevd.c -index a8b339f..df5c199 100644 ---- a/udev/udevd.c -+++ b/udev/udevd.c -@@ -822,7 +822,7 @@ static void static_dev_create_from_modules(struct udev *udev) - continue; - - util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/", devname, NULL); -- util_create_path(udev, filename); -+ util_create_path_selinux(udev, filename); - udev_selinux_setfscreatecon(udev, filename, mode); - info(udev, "mknod '%s' %c%u:%u\n", filename, type, maj, min); - if (mknod(filename, mode, makedev(maj, min)) < 0 && errno == EEXIST) -@@ -833,7 +833,7 @@ static void static_dev_create_from_modules(struct udev *udev) - fclose(f); - } - --static int copy_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) -+static int copy_dev_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) - { - struct dirent *dent; - -@@ -886,7 +886,7 @@ static int copy_dir(struct udev *udev, DIR *dir_from, DIR *dir_to, int maxdepth) - continue; - } - -- copy_dir(udev, dir2_from, dir2_to, maxdepth-1); -+ copy_dev_dir(udev, dir2_from, dir2_to, maxdepth-1); - - closedir(dir2_to); - closedir(dir2_from); -@@ -930,7 +930,7 @@ static void static_dev_create_from_devices(struct udev *udev, DIR *dir) - dir_from = opendir(LIBEXECDIR "/devices"); - if (dir_from == NULL) - return; -- copy_dir(udev, dir_from, dir, 8); -+ copy_dev_dir(udev, dir_from, dir, 8); - closedir(dir_from); - } - -@@ -985,9 +985,7 @@ static int convert_db(struct udev *udev) - - /* make sure we do not get here again */ - util_create_path(udev, filename); -- udev_selinux_setfscreatecon(udev, udev_get_run_path(udev), S_IFDIR|0755); - mkdir(filename, 0755); -- udev_selinux_resetfscreatecon(udev); - - /* old database */ - util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/db", NULL); -@@ -1097,9 +1095,7 @@ int main(int argc, char *argv[]) - /* make sure, that our runtime dir exists and is writable */ - if (utimensat(AT_FDCWD, udev_get_run_config_path(udev), NULL, 0) < 0) { - /* try to create our own subdirectory, do not create parent directories */ -- udev_selinux_setfscreatecon(udev, udev_get_run_config_path(udev), S_IFDIR|0755); - mkdir(udev_get_run_config_path(udev), 0755); -- udev_selinux_resetfscreatecon(udev); - - if (utimensat(AT_FDCWD, udev_get_run_config_path(udev), NULL, 0) >= 0) { - /* directory seems writable now */ -@@ -1111,8 +1107,12 @@ int main(int argc, char *argv[]) - util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev", NULL); - if (udev_set_run_path(udev, filename) == NULL) - goto exit; -+ mkdir(udev_get_run_path(udev), 0755); - } - } -+ /* relabel runtime dir only if it resides below /dev */ -+ if (strncmp(udev_get_run_path(udev), udev_get_dev_path(udev), strlen(udev_get_dev_path(udev))) == 0) -+ udev_selinux_lsetfilecon(udev, udev_get_run_path(udev), 0755); - info(udev, "runtime dir '%s'\n", udev_get_run_path(udev)); - - for (;;) { -@@ -1281,9 +1281,7 @@ int main(int argc, char *argv[]) - util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev), "/rules.d", NULL); - if (stat(filename, &statbuf) != 0) { - util_create_path(udev, filename); -- udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755); - mkdir(filename, 0755); -- udev_selinux_resetfscreatecon(udev); - } - inotify_add_watch(pfd[FD_INOTIFY].fd, filename, - IN_DELETE | IN_MOVE | IN_CLOSE_WRITE); --- -1.7.4.4 - - diff --git a/udev.spec b/udev.spec index 6b402b4..afa762f 100644 --- a/udev.spec +++ b/udev.spec @@ -6,27 +6,14 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 167 -Release: 4%{?dist} +Version: 170 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} Obsoletes: udev-persistent < 0:030-5 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 -Source1: start_udev - -Patch2: 0002-Run-ata_id-on-non-removable-USB-devices.patch -Patch3: 0003-systemd-let-settle-depend-on-trigger-do-not-block-ba.patch -Patch4: 0004-Add-rule-for-Acer-Aspire-One-ZG8-to-use-acer-aspire_.patch -Patch5: 0005-udevd-add-N-to-optstring-in-getopt_long.patch -Patch6: 0006-Revert-Do-not-build-extras-with-disable-extras.patch -Patch7: 0007-Avoid-spinning-up-CD-on-pressing-eject-button.patch -Patch8: 0008-keymap-Support-Dell-Latitude-XT2-tablet-mode-navigat.patch -Patch9: 0009-selinux-do-not-label-files-in-runtime-dir.patch -Patch10: 0010-selinux-firmware-do-not-label-files-in-runtime-dir.patch - - ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,7 +23,7 @@ Requires(pre): /usr/bin/getent /usr/sbin/groupadd Requires: hwdata Requires: systemd-units Requires: pkgconfig -Conflicts: systemd < 3 +Conflicts: systemd < 25 %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -121,15 +108,6 @@ glib-based applications using libudev functionality. %prep %setup -q -%patch2 -p1 -b .git2 -%patch3 -p1 -b .git3 -%patch4 -p1 -b .git4 -%patch5 -p1 -b .git5 -%patch6 -p1 -b .git6 -%patch7 -p1 -b .git7 -%patch8 -p1 -b .git8 -%patch9 -p1 -b .git9 -%patch10 -p1 -b .git10 %build # prevent man pages from re-building (xmlto) @@ -147,7 +125,10 @@ libtoolize -f -c --sbindir="/sbin" --libexecdir=%{udev_scriptdir} \ --with-rootlibdir=/%{_lib} \ --enable-introspection \ - --with-systemdsystemunitdir=%{systemdsystemunitdir} + --with-systemdsystemunitdir=%{systemdsystemunitdir} \ + --enable-floppy \ + --enable-edd \ + --enable-action_modeswitch make %{?_smp_mflags} @@ -183,7 +164,7 @@ for i in \ ; do install -m 0644 "$i" "$RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/${i##*/}" done - + mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices,devices/net,devices/pts,devices/shm,devices/hugepages} mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev @@ -197,22 +178,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then if test -x /usr/bin/stat -a \ "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - if [ -x /sbin/pidof ]; then - pid=$(/sbin/pidof -c udevd) - while [ -n "$pid" ]; do - for p in $pid; do - kill $hard $p 2>/dev/null - done - sleep 0.2 - pid=$(/sbin/pidof -c udevd) - hard="-9" - done - fi + /sbin/udevadm control --exit 2>&1 || : fi - /sbin/chkconfig --del udev + /sbin/chkconfig --del udev || : fi if [ "$1" -eq 0 ]; then - /sbin/chkconfig --del udev-retry + /sbin/chkconfig --del udev-retry || : fi /sbin/chkconfig --del udev-post >/dev/null 2>&1 || : exit 0 @@ -223,39 +194,28 @@ getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || : getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || : getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : -# kill daemon if we are not in a chroot -if test -f /proc/1/exe -a -d /proc/1/root; then - if test -x /usr/bin/stat -a \ - "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - /bin/systemctl stop udev.service >/dev/null 2>&1 || : - if test -x /sbin/udevd -a -x /sbin/pidof ; then - /sbin/udevadm control --stop-exec-queue - pid=$(/sbin/pidof -c udevd) - while [ -n "$pid" ]; do - for p in $pid; do - kill $hard $p 2>/dev/null - done - sleep 0.2 - pid=$(/sbin/pidof -c udevd) - hard="-9" - done - fi - fi +if ! /bin/systemctl stop udev.service udev.socket >/dev/null 2>&1; then + # kill daemon if we are not in a chroot + if test -f /proc/1/exe -a -d /proc/1/root; then + if test -x /usr/bin/stat -a \ + "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then + /sbin/udevadm control --exit 2>&1 || : + fi + fi fi exit 0 %post /bin/systemctl daemon-reload >/dev/null 2>&1 || : -# start daemon if we are not in a chroot -if test -f /proc/1/exe -a -d /proc/1/root; then +if ! /bin/systemctl start udev.service >/dev/null 2>&1; then + # start daemon if we are not in a chroot + if test -f /proc/1/exe -a -d /proc/1/root; then if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - /bin/systemctl start udev.service >/dev/null 2>&1 || : /sbin/udevd -d >/dev/null 2>&1 || : - /sbin/udevadm control --start-exec-queue || : fi + fi fi - exit 0 %postun @@ -282,7 +242,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{udev_scriptdir}/usb_id %attr(0755,root,root) %{udev_scriptdir}/cdrom_id %attr(0755,root,root) %{udev_scriptdir}/path_id -%attr(0755,root,root) %{udev_scriptdir}/hid2hci %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices %attr(0755,root,root) %{udev_scriptdir}/firmware %attr(0644,root,root) %{udev_scriptdir}/rule_generator.functions @@ -377,6 +336,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri May 20 2011 Harald Hoyer 170-1 +- version 170 +- removed /sbin/start_udev + * Mon Apr 11 2011 Harald Hoyer 167-4 - more selinux fixes From 60836322f1f7c80554b860e8e5b52101bdc52683 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 20 May 2011 14:45:08 +0200 Subject: [PATCH 34/66] version 170 removed /sbin/start_udev --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 80bcd9e..465b6ed 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ udev-160.tar.bz2 /udev-166.tar.bz2 /udev-166.tar.bz2.sign /udev-167.tar.bz2 +/udev-170.tar.bz2 diff --git a/sources b/sources index db4315b..5395054 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b37e1222f06c14c24147de346aa0bad udev-167.tar.bz2 +6e132d1a3b4dae24dafd2726c5cdd982 udev-170.tar.bz2 From 3ad6199da322e160fd22408038488859f2445db5 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 20 May 2011 14:53:29 +0200 Subject: [PATCH 35/66] version 170 removed /sbin/start_udev --- udev.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/udev.spec b/udev.spec index afa762f..6180f87 100644 --- a/udev.spec +++ b/udev.spec @@ -168,7 +168,6 @@ done mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices,devices/net,devices/pts,devices/shm,devices/hugepages} mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev -install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/start_udev mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir} @@ -288,7 +287,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-seat.d/udev-acl.ck %{_datadir}/pkgconfig/udev.pc -%attr(0755,root,root) /sbin/start_udev %attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service %attr(0644,root,root) %{systemdsystemunitdir}/udev-trigger.service %attr(0644,root,root) %{systemdsystemunitdir}/udev.service From f9e3401ad50172630d7d400f6026ecfa5ffe2d03 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 27 May 2011 11:18:48 +0200 Subject: [PATCH 36/66] version 171 --- .gitignore | 1 + sources | 2 +- udev.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 465b6ed..c4bbefe 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ udev-160.tar.bz2 /udev-166.tar.bz2.sign /udev-167.tar.bz2 /udev-170.tar.bz2 +/udev-171.tar.bz2 diff --git a/sources b/sources index 5395054..e1aa70f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e132d1a3b4dae24dafd2726c5cdd982 udev-170.tar.bz2 +bdf4617284be2ecac11767437417e209 udev-171.tar.bz2 diff --git a/udev.spec b/udev.spec index 6180f87..4a14c08 100644 --- a/udev.spec +++ b/udev.spec @@ -6,7 +6,7 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 170 +Version: 171 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base @@ -23,7 +23,7 @@ Requires(pre): /usr/bin/getent /usr/sbin/groupadd Requires: hwdata Requires: systemd-units Requires: pkgconfig -Conflicts: systemd < 25 +Conflicts: systemd < 28 %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -193,7 +193,7 @@ getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || : getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || : getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : -if ! /bin/systemctl stop udev.service udev.socket >/dev/null 2>&1; then +if ! /bin/systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1; then # kill daemon if we are not in a chroot if test -f /proc/1/exe -a -d /proc/1/root; then if test -x /usr/bin/stat -a \ @@ -290,10 +290,12 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service %attr(0644,root,root) %{systemdsystemunitdir}/udev-trigger.service %attr(0644,root,root) %{systemdsystemunitdir}/udev.service -%attr(0644,root,root) %{systemdsystemunitdir}/udev.socket +%attr(0644,root,root) %{systemdsystemunitdir}/udev-kernel.socket +%attr(0644,root,root) %{systemdsystemunitdir}/udev-control.socket %{systemdsystemunitdir}/basic.target.wants/udev.service %{systemdsystemunitdir}/basic.target.wants/udev-trigger.service -%{systemdsystemunitdir}/sockets.target.wants/udev.socket +%{systemdsystemunitdir}/sockets.target.wants/udev-control.socket +%{systemdsystemunitdir}/sockets.target.wants/udev-kernel.socket # Deprecated, but keep the ownership %ghost %dir /var/lib/udev @@ -334,6 +336,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri May 27 2011 Harald Hoyer 171-1 +- version 171 + * Fri May 20 2011 Harald Hoyer 170-1 - version 170 - removed /sbin/start_udev From 3643fbe9e58d2f561ad1350df0f9f2c540f96a0b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 20 Jun 2011 10:22:00 +0200 Subject: [PATCH 37/66] udev.spec: remove introspection and unneeded dirs --- udev.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/udev.spec b/udev.spec index 4a14c08..f8434dd 100644 --- a/udev.spec +++ b/udev.spec @@ -124,7 +124,6 @@ libtoolize -f -c --sysconfdir=%{_sysconfdir} \ --sbindir="/sbin" --libexecdir=%{udev_scriptdir} \ --with-rootlibdir=/%{_lib} \ - --enable-introspection \ --with-systemdsystemunitdir=%{systemdsystemunitdir} \ --enable-floppy \ --enable-edd \ @@ -165,14 +164,9 @@ for i in \ install -m 0644 "$i" "$RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/${i##*/}" done -mkdir -p $RPM_BUILD_ROOT%{udev_scriptdir}/{,devices,devices/net,devices/pts,devices/shm,devices/hugepages} - mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev - mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d - %preun if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then if test -x /usr/bin/stat -a \ From 2443122e5f429f84e19a679d7ad0ead3b51f982d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 20 Jun 2011 10:23:17 +0200 Subject: [PATCH 38/66] udev.spec: own the ConsoleKit and ConsoleKit/run-seat.d dirs If udev does not actually require ConsoleKit, the dependency should not be added just for dir ownership, instead the dirs should be owned in udev which is what the patch does. http://fedoraproject.org/wiki/Packaging/Guidelines#File_and_Directory_Ownership https://bugzilla.redhat.com/show_bug.cgi?id=710781 --- udev.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/udev.spec b/udev.spec index f8434dd..4c85464 100644 --- a/udev.spec +++ b/udev.spec @@ -278,6 +278,8 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{udev_scriptdir}/findkeyboards %dir %{udev_scriptdir}/keymaps %{udev_scriptdir}/keymaps/* +%dir %{_prefix}/lib/ConsoleKit +%dir %{_prefix}/lib/ConsoleKit/run-seat.d %attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-seat.d/udev-acl.ck %{_datadir}/pkgconfig/udev.pc From 27c9ba33fe09b996c7c7fda3bba9282b9190a07c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 20 Jun 2011 10:27:09 +0200 Subject: [PATCH 39/66] build without introspection removed unused dirs added ConsoleKit dirs --- udev.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index 4c85464..90b58b7 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 171 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -332,6 +332,11 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Mon Jun 20 2011 Harald Hoyer 171-2 +- build without introspection +- removed unused dirs +- added ConsoleKit dirs + * Fri May 27 2011 Harald Hoyer 171-1 - version 171 From 0c6edc1da227453b89d470ca5789565fd8b3e158 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 11 Jul 2011 15:12:16 +0200 Subject: [PATCH 40/66] version 172 --- .gitignore | 1 + sources | 2 +- udev.spec | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c4bbefe..9febfe1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ udev-160.tar.bz2 /udev-167.tar.bz2 /udev-170.tar.bz2 /udev-171.tar.bz2 +/udev-172.tar.bz2 diff --git a/sources b/sources index e1aa70f..cee2704 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bdf4617284be2ecac11767437417e209 udev-171.tar.bz2 +bd122d04cf758441f498aad0169a454f udev-172.tar.bz2 diff --git a/udev.spec b/udev.spec index 90b58b7..84faac5 100644 --- a/udev.spec +++ b/udev.spec @@ -6,8 +6,8 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 171 -Release: 2%{?dist} +Version: 172 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -125,9 +125,7 @@ libtoolize -f -c --sbindir="/sbin" --libexecdir=%{udev_scriptdir} \ --with-rootlibdir=/%{_lib} \ --with-systemdsystemunitdir=%{systemdsystemunitdir} \ - --enable-floppy \ - --enable-edd \ - --enable-action_modeswitch + --enable-floppy make %{?_smp_mflags} @@ -231,7 +229,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) /sbin/scsi_id %attr(0755,root,root) %{udev_scriptdir}/scsi_id %attr(0755,root,root) %{udev_scriptdir}/ata_id -%attr(0755,root,root) %{udev_scriptdir}/edd_id %attr(0755,root,root) %{udev_scriptdir}/usb_id %attr(0755,root,root) %{udev_scriptdir}/cdrom_id %attr(0755,root,root) %{udev_scriptdir}/path_id @@ -244,6 +241,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{udev_scriptdir}/input_id %attr(0755,root,root) %{udev_scriptdir}/keyboard-force-release.sh %attr(0755,root,root) %{udev_scriptdir}/mtd_probe +%attr(0755,root,root) %{udev_scriptdir}/accelerometer %attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/ @@ -269,7 +267,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_mandir}/man7/udev*.7* %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8* -%attr(0755,root,root) %{udev_scriptdir}/mobile-action-modeswitch %attr(0755,root,root) %{udev_scriptdir}/pci-db %attr(0755,root,root) %{udev_scriptdir}/usb-db %attr(0755,root,root) %{udev_scriptdir}/keymap @@ -332,6 +329,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Mon Jul 11 2011 Harald Hoyer 172-1 +- version 172 + * Mon Jun 20 2011 Harald Hoyer 171-2 - build without introspection - removed unused dirs From c48bf88aeae0c89a23f1220dd3424c2082f4e7b1 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 20 Jul 2011 13:29:29 +0200 Subject: [PATCH 41/66] removed loop devices (should be compiled in the kernel) --- udev.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/udev.spec b/udev.spec index 84faac5..bc31d9a 100644 --- a/udev.spec +++ b/udev.spec @@ -7,7 +7,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 172 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -248,14 +248,6 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ %attr(0755,root,root) %dir %{udev_scriptdir}/ %attr(0755,root,root) %dir %{udev_scriptdir}/devices/ -%attr(640,root,disk) %dev(b,7,0) %{udev_scriptdir}/devices/loop0 -%attr(640,root,disk) %dev(b,7,1) %{udev_scriptdir}/devices/loop1 -%attr(640,root,disk) %dev(b,7,2) %{udev_scriptdir}/devices/loop2 -%attr(640,root,disk) %dev(b,7,3) %{udev_scriptdir}/devices/loop3 -%attr(640,root,disk) %dev(b,7,4) %{udev_scriptdir}/devices/loop4 -%attr(640,root,disk) %dev(b,7,5) %{udev_scriptdir}/devices/loop5 -%attr(640,root,disk) %dev(b,7,6) %{udev_scriptdir}/devices/loop6 -%attr(640,root,disk) %dev(b,7,7) %{udev_scriptdir}/devices/loop7 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules @@ -329,6 +321,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Jul 20 2011 Harald Hoyer 172-2 +- removed loop devices (should be compiled in the kernel) + * Mon Jul 11 2011 Harald Hoyer 172-1 - version 172 From 6ae88f0d846a67e8834570ac67e1baa47ac905f6 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 20 Jul 2011 13:50:03 +0200 Subject: [PATCH 42/66] removed loop devices (should be compiled in the kernel) removed deprecated directories --- udev.spec | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/udev.spec b/udev.spec index bc31d9a..40ba7c7 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,5 @@ -%define debug true %define udev_scriptdir /lib/udev %define firmwaredir /lib/firmware - %define systemdsystemunitdir /lib/systemd/system Summary: A rule-based device node and kernel event manager @@ -140,10 +138,8 @@ rm -fr $RPM_BUILD_ROOT%{_docdir}/udev rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la # Deprecated, but keep the ownership -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,scripts,devices} -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dev.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,devices} mkdir -p $RPM_BUILD_ROOT%{_bindir} -touch $RPM_BUILD_ROOT%{_sysconfdir}/scsi_id.config # force relative symlinks ln -sf ..%{udev_scriptdir}/scsi_id $RPM_BUILD_ROOT/sbin/scsi_id @@ -283,11 +279,7 @@ rm -rf $RPM_BUILD_ROOT %{systemdsystemunitdir}/sockets.target.wants/udev-kernel.socket # Deprecated, but keep the ownership -%ghost %dir /var/lib/udev -%ghost %dir %{_sysconfdir}/udev/scripts/ %ghost %dir %{_sysconfdir}/udev/devices/ -%ghost %dir %{_sysconfdir}/dev.d/ -%ghost %dir %{_sysconfdir}/udev/makedev.d/ %files -n libudev %defattr(0644, root, root, 0755) @@ -323,6 +315,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Jul 20 2011 Harald Hoyer 172-2 - removed loop devices (should be compiled in the kernel) +- removed deprecated directories * Mon Jul 11 2011 Harald Hoyer 172-1 - version 172 From c28cf5922cc6d9b2978e28d49509f3a1ba68cf61 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 20 Jul 2011 13:58:40 +0200 Subject: [PATCH 43/66] removed loop devices (should be compiled in the kernel) removed deprecated directories removed scsi_id symlink cleanup of requirements --- udev.spec | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/udev.spec b/udev.spec index 40ba7c7..1bf02ec 100644 --- a/udev.spec +++ b/udev.spec @@ -15,8 +15,8 @@ Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.t ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(pre): /bin/sh fileutils /sbin/chkconfig /sbin/service -Requires(pre): /usr/bin/stat /sbin/pidof +Requires(pre): /bin/sh fileutils +Requires(pre): /usr/bin/stat Requires(pre): /usr/bin/getent /usr/sbin/groupadd Requires: hwdata Requires: systemd-units @@ -28,18 +28,18 @@ Conflicts: systemd < 28 Requires: s390utils-base %endif -BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel -BuildRequires: glib2-devel bison findutils +BuildRequires: sed libselinux-devel >= 0:1.17.9-2 libsepol-devel +BuildRequires: glib2-devel findutils BuildRequires: gperf libtool -BuildRequires: libusb-devel libacl-devel +BuildRequires: libacl-devel BuildRequires: hwdata BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: usbutils >= 0.82 BuildRequires: libtool >= 2.2.6 BuildRequires: pkgconfig Requires: libselinux >= 0:1.17.9-2 sed -Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84 -Requires: util-linux-ng >= 2.15.1 +Conflicts: kernel < 0:2.6 +Requires: util-linux >= 2.15.1 Obsoletes: dev <= 0:3.12-1 Provides: dev = 0:3.12-2 # hid2hci moved to udev @@ -141,9 +141,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,devices} mkdir -p $RPM_BUILD_ROOT%{_bindir} -# force relative symlinks -ln -sf ..%{udev_scriptdir}/scsi_id $RPM_BUILD_ROOT/sbin/scsi_id - for i in \ %ifarch ia64 rules/arch/40-ia64.rules \ @@ -222,8 +219,6 @@ rm -rf $RPM_BUILD_ROOT %doc NEWS COPYING README TODO ChangeLog extras/keymap/README.keymap.txt %attr(0755,root,root) /sbin/udevadm %attr(0755,root,root) /sbin/udevd -%attr(0755,root,root) /sbin/scsi_id -%attr(0755,root,root) %{udev_scriptdir}/scsi_id %attr(0755,root,root) %{udev_scriptdir}/ata_id %attr(0755,root,root) %{udev_scriptdir}/usb_id %attr(0755,root,root) %{udev_scriptdir}/cdrom_id @@ -248,13 +243,12 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules -%ghost %config(noreplace,missingok) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config - %dir %attr(0755,root,root) %{firmwaredir} %attr(0644,root,root) %{_mandir}/man8/udev*.8* %attr(0644,root,root) %{_mandir}/man7/udev*.7* %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8* +%attr(0755,root,root) %{udev_scriptdir}/scsi_id %attr(0755,root,root) %{udev_scriptdir}/pci-db %attr(0755,root,root) %{udev_scriptdir}/usb-db %attr(0755,root,root) %{udev_scriptdir}/keymap @@ -316,6 +310,8 @@ rm -rf $RPM_BUILD_ROOT * Wed Jul 20 2011 Harald Hoyer 172-2 - removed loop devices (should be compiled in the kernel) - removed deprecated directories +- removed scsi_id symlink +- cleanup of requirements * Mon Jul 11 2011 Harald Hoyer 172-1 - version 172 From 08ec76712b2cceddbbeecab60437a76f0b70d2f5 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 1 Aug 2011 13:21:13 +0200 Subject: [PATCH 44/66] version 173 udev-acl functionality is in systemd --- .gitignore | 1 + sources | 2 +- udev.spec | 15 +++++++-------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9febfe1..26a7948 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ udev-160.tar.bz2 /udev-170.tar.bz2 /udev-171.tar.bz2 /udev-172.tar.bz2 +/udev-173.tar.bz2 diff --git a/sources b/sources index cee2704..cba6520 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bd122d04cf758441f498aad0169a454f udev-172.tar.bz2 +91a88a359b60bbd074b024883cc0dbde udev-173.tar.bz2 diff --git a/udev.spec b/udev.spec index 1bf02ec..e026339 100644 --- a/udev.spec +++ b/udev.spec @@ -4,8 +4,8 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 172 -Release: 2%{?dist} +Version: 173 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} @@ -21,7 +21,7 @@ Requires(pre): /usr/bin/getent /usr/sbin/groupadd Requires: hwdata Requires: systemd-units Requires: pkgconfig -Conflicts: systemd < 28 +Conflicts: systemd < 32 %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -31,7 +31,6 @@ Requires: s390utils-base BuildRequires: sed libselinux-devel >= 0:1.17.9-2 libsepol-devel BuildRequires: glib2-devel findutils BuildRequires: gperf libtool -BuildRequires: libacl-devel BuildRequires: hwdata BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: usbutils >= 0.82 @@ -252,14 +251,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0755,root,root) %{udev_scriptdir}/pci-db %attr(0755,root,root) %{udev_scriptdir}/usb-db %attr(0755,root,root) %{udev_scriptdir}/keymap -%attr(0755,root,root) %{udev_scriptdir}/udev-acl %attr(0755,root,root) %{udev_scriptdir}/v4l_id %attr(0755,root,root) %{udev_scriptdir}/findkeyboards %dir %{udev_scriptdir}/keymaps %{udev_scriptdir}/keymaps/* -%dir %{_prefix}/lib/ConsoleKit -%dir %{_prefix}/lib/ConsoleKit/run-seat.d -%attr(0644,root,root) %{_prefix}/lib/ConsoleKit/run-seat.d/udev-acl.ck %{_datadir}/pkgconfig/udev.pc %attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service @@ -307,6 +302,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Mon Aug 01 2011 Harald Hoyer 173-1 +- version 173 +- udev-acl functionality is in systemd + * Wed Jul 20 2011 Harald Hoyer 172-2 - removed loop devices (should be compiled in the kernel) - removed deprecated directories From 5fd2aaff27c2c868222011a94f2019f4bb2648fa Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Mon, 29 Aug 2011 09:10:39 +0100 Subject: [PATCH 45/66] Update OLPC XO keymap --- udev-olpc-keymap-update.patch | 65 +++++++++++++++++++++++++++++++++++ udev.spec | 8 ++++- 2 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 udev-olpc-keymap-update.patch diff --git a/udev-olpc-keymap-update.patch b/udev-olpc-keymap-update.patch new file mode 100644 index 0000000..f1bbecf --- /dev/null +++ b/udev-olpc-keymap-update.patch @@ -0,0 +1,65 @@ +From 00fc377e7a6b1997db346c8de51cbf05cad48376 Mon Sep 17 00:00:00 2001 +From: Paul Fox +Date: Mon, 22 Aug 2011 06:39:06 +0200 +Subject: [PATCH] keymap: update the OLPC keymap for correct function key + behavior + +New mappings were needed when the mechanical keyboard was +introduced, and GNOME was made a peer to the sugar desktop. +see http://lists.laptop.org/pipermail/devel/2010-July/029384.html +--- + extras/keymap/keymaps/olpc-xo | 38 ++++++++++++++++++++++++++------------ + 1 files changed, 26 insertions(+), 12 deletions(-) + +diff --git a/extras/keymap/keymaps/olpc-xo b/extras/keymap/keymaps/olpc-xo +index 7fe0662..34434a1 100644 +--- a/extras/keymap/keymaps/olpc-xo ++++ b/extras/keymap/keymaps/olpc-xo +@@ -2,18 +2,32 @@ + 0x81 fn_esc + 0xF9 camera + 0xF8 sound # Fn-CAMERA = Mic +-0xBB fn_f1 +-0xBC fn_f2 +-0xBD fn_f3 +-0xBE fn_f4 +-0xBF fn_f5 +-0xC0 fn_f6 +-0xC1 fn_f7 +-0xC2 fn_f8 +-0xC3 fn_f9 +-0xC4 fn_f10 +-0xD7 fn_f11 +-0xD8 fn_f12 ++ ++ ++# Function key mappings, as per ++# http://dev.laptop.org/ticket/10213#comment:20 ++# ++# Unmodified F1-F8 produce F1-F8, so no remap necessary. ++# Unmodified F9-F12 control brightness and volume. ++0x43 brightnessdown ++0x44 brightnessup ++0x57 volumedown ++0x58 volumeup ++ ++# fn-modified fkeys all produce the unmodified version of the key. ++0xBB f1 ++0xBC f2 ++0xBD f3 ++0xBE f4 ++0xBF f5 ++0xC0 f6 ++0xC1 f7 ++0xC2 f8 ++0xC3 f9 ++0xC4 f10 ++0xD7 f11 ++0xD8 f12 ++ + + # Using F13-F21 for the .5 F keys right now. + 0xF7 f13 +-- +1.7.4.4 + diff --git a/udev.spec b/udev.spec index e026339..598dcf2 100644 --- a/udev.spec +++ b/udev.spec @@ -5,13 +5,15 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 173 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Provides: udev-persistent = %{version}-%{release} Obsoletes: udev-persistent < 0:030-5 Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 +Patch1: udev-olpc-keymap-update.patch + ExclusiveOS: Linux URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -105,6 +107,7 @@ glib-based applications using libudev functionality. %prep %setup -q +%patch1 -p1 %build # prevent man pages from re-building (xmlto) @@ -302,6 +305,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Mon Aug 29 2011 Daniel Drake 173-2 +- Update OLPC XO keymap + * Mon Aug 01 2011 Harald Hoyer 173-1 - version 173 - udev-acl functionality is in systemd From 2618aa966eb7b47967048fc8e582a79bd7f3faa5 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 19 Oct 2011 21:22:11 +0200 Subject: [PATCH 46/66] version 174 --- .gitignore | 11 +- sources | 2 +- udev-olpc-keymap-update.patch | 65 -------- udev.spec | 277 ++++++++++++---------------------- 4 files changed, 95 insertions(+), 260 deletions(-) delete mode 100644 udev-olpc-keymap-update.patch diff --git a/.gitignore b/.gitignore index 26a7948..aaa1534 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -udev-160.tar.bz2 -/udev-164.tar.bz2 -/udev-164.tar.bz2.sign -/udev-166.tar.bz2 -/udev-166.tar.bz2.sign -/udev-167.tar.bz2 -/udev-170.tar.bz2 -/udev-171.tar.bz2 -/udev-172.tar.bz2 -/udev-173.tar.bz2 +/udev-174.tar.bz2 diff --git a/sources b/sources index cba6520..5e58980 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -91a88a359b60bbd074b024883cc0dbde udev-173.tar.bz2 +3b84706046a33d7a7e00491a1136804d udev-174.tar.bz2 diff --git a/udev-olpc-keymap-update.patch b/udev-olpc-keymap-update.patch deleted file mode 100644 index f1bbecf..0000000 --- a/udev-olpc-keymap-update.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 00fc377e7a6b1997db346c8de51cbf05cad48376 Mon Sep 17 00:00:00 2001 -From: Paul Fox -Date: Mon, 22 Aug 2011 06:39:06 +0200 -Subject: [PATCH] keymap: update the OLPC keymap for correct function key - behavior - -New mappings were needed when the mechanical keyboard was -introduced, and GNOME was made a peer to the sugar desktop. -see http://lists.laptop.org/pipermail/devel/2010-July/029384.html ---- - extras/keymap/keymaps/olpc-xo | 38 ++++++++++++++++++++++++++------------ - 1 files changed, 26 insertions(+), 12 deletions(-) - -diff --git a/extras/keymap/keymaps/olpc-xo b/extras/keymap/keymaps/olpc-xo -index 7fe0662..34434a1 100644 ---- a/extras/keymap/keymaps/olpc-xo -+++ b/extras/keymap/keymaps/olpc-xo -@@ -2,18 +2,32 @@ - 0x81 fn_esc - 0xF9 camera - 0xF8 sound # Fn-CAMERA = Mic --0xBB fn_f1 --0xBC fn_f2 --0xBD fn_f3 --0xBE fn_f4 --0xBF fn_f5 --0xC0 fn_f6 --0xC1 fn_f7 --0xC2 fn_f8 --0xC3 fn_f9 --0xC4 fn_f10 --0xD7 fn_f11 --0xD8 fn_f12 -+ -+ -+# Function key mappings, as per -+# http://dev.laptop.org/ticket/10213#comment:20 -+# -+# Unmodified F1-F8 produce F1-F8, so no remap necessary. -+# Unmodified F9-F12 control brightness and volume. -+0x43 brightnessdown -+0x44 brightnessup -+0x57 volumedown -+0x58 volumeup -+ -+# fn-modified fkeys all produce the unmodified version of the key. -+0xBB f1 -+0xBC f2 -+0xBD f3 -+0xBE f4 -+0xBF f5 -+0xC0 f6 -+0xC1 f7 -+0xC2 f8 -+0xC3 f9 -+0xC4 f10 -+0xD7 f11 -+0xD8 f12 -+ - - # Using F13-F21 for the .5 F keys right now. - 0xF7 f13 --- -1.7.4.4 - diff --git a/udev.spec b/udev.spec index 598dcf2..15e136a 100644 --- a/udev.spec +++ b/udev.spec @@ -1,52 +1,36 @@ -%define udev_scriptdir /lib/udev -%define firmwaredir /lib/firmware -%define systemdsystemunitdir /lib/systemd/system - -Summary: A rule-based device node and kernel event manager -Name: udev -Version: 173 -Release: 2%{?dist} -License: GPLv2+ -Group: System Environment/Base -Provides: udev-persistent = %{version}-%{release} -Obsoletes: udev-persistent < 0:030-5 -Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 - -Patch1: udev-olpc-keymap-update.patch - -ExclusiveOS: Linux -URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(pre): /bin/sh fileutils -Requires(pre): /usr/bin/stat -Requires(pre): /usr/bin/getent /usr/sbin/groupadd -Requires: hwdata -Requires: systemd-units -Requires: pkgconfig -Conflicts: systemd < 32 +Summary: A rule-based device node and kernel event manager +Name: udev +Version: 174 +Release: 1%{?dist} +License: GPLv2+ +Group: System Environment/Base +Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 +URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: gperf +BuildRequires: libselinux-devel libsepol-devel +BuildRequires: glib2-devel +BuildRequires: hwdata +BuildRequires: gobject-introspection-devel >= 0.6.2 +BuildRequires: usbutils >= 0.82 +Obsoletes: dev <= 0:3.12-1 +Provides: dev = 0:3.12-2 +Requires(pre): fileutils +Requires(pre): /usr/bin/getent /usr/sbin/groupadd +Requires: hwdata +Requires: systemd-units +Requires: pkgconfig +Requires: util-linux >= 2.15.1 +Conflicts: systemd < 37 +Conflicts: dracut < 013-85.git20111019 %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 -Requires: s390utils-base +Requires: s390utils-base %endif -BuildRequires: sed libselinux-devel >= 0:1.17.9-2 libsepol-devel -BuildRequires: glib2-devel findutils -BuildRequires: gperf libtool -BuildRequires: hwdata -BuildRequires: gobject-introspection-devel >= 0.6.2 -BuildRequires: usbutils >= 0.82 -BuildRequires: libtool >= 2.2.6 -BuildRequires: pkgconfig -Requires: libselinux >= 0:1.17.9-2 sed -Conflicts: kernel < 0:2.6 -Requires: util-linux >= 2.15.1 -Obsoletes: dev <= 0:3.12-1 -Provides: dev = 0:3.12-2 -# hid2hci moved to udev -Conflicts: bluez < 4.47 -Requires: libudev = %{version}-%{release} - %description udev is a collection of tools and a daemon to manage events received from the kernel and deal with them in user-space. Primarily this @@ -55,94 +39,70 @@ symlinks to device nodes in /dev when hardware is discovered or removed from the system. %package -n libudev -Summary: Dynamic library to access udev device information -Group: System Environment/Libraries -Obsoletes: libudev0 <= 142 -Provides: libudev0 = 143 -License: LGPLv2+ +Summary: Dynamic library to access udev device information +Group: System Environment/Libraries +Requires: udev = %{version}-%{release} +License: LGPLv2+ %description -n libudev This package contains the dynamic library libudev, which provides access to udev device information, and an interface to search devices in sysfs. %package -n libudev-devel -Summary: Development files for libudev -Group: Development/Libraries -Requires: udev = %{version}-%{release} -Requires: libudev = %{version}-%{release} -Requires: pkgconfig -License: LGPLv2+ +Summary: Development files for libudev +Group: Development/Libraries +Requires: libudev = %{version}-%{release} +Requires: pkgconfig +License: LGPLv2+ %description -n libudev-devel This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. %package -n libgudev1 -Summary: Libraries for adding libudev support to applications that use glib -Group: Development/Libraries -Requires: libudev >= 142 -# remove the following lines for libgudev so major 1 -Provides: libgudev = 20090518 -Obsoletes: libgudev <= 20090517 -License: LGPLv2+ +Summary: Libraries for adding libudev support to applications that use glib +Group: Development/Libraries +Requires: libudev = %{version}-%{release} +License: LGPLv2+ %description -n libgudev1 This package contains the libraries that make it easier to use libudev functionality from applications that use glib. %package -n libgudev1-devel -Summary: Header files for adding libudev support to applications that use glib -Group: Development/Libraries -Requires: libudev-devel >= 142 -Provides: libgudev-devel = 20090518 -Obsoletes: libgudev-devel <= 20090517 -Requires: pkgconfig -License: LGPLv2+ - -Requires: libgudev1 = %{version}-%{release} +Summary: Header files for adding libudev support to applications that use glib +Group: Development/Libraries +Requires: libgudev1 = %{version}-%{release} +License: LGPLv2+ %description -n libgudev1-devel This package contains the header and pkg-config files for developing glib-based applications using libudev functionality. -%prep -%setup -q -%patch1 -p1 +%prep +%setup -q %build # prevent man pages from re-building (xmlto) find . -name "*.[1-8]" -exec touch '{}' \; - export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" - -# prevent man pages from re-building (xmlto) -find . -name "*.[1-8]" -exec touch '{}' \; export V=1 - -libtoolize -f -c -%configure --with-selinux --prefix=%{_prefix} --exec-prefix="" \ - --sysconfdir=%{_sysconfdir} \ - --sbindir="/sbin" --libexecdir=%{udev_scriptdir} \ - --with-rootlibdir=/%{_lib} \ - --with-systemdsystemunitdir=%{systemdsystemunitdir} \ - --enable-floppy - +%configure \ + --prefix=%{_prefix} \ + --sysconfdir=%{_sysconfdir} \ + --sbindir=/sbin \ + --libexecdir=/lib/udev \ + --with-rootlibdir=/%{_lib} \ + --with-selinux \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --enable-floppy make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT - -mkdir -p $RPM_BUILD_ROOT%{_sbindir} - make install DESTDIR=$RPM_BUILD_ROOT - rm -fr $RPM_BUILD_ROOT%{_docdir}/udev rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la - -# Deprecated, but keep the ownership -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/{rules.d,devices} -mkdir -p $RPM_BUILD_ROOT%{_bindir} - for i in \ %ifarch ia64 rules/arch/40-ia64.rules \ @@ -154,55 +114,21 @@ for i in \ rules/arch/40-s390.rules \ %endif ; do - install -m 0644 "$i" "$RPM_BUILD_ROOT%{udev_scriptdir}/rules.d/${i##*/}" + install -m 0644 "$i" "$RPM_BUILD_ROOT/lib/udev/rules.d/${i##*/}" done - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/udev -mkdir -p -m 0755 $RPM_BUILD_ROOT%{firmwaredir} - -%preun -if [ "$1" -eq 0 -a -f %{_initrddir}/udev ]; then - if test -x /usr/bin/stat -a \ - "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - /sbin/udevadm control --exit 2>&1 || : - fi - /sbin/chkconfig --del udev || : -fi -if [ "$1" -eq 0 ]; then - /sbin/chkconfig --del udev-retry || : -fi -/sbin/chkconfig --del udev-post >/dev/null 2>&1 || : -exit 0 +mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware +mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware/updates %pre getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || : getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || : getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || : getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : - -if ! /bin/systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1; then - # kill daemon if we are not in a chroot - if test -f /proc/1/exe -a -d /proc/1/root; then - if test -x /usr/bin/stat -a \ - "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - /sbin/udevadm control --exit 2>&1 || : - fi - fi -fi -exit 0 +/bin/systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || : %post /bin/systemctl daemon-reload >/dev/null 2>&1 || : - -if ! /bin/systemctl start udev.service >/dev/null 2>&1; then - # start daemon if we are not in a chroot - if test -f /proc/1/exe -a -d /proc/1/root; then - if test "$(/usr/bin/stat -Lc '%%D-%%i' /)" = "$(/usr/bin/stat -Lc '%%D-%%i' /proc/1/root)"; then - /sbin/udevd -d >/dev/null 2>&1 || : - fi - fi -fi -exit 0 +/bin/systemctl start udev.service >/dev/null 2>&1 || : %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : @@ -217,61 +143,30 @@ exit 0 rm -rf $RPM_BUILD_ROOT %files -%defattr(0644, root, root, 0755) +%defattr(-, root, root, 0755) %doc NEWS COPYING README TODO ChangeLog extras/keymap/README.keymap.txt %attr(0755,root,root) /sbin/udevadm -%attr(0755,root,root) /sbin/udevd -%attr(0755,root,root) %{udev_scriptdir}/ata_id -%attr(0755,root,root) %{udev_scriptdir}/usb_id -%attr(0755,root,root) %{udev_scriptdir}/cdrom_id -%attr(0755,root,root) %{udev_scriptdir}/path_id -%attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices -%attr(0755,root,root) %{udev_scriptdir}/firmware -%attr(0644,root,root) %{udev_scriptdir}/rule_generator.functions -%attr(0755,root,root) %{udev_scriptdir}/write_cd_rules -%attr(0755,root,root) %{udev_scriptdir}/write_net_rules -%attr(0755,root,root) %{udev_scriptdir}/collect -%attr(0755,root,root) %{udev_scriptdir}/input_id -%attr(0755,root,root) %{udev_scriptdir}/keyboard-force-release.sh -%attr(0755,root,root) %{udev_scriptdir}/mtd_probe -%attr(0755,root,root) %{udev_scriptdir}/accelerometer - -%attr(0755,root,root) %dir %{udev_scriptdir}/rules.d/ +%attr(0755,root,root) /lib/udev/udevd +%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ -%attr(0755,root,root) %dir %{udev_scriptdir}/ -%attr(0755,root,root) %dir %{udev_scriptdir}/devices/ - -%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf -%attr(0644,root,root) %{udev_scriptdir}/rules.d/*.rules - -%dir %attr(0755,root,root) %{firmwaredir} -%attr(0644,root,root) %{_mandir}/man8/udev*.8* -%attr(0644,root,root) %{_mandir}/man7/udev*.7* -%attr(0644,root,root) %{_mandir}/man8/scsi_id*.8* - -%attr(0755,root,root) %{udev_scriptdir}/scsi_id -%attr(0755,root,root) %{udev_scriptdir}/pci-db -%attr(0755,root,root) %{udev_scriptdir}/usb-db -%attr(0755,root,root) %{udev_scriptdir}/keymap -%attr(0755,root,root) %{udev_scriptdir}/v4l_id -%attr(0755,root,root) %{udev_scriptdir}/findkeyboards -%dir %{udev_scriptdir}/keymaps -%{udev_scriptdir}/keymaps/* +%attr(0755,root,root) %dir /lib/udev +%attr(0755,root,root) %dir /lib/udev/rules.d/ +%attr(0755,root,root) %dir /lib/udev/devices/ +%attr(0755,root,root) %dir /lib/udev/keymaps +/lib/udev/* +/lib/udev/keymaps/* +%attr(0644,root,root) /lib/udev/rules.d/*.rules +%attr(0644,root,root) %{_mandir}/man7/*.7* +%attr(0644,root,root) %{_mandir}/man8/*.8* %{_datadir}/pkgconfig/udev.pc +%dir %attr(0755,root,root) /lib/firmware +%dir %attr(0755,root,root) /lib/firmware/updates -%attr(0644,root,root) %{systemdsystemunitdir}/udev-settle.service -%attr(0644,root,root) %{systemdsystemunitdir}/udev-trigger.service -%attr(0644,root,root) %{systemdsystemunitdir}/udev.service -%attr(0644,root,root) %{systemdsystemunitdir}/udev-kernel.socket -%attr(0644,root,root) %{systemdsystemunitdir}/udev-control.socket -%{systemdsystemunitdir}/basic.target.wants/udev.service -%{systemdsystemunitdir}/basic.target.wants/udev-trigger.service -%{systemdsystemunitdir}/sockets.target.wants/udev-control.socket -%{systemdsystemunitdir}/sockets.target.wants/udev-kernel.socket - -# Deprecated, but keep the ownership -%ghost %dir %{_sysconfdir}/udev/devices/ +%attr(0644,root,root) /lib/systemd/system/*.service +%attr(0644,root,root) /lib/systemd/system/*.socket +/lib/systemd/system/basic.target.wants/*.service +/lib/systemd/system/sockets.target.wants/*.socket %files -n libudev %defattr(0644, root, root, 0755) @@ -305,6 +200,20 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Mon Oct 10 2011 Kay Sievers 173-4 +- version 174 + - path_id, usb_id, input_id tools are built-in commands + - fusectl is mounted by systemd + - SYSFS=, ID=, BUS= are removed + - udevadm trigger --type=failed is removed + - udev control socket is now in /run/udev/control + - disable persistent net and cdrom rule generator +- remove obsolete rpm dependencies +- remove SYSV init script controls + +* Mon Aug 29 2011 Kay Sievers 173-3 +- fix bluetooth input device handling (brc#733862) + * Mon Aug 29 2011 Daniel Drake 173-2 - Update OLPC XO keymap From 2d66943d2fe4aa0610be58f866264708aacf017e Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 20 Oct 2011 00:24:46 +0200 Subject: [PATCH 47/66] fix version in changelog --- udev.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index 15e136a..25c72e2 100644 --- a/udev.spec +++ b/udev.spec @@ -200,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog -* Mon Oct 10 2011 Kay Sievers 173-4 +* Mon Oct 10 2011 Kay Sievers 174-1 - version 174 - path_id, usb_id, input_id tools are built-in commands - fusectl is mounted by systemd From 9653945ff2fc121267e714150575a12c4ff88358 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 20 Oct 2011 13:55:54 +0200 Subject: [PATCH 48/66] update dracut requirement, include entire /lib/udev directory --- udev.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/udev.spec b/udev.spec index 25c72e2..a083a95 100644 --- a/udev.spec +++ b/udev.spec @@ -24,7 +24,7 @@ Requires: systemd-units Requires: pkgconfig Requires: util-linux >= 2.15.1 Conflicts: systemd < 37 -Conflicts: dracut < 013-85.git20111019 +Conflicts: dracut < 013-93 %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -146,23 +146,15 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root, 0755) %doc NEWS COPYING README TODO ChangeLog extras/keymap/README.keymap.txt %attr(0755,root,root) /sbin/udevadm -%attr(0755,root,root) /lib/udev/udevd %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ -%attr(0755,root,root) %dir /lib/udev -%attr(0755,root,root) %dir /lib/udev/rules.d/ -%attr(0755,root,root) %dir /lib/udev/devices/ -%attr(0755,root,root) %dir /lib/udev/keymaps -/lib/udev/* -/lib/udev/keymaps/* -%attr(0644,root,root) /lib/udev/rules.d/*.rules +%attr(0755,root,root) /lib/udev %attr(0644,root,root) %{_mandir}/man7/*.7* %attr(0644,root,root) %{_mandir}/man8/*.8* %{_datadir}/pkgconfig/udev.pc %dir %attr(0755,root,root) /lib/firmware %dir %attr(0755,root,root) /lib/firmware/updates - %attr(0644,root,root) /lib/systemd/system/*.service %attr(0644,root,root) /lib/systemd/system/*.socket /lib/systemd/system/basic.target.wants/*.service @@ -200,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog -* Mon Oct 10 2011 Kay Sievers 174-1 +* Thu Oct 20 2011 Kay Sievers 174-1 - version 174 - path_id, usb_id, input_id tools are built-in commands - fusectl is mounted by systemd From 4dfe0853b64444e1c5c8f0c7564909ce7b9ed81a Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sat, 22 Oct 2011 22:06:39 +0200 Subject: [PATCH 49/66] ignore entire rule when a key is unknown --- ...-rules-line-if-unknown-keys-are-used.patch | 26 +++++++++++++++++++ udev.spec | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch diff --git a/0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch b/0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch new file mode 100644 index 0000000..4d9f1c6 --- /dev/null +++ b/0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch @@ -0,0 +1,26 @@ +From 95691487363ef213fec6975219c87d29415a2479 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Sat, 22 Oct 2011 20:50:23 +0200 +Subject: [PATCH] ignore entire rules line if unknown keys are used + +--- + udev/udev-rules.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/udev/udev-rules.c b/udev/udev-rules.c +index 75636d9..f540a5a 100644 +--- a/udev/udev-rules.c ++++ b/udev/udev-rules.c +@@ -1612,7 +1612,9 @@ static int add_rule(struct udev_rules *rules, char *line, + + continue; + } ++ + err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno); ++ goto invalid; + } + + /* add rule token */ +-- +1.7.6.4 + diff --git a/udev.spec b/udev.spec index a083a95..f2e24ff 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 174 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 @@ -25,6 +25,7 @@ Requires: pkgconfig Requires: util-linux >= 2.15.1 Conflicts: systemd < 37 Conflicts: dracut < 013-93 +Patch10: 0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -81,6 +82,7 @@ glib-based applications using libudev functionality. %prep %setup -q +%patch10 -p1 %build # prevent man pages from re-building (xmlto) @@ -192,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Sat Oct 22 2011 Kay Sievers 174-2 +- ignore entire rule when a key is unknown (brc#748082) + * Thu Oct 20 2011 Kay Sievers 174-1 - version 174 - path_id, usb_id, input_id tools are built-in commands From f9c13ce3bfd1f58042484f7eb631fc64ac121767 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 8 Nov 2011 01:46:54 +0100 Subject: [PATCH 50/66] version 175 --- .gitignore | 2 +- ...-rules-line-if-unknown-keys-are-used.patch | 26 ------------------- sources | 2 +- udev.spec | 10 ++++--- 4 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch diff --git a/.gitignore b/.gitignore index aaa1534..9e36943 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/udev-174.tar.bz2 +/udev-175.tar.bz2 diff --git a/0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch b/0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch deleted file mode 100644 index 4d9f1c6..0000000 --- a/0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 95691487363ef213fec6975219c87d29415a2479 Mon Sep 17 00:00:00 2001 -From: Kay Sievers -Date: Sat, 22 Oct 2011 20:50:23 +0200 -Subject: [PATCH] ignore entire rules line if unknown keys are used - ---- - udev/udev-rules.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/udev/udev-rules.c b/udev/udev-rules.c -index 75636d9..f540a5a 100644 ---- a/udev/udev-rules.c -+++ b/udev/udev-rules.c -@@ -1612,7 +1612,9 @@ static int add_rule(struct udev_rules *rules, char *line, - - continue; - } -+ - err(rules->udev, "unknown key '%s' in %s:%u\n", key, filename, lineno); -+ goto invalid; - } - - /* add rule token */ --- -1.7.6.4 - diff --git a/sources b/sources index 5e58980..f573b89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b84706046a33d7a7e00491a1136804d udev-174.tar.bz2 +2fc9c1efcbde98e3d73ffee7a77aea47 udev-175.tar.bz2 diff --git a/udev.spec b/udev.spec index f2e24ff..09ee959 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 174 -Release: 2%{?dist} +Version: 175 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 @@ -25,7 +25,6 @@ Requires: pkgconfig Requires: util-linux >= 2.15.1 Conflicts: systemd < 37 Conflicts: dracut < 013-93 -Patch10: 0001-ignore-entire-rules-line-if-unknown-keys-are-used.patch %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -82,7 +81,6 @@ glib-based applications using libudev functionality. %prep %setup -q -%patch10 -p1 %build # prevent man pages from re-building (xmlto) @@ -194,6 +192,10 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Mon Nov 7 2011 Kay Sievers 175-1 +- version 175 + - bug fix release + * Sat Oct 22 2011 Kay Sievers 174-2 - ignore entire rule when a key is unknown (brc#748082) From 27412d3df258a617bfc05f4b1d820b23e3ebe866 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:25:45 -0600 Subject: [PATCH 51/66] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- udev.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index 09ee959..a52b63b 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 175 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 @@ -192,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 175-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Nov 7 2011 Kay Sievers 175-1 - version 175 - bug fix release From faded2be30b587c563f6aceba52826ef1ea8f7fe Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 25 Jan 2012 14:04:35 +0100 Subject: [PATCH 52/66] version 179 --- .gitignore | 2 +- sources | 2 +- udev.spec | 62 ++++++++++++++++++++++-------------------------------- 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 9e36943..9e7171b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/udev-175.tar.bz2 +/udev-179.tar.xz diff --git a/sources b/sources index f573b89..85ba111 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2fc9c1efcbde98e3d73ffee7a77aea47 udev-175.tar.bz2 +c966a07dd75fd8d3f1a7e3d210a96c6b udev-179.tar.xz diff --git a/udev.spec b/udev.spec index a52b63b..6c26f64 100644 --- a/udev.spec +++ b/udev.spec @@ -1,12 +1,11 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 175 -Release: 2%{?dist} +Version: 179 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base -Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: gperf @@ -15,13 +14,14 @@ BuildRequires: glib2-devel BuildRequires: hwdata BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: usbutils >= 0.82 +BuildRequires: kmod-libs >= 4 +BuildRequires: libblkid-devel >= 2.20 Obsoletes: dev <= 0:3.12-1 Provides: dev = 0:3.12-2 Requires(pre): fileutils Requires(pre): /usr/bin/getent /usr/sbin/groupadd Requires: hwdata Requires: systemd-units -Requires: pkgconfig Requires: util-linux >= 2.15.1 Conflicts: systemd < 37 Conflicts: dracut < 013-93 @@ -89,35 +89,24 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" export V=1 %configure \ --prefix=%{_prefix} \ + --with-rootprefix= \ --sysconfdir=%{_sysconfdir} \ - --sbindir=/sbin \ - --libexecdir=/lib/udev \ + --bindir=/sbin \ + --libexecdir=/lib \ --with-rootlibdir=/%{_lib} \ --with-selinux \ - --with-systemdsystemunitdir=/lib/systemd/system \ - --enable-floppy + --with-systemdsystemunitdir=/lib/systemd/system make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT%{_docdir}/udev rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -for i in \ -%ifarch ia64 - rules/arch/40-ia64.rules \ -%endif -%ifarch ppc ppc64 - rules/arch/40-ppc.rules \ -%endif -%ifarch s390 s390x - rules/arch/40-s390.rules \ -%endif - ; do - install -m 0644 "$i" "$RPM_BUILD_ROOT/lib/udev/rules.d/${i##*/}" -done mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware/updates +%ifarch s390 s390x +install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT/lib/udev/rules.d +%endif %pre getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || : @@ -139,17 +128,13 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : %post -n libgudev1 -p /sbin/ldconfig %postun -n libgudev1 -p /sbin/ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-, root, root, 0755) -%doc NEWS COPYING README TODO ChangeLog extras/keymap/README.keymap.txt +%doc NEWS COPYING README TODO ChangeLog src/extras/keymap/README.keymap.txt +/lib/udev %attr(0755,root,root) /sbin/udevadm %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ -%attr(0755,root,root) /lib/udev %attr(0644,root,root) %{_mandir}/man7/*.7* %attr(0644,root,root) %{_mandir}/man8/*.8* %{_datadir}/pkgconfig/udev.pc @@ -161,27 +146,23 @@ rm -rf $RPM_BUILD_ROOT /lib/systemd/system/sockets.target.wants/*.socket %files -n libudev -%defattr(0644, root, root, 0755) -%doc libudev/COPYING +%doc src/COPYING %attr(0755,root,root) /%{_lib}/libudev.so.* %files -n libudev-devel -%defattr(0644, root, root, 0755) -%doc libudev/docs/html/* +%doc src/docs/html/* %{_includedir}/libudev.h %{_libdir}/libudev.so %{_libdir}/pkgconfig/libudev.pc %{_datadir}/gtk-doc/html/libudev/* %files -n libgudev1 -%defattr(0644, root, root, 0755) -%doc extras/gudev/COPYING +%doc src/extras/gudev/COPYING %attr(0755,root,root) /%{_lib}/libgudev-1.0.so.* %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib %files -n libgudev1-devel -%defattr(0644, root, root, 0755) -%doc extras/gudev/docs/html/* +%doc src/extras/gudev/docs/html/* %attr(0755,root,root) %{_libdir}/libgudev-1.0.so %dir %attr(0755,root,root) %{_includedir}/gudev-1.0 %dir %attr(0755,root,root) %{_includedir}/gudev-1.0/gudev @@ -192,6 +173,13 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Jan 25 2012 Kay Sievers 179-1 +- version 179 + - devtmpfs is mandatory now + - /run is mandatory now + - modules are loaded with 'libkmod' + - blkid is built-in now + * Sat Jan 14 2012 Fedora Release Engineering - 175-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From e0eeb8a6eb14a00a01f3a1d8f384cc1309db4e06 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 25 Jan 2012 14:47:02 +0100 Subject: [PATCH 53/66] require 'kmod-devel' instead of 'kmod-libs' --- udev.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udev.spec b/udev.spec index 6c26f64..290d0e4 100644 --- a/udev.spec +++ b/udev.spec @@ -14,7 +14,7 @@ BuildRequires: glib2-devel BuildRequires: hwdata BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: usbutils >= 0.82 -BuildRequires: kmod-libs >= 4 +BuildRequires: kmod-devel >= 4 BuildRequires: libblkid-devel >= 2.20 Obsoletes: dev <= 0:3.12-1 Provides: dev = 0:3.12-2 From f110253ee56616d3d843e7cfd14a6788d63ec9c6 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 25 Jan 2012 15:02:58 +0100 Subject: [PATCH 54/66] work around broken upstream tarball's 'xslt' ifdef --- udev.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/udev.spec b/udev.spec index 290d0e4..2aeb9b3 100644 --- a/udev.spec +++ b/udev.spec @@ -16,6 +16,7 @@ BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: usbutils >= 0.82 BuildRequires: kmod-devel >= 4 BuildRequires: libblkid-devel >= 2.20 +BuildRequires: libxslt Obsoletes: dev <= 0:3.12-1 Provides: dev = 0:3.12-2 Requires(pre): fileutils From dc3e663505775fa2e4d743d6a6033565ebdaf096 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 25 Jan 2012 15:26:48 +0100 Subject: [PATCH 55/66] install everything in /usr This patch is needed for the /usr-move feature https://fedoraproject.org/wiki/Features/UsrMove This package requires now 'filesystem' >= 3, which is only installable on a system which has /bin, /sbin, /lib, /lib64 as symlinks to /usr and not regular directories. The 'filesystem' package acts as a guard, to prevent *this* package to be installed on old unconverted systems. New installations will have the 'filesystem' >=3 layout right away, old installations need to be converted with anaconda or dracut first; only after that, the 'filesystem' package, and also *this* package can be installed. Packages *should* not install files in /bin, /sbin, /lib, /lib64, but only in the corresponding directories in /usr. Packages *must* not install conflicting files with the same names in the corresponding directories in / and /usr. Especially compatibilty symlinks must not be installed. Feel free to modify any of the changes to the spec file, but keep the above in mind. --- udev.spec | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/udev.spec b/udev.spec index 2aeb9b3..0ac9dcf 100644 --- a/udev.spec +++ b/udev.spec @@ -24,8 +24,9 @@ Requires(pre): /usr/bin/getent /usr/sbin/groupadd Requires: hwdata Requires: systemd-units Requires: util-linux >= 2.15.1 -Conflicts: systemd < 37 +Conflicts: systemd < 39 Conflicts: dracut < 013-93 +Conflicts: filesystem < 3 %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -43,6 +44,7 @@ removed from the system. Summary: Dynamic library to access udev device information Group: System Environment/Libraries Requires: udev = %{version}-%{release} +Conflicts: filesystem < 3 License: LGPLv2+ %description -n libudev @@ -64,6 +66,7 @@ dynamic library, which provides access to udev device information. Summary: Libraries for adding libudev support to applications that use glib Group: Development/Libraries Requires: libudev = %{version}-%{release} +Conflicts: filesystem < 3 License: LGPLv2+ %description -n libgudev1 @@ -90,23 +93,22 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" export V=1 %configure \ --prefix=%{_prefix} \ - --with-rootprefix= \ --sysconfdir=%{_sysconfdir} \ - --bindir=/sbin \ - --libexecdir=/lib \ - --with-rootlibdir=/%{_lib} \ + --libexecdir=%{_prefix}/lib \ --with-selinux \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT%{_docdir}/udev rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware -mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware/updates +mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware +mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware/updates +mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/sbin +ln -sf ../bin/udevadm $RPM_BUILD_ROOT%{_prefix}/sbin/udevadm %ifarch s390 s390x -install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT/lib/udev/rules.d +install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d %endif %pre @@ -131,24 +133,25 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : %files %doc NEWS COPYING README TODO ChangeLog src/extras/keymap/README.keymap.txt -/lib/udev -%attr(0755,root,root) /sbin/udevadm +%{_bindir}/udevadm +%{_prefix}/sbin/udevadm +%{_prefix}/lib/udev %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ %attr(0644,root,root) %{_mandir}/man7/*.7* %attr(0644,root,root) %{_mandir}/man8/*.8* %{_datadir}/pkgconfig/udev.pc -%dir %attr(0755,root,root) /lib/firmware -%dir %attr(0755,root,root) /lib/firmware/updates -%attr(0644,root,root) /lib/systemd/system/*.service -%attr(0644,root,root) /lib/systemd/system/*.socket -/lib/systemd/system/basic.target.wants/*.service -/lib/systemd/system/sockets.target.wants/*.socket +%dir %attr(0755,root,root) %{_prefix}/lib/firmware +%dir %attr(0755,root,root) %{_prefix}/lib/firmware/updates +%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.service +%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.socket +%{_prefix}/lib/systemd/system/basic.target.wants/*.service +%{_prefix}/lib/systemd/system/sockets.target.wants/*.socket %files -n libudev %doc src/COPYING -%attr(0755,root,root) /%{_lib}/libudev.so.* +%attr(0755,root,root) %{_libdir}/libudev.so.* %files -n libudev-devel %doc src/docs/html/* @@ -159,7 +162,7 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : %files -n libgudev1 %doc src/extras/gudev/COPYING -%attr(0755,root,root) /%{_lib}/libgudev-1.0.so.* +%attr(0755,root,root) %{_libdir}/libgudev-1.0.so.* %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib %files -n libgudev1-devel @@ -174,6 +177,10 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Jan 25 2012 Kay Sievers 179-1 +- install everything in /usr + https://fedoraproject.org/wiki/Features/UsrMove + * Wed Jan 25 2012 Kay Sievers 179-1 - version 179 - devtmpfs is mandatory now From 36b9856624b9245a937a7c89b692cbcb709d0a8b Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Wed, 25 Jan 2012 15:42:00 +0100 Subject: [PATCH 56/66] increment release --- udev.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/udev.spec b/udev.spec index 0ac9dcf..826ea6c 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 179 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -177,7 +177,7 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog -* Wed Jan 25 2012 Kay Sievers 179-1 +* Wed Jan 25 2012 Kay Sievers 179-2 - install everything in /usr https://fedoraproject.org/wiki/Features/UsrMove From e0bc75be11e9b7ab64d883c517d8906d15cb5a74 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 25 Jan 2012 19:36:33 +0100 Subject: [PATCH 57/66] use %{_sbindir} now that everything is in /usr --- udev.spec | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/udev.spec b/udev.spec index 826ea6c..382ee15 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 179 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -87,16 +87,16 @@ glib-based applications using libudev functionality. %setup -q %build -# prevent man pages from re-building (xmlto) +# prevent man pages from re-building (xsltproc) find . -name "*.[1-8]" -exec touch '{}' \; export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" export V=1 %configure \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --libexecdir=%{_prefix}/lib \ - --with-selinux \ - --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system + --prefix=%{_prefix} \ + --sysconfdir=%{_sysconfdir} \ + --libexecdir=%{_prefix}/lib \ + --with-selinux \ + --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system make %{?_smp_mflags} %install @@ -105,8 +105,8 @@ rm -fr $RPM_BUILD_ROOT%{_docdir}/udev rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware/updates -mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/sbin -ln -sf ../bin/udevadm $RPM_BUILD_ROOT%{_prefix}/sbin/udevadm +mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sbindir} +ln -sf ../bin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevadm %ifarch s390 s390x install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d %endif @@ -116,14 +116,14 @@ getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || : getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || : getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || : getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : -/bin/systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || : +systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || : %post -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -/bin/systemctl start udev.service >/dev/null 2>&1 || : +systemctl daemon-reload >/dev/null 2>&1 || : +systemctl start udev.service >/dev/null 2>&1 || : %postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : +systemctl daemon-reload >/dev/null 2>&1 || : %post -n libudev -p /sbin/ldconfig %postun -n libudev -p /sbin/ldconfig @@ -134,7 +134,7 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : %files %doc NEWS COPYING README TODO ChangeLog src/extras/keymap/README.keymap.txt %{_bindir}/udevadm -%{_prefix}/sbin/udevadm +%{_sbindir}/udevadm %{_prefix}/lib/udev %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %attr(0755,root,root) %dir %{_sysconfdir}/udev/ @@ -177,6 +177,9 @@ getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Jan 25 2012 Kay Sievers 179-3 +- use %{_sbindir} + * Wed Jan 25 2012 Kay Sievers 179-2 - install everything in /usr https://fedoraproject.org/wiki/Features/UsrMove From 17aa1fb443765c6d357ea2d00cc0feff87842c0b Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sun, 29 Jan 2012 06:10:55 +0100 Subject: [PATCH 58/66] version 180 --- .gitignore | 2 +- sources | 2 +- udev.spec | 52 ++++++++++++++++++++++++++++------------------------ 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 9e7171b..fc16718 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/udev-179.tar.xz +/udev-180.tar.xz diff --git a/sources b/sources index 85ba111..c1d8327 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c966a07dd75fd8d3f1a7e3d210a96c6b udev-179.tar.xz +b8fb801e7d8371d1bc5c80535008d608 udev-180.tar.xz diff --git a/udev.spec b/udev.spec index 382ee15..06d97fa 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 179 -Release: 3%{?dist} +Version: 180 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -16,7 +16,6 @@ BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: usbutils >= 0.82 BuildRequires: kmod-devel >= 4 BuildRequires: libblkid-devel >= 2.20 -BuildRequires: libxslt Obsoletes: dev <= 0:3.12-1 Provides: dev = 0:3.12-2 Requires(pre): fileutils @@ -26,7 +25,6 @@ Requires: systemd-units Requires: util-linux >= 2.15.1 Conflicts: systemd < 39 Conflicts: dracut < 013-93 -Conflicts: filesystem < 3 %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -44,7 +42,6 @@ removed from the system. Summary: Dynamic library to access udev device information Group: System Environment/Libraries Requires: udev = %{version}-%{release} -Conflicts: filesystem < 3 License: LGPLv2+ %description -n libudev @@ -66,7 +63,6 @@ dynamic library, which provides access to udev device information. Summary: Libraries for adding libudev support to applications that use glib Group: Development/Libraries Requires: libudev = %{version}-%{release} -Conflicts: filesystem < 3 License: LGPLv2+ %description -n libgudev1 @@ -93,22 +89,23 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" export V=1 %configure \ --prefix=%{_prefix} \ + --with-rootprefix= \ --sysconfdir=%{_sysconfdir} \ - --libexecdir=%{_prefix}/lib \ + --libexecdir=/lib \ + --bindir=/sbin \ + --with-rootlibdir=/%{_lib} \ --with-selinux \ - --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system + --with-systemdsystemunitdir=/lib/systemd/system make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT%{_docdir}/udev rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware -mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware/updates -mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sbindir} -ln -sf ../bin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevadm +mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware +mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware/updates %ifarch s390 s390x -install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d +install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT/lib/udev/rules.d %endif %pre @@ -133,25 +130,24 @@ systemctl daemon-reload >/dev/null 2>&1 || : %files %doc NEWS COPYING README TODO ChangeLog src/extras/keymap/README.keymap.txt -%{_bindir}/udevadm -%{_sbindir}/udevadm -%{_prefix}/lib/udev +/lib/udev +/sbin/udevadm %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ %attr(0644,root,root) %{_mandir}/man7/*.7* %attr(0644,root,root) %{_mandir}/man8/*.8* %{_datadir}/pkgconfig/udev.pc -%dir %attr(0755,root,root) %{_prefix}/lib/firmware -%dir %attr(0755,root,root) %{_prefix}/lib/firmware/updates -%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.service -%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.socket -%{_prefix}/lib/systemd/system/basic.target.wants/*.service -%{_prefix}/lib/systemd/system/sockets.target.wants/*.socket +%dir %attr(0755,root,root) /lib/firmware +%dir %attr(0755,root,root) /lib/firmware/updates +%attr(0644,root,root) /lib/systemd/system/*.service +%attr(0644,root,root) /lib/systemd/system/*.socket +/lib/systemd/system/basic.target.wants/*.service +/lib/systemd/system/sockets.target.wants/*.socket %files -n libudev %doc src/COPYING -%attr(0755,root,root) %{_libdir}/libudev.so.* +%attr(0755,root,root) /%{_lib}/libudev.so.* %files -n libudev-devel %doc src/docs/html/* @@ -162,7 +158,7 @@ systemctl daemon-reload >/dev/null 2>&1 || : %files -n libgudev1 %doc src/extras/gudev/COPYING -%attr(0755,root,root) %{_libdir}/libgudev-1.0.so.* +%attr(0755,root,root) /%{_lib}/libgudev-1.0.so.* %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib %files -n libgudev1-devel @@ -177,6 +173,14 @@ systemctl daemon-reload >/dev/null 2>&1 || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Wed Jan 25 2012 Kay Sievers 180-1 +- version 180 + - fix rule execution (brc#785148) + - ID_PART_* export for udisks2 +- temporarily revert 'install everything in /usr' to be + able to update teh current rawhide package without the + dependency on the /usr-move converted filessytem + * Wed Jan 25 2012 Kay Sievers 179-3 - use %{_sbindir} From 90bdfa8bcd577423f731f8a96ce3c334a7a0610f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sun, 29 Jan 2012 18:36:10 +0100 Subject: [PATCH 59/66] install everything in /usr --- udev.spec | 47 +++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/udev.spec b/udev.spec index 06d97fa..82c072b 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 180 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -25,6 +25,7 @@ Requires: systemd-units Requires: util-linux >= 2.15.1 Conflicts: systemd < 39 Conflicts: dracut < 013-93 +Conflicts: filesystem < 3 %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -42,6 +43,7 @@ removed from the system. Summary: Dynamic library to access udev device information Group: System Environment/Libraries Requires: udev = %{version}-%{release} +Conflicts: filesystem < 3 License: LGPLv2+ %description -n libudev @@ -63,6 +65,7 @@ dynamic library, which provides access to udev device information. Summary: Libraries for adding libudev support to applications that use glib Group: Development/Libraries Requires: libudev = %{version}-%{release} +Conflicts: filesystem < 3 License: LGPLv2+ %description -n libgudev1 @@ -89,23 +92,22 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" export V=1 %configure \ --prefix=%{_prefix} \ - --with-rootprefix= \ --sysconfdir=%{_sysconfdir} \ - --libexecdir=/lib \ - --bindir=/sbin \ - --with-rootlibdir=/%{_lib} \ + --libexecdir=%{_prefix}/lib \ --with-selinux \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT%{_docdir}/udev rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware -mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware/updates +mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware +mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware/updates +mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sbindir} +ln -sf ../bin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevadm %ifarch s390 s390x -install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT/lib/udev/rules.d +install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d %endif %pre @@ -130,24 +132,25 @@ systemctl daemon-reload >/dev/null 2>&1 || : %files %doc NEWS COPYING README TODO ChangeLog src/extras/keymap/README.keymap.txt -/lib/udev -/sbin/udevadm +%{_bindir}/udevadm +%{_sbindir}/udevadm +%{_prefix}/lib/udev %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf %attr(0755,root,root) %dir %{_sysconfdir}/udev/ %attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ %attr(0644,root,root) %{_mandir}/man7/*.7* %attr(0644,root,root) %{_mandir}/man8/*.8* %{_datadir}/pkgconfig/udev.pc -%dir %attr(0755,root,root) /lib/firmware -%dir %attr(0755,root,root) /lib/firmware/updates -%attr(0644,root,root) /lib/systemd/system/*.service -%attr(0644,root,root) /lib/systemd/system/*.socket -/lib/systemd/system/basic.target.wants/*.service -/lib/systemd/system/sockets.target.wants/*.socket +%dir %attr(0755,root,root) %{_prefix}/lib/firmware +%dir %attr(0755,root,root) %{_prefix}/lib/firmware/updates +%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.service +%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.socket +%{_prefix}/lib/systemd/system/basic.target.wants/*.service +%{_prefix}/lib/systemd/system/sockets.target.wants/*.socket %files -n libudev %doc src/COPYING -%attr(0755,root,root) /%{_lib}/libudev.so.* +%attr(0755,root,root) %{_libdir}/libudev.so.* %files -n libudev-devel %doc src/docs/html/* @@ -158,7 +161,7 @@ systemctl daemon-reload >/dev/null 2>&1 || : %files -n libgudev1 %doc src/extras/gudev/COPYING -%attr(0755,root,root) /%{_lib}/libgudev-1.0.so.* +%attr(0755,root,root) %{_libdir}/libgudev-1.0.so.* %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib %files -n libgudev1-devel @@ -173,7 +176,11 @@ systemctl daemon-reload >/dev/null 2>&1 || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog -* Wed Jan 25 2012 Kay Sievers 180-1 +* Sun Jan 29 2012 Kay Sievers 180-2 + - install everything in /usr + https://fedoraproject.org/wiki/Features/UsrMove + +* Sun Jan 29 2012 Kay Sievers 180-1 - version 180 - fix rule execution (brc#785148) - ID_PART_* export for udisks2 From 9646fdce3ab5383710aefaaac5a944347b8e9dec Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 3 Feb 2012 11:36:31 +0100 Subject: [PATCH 60/66] test building with filesystem guard --- udev.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/udev.spec b/udev.spec index 82c072b..1b2c087 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 180 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -25,7 +25,7 @@ Requires: systemd-units Requires: util-linux >= 2.15.1 Conflicts: systemd < 39 Conflicts: dracut < 013-93 -Conflicts: filesystem < 3 +Conflicts: filesystem < 3-2 %ifarch s390 s390x # Require s390utils-base, because it's essential on s390 @@ -176,6 +176,9 @@ systemctl daemon-reload >/dev/null 2>&1 || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Fri Feb 3 2012 Kay Sievers 180-3 + - require an newer filesystem (repo test rebuild) + * Sun Jan 29 2012 Kay Sievers 180-2 - install everything in /usr https://fedoraproject.org/wiki/Features/UsrMove From d138c6fc556b77a1c7cb6764a2389af39a3f0d18 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 7 Feb 2012 02:10:33 +0100 Subject: [PATCH 61/66] version 181 --- .gitignore | 2 +- sources | 2 +- udev.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index fc16718..74b8c82 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/udev-180.tar.xz +/udev-181.tar.xz diff --git a/sources b/sources index c1d8327..e40f349 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8fb801e7d8371d1bc5c80535008d608 udev-180.tar.xz +ef86e3e1b4f3eaa9d8c72ac76b9466a7 udev-181.tar.xz diff --git a/udev.spec b/udev.spec index 1b2c087..7d30523 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 180 -Release: 3%{?dist} +Version: 181 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -14,7 +14,7 @@ BuildRequires: glib2-devel BuildRequires: hwdata BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: usbutils >= 0.82 -BuildRequires: kmod-devel >= 4 +BuildRequires: kmod-devel >= 5 BuildRequires: libblkid-devel >= 2.20 Obsoletes: dev <= 0:3.12-1 Provides: dev = 0:3.12-2 @@ -176,11 +176,16 @@ systemctl daemon-reload >/dev/null 2>&1 || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Tue Feb 7 2012 Kay Sievers 181-1 +- version 181 + - require kmod 5 + - provide /dev/cdrom for /dev/sr0 + * Fri Feb 3 2012 Kay Sievers 180-3 - - require an newer filesystem (repo test rebuild) +- require an newer filesystem (repo test rebuild) * Sun Jan 29 2012 Kay Sievers 180-2 - - install everything in /usr +- install everything in /usr https://fedoraproject.org/wiki/Features/UsrMove * Sun Jan 29 2012 Kay Sievers 180-1 From 1fcd4845c9b26c2226bf4e20f75394e46142a7a6 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 9 Feb 2012 13:08:07 +0100 Subject: [PATCH 62/66] rebuild with fixed binutils --- udev.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/udev.spec b/udev.spec index 7d30523..660f4fa 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 181 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -16,8 +16,6 @@ BuildRequires: gobject-introspection-devel >= 0.6.2 BuildRequires: usbutils >= 0.82 BuildRequires: kmod-devel >= 5 BuildRequires: libblkid-devel >= 2.20 -Obsoletes: dev <= 0:3.12-1 -Provides: dev = 0:3.12-2 Requires(pre): fileutils Requires(pre): /usr/bin/getent /usr/sbin/groupadd Requires: hwdata @@ -176,6 +174,10 @@ systemctl daemon-reload >/dev/null 2>&1 || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Thu Feb 09 2012 Kay Sievers - 181-2 +- rebuild with fixed binutils +- remove 'dev' package dependency handling + * Tue Feb 7 2012 Kay Sievers 181-1 - version 181 - require kmod 5 From b59133e5f90761a437061d6c1c74a7765afe4894 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sun, 18 Mar 2012 20:24:36 +0100 Subject: [PATCH 63/66] version 182 --- .gitignore | 2 +- sources | 2 +- udev.spec | 17 ++++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 74b8c82..fbb633d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/udev-181.tar.xz +/udev-182.tar.xz diff --git a/sources b/sources index e40f349..9690345 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef86e3e1b4f3eaa9d8c72ac76b9466a7 udev-181.tar.xz +d0a1ac9501d7c4ae68839d1b601592b8 udev-182.tar.xz diff --git a/udev.spec b/udev.spec index 660f4fa..dc7af54 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev -Version: 181 -Release: 2%{?dist} +Version: 182 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -129,7 +129,7 @@ systemctl daemon-reload >/dev/null 2>&1 || : %postun -n libgudev1 -p /sbin/ldconfig %files -%doc NEWS COPYING README TODO ChangeLog src/extras/keymap/README.keymap.txt +%doc NEWS COPYING README TODO ChangeLog src/keymap/README.keymap.txt %{_bindir}/udevadm %{_sbindir}/udevadm %{_prefix}/lib/udev @@ -158,12 +158,12 @@ systemctl daemon-reload >/dev/null 2>&1 || : %{_datadir}/gtk-doc/html/libudev/* %files -n libgudev1 -%doc src/extras/gudev/COPYING +%doc src/gudev/COPYING %attr(0755,root,root) %{_libdir}/libgudev-1.0.so.* %attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib %files -n libgudev1-devel -%doc src/extras/gudev/docs/html/* +%doc src/gudev/docs/html/* %attr(0755,root,root) %{_libdir}/libgudev-1.0.so %dir %attr(0755,root,root) %{_includedir}/gudev-1.0 %dir %attr(0755,root,root) %{_includedir}/gudev-1.0/gudev @@ -174,6 +174,13 @@ systemctl daemon-reload >/dev/null 2>&1 || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Sun Mar 18 2012 Kay Sievers - 182-1 +- version 182 + - enable USB sutosuspend for some built-in HID devices + - do not create /dev/disk/by-path/ for 'ATA transport class' devices + - do not create /dev/disk/by-id/scsi-* for pure ATA devices + - let rules file in /etc override rules with the same name in /run + * Thu Feb 09 2012 Kay Sievers - 181-2 - rebuild with fixed binutils - remove 'dev' package dependency handling From 38609fdb7ff28c251c81e709afc21a001612dd8c Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 27 Mar 2012 16:54:27 +0200 Subject: [PATCH 64/66] udev-182-2 - removed s390 rules --- udev.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/udev.spec b/udev.spec index dc7af54..93ff898 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 182 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -104,9 +104,6 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware/updates mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sbindir} ln -sf ../bin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevadm -%ifarch s390 s390x -install -m 0644 rules/arch/40-s390.rules $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d -%endif %pre getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || : @@ -174,6 +171,9 @@ systemctl daemon-reload >/dev/null 2>&1 || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Tue Mar 27 2012 Harald Hoyer 182-2 +- removed s390 rules + * Sun Mar 18 2012 Kay Sievers - 182-1 - version 182 - enable USB sutosuspend for some built-in HID devices From a07cb8f5f4171b869e6644fd507e84a34eadff2f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 24 May 2012 22:51:05 +0200 Subject: [PATCH 65/66] drop dependency on specific udev daemon verison --- udev.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/udev.spec b/udev.spec index 93ff898..437d229 100644 --- a/udev.spec +++ b/udev.spec @@ -1,7 +1,7 @@ Summary: A rule-based device node and kernel event manager Name: udev Version: 182 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Base Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz @@ -40,7 +40,6 @@ removed from the system. %package -n libudev Summary: Dynamic library to access udev device information Group: System Environment/Libraries -Requires: udev = %{version}-%{release} Conflicts: filesystem < 3 License: LGPLv2+ @@ -171,6 +170,9 @@ systemctl daemon-reload >/dev/null 2>&1 || : %attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* %changelog +* Thu May 24 2012 Kay Sievers - 182-3 +- libudev: drop dependency on specific udev daemon version + * Tue Mar 27 2012 Harald Hoyer 182-2 - removed s390 rules From ce9320b04bb17d68672063a8a8308ad8721c14a1 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 11 Jul 2012 14:28:30 +0200 Subject: [PATCH 66/66] obsolete udev, it is replaced by systemd --- .gitignore | 1 - Makefile.git | 6 - dead.package | 1 + mirrors | 1 - sources | 1 - udev.spec | 1536 -------------------------------------------------- 6 files changed, 1 insertion(+), 1545 deletions(-) delete mode 100644 .gitignore delete mode 100644 Makefile.git create mode 100644 dead.package delete mode 100644 mirrors delete mode 100644 sources delete mode 100644 udev.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index fbb633d..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/udev-182.tar.xz diff --git a/Makefile.git b/Makefile.git deleted file mode 100644 index ea5486a..0000000 --- a/Makefile.git +++ /dev/null @@ -1,6 +0,0 @@ -Patch: - @for i in 00*.patch; do n=$$[$$(echo $$i|cut -f 1 -d '-'|sed -e 's#^0*##')]; echo "Patch$$n: $$i";done - -patch: - @for i in 00*.patch; do n=$$[$$(echo $$i|cut -f 1 -d '-'|sed -e 's#^0*##')]; echo "%patch$$n -p1 -b .git$$n";done - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..401b5da --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +obsolete udev, it is replaced by systemd diff --git a/mirrors b/mirrors deleted file mode 100644 index 74b0af6..0000000 --- a/mirrors +++ /dev/null @@ -1 +0,0 @@ -ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ diff --git a/sources b/sources deleted file mode 100644 index 9690345..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -d0a1ac9501d7c4ae68839d1b601592b8 udev-182.tar.xz diff --git a/udev.spec b/udev.spec deleted file mode 100644 index 437d229..0000000 --- a/udev.spec +++ /dev/null @@ -1,1536 +0,0 @@ -Summary: A rule-based device node and kernel event manager -Name: udev -Version: 182 -Release: 3%{?dist} -License: GPLv2+ -Group: System Environment/Base -Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/%{name}-%{version}.tar.xz -URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -BuildRequires: libtool -BuildRequires: pkgconfig -BuildRequires: gperf -BuildRequires: libselinux-devel libsepol-devel -BuildRequires: glib2-devel -BuildRequires: hwdata -BuildRequires: gobject-introspection-devel >= 0.6.2 -BuildRequires: usbutils >= 0.82 -BuildRequires: kmod-devel >= 5 -BuildRequires: libblkid-devel >= 2.20 -Requires(pre): fileutils -Requires(pre): /usr/bin/getent /usr/sbin/groupadd -Requires: hwdata -Requires: systemd-units -Requires: util-linux >= 2.15.1 -Conflicts: systemd < 39 -Conflicts: dracut < 013-93 -Conflicts: filesystem < 3-2 - -%ifarch s390 s390x -# Require s390utils-base, because it's essential on s390 -Requires: s390utils-base -%endif - -%description -udev is a collection of tools and a daemon to manage events received -from the kernel and deal with them in user-space. Primarily this -involves managing permissions, and creating and removing meaningful -symlinks to device nodes in /dev when hardware is discovered or -removed from the system. - -%package -n libudev -Summary: Dynamic library to access udev device information -Group: System Environment/Libraries -Conflicts: filesystem < 3 -License: LGPLv2+ - -%description -n libudev -This package contains the dynamic library libudev, which provides access -to udev device information, and an interface to search devices in sysfs. - -%package -n libudev-devel -Summary: Development files for libudev -Group: Development/Libraries -Requires: libudev = %{version}-%{release} -Requires: pkgconfig -License: LGPLv2+ - -%description -n libudev-devel -This package contains the development files for the library libudev, a -dynamic library, which provides access to udev device information. - -%package -n libgudev1 -Summary: Libraries for adding libudev support to applications that use glib -Group: Development/Libraries -Requires: libudev = %{version}-%{release} -Conflicts: filesystem < 3 -License: LGPLv2+ - -%description -n libgudev1 -This package contains the libraries that make it easier to use libudev -functionality from applications that use glib. - -%package -n libgudev1-devel -Summary: Header files for adding libudev support to applications that use glib -Group: Development/Libraries -Requires: libgudev1 = %{version}-%{release} -License: LGPLv2+ - -%description -n libgudev1-devel -This package contains the header and pkg-config files for developing -glib-based applications using libudev functionality. - -%prep -%setup -q - -%build -# prevent man pages from re-building (xsltproc) -find . -name "*.[1-8]" -exec touch '{}' \; -export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fPIE -DPIE -pie -Wl,-z,relro -Wl,-z,now" -export V=1 -%configure \ - --prefix=%{_prefix} \ - --sysconfdir=%{_sysconfdir} \ - --libexecdir=%{_prefix}/lib \ - --with-selinux \ - --with-systemdsystemunitdir=%{_prefix}/lib/systemd/system -make %{?_smp_mflags} - -%install -make install DESTDIR=$RPM_BUILD_ROOT -rm -fr $RPM_BUILD_ROOT%{_docdir}/udev -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware -mkdir -p -m 0755 $RPM_BUILD_ROOT%{_prefix}/lib/firmware/updates -mkdir -p -m 0755 $RPM_BUILD_ROOT%{_sbindir} -ln -sf ../bin/udevadm $RPM_BUILD_ROOT%{_sbindir}/udevadm - -%pre -getent group cdrom >/dev/null || /usr/sbin/groupadd -g 11 cdrom || : -getent group tape >/dev/null || /usr/sbin/groupadd -g 33 tape || : -getent group dialout >/dev/null || /usr/sbin/groupadd -g 18 dialout || : -getent group floppy >/dev/null || /usr/sbin/groupadd -g 19 floppy || : -systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || : - -%post -systemctl daemon-reload >/dev/null 2>&1 || : -systemctl start udev.service >/dev/null 2>&1 || : - -%postun -systemctl daemon-reload >/dev/null 2>&1 || : - -%post -n libudev -p /sbin/ldconfig -%postun -n libudev -p /sbin/ldconfig - -%post -n libgudev1 -p /sbin/ldconfig -%postun -n libgudev1 -p /sbin/ldconfig - -%files -%doc NEWS COPYING README TODO ChangeLog src/keymap/README.keymap.txt -%{_bindir}/udevadm -%{_sbindir}/udevadm -%{_prefix}/lib/udev -%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf -%attr(0755,root,root) %dir %{_sysconfdir}/udev/ -%attr(0755,root,root) %dir %{_sysconfdir}/udev/rules.d/ -%attr(0644,root,root) %{_mandir}/man7/*.7* -%attr(0644,root,root) %{_mandir}/man8/*.8* -%{_datadir}/pkgconfig/udev.pc -%dir %attr(0755,root,root) %{_prefix}/lib/firmware -%dir %attr(0755,root,root) %{_prefix}/lib/firmware/updates -%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.service -%attr(0644,root,root) %{_prefix}/lib/systemd/system/*.socket -%{_prefix}/lib/systemd/system/basic.target.wants/*.service -%{_prefix}/lib/systemd/system/sockets.target.wants/*.socket - -%files -n libudev -%doc src/COPYING -%attr(0755,root,root) %{_libdir}/libudev.so.* - -%files -n libudev-devel -%doc src/docs/html/* -%{_includedir}/libudev.h -%{_libdir}/libudev.so -%{_libdir}/pkgconfig/libudev.pc -%{_datadir}/gtk-doc/html/libudev/* - -%files -n libgudev1 -%doc src/gudev/COPYING -%attr(0755,root,root) %{_libdir}/libgudev-1.0.so.* -%attr(0644,root,root) %{_libdir}/girepository-1.0/GUdev-1.0.typelib - -%files -n libgudev1-devel -%doc src/gudev/docs/html/* -%attr(0755,root,root) %{_libdir}/libgudev-1.0.so -%dir %attr(0755,root,root) %{_includedir}/gudev-1.0 -%dir %attr(0755,root,root) %{_includedir}/gudev-1.0/gudev -%attr(0644,root,root) %{_includedir}/gudev-1.0/gudev/*.h -%attr(0644,root,root) %{_datadir}/gir-1.0/GUdev-1.0.gir -%dir %{_datadir}/gtk-doc/html/gudev -%attr(0644,root,root) %{_datadir}/gtk-doc/html/gudev/* -%attr(0644,root,root) %{_libdir}/pkgconfig/gudev-1.0* - -%changelog -* Thu May 24 2012 Kay Sievers - 182-3 -- libudev: drop dependency on specific udev daemon version - -* Tue Mar 27 2012 Harald Hoyer 182-2 -- removed s390 rules - -* Sun Mar 18 2012 Kay Sievers - 182-1 -- version 182 - - enable USB sutosuspend for some built-in HID devices - - do not create /dev/disk/by-path/ for 'ATA transport class' devices - - do not create /dev/disk/by-id/scsi-* for pure ATA devices - - let rules file in /etc override rules with the same name in /run - -* Thu Feb 09 2012 Kay Sievers - 181-2 -- rebuild with fixed binutils -- remove 'dev' package dependency handling - -* Tue Feb 7 2012 Kay Sievers 181-1 -- version 181 - - require kmod 5 - - provide /dev/cdrom for /dev/sr0 - -* Fri Feb 3 2012 Kay Sievers 180-3 -- require an newer filesystem (repo test rebuild) - -* Sun Jan 29 2012 Kay Sievers 180-2 -- install everything in /usr - https://fedoraproject.org/wiki/Features/UsrMove - -* Sun Jan 29 2012 Kay Sievers 180-1 -- version 180 - - fix rule execution (brc#785148) - - ID_PART_* export for udisks2 -- temporarily revert 'install everything in /usr' to be - able to update teh current rawhide package without the - dependency on the /usr-move converted filessytem - -* Wed Jan 25 2012 Kay Sievers 179-3 -- use %{_sbindir} - -* Wed Jan 25 2012 Kay Sievers 179-2 -- install everything in /usr - https://fedoraproject.org/wiki/Features/UsrMove - -* Wed Jan 25 2012 Kay Sievers 179-1 -- version 179 - - devtmpfs is mandatory now - - /run is mandatory now - - modules are loaded with 'libkmod' - - blkid is built-in now - -* Sat Jan 14 2012 Fedora Release Engineering - 175-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Nov 7 2011 Kay Sievers 175-1 -- version 175 - - bug fix release - -* Sat Oct 22 2011 Kay Sievers 174-2 -- ignore entire rule when a key is unknown (brc#748082) - -* Thu Oct 20 2011 Kay Sievers 174-1 -- version 174 - - path_id, usb_id, input_id tools are built-in commands - - fusectl is mounted by systemd - - SYSFS=, ID=, BUS= are removed - - udevadm trigger --type=failed is removed - - udev control socket is now in /run/udev/control - - disable persistent net and cdrom rule generator -- remove obsolete rpm dependencies -- remove SYSV init script controls - -* Mon Aug 29 2011 Kay Sievers 173-3 -- fix bluetooth input device handling (brc#733862) - -* Mon Aug 29 2011 Daniel Drake 173-2 -- Update OLPC XO keymap - -* Mon Aug 01 2011 Harald Hoyer 173-1 -- version 173 -- udev-acl functionality is in systemd - -* Wed Jul 20 2011 Harald Hoyer 172-2 -- removed loop devices (should be compiled in the kernel) -- removed deprecated directories -- removed scsi_id symlink -- cleanup of requirements - -* Mon Jul 11 2011 Harald Hoyer 172-1 -- version 172 - -* Mon Jun 20 2011 Harald Hoyer 171-2 -- build without introspection -- removed unused dirs -- added ConsoleKit dirs - -* Fri May 27 2011 Harald Hoyer 171-1 -- version 171 - -* Fri May 20 2011 Harald Hoyer 170-1 -- version 170 -- removed /sbin/start_udev - -* Mon Apr 11 2011 Harald Hoyer 167-4 -- more selinux fixes - -* Thu Apr 7 2011 Adam Williamson - 167-3 -- selinux_label.patch: from upstream, don't label files outside of /dev - -* Thu Mar 31 2011 Harald Hoyer 167-2 -- fixed udev-trigger.service - -* Wed Mar 30 2011 Harald Hoyer 167-1 -- version 167 - -* Wed Mar 23 2011 Harald Hoyer 166-2 -- add ACLs for harmony remote controls -Resolves: rhbz#559412 -- fixed CDROM profile handling - -* Wed Feb 16 2011 Harald Hoyer 166-1 -- renamed udev-post initscript to udev-retry to match - upstream systemd service name -- version 166 - -* Mon Feb 07 2011 Fedora Release Engineering - 164-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Feb 02 2011 Harald Hoyer 164-8 -- fixed: network device renaming 2-step exceeds IFNAMSIZ -Resolves: rhbz#673675 -- removed v4l version 1 - -* Fri Jan 21 2011 Harald Hoyer 164-7 -- removed unnecessary devices from /lib/udev/devices - -* Mon Dec 06 2010 Harald Hoyer 164-6 -- removed MAKEDEV symlink -Resolves: rhbz#660091 -- fixed kill loop -Resolves: rhbz#657651 - -* Thu Nov 25 2010 Bastien Nocera 164-5 -- Add patches to fix touchpad toggle key handling - -* Fri Nov 12 2010 Harald Hoyer 164-4 -- add ACLs for PDA devices -Resolves: rhbz#642435 - -* Fri Nov 12 2010 Harald Hoyer 164-3 -- enlarged the import buffer to fix the ressize bugs -Resolves: rhbz#652318 - -* Fri Nov 12 2010 Harald Hoyer 164-2 -- do not create mount point dirs in /dev - -* Fri Oct 29 2010 Harald Hoyer 164-1 -- version 164 -- skip start_udev with systemd - -* Wed Sep 29 2010 jkeating - 161-4 -- Rebuilt for gcc bug 634757 - -* Tue Sep 21 2010 Matthias Clasen 161-3 -- Rebuild against newer gobject-introspection - -* Wed Sep 01 2010 Harald Hoyer 161-2 -- bugfixes for systemd service files -- bugfix for selinux labeling -- bugfixes for cdrom_id - -* Tue Aug 17 2010 Harald Hoyer 161-1 -- udev-161 with an upstream quirk for the qemu cdrom and - more cdrom handling bugfixes -Resolves: rhbz#609049 rhbz#624286 -- added floppy group -Resolves: rhbz#620814 - -* Fri Aug 06 2010 Harald Hoyer 160-9 -- added quirk to cdrom_id, to boot from qemu -Resolves: rhbz#609049 -- fix console switching and ACLs -Resolves: rhbz#608712 -- minor bugfixes - -* Tue Jul 20 2010 Harald Hoyer 160-8 -- make loop block device again - -* Tue Jul 20 2010 Harald Hoyer 160-7 -- turn off hotplug in /sys/kernel/uevent_helper or /proc/sys/kernel/hotplug - -* Thu Jul 15 2010 Harald Hoyer 160-6 -- add versioned requires for libudev to udev - -* Wed Jul 14 2010 Dan Horák 160-5 -- update paths to arch-specific rules - -* Tue Jul 13 2010 Lennart Poettering - 160-4 -- Comment systemd-install for now as long as sysinit is not split into pieces - -* Tue Jul 13 2010 Lennart Poettering - 160-3 -- Update systemd-install lines to use --realize instead of --start (which got renamed in systemd) - -* Tue Jul 13 2010 Lennart Poettering - 160-2 -- Don't require systemd .pc file, to break build dependency cycle - -* Tue Jul 13 2010 Harald Hoyer 160-1 -- version 160 -- add systemd service files -- fixed COPYRIGHT files - -* Fri Jun 25 2010 Harald Hoyer 158-2 -- moved udev pkgconfig to base file on authors request -- specfile cleanups - -* Thu Jun 24 2010 Harald Hoyer 158-1 -- version 158 - -* Thu May 27 2010 Harald Hoyer 156-2 -- cleaned up start_udev and udev-post initscript -- removed redhat specific rules -- removed all the makedev.d stuff, udevd now natively supports - /lib/udev/devices -- added basic devices in /lib/udev/devices - -* Tue May 25 2010 Harald Hoyer 156-1 -- version 156 - -* Tue May 25 2010 Harald Hoyer 155-1 -- version 155 - -* Wed May 12 2010 Harald Hoyer 154-1 -- version 154 - -* Tue Apr 27 2010 Harald Hoyer 153-1.20100427git -- version 153 - -* Tue Apr 13 2010 Harald Hoyer 152-0.1.20100413git -- pre release of version 152 - -* Mon Mar 22 2010 Harald Hoyer 151-8 -- only correct the timestamp, if UTC=="no" - -* Mon Mar 22 2010 Harald Hoyer 151-7 -- touch with "--no-create", will not use open() - and trigger devs/watchdogs (bug #575417) - -* Mon Mar 22 2010 Harald Hoyer 151-6 -- fixed return code of touching the device nodes [FAIL] -> [OK] - -* Fri Mar 19 2010 Harald Hoyer 151-5 -- add "-D" to gperf call - -* Fri Mar 19 2010 Harald Hoyer 151-4 -- add patch for virtio-ports (#569700) -- own libgudev dirs (#561319) -- minor udev startup script improvements (#549518) -- create /dev/hugepages subdir in start_udev (#541998) -- remove GPL COPYING file from LGPL subpackages (#536843) -- removed symlinks to udevadm -- touch all device nodes after udev settled for the timezone - timestamp (#569335) -- add some upstream bugfixes - -* Sun Feb 07 2010 Kyle McMartin 151-3 -- udev-86a7a2f-fix-missing-firmware.patch: fix hang when loading - microcode (since microcode_intel tries to probe firmware which does - not exist. *sigh*) - -* Fri Jan 29 2010 Harald Hoyer 151-2 -- fixed rules and startup script (#559844) - -* Wed Jan 27 2010 Harald Hoyer 151-1 -- version 151 -- fixed udev-post initscript -- only require s390utils-base, rather than s390utils (#553156) - -* Tue Nov 24 2009 Harald Hoyer 147-2 -- require s390utils, because it's essential on s390 - -* Thu Nov 12 2009 Harald Hoyer 147-1 -- version 147 -- Fix upgrade from Fedora 11 with bluez installed (#533925) -- obsolete DeviceKit and DeviceKit-devel (#532961) -- fixed udev-post exit codes (#523976) -- own directory /lib/udev/keymaps (#521801) -- no more floppy modaliases (#514329) -- added one more modems to modem-modeswitch.rules (#515349) -- add NEWS file to the doc section -- automatically turn on hotplugged CPUs (rhbz#523127) -- recognize a devtmpfs on /dev (bug #528488) - -* Fri Oct 09 2009 Harald Hoyer 147-0.1.gitdf3e07d -- pre 147 -- database format changed -- lots of potential buffer overflow fixes - -* Tue Sep 29 2009 Harald Hoyer 145-10 -- add ConsoleKit patch for ConsoleKit 0.4.1 - -* Fri Sep 25 2009 harald@redhat.com 145-9 -- add patches to fix cdrom_id -- add patch to fix the inotify bug (bug #524752) - -* Wed Sep 23 2009 harald@redhat.com 145-8 -- obsolete libgudev and libgudev-devel (bug #523569) - -* Mon Aug 24 2009 Karsten Hopp 145-7 -- drop ifnarch s390x for usbutils, as we now have usbutils for s390x - -* Mon Aug 24 2009 Harald Hoyer 145-6 -- ifnarch s390 for usbutils - -* Tue Aug 04 2009 Harald Hoyer 145-5 -- do not make extra nodes in parallel -- restorecon on /dev - -* Tue Aug 04 2009 Harald Hoyer 145-4 -- --enable-debug -- add patch for timestamps in debugging output - -* Wed Jul 29 2009 Harald Hoyer 145-3 -- add patch from upstream git to fix bug #514086 -- add version to usbutils build requirement - -* Fri Jul 24 2009 Harald Hoyer 145-2 -- fix file permissions -- remove rpath -- chkconfig --add for udev-post -- fix summaries -- add "Required-Stop" to udev-post - -* Tue Jul 14 2009 Harald Hoyer 145-1 -- version 145 -- add "udevlog" kernel command line option to redirect the - output of udevd to /dev/.udev/udev.log - -* Fri Jul 03 2009 Harald Hoyer 143-2 -- add acpi floppy modalias -- add retrigger of failed events in udev-post.init -- killall pids of udev in %%pre - -* Fri Jun 19 2009 Harald Hoyer 143-1 -- version 143 - -* Thu Jun 08 2009 Harald Hoyer 142-4 -- git fix: udevadm: settle - fix timeout -- git fix: OWNER/GROUP: fix if logic -- git fix: rule-generator: cd - skip by-path links if we create by-id links -- git fix: fix possible endless loop for GOTO to non-existent LABEL -- git fix: cdrom_id: suppress ID_CDROM_MEDIA_STATE=blank for plain non-writable - CDROM media - -* Thu Jun 08 2009 Harald Hoyer 142-3 -- delay device-mapper changes - -* Fri Jun 05 2009 Bastien Nocera 142-2 -- Rebuild in dist-f12 - -* Fri May 15 2009 Harald Hoyer 142-1 -- version 142 -- no more libvolume_id and vol_id - -* Fri Apr 17 2009 Harald Hoyer 141-3 -- added /dev/fuse creation to start_udev - -* Thu Apr 16 2009 Harald Hoyer 141-2 -- fixed post and pre - -* Tue Apr 14 2009 Harald Hoyer 141-1 -- version 141 - -* Wed Apr 01 2009 Harald Hoyer 139-4 -- double the IMPORT buffer (bug #488554) -- Resolves: rhbz#488554 - -* Wed Apr 01 2009 Harald Hoyer 139-3 -- renamed modprobe /etc/modprobe.d/floppy-pnp to - /etc/modprobe.d/floppy-pnp.conf (bug #492732 #488768) -- Resolves: rhbz#492732 - -* Tue Mar 03 2009 Harald Hoyer 139-2 -- speedup of start_udev by doing make_extra_nodes in parallel to - the daemon start - -* Fri Feb 27 2009 Harald Hoyer 139-1 -- version 139 - -* Wed Feb 25 2009 Fedora Release Engineering - 137-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Feb 05 2009 Harald Hoyer 137-4 -- fixed md change/remove event handling - -* Thu Feb 05 2009 Harald Hoyer 137-3 -- added 5 second sleep for "modprobedebug" to catch bad modules - -* Fri Jan 30 2009 Harald Hoyer 137-2 -- moved groupadd to pre section (bug #483089) - -* Thu Jan 29 2009 Harald Hoyer 137-1 -- version 137 -- add vol_id patches from kzak -- dialout group has gid 18 now - -* Tue Jan 20 2009 Harald Hoyer 136-2 -- added some rule fixes, which will be in udev-137 - -* Tue Jan 20 2009 Harald Hoyer 136-1 -- test for restorecon in start_udev before it is used (bug #480608) -- added groups video audio cdrom tape dialout in post - (might be moved to MAKEDEV) -- version 136 - -* Tue Dec 16 2008 Harald Hoyer 135-3 -- added sepol patch - -* Tue Dec 16 2008 Harald Hoyer 135-2 -- changed udevsettle -> udevadm settle -- added doc to libudev-devel -- added more attr and defattr -- various rpmlint fixes - -* Tue Dec 02 2008 Harald Hoyer 135-1 -- version 135 - -* Wed Nov 19 2008 Harald Hoyer 133-1 -- version 133 - -* Mon Nov 10 2008 Harald Hoyer 132-1 -- version 132 -- added memory stick rules (bug #470096) - -* Thu Oct 16 2008 Harald Hoyer 127-2 -- added 2 patches for md raid vol_id - -* Mon Sep 01 2008 Harald Hoyer 127-1 -- version 127 - -* Fri Aug 08 2008 Harald Hoyer 126-1 -- version 126 -- fixed udevadm syntax in start_udev (credits B.J.W. Polman) -- removed some manually created devices from makedev (bug #457125) - -* Tue Jun 17 2008 Harald Hoyer 124-1.1 -- readded udevcontrol, udevtrigger symlinks for Fedora 9, - which are needed by live-cd-tools - -* Thu Jun 12 2008 Harald Hoyer 124-1 -- version 124 -- removed udevcontrol, udevtrigger symlinks (use udevadm now) - -* Tue Jun 3 2008 Jeremy Katz - 121-2.20080516git -- Add lost F9 change to remove /dev/.udev in start_udev (#442827) - -* Fri May 16 2008 Harald Hoyer 121-1.20080516git -- version 121 + latest git fixes - -* Thu May 07 2008 Harald Hoyer 120-6.20080421git -- added input/hp_ilo_mouse symlink - -* Tue May 06 2008 Harald Hoyer 120-5.20080421git -- remove /dev/.udev in start_udev (bug #442827) - -* Mon Apr 21 2008 Harald Hoyer 120-4.20080421git -- added patches from git: -- persistent device naming: also read unpartitioned media -- scsi_id: initialize serial strings -- logging: add trailing newline to all strings -- path_id: remove subsystem whitelist -- allow setting of MODE="0000" -- selinux: more context settings -- rules_generator: net rules - always add KERNEL== match to generated rules -- cdrom_id: replace with version which also exports media properties -- vol_id: add --offset option -- udevinfo: do not replace chars when printing ATTR== matches -- Resolves: rhbz#440568 - -* Fri Apr 11 2008 Harald Hoyer 120-3 -- fixed pre/preun scriptlets (bug #441941) -- removed fedora specific patch for selinux symlink handling - -* Sat Apr 05 2008 Harald Hoyer 120-2 -- removed warning about deprecated /lib/udev/devices (rhbz#440961) -- replaced /usr/bin/find with shell find function (rhbz#440961) - -* Fri Apr 04 2008 Harald Hoyer 120-1 -- version 120 - -* Mon Mar 17 2008 Harald Hoyer 118-11 -- removed /var/lib/udev/rules.d again - -* Fri Mar 14 2008 Harald Hoyer 118-10 -- turned off MAKEDEV cache, until the generated shell scripts - create new directories - -* Thu Mar 13 2008 Harald Hoyer 118-9 -- added more support for the "modprobedebug" kernel command - line option, to debug hanging kernel modules - -* Thu Mar 13 2008 Harald Hoyer 118-8 -- added /etc/sysconfig/udev to configure some speedups -- added "udevnopersist" as a kernel command line, to disable - persistent storage symlink generation - -* Thu Mar 13 2008 Harald Hoyer 118-7 -- files from /var/lib/udev/rules.d are copied to /dev/.udev/rules.d - at startup and back at shutdown -- persistent cd and net rules generate the files in - /dev/.udev/rules.d now -- added post section to symlink 70-persistent-cd.rules 70-persistent-net.rules - from /etc/udev/rules.d to /dev/.udev/rules.d - -* Thu Mar 13 2008 Harald Hoyer 118-6 -- moved all generated files to /var/lib/udev - (also 70-persistent-cd.rules 70-persistent-net.rules) -- added a caching mechanism for MAKEDEV (saves some seconds on startup) -- added trigger for selinux-policy and MAKEDEV to remove the udev cache files - -* Wed Feb 20 2008 Harald Hoyer 118-4 -- made symlinks relative (rhbz#432878) -- removed the backgrounding of node creation (rhbz#381461) -- do not change sg group ownership to disk for scanners (rhbz#432602) -- attempt to fix selinux symlink bug (rhbz#345071) -- fixed URL -- made rpmlint mostly happy -- disabled static version (no static selinux lib) - -* Mon Feb 18 2008 Fedora Release Engineering - 118-3 -- Autorebuild for GCC 4.3 - -* Wed Jan 09 2008 Harald Hoyer 118-2 -- reenabled static version - -* Tue Jan 08 2008 Harald Hoyer 118-1 -- version 118 -- removed old USB compat rule (rhbz#424331) -- disabled static version - -* Thu Oct 18 2007 Harald Hoyer 116-3 -- fixed preun chkconfig -- added /sbin path to chkconfig in post section -- patch: do not generate net rules for type > 256 -- fixes glitches appearing in bz#323991 - -* Tue Oct 16 2007 Dennis Gilmore 116-2 -- sparc64 requires -fPIE not -fpie - -* Mon Oct 15 2007 Harald Hoyer 116-1 -- version 116 - -* Fri Oct 12 2007 Harald Hoyer 115-5.20071012git -- added upstream patch for rhbz#328691 -- moved floppy module loading to pnp-alias in /etc/modprobe.d/floppy-pnp - -* Wed Oct 10 2007 Harald Hoyer 115-5.20070921git -- better modprobe options for the kernel command line 'modprobedebug' option - -* Fri Sep 21 2007 Harald Hoyer - 115-4 -- more upstream fixes from git - -* Thu Sep 20 2007 Harald Hoyer - 115-3 -- some upstream fixes from git -- removed last_rule for loop rules -- added "udevinfo udevtrace" kernel command line options for better debugging - -* Fri Sep 07 2007 Harald Hoyer - 115-2 -- some upstream fixes from git -- last_rule for loop rules (speedup for live-cds/qemu with 128 loop devices) - -* Thu Aug 24 2007 Harald Hoyer - 115-1 -- version 115 - -* Fri Aug 24 2007 Harald Hoyer - 113-12 -- removed /dev/tape symlink, because it's now a directory - (bug #251755) - -* Thu Aug 23 2007 Harald Hoyer - 114-4 -- added patch to prevent persistent net rules for virtual network interfaces, - like vmware and vlans - -* Thu Aug 23 2007 Harald Hoyer - 114-3 -- changed license tag -- changed to latest upstream rule ordering - -* Thu Aug 16 2007 Harald Hoyer - 113-11 -- readded firmware rule (#252983) - -* Wed Aug 15 2007 Harald Hoyer - 113-10 -- do not run vol_id on non-partition block devices (bug #251401) -- read all multiline pnp modaliases again - -* Mon Aug 13 2007 Harald Hoyer - 114-2 -- fixed isapnp rule (bug #251815) -- fix for nikon cameras (bug #251401) - -* Fri Aug 10 2007 Harald Hoyer - 114-1 -- version 114 -- big rule unification and cleanup -- added persistent names for network and cdrom devices over reboot - -* Wed Aug 08 2007 Harald Hoyer - 113-9 -- added lp* to 50-udev.nodes (#251272) - -* Mon Jul 30 2007 Harald Hoyer - 113-8 -- removed "noreplace" config tag from rules (#250043) - -* Fri Jul 27 2007 Harald Hoyer - 113-7 -- major rule cleanup -- removed persistent rules from 50 and included upstream rules -- removed skip_wait from modprobe - -* Fri Jul 20 2007 Harald Hoyer - 113-6 -- kernel does not provide usb_device anymore, - corrected the rules (#248916) - -* Thu Jul 19 2007 Harald Hoyer - 113-5 -- corrected the rule for usb devices (#248916) - -* Sat Jul 14 2007 Harald Hoyer - 113-4 -- do not collect modprobes (bug #222542), because firmware - loading seems to depend on it. - -* Mon Jul 9 2007 Harald Hoyer - 113-3 -- speedup things a little bit - -* Wed Jun 27 2007 Harald Hoyer - 113-2 -- added more firewire symlinks (#240770) -- minor rule patches - -* Tue Jun 26 2007 Harald Hoyer - 113-1 -- version 113 -- added rule for SD cards in a TI FlashMedia slot (#217070) - -* Tue Jun 26 2007 Harald Hoyer - 106-4.1 -- fixed modprobedebug option -- removed snd-powermac from the default modules (#200585) - -* Wed May 02 2007 Harald Hoyer - 106-4 -- do not skip all events on modprobe (#238385) -- Resolves: rhbz#238385 - -* Fri Apr 27 2007 Harald Hoyer - 106-3 -- modprobe only on modalias (bug #238140) -- make startup messages visible again -- speedup boot process by not executing pam_console_apply while booting -- Resolves: rhbz#238140 - -* Wed Apr 11 2007 Harald Hoyer - 106-2 -- create floppy device nodes with the correct selinux context (bug #235953) -- Resolves: rhbz#235953 - -* Wed Mar 7 2007 Harald Hoyer - 106-1 -- version 106 -- specfile cleanup -- removed pilot rule -- removed dasd_id and dasd_id rule -- provide static versions in a subpackage - -* Wed Feb 21 2007 Harald Hoyer - 105-1 -- version 105 - -* Tue Feb 6 2007 Harald Hoyer - 104-2 -- moved uinput to input subdirectory (rhbz#213854) -- added USB floppy symlinks (rhbz#185171) -- fixed ZIP drive handling (rhbz#223016) -- Resolves: rhbz#213854,rhbz#185171,rhbz#223016 - -* Tue Jan 23 2007 Harald Hoyer - 104-1 -- version 104 -- merged changes from RHEL - -* Wed Dec 6 2006 Harald Hoyer - 103-3 -- changed DRIVER to DRIVERS -- Resolves: rhbz#218160 - -* Fri Nov 10 2006 Harald Hoyer - 103-2 -- changed SYSFS to new ATTR rules -- Resolves: rhbz#214898 - -* Fri Nov 10 2006 Harald Hoyer - 103-1 -- Removed 51-hotplug.rules -- Resolves: rhbz#214277 - -* Wed Oct 11 2006 Harald Hoyer - 095-14 -- skip persistent block for gnbd devices (bug #210227) - -* Wed Oct 4 2006 Harald Hoyer - 095-13 -- fixed path_id script (bug #207139) - -* Tue Oct 3 2006 Jeremy Katz - 095-12 -- autoload mmc_block (#171687) - -* Wed Sep 27 2006 Harald Hoyer - 095-10 -- typo in xpram/slram rule (bug #205563) - -* Mon Sep 25 2006 Harald Hoyer - 095-9 -- improved error msg for firmware_helper (bug #206944) -- added xpram symlink to slram device nodes (bug #205563) -- removed infiniband rules (bug #206224) -- use newest path_id script (bug #207139) - -* Tue Aug 29 2006 Harald Hoyer - 095-8 -- fixed bug #204157 - -* Wed Aug 16 2006 Harald Hoyer - 095-7 -- added udevtimeout= - kernel command line parameters for start_udev - (default is to wait forever) - -* Wed Aug 16 2006 Harald Hoyer - 095-6 -- new speedup patch for selinux (bug #202673) - -* Thu Aug 10 2006 Harald Hoyer - 095-5 -- allow long comments (bug #200244) - -* Mon Aug 7 2006 Harald Hoyer - 095-4 -- fixed CAPI device nodes (bug #139321) -- fixed bug #201422 - -* Wed Jul 12 2006 Harald Hoyer - 095-3 -- more infiniband rules (bug #198501) - -* Wed Jul 12 2006 Jesse Keating - 095-2.1 -- rebuild - -* Thu Jul 6 2006 Harald Hoyer - 095-2 -- added option to debug udev with kernel cmdline option "udevdebug" - -* Wed Jul 5 2006 Harald Hoyer - 095-1 -- version 095 - -* Wed Jun 14 2006 Harald Hoyer - 094-1 -- version 094 - -* Sun May 21 2006 Peter Jones - 092-2 -- Fix typo in pam-console rule - -* Wed May 18 2006 Harald Hoyer - 092-1 -- version 092 -- corrected some rules (bug #192210 #190927) - -* Tue May 09 2006 Harald Hoyer - 091-3 -- corrected some rules (bug #190927) - -* Wed May 03 2006 Harald Hoyer - 091-2 -- added subpackages libvolume_id and libvolume_id-devel - -* Wed May 03 2006 Harald Hoyer - 091-1 -- version 091 - -* Wed Apr 19 2006 Harald Hoyer - 090-1 -- version 090 - -* Thu Apr 13 2006 Harald Hoyer - 089-1 -- version 089 -- do not force loading of parport_pc (bug #186850) -- manually load snd-powermac (bug #176761) -- added usb floppy symlink (bug #185171) -- start_udev uses udevtrigger now instead of udevstart - -* Wed Mar 08 2006 Harald Hoyer - 084-13 -- fixed pam_console rules (#182600) - -* Mon Mar 06 2006 Harald Hoyer - 084-12 -- fixed DRI permissions - -* Sun Mar 05 2006 Bill Nottingham - 084-11 -- use $ENV{MODALIAS}, not $modalias (#181494) - -* Thu Mar 02 2006 Harald Hoyer - 084-10 -- fixed cdrom rule - -* Wed Mar 01 2006 Harald Hoyer - 084-9 -- create non-enum device (cdrom, floppy, scanner, changer) - for compatibility (random device wins) - e.g. /dev/cdrom -> hdd /dev/cdrom-hdc -> hdc /dev/cdrom-hdd -> hdd - -* Wed Mar 01 2006 Harald Hoyer - 084-8 -- fixed ZIP drive thrashing (bz #181041 #182601) -- fixed enumeration (%%e does not work anymore) (bz #183288) - -* Fri Feb 24 2006 Peter Jones - 084-7 -- Don't start udevd in %%post unless it's already running -- Stop udevd before chkconfig --del in %%preun - -* Fri Feb 24 2006 Harald Hoyer - 084-6 -- put back original WAIT_FOR_SYSFS rule - -* Fri Feb 24 2006 Harald Hoyer - 084-5 -- removed WAIT_FOR_SYSFS rule - -* Wed Feb 22 2006 Harald Hoyer - 084-4 -- fixed group issue with vol_id (bz #181432) -- fixed dvb permissions (bz #179993) -- added support for scsi media changer (bz #181911) -- fixed pktcdvd device creation (bz #161268) - -* Tue Feb 21 2006 Florian La Roche - 084-3 -- also output the additional space char as part of the startup message - -* Fri Feb 10 2006 Jesse Keating - 084-1.1 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Harald Hoyer - 084-1 -- version 084 - -* Mon Feb 06 2006 Harald Hoyer - 078-9 -- closed fd leak (bug #179980) - -* Thu Jan 26 2006 Harald Hoyer - 078-8 -- changed usb device naming - -* Tue Jan 24 2006 Harald Hoyer - 078-7 -- put WAIT_FOR_SYSFS rules in 05-udev-early.rules - -* Mon Jan 23 2006 Harald Hoyer - 078-6 -- added some WAIT_FOR_SYSFS rules -- removed warning message, if udev_db is not available - -* Sun Jan 22 2006 Kristian Høgsberg 078-5 -- Drop udev dependency (#178621). - -* Tue Jan 11 2006 Harald Hoyer - 078-4 -- removed group "video" from the rules -- fixed specfile -- load nvram, floppy, parport and lp modules in - /etc/sysconfig/modules/udev-stw.modules until there - is a better solution -- fixed more floppy module loading - -* Fri Dec 23 2005 Harald Hoyer - 078-3 -- fixed floppy module loading -- added monitor socket -- fixed typo in dvb rule - -* Wed Dec 21 2005 Bill Nottingham - 078-2 -- udevstart change: allow greylisting of certain modaliases (usb, firewire) - -* Wed Dec 21 2005 Harald Hoyer - 078-1 -- version 078 -- fixed symlink to pam_console.dev - -* Thu Dec 15 2005 Harald Hoyer - 077-2 -- switched back to udevstart and use active /dev/.udev/queue waiting - in start_udev -- removed support for old kernels -- refined some udev.rules - -* Mon Dec 13 2005 Harald Hoyer - 077-1 -- version 077 -- patch to include udevstart2 in udevd and delay daemonize until queue is empty - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Tue Dec 06 2005 Harald Hoyer - 076-1 -- speedup udevd with selinux by calling matchpathcon_init_prefix() -- version 076 - -* Mon Nov 21 2005 Harald Hoyer - 075-4 -- speedup udev event replay with udevstart2 - -* Fri Nov 18 2005 Harald Hoyer - 075-3 -- refined start_udev for old kernels - -* Fri Nov 11 2005 Harald Hoyer - 075-2 -- moved /etc/udev/scripts to /lib/udev -- moved /etc/udev/devices to /lib/udev/devices -- added new event replay for kernel >= 2.6.15 -- added usb devices -- renamed cpu device to cpuid (bug #161538) -- changed vendor string "Onstream" to "On[sS]tream" (bug #173043) -- compiled all *_id programs statically - -* Fri Nov 11 2005 Harald Hoyer - 075-1 -- version 075 - -* Tue Oct 25 2005 Harald Hoyer - 071-1 -- version 071 - -* Mon Oct 10 2005 Harald Hoyer - 069-10 -- removed group usb - -* Mon Oct 10 2005 Harald Hoyer - 069-9 -- added libsepol-devel BuildReq -- refined persistent rules - -* Mon Oct 10 2005 Harald Hoyer - 069-8 -- corrected c&p edd_id rule, symlink for js devices -- added -lsepol - -* Thu Oct 06 2005 Harald Hoyer - 069-7 -- added edd_id - -* Fri Sep 30 2005 Harald Hoyer - 069-6 -- special handling of IEEE1394 firewire devices (bug #168093) - -* Fri Sep 23 2005 Harald Hoyer - 069-5 -- added missing path_id - -* Wed Sep 21 2005 Harald Hoyer - 069-4 -- readded volume_id now known as vol_id, bug #168883 - -* Thu Sep 15 2005 Bill Nottingham - 069-3 -- fix firmware loading - -* Wed Sep 14 2005 Bill Nottingham - 069-2 -- own /lib/firmware (#167016) - -* Wed Sep 14 2005 Harald Hoyer - 069-1 -- version 069 - -* Thu Aug 04 2005 Harald Hoyer - 063-6 -- compile with pie .. again... (#158935) -- fixed typo in echo (#138509) - -* Tue Aug 02 2005 Harald Hoyer - 063-5 -- fixed scsi hotplug replay - -* Tue Aug 02 2005 Bill Nottingham - 063-5 -- add rule to allow function id matching for pcmcia after loading - modules (#164665) - -* Tue Aug 02 2005 Harald Hoyer - 063-4 -- fixed typo for tape devices and changed mode to 0660 - -* Thu Jul 28 2005 Harald Hoyer - 063-3 -- changed "SYMLINK=" to "SYMLINK+=" - -* Sun Jul 24 2005 Bill Nottingham - 063-2 -- don't set SEQNUM for scsi replay events (#163729) - -* Tue Jul 19 2005 Bill Nottingham - 063-1 -- update to 063 -- handle the hotplug events for ieee1394, scsi, firmware - -* Fri Jul 08 2005 Bill Nottingham - 062-2 -- update to 062 -- use included ata_id, build usb_id -- load modules for pci, usb, pcmcia -- ship RELEASE-NOTES in %%doc - -* Thu Jul 07 2005 Harald Hoyer - 058-2 -- compile with pie - -* Fri May 20 2005 Bill Nottingham - 058-1 -- update to 058, fixes conflict with newer kernels (#158371) - -* Thu May 12 2005 Harald Hoyer - 057-6 -- polished persistent scripts - -* Thu May 5 2005 Bill Nottingham - 057-5 -- rebuild - -* Thu May 5 2005 Bill Nottingham - 057-4 -- better check for mounted tmpfs on /dev (#156862) - -* Wed Apr 27 2005 Peter Jones - 057-3 -- use udevstart rather than udev for udevstart.static - -* Thu Apr 21 2005 Harald Hoyer - 057-2 -- added Inifiniband devices (bug #147035) -- fixed pam_console.dev (bug #153250) - -* Mon Apr 18 2005 Harald Hoyer - 057-1 -- version 057 - -* Fri Apr 15 2005 Dan Walsh - 056-2 -- Fix SELinux during creation of Symlinks - -* Mon Apr 11 2005 Harald Hoyer - 056-1 -- updated to version 056 -- merged permissions in the rules file -- added udevpermconv.sh to convert old permission files - -* Mon Mar 28 2005 Warren Togami - 050-10 -- own default and net dirs (#151368 Hans de Goede) - -* Mon Mar 07 2005 Warren Togami - 050-9 -- fixed rh#150462 (udev DRI permissions) - -* Wed Mar 02 2005 Harald Hoyer - 050-8 -- fixed rh#144598 - -* Fri Feb 18 2005 Harald Hoyer - 050-6 -- introducing /etc/udev/makedev.d/50-udev.nodes -- glibcstatic patch modified to let gcc4 compile udev - -* Thu Feb 10 2005 Harald Hoyer - 050-5 -- doh, reverted the start_udev devel version, which slipped in - -* Thu Feb 10 2005 Harald Hoyer - 050-3 -- fixed forgotten " in udev.rules - -* Tue Jan 11 2005 Harald Hoyer - 050-2 -- removed /dev/microcode, /dev/cpu/microcode is now the real node -- cleaned up start_udev - -* Tue Jan 11 2005 Harald Hoyer - 050-1 -- version 050 -- /dev/cpu/0/microcode -> /dev/cpu/microcode - -* Tue Dec 21 2004 Dan Walsh - 048-4 -- Call selinux_restore to fix labeling problem in selinux -- Fixes rh#142817 - -* Tue Dec 21 2004 Harald Hoyer - 048-3 -- maybe fixed bug rh#143367 - -* Thu Dec 16 2004 Harald Hoyer - 048-2 -- fixed a case where reading /proc/ide/hd?/media returns EIO - (bug rh#142713) -- changed all device node permissions of group "disk" to 0640 - (bug rh#110197) -- remove $udev_db with -fr in case of a directory (bug rh#142962) - -* Mon Dec 13 2004 Harald Hoyer - 048-1 -- version 048 -- major specfile cleanup - -* Thu Nov 04 2004 Harald Hoyer - 042-1 -- version 042 - -* Thu Nov 04 2004 Harald Hoyer - 039-10 -- speed improvement, scripts in rules are now executed only once, - instead of four times - -* Thu Nov 04 2004 Harald Hoyer - 039-9 -- removed wrong SIG_IGN for SIGCHLD -- moved ide media check to script to wait for the procfs - -* Wed Nov 3 2004 Jeremy Katz - 039-8.FC3 -- recreate lvm device nodes if needed in the trigger (#137807) - -* Wed Nov 03 2004 Harald Hoyer - 039-6.FC3.2 -- replace udev.conf by default -- LANG=C for fgrep in start_udev; turn grep into fgrep - -* Tue Nov 02 2004 Harald Hoyer - 039-6.FC3.1 -- speed up pam_console.dev -- mount pts and shm, in case of the dev trigger -- increased timeout for udevstart -- removed syslog() from signal handler (caused vmware locks) -- turned off logging, which speeds up the boot process - -* Thu Oct 21 2004 Harald Hoyer - 039-6 -- fixed typo - -* Thu Oct 21 2004 Harald Hoyer - 039-5 -- added udev-039-norm.patch, which prevents removal of hd* devices, - because the kernel sends remove/add events, if an IDE removable device - is close(2)ed. mke2fs, e.g. would fail in this case. - -* Wed Oct 20 2004 Harald Hoyer - 039-4 -- do not call dev.d scripts, if network interface hasn't changed - the name -- correct wait for dummy network devices -- removed NONBLOCK from volume-id -- do not log in udev.static, which should fix bug 136005 - -* Mon Oct 18 2004 Harald Hoyer - 039-3 -- refined wait_for_sysfs for udev.static - -* Mon Oct 18 2004 Harald Hoyer - 039-2 -- improved wait_for_sysfs for virtual consoles with Kay Siever's patch -- wait for ppp class -- wait for LVM dm- devices -- integrate wait_for_sys in udev.static for the initrd - -* Mon Oct 18 2004 Harald Hoyer - 039-1 -- version 039, fixes also manpage bug 135996 -- fixed glibc issue for static version (getgrnam, getpwnam) (bug 136005) -- close the syslog in every app - -* Fri Oct 15 2004 Harald Hoyer - 038-2 -- par[0-9] is now a symlink to lp -- MAKEDEV the parport devices -- now conflicts with older initscripts - -* Thu Oct 14 2004 Harald Hoyer - 038-1 -- raw device nodes are now created in directory raw -- version 038 - -* Wed Oct 13 2004 Harald Hoyer - 036-1 -- better wait_for_sysfs warning messages - -* Wed Oct 13 2004 Harald Hoyer - 035-2 -- fixed double bug in start_udev (bug 135405) - -* Tue Oct 12 2004 Harald Hoyer - 035-1 -- version 035, which only improves wait_for_sysfs -- load ide modules in start_udev, until a hotplug script is available - (bug 135260) - -* Mon Oct 11 2004 Harald Hoyer - 034-3 -- removed scary error messages from wait_for_sysfs -- symlink from nst? -> tape? -- kill udevd on update - -* Fri Oct 8 2004 Harald Hoyer - 034-2 -- check for /proc/sys/dev/cdrom/info existence in check-cdrom.sh - -* Fri Oct 8 2004 Harald Hoyer - 034-1 -- new version udev-034 -- removed patches, which went upstream -- pam_console.dev link renamed to 05-pam_console.dev -- MAKEDEV.dev links renamed to 10-MAKEDEV.dev - -* Thu Oct 07 2004 Harald Hoyer - 032-10 -- added floppy madness (bug 134830) -- replay scsi events in start_udev for the devices on the adapter (bug 130746) - -* Wed Oct 06 2004 Harald Hoyer - 032-9 -- obsoleted $UDEV_LOG, use udev_log -- correct SYMLINK handling in pam_console.dev -- specfile cleanup -- added check-cdrom.sh for nice cdrom symlinks - -* Mon Oct 04 2004 Harald Hoyer - 032-8 -- added patches from Féliciano Matias for multiple symlinks (bug 134477 and 134478) -- corrected some permissions with a missing leading 0 -- added z90crypt to the permissions file (bug 134448) -- corrected requires and conflicts tags -- removed /dev/log from MAKEDEV creation - -* Fri Oct 01 2004 Harald Hoyer - 032-7 -- more device nodes for those without initrd - -* Thu Sep 30 2004 Harald Hoyer - 032-6 -- prevent error message from device copying -- use already translated starting strings - -* Wed Sep 29 2004 Harald Hoyer - 032-5 -- add "fi" to start_udev -- do not create floppy devices manually (bug 133838) - -* Tue Sep 28 2004 Harald Hoyer - 032-4 -- made /etc/udev/devices/ for manual device nodes -- refined SELINUX check, if /dev is not yet mounted in start_dev - -* Mon Sep 27 2004 Harald Hoyer - 032-3 -- corrected permissions for /dev/rtc (bug 133636) -- renamed device-mapper to mapper/control (bug 133688) - -* Wed Sep 22 2004 Harald Hoyer - 032-2 -- removed option to turn off udev -- udevstart.static now symling to udev.static - -* Tue Sep 21 2004 Harald Hoyer - 032-1 -- version 032 - -* Mon Sep 20 2004 Harald Hoyer - 030-27 -- simplified udev.conf -- refined close_on_exec patch -- added pam_console supply for symlinks, now gives correct permissions, - for e.g. later plugged in cdroms -- renamed sr? to scd? (see devices.txt; k3b likes that :) - -* Mon Sep 13 2004 Jeremy Katz - 030-26 -- require a 2.6 kernel -- prereq instead of requires MAKEDEV -- obsolete and provide dev -- add a trigger for the removal of /dev so that we set things up - -* Fri Sep 10 2004 Dan Walsh - 030-25 -- Use matchmediacon - -* Fri Sep 10 2004 Harald Hoyer - 030-24 -- check if SELINUX is not disabled before executing setfiles (bug 132099) - -* Wed Sep 8 2004 Harald Hoyer - 030-23 -- mount tmpfs with mode 0755 in start_udev - -* Tue Sep 7 2004 Harald Hoyer - 030-22 -- applied rules from David Zeuthen which read /proc directly without - shellscript - -* Tue Sep 7 2004 Harald Hoyer - 030-21 -- applied enumeration patch from David Zeuthen for cdrom symlinks (bug 131532) -- create /dev/ppp in start_udev (bug 131114) -- removed nvidia devices from start_udev -- check for restorecon presence in start_udev (bug 131904) - -* Fri Sep 3 2004 Harald Hoyer - 030-20 -- due to -x added to MAKEDEV specify the par and lp numbers - -* Fri Sep 3 2004 Harald Hoyer - 030-19 -- added udev-030-rhsec.patch (bug 130351) - -* Thu Sep 2 2004 Jeremy Katz - 030-18 -- make the exact device in start_udev (and thus, require new MAKEDEV) - -* Thu Sep 2 2004 Jeremy Katz - 030-17 -- make sure file contexts of everything in the tmpfs /dev are set right - when start_udev runs - -* Thu Sep 02 2004 Harald Hoyer - 030-16 -- moved %%{_sysconfdir}/hotplug.d/default/udev.hotplug to %%{_sysconfdir}/hotplug.d/default/10-udev.hotplug - -* Thu Sep 02 2004 Harald Hoyer - 030-15 -- added nvidia devices to start_udev -- added UDEV_RAMFS for backwards compat to udev.conf -- changed Group (bug 131488) -- added libselinux-devel to build requirements - -* Wed Sep 1 2004 Jeremy Katz - 030-14 -- require MAKEDEV - -* Wed Sep 1 2004 Dan Walsh - 030-13 -- Change to setfilecon if directory exists. - -* Wed Sep 01 2004 Harald Hoyer - 030-12 -- fixed start_udev - -* Tue Aug 31 2004 Jeremy Katz - 030-11 -- use tmpfs instead of ramfs (it has xattr support now) -- change variables appropriately to TMPFS intead of RAMFS in udev.conf -- create loopN, not just loop in start_udev - -* Fri Aug 27 2004 Dan Walsh - 030-10 -- Fix Patch - -* Thu Aug 26 2004 Dan Walsh - 030-9 -- Cleaned up selinux patch - -* Tue Aug 24 2004 Harald Hoyer - 030-8 -- changed defaults not to remove device nodes -- added rule for net/tun -- extended start_udev to create devices, which can trigger module autoloading -- refined cloexec patch, to redirect stdin,out,err of /dev.d execed apps to /dev/null - -* Mon Aug 23 2004 Harald Hoyer - 030-7 -- removed usage of /usr/bin/seq in start_udev -- set correct permissions in start_udev -- extended the cloexec patch -- removed udev-persistent package (define with_persistent==0) -- check for /var/run/console/console.lock before calling /sbin/pam_console_setowner -- linked pam_console_setowner statically against libglib-2.0.a - -* Fri Aug 20 2004 Harald Hoyer - 030-5 -- use correct console.lock file now in pam_console_setowner - -* Wed Aug 18 2004 Harald Hoyer - 030-4 -- added the selinux patch - -* Fri Jul 23 2004 Harald Hoyer - 030-3 -- extended the cloexec patch - -* Wed Jul 21 2004 Dan Walsh - 030-2 -- Close Database fd in exec processes using FD_CLOSEXEC - -* Wed Jul 14 2004 Harald Hoyer - 030-1 -- version 030 - -* Wed Jul 14 2004 Harald Hoyer - 029-4 -- added udevstart.static - -* Wed Jul 14 2004 Harald Hoyer - 029-3 -- put /etc/sysconfig/udev in /etc/udev/udev.conf and removed it -- made only udev.static static -- make our defaults the default values -- removed /udev - -* Tue Jul 6 2004 Harald Hoyer - 029-1 -- version 029, added udev_remove and udev_owner to udev.conf - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue Jun 8 2004 Harald Hoyer - 026-3 -- fixed UDEV_REMOVE=no - -* Tue Jun 8 2004 Harald Hoyer - 026-2 -- udev-026 -- preserve ownership of device nodes, which already exist -- do not remove device nodes if UDEV_REMOVE="no" -- added volume_id -- build with klibc - -* Wed May 26 2004 Harald Hoyer - 025-1 -- udev-025 -- added ata_identify -- build nearly all with dietlibc - -* Mon May 10 2004 Elliot Lee 024-6 -- Turn off udevd by default for FC2 - -* Tue Apr 20 2004 Harald Hoyer - 024-5 -- fixed permission for /dev/tty (FC2) - -* Thu Apr 15 2004 Harald Hoyer - 024-4 -- moved the 00- files to 50-, to let the use place his files in front - -* Thu Apr 15 2004 Harald Hoyer - 024-3 -- set UDEV_SELINUX to yes -- added UDEV_LOG - -* Thu Apr 15 2004 Harald Hoyer - 024-2 -- added /udev to filelist - -* Wed Apr 14 2004 Harald Hoyer - 024-1 -- update to 024 -- added /etc/sysconfig/udev -- added selinux, pam_console, dbus support - -* Fri Mar 26 2004 Harald Hoyer - 023-1 -- update to 023 - -* Wed Mar 24 2004 Bill Nottingham 022-1 -- update to 022 - -* Sun Mar 21 2004 Florian La Roche -- really move initscript - -* Sun Feb 29 2004 Florian La Roche -- move chkconv to preun -- nicer url - -* Wed Feb 25 2004 Harald Hoyer - 018-1 -- changes permissions and rules - -* Mon Feb 23 2004 Dan Walsh -- Add selinux support - -* Thu Feb 19 2004 Greg Kroah-Hartman -- add some more files to the documentation directory -- add ability to build scsi_id and make it the default - -* Mon Feb 16 2004 Greg Kroah-Hartman -- fix up udevd build, as it's no longer needed to be build seperatly -- add udevtest to list of files -- more Red Hat sync ups. - -* Thu Feb 12 2004 Greg Kroah-Hartman -- add some changes from the latest Fedora udev release. - -* Mon Feb 2 2004 Greg Kroah-Hartman -- add udevsend, and udevd to the files -- add ability to build udevd with glibc after the rest is build with klibc - -* Mon Jan 26 2004 Greg Kroah-Hartman -- added udevinfo to rpm -- added URL to spec file -- added udevinfo's man page - -* Mon Jan 05 2004 Rolf Eike Beer -- add defines to choose the init script (Redhat or LSB) - -* Tue Dec 16 2003 Robert Love -- install the initscript and run chkconfig on it - -* Tue Nov 2 2003 Greg Kroah-Hartman -- changes due to config file name changes - -* Fri Oct 17 2003 Robert Love -- Make work without a build root -- Correctly install the right files -- Pass the RPM_OPT_FLAGS to gcc so we can build per the build policy -- Put some prereqs in -- Install the hotplug symlink to udev - -* Mon Jul 28 2003 Paul Mundt -- Initial spec file for udev-0.2.