Accepting request 155791 from Base:System

- udev: usb_id: parse only 'size' bytes of the 'descriptors' buffer
  add: 1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch
- udev: expose new ISO9660 properties from libblkid
  add: 1025-udev-expose-new-ISO9660-properties-from-libblkid.patch 

- udev: usb_id: parse only 'size' bytes of the 'descriptors' buffer
  add: 1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch
- udev: expose new ISO9660 properties from libblkid
  add: 1025-udev-expose-new-ISO9660-properties-from-libblkid.patch (forwarded request 155790 from rmilasan)

OBS-URL: https://build.opensuse.org/request/show/155791
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=131

1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch

@@ -0,0 +1,24 @@
+From 7962afbba9016ea03d9f2987fee341443fcde39d Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay@vrfy.org>
+Date: Sun, 17 Feb 2013 21:16:56 +0100
+Subject: [PATCH] udev: usb_id: parse only 'size' bytes of the 'descriptors'
+ buffer
+
+Signed-off-by: Robert Milasan <rmilasan@suse.com>
+---
+ src/udev/udev-builtin-usb_id.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+Index: systemd-195/src/udev/udev-builtin-usb_id.c
+===================================================================
+--- systemd-195.orig/src/udev/udev-builtin-usb_id.c
++++ systemd-195/src/udev/udev-builtin-usb_id.c
+@@ -210,7 +210,7 @@ static int dev_if_packed_info(struct ude
+         pos = 0;
+         strpos = 0;
+         ifs_str[0] = '\0';
+-        while (pos < sizeof(buf) && strpos+7 < len-2) {
++        while (pos < size && strpos+7 < len-2) {
+                 struct usb_interface_descriptor *desc;
+                 char if_str[8];
+ 

1025-udev-expose-new-ISO9660-properties-from-libblkid.patch

@@ -0,0 +1,37 @@
+From ddb5bee15a6ad71e5b596c035c1ee4dc04d5fd2e Mon Sep 17 00:00:00 2001
+From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
+Date: Sun, 17 Feb 2013 03:21:27 +0200
+Subject: [PATCH] udev: expose new ISO9660 properties from libblkid
+
+Signed-off-by: Robert Milasan <rmilasan@suse.com>
+---
+ src/udev/udev-builtin-blkid.c |   16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+Index: systemd-195/src/udev/udev-builtin-blkid.c
+===================================================================
+--- systemd-195.orig/src/udev/udev-builtin-blkid.c
++++ systemd-195/src/udev/udev-builtin-blkid.c
+@@ -78,6 +78,22 @@ static void print_property(struct udev_d
+         } else if (startswith(name, "PART_ENTRY_")) {
+                 util_strscpyl(s, sizeof(s), "ID_", name, NULL);
+                 udev_builtin_add_property(dev, test, s, value);
++
++        } else if (streq(name, "SYSTEM_ID")) {
++                blkid_encode_string(value, s, sizeof(s));
++                udev_builtin_add_property(dev, test, "ID_FS_SYSTEM_ID", s);
++
++        } else if (streq(name, "PUBLISHER_ID")) {
++                blkid_encode_string(value, s, sizeof(s));
++                udev_builtin_add_property(dev, test, "ID_FS_PUBLISHER_ID", s);
++
++        } else if (streq(name, "APPLICATION_ID")) {
++                blkid_encode_string(value, s, sizeof(s));
++                udev_builtin_add_property(dev, test, "ID_FS_APPLICATION_ID", s);
++
++        } else if (streq(name, "BOOT_SYSTEM_ID")) {
++                blkid_encode_string(value, s, sizeof(s));
++                udev_builtin_add_property(dev, test, "ID_FS_BOOT_SYSTEM_ID", s);
+         }
+ }
+ 

systemd-mini.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Feb 19 09:51:18 UTC 2013 - rmilasan@suse.com
+
+- udev: usb_id: parse only 'size' bytes of the 'descriptors' buffer
+  add: 1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch
+- udev: expose new ISO9660 properties from libblkid
+  add: 1025-udev-expose-new-ISO9660-properties-from-libblkid.patch 
+
+-------------------------------------------------------------------
+Mon Feb 18 09:27:05 UTC 2013 - jengelh@inai.de
+
+- Create getty@tty1.service to restore traditional SUSE behavior
+  of not clearing tty1. (bnc#804158)
+- Better use of find -exec
+
 -------------------------------------------------------------------
 Fri Feb 15 16:04:39 UTC 2013 - fcrozat@suse.com
 

systemd-mini.spec

@@ -322,6 +322,10 @@ Patch1021:      1021-create-default-links-for-primary-cd_dvd-drive.patch
 Patch1022:      1022-udev-use-unique-names-for-temporary-files-created-in.patch
 # PATCH-FIX-UPSTREAM 1023-cdrom_id-add-data-track-count-for-bad-virtual-drive.patch
 Patch1023:      1023-cdrom_id-add-data-track-count-for-bad-virtual-drive.patch
+# PATCH-FIX-UPSTREAM 1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch
+Patch1024:      1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch
+# PATCH-FIX-UPSTREAM 1025-udev-expose-new-ISO9660-properties-from-libblkid.patch
+Patch1025:      1025-udev-expose-new-ISO9660-properties-from-libblkid.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -505,6 +509,8 @@ cp %{SOURCE7} m4/
 %patch1021 -p1
 %patch1022 -p1
 %patch1023 -p1
+%patch1024 -p1
+%patch1025 -p1
 
 #systemd
 %patch1 -p1
@@ -604,7 +610,7 @@ cp %{SOURCE7} m4/
 %build
 autoreconf -fiv
 # prevent pre-generated and distributed files from re-building
-find . -name "*.[1-8]" -exec touch '{}' \;
+find . -name "*.[1-8]" -exec touch '{}' '+';
 export V=1
 # keep split-usr until all packages have moved their systemd rules to /usr
 %configure \
@@ -656,7 +662,7 @@ ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/syste
 chmod 644 %{buildroot}%{_bindir}/systemd-analyze
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 install -m644 %{S:4} %{buildroot}%{_sysconfdir}/rpm
-find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.la' -delete
 mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants}
 
 install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert
@@ -733,6 +739,11 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/syslog.target.wants
 
+src="%buildroot/%_libexecdir/systemd/system/getty@.service"
+dst="${src/@/@tty1}"
+cp "$src" "$dst"
+perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst"
+
 %fdupes -s %{buildroot}%{_mandir}
 
 %pre

systemd.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Feb 19 09:51:18 UTC 2013 - rmilasan@suse.com
+
+- udev: usb_id: parse only 'size' bytes of the 'descriptors' buffer
+  add: 1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch
+- udev: expose new ISO9660 properties from libblkid
+  add: 1025-udev-expose-new-ISO9660-properties-from-libblkid.patch 
+
+-------------------------------------------------------------------
+Mon Feb 18 09:27:05 UTC 2013 - jengelh@inai.de
+
+- Create getty@tty1.service to restore traditional SUSE behavior
+  of not clearing tty1. (bnc#804158)
+- Better use of find -exec
+
 -------------------------------------------------------------------
 Fri Feb 15 16:04:39 UTC 2013 - fcrozat@suse.com
 

systemd.spec

@@ -317,6 +317,10 @@ Patch1021:      1021-create-default-links-for-primary-cd_dvd-drive.patch
 Patch1022:      1022-udev-use-unique-names-for-temporary-files-created-in.patch
 # PATCH-FIX-UPSTREAM 1023-cdrom_id-add-data-track-count-for-bad-virtual-drive.patch
 Patch1023:      1023-cdrom_id-add-data-track-count-for-bad-virtual-drive.patch
+# PATCH-FIX-UPSTREAM 1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch
+Patch1024:      1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch
+# PATCH-FIX-UPSTREAM 1025-udev-expose-new-ISO9660-properties-from-libblkid.patch
+Patch1025:      1025-udev-expose-new-ISO9660-properties-from-libblkid.patch
 
 %description
 Systemd is a system and service manager, compatible with SysV and LSB
@@ -500,6 +504,8 @@ cp %{SOURCE7} m4/
 %patch1021 -p1
 %patch1022 -p1
 %patch1023 -p1
+%patch1024 -p1
+%patch1025 -p1
 
 #systemd
 %patch1 -p1
@@ -599,7 +605,7 @@ cp %{SOURCE7} m4/
 %build
 autoreconf -fiv
 # prevent pre-generated and distributed files from re-building
-find . -name "*.[1-8]" -exec touch '{}' \;
+find . -name "*.[1-8]" -exec touch '{}' '+';
 export V=1
 # keep split-usr until all packages have moved their systemd rules to /usr
 %configure \
@@ -651,7 +657,7 @@ ln -sf ../systemd-udev-root-symlink.service $RPM_BUILD_ROOT/%{_prefix}/lib/syste
 chmod 644 %{buildroot}%{_bindir}/systemd-analyze
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 install -m644 %{S:4} %{buildroot}%{_sysconfdir}/rpm
-find %{buildroot} -type f -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.la' -delete
 mkdir -p %{buildroot}/{sbin,var/lib/systemd/sysv-convert,var/lib/systemd/migrated} %{buildroot}/usr/lib/systemd/{system-generators,user-generators,system-preset,user-preset,system/halt.target.wants,system/kexec.target.wants,system/poweroff.target.wants,system/reboot.target.wants}
 
 install -m755 %{S:3} -D %{buildroot}%{_sbindir}/systemd-sysv-convert
@@ -728,6 +734,11 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/syslog.target.wants
 
+src="%buildroot/%_libexecdir/systemd/system/getty@.service"
+dst="${src/@/@tty1}"
+cp "$src" "$dst"
+perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst"
+
 %fdupes -s %{buildroot}%{_mandir}
 
 %pre