Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-02-12 16:45:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2013-01-30 11:20:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2013-02-12 16:45:56.000000000 +0100 @@ -1,0 +2,16 @@ +Tue Feb 12 09:16:23 UTC 2013 - [email protected] + +- usb_id: ensure we have a valid serial number as a string (bnc#779493). + add: 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch +- cdrom_id: created links for the default cd/dvd drive (bnc#783054). + add: 1021-create-default-links-for-primary-cd_dvd-drive.patch + +------------------------------------------------------------------- +Fri Feb 1 16:27:45 UTC 2013 - [email protected] + +- Add cryptsetup-accept-read-only.patch: accept "read-only" in + addition to "readonly" in crypttab +- Update parse-multiline-env-file.patch to correctly handle + commented lines (bnc#793411) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2013-02-02 19:36:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd.changes 2013-02-12 16:45:56.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 12 09:16:23 UTC 2013 - [email protected] + +- usb_id: ensure we have a valid serial number as a string (bnc#779493). + add: 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch +- cdrom_id: created links for the default cd/dvd drive (bnc#783054). + add: 1021-create-default-links-for-primary-cd_dvd-drive.patch + +------------------------------------------------------------------- New: ---- 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch 1021-create-default-links-for-primary-cd_dvd-drive.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.lafxow/_old 2013-02-12 16:46:00.000000000 +0100 +++ /var/tmp/diff_new_pack.lafxow/_new 2013-02-12 16:46:00.000000000 +0100 @@ -262,6 +262,8 @@ Patch124: systemd-fix-merge-ignore-dependencies.patch # PATCH-FIX-UPSTREAM journalctl-require-argument-for-priority Patch125: journalctl-require-argument-for-priority +# PATCH-FIX-UPSTREAM cryptsetup-accept-read-only.patch [email protected] -- Accept read-only as well as readonly as parameters for crypttab +Patch126: cryptsetup-accept-read-only.patch # udev patches # PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch @@ -302,6 +304,10 @@ Patch1018: 1018-keymap-add-aditional-support.patch # PATCH-FIX-UPSTREAM 1019-udev-Fix-device-matching-in-the-accelerometer.patch Patch1019: 1019-udev-Fix-device-matching-in-the-accelerometer.patch +# PATCH-FIX-OPENSUSE 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch +Patch1020: 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch +# PATCH-FIX-OPENSUSE 1021-create-default-links-for-primary-cd_dvd-drive.patch +Patch1021: 1021-create-default-links-for-primary-cd_dvd-drive.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -481,6 +487,8 @@ %patch1017 -p1 %patch1018 -p1 %patch1019 -p1 +%patch1020 -p1 +%patch1021 -p1 #systemd %patch1 -p1 @@ -570,6 +578,7 @@ %patch123 -p1 %patch124 -p1 %patch125 -p1 +%patch126 -p1 %build autoreconf -fiv ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.lafxow/_old 2013-02-12 16:46:00.000000000 +0100 +++ /var/tmp/diff_new_pack.lafxow/_new 2013-02-12 16:46:00.000000000 +0100 @@ -299,6 +299,10 @@ Patch1018: 1018-keymap-add-aditional-support.patch # PATCH-FIX-UPSTREAM 1019-udev-Fix-device-matching-in-the-accelerometer.patch Patch1019: 1019-udev-Fix-device-matching-in-the-accelerometer.patch +# PATCH-FIX-OPENSUSE 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch +Patch1020: 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch +# PATCH-FIX-OPENSUSE 1021-create-default-links-for-primary-cd_dvd-drive.patch +Patch1021: 1021-create-default-links-for-primary-cd_dvd-drive.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -478,6 +482,8 @@ %patch1017 -p1 %patch1018 -p1 %patch1019 -p1 +%patch1020 -p1 +%patch1021 -p1 #systemd %patch1 -p1 ++++++ 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch ++++++ >From 2ffcfb9b45262271019d1751cafc895c3dae8f0e Mon Sep 17 00:00:00 2001 From: Robert Milasan <[email protected]> Date: Sun, 10 Feb 2013 11:00:20 +0100 Subject: [PATCH] usb_id: some strange devices have a very bogus or strange serial numer, making a mess in /dev/disk/by-id. Let's check if the serial number is a valid, otherwise don't use it. --- src/udev/udev-builtin-usb_id.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c index 7ce401d..9e407c5 100644 --- a/src/udev/udev-builtin-usb_id.c +++ b/src/udev/udev-builtin-usb_id.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> +#include <stdbool.h> #include <unistd.h> #include <string.h> #include <ctype.h> @@ -31,6 +32,26 @@ #include "udev.h" +static bool validate_string(const char *str) +{ + const char *s; + + if (!str) + return false; + + for (s = str; *s != '\0'; s++) { + if ((*s >= 'a' && *s <= 'z') || + (*s >= 'A' && *s <= 'Z') || + (*s >= '0' && *s <= '9') || + *s == '-' || *s == '_') + continue; + else + return false; + } + + return true; +} + static void set_usb_iftype(char *to, int if_class_num, size_t len) { const char *type = "generic"; @@ -431,6 +452,8 @@ fallback: const char *usb_serial; usb_serial = udev_device_get_sysattr_value(dev_usb, "serial"); + if (!validate_string(usb_serial)) + usb_serial = NULL; if (usb_serial) { util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1); util_replace_chars(serial_str, NULL); -- 1.7.10.4 ++++++ 1021-create-default-links-for-primary-cd_dvd-drive.patch ++++++ Index: systemd-195/rules/60-cdrom_id.rules =================================================================== --- systemd-195.orig/rules/60-cdrom_id.rules +++ systemd-195/rules/60-cdrom_id.rules @@ -15,6 +15,9 @@ ENV{DISK_EJECT_REQUEST}=="?*", RUN+="cdr # enable the receiving of media eject button events IMPORT{program}="cdrom_id --lock-media $devnode" -KERNEL=="sr0", SYMLINK+="cdrom", OPTIONS+="link_priority=-100" +KERNEL=="sr0", ENV{ID_CDROM}=="1", SYMLINK+="cdrom", OPTIONS+="link_priority=-100" +KERNEL=="sr0", ENV{ID_CDROM_CD_RW}=="1", SYMLINK+="cdrw", OPTIONS+="link_priority=-100" +KERNEL=="sr0", ENV{ID_CDROM_DVD}=="1", SYMLINK+="dvd", OPTIONS+="link_priority=-100" +KERNEL=="sr0", ENV{ID_CDROM_DVD_RW}=="1", SYMLINK+="dvdrw", OPTIONS+="link_priority=-100" LABEL="cdrom_end" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
