From ede0ef834e096105cd9191acedee91b8030c73667a1d7a16d68f51cab92ecabe Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Tue, 24 Jun 2014 11:57:06 +0000 Subject: [PATCH] Accepting request 238484 from home:rmilasan:branches:Base:System - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch to 1038-udev-fix-invalid-free-in-enable_name_policy.patch OBS-URL: https://build.opensuse.org/request/show/238484 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=682 --- ...x-invalid-free-in-enable_name_policy.patch | 0 systemd-mini.changes | 6 ++++ systemd-mini.spec | 34 +++++++++---------- systemd.changes | 6 ++++ systemd.spec | 34 +++++++++---------- 5 files changed, 46 insertions(+), 34 deletions(-) rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch => 1038-udev-fix-invalid-free-in-enable_name_policy.patch (100%) diff --git a/0002-udev-fix-invalid-free-in-enable_name_policy.patch b/1038-udev-fix-invalid-free-in-enable_name_policy.patch similarity index 100% rename from 0002-udev-fix-invalid-free-in-enable_name_policy.patch rename to 1038-udev-fix-invalid-free-in-enable_name_policy.patch diff --git a/systemd-mini.changes b/systemd-mini.changes index 0d46688d..981c8c3d 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com + +- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch + to 1038-udev-fix-invalid-free-in-enable_name_policy.patch + ------------------------------------------------------------------- Tue Jun 24 11:27:27 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 146b7ac7..a1b46519 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -563,31 +563,29 @@ Patch277: 0006-log-honour-the-kernel-s-quiet-cmdline-argument.patch # PATCH-FIX-UPSTREAM added at 2014/06/17 Patch278: 0001-core-fix-invalid-free-in-killall.patch # PATCH-FIX-UPSTREAM added at 2014/06/17 -Patch279: 0002-udev-fix-invalid-free-in-enable_name_policy.patch -# PATCH-FIX-UPSTREAM added at 2014/06/17 -Patch280: 0003-install-fix-invalid-free-in-unit_file_mask.patch +Patch279: 0003-install-fix-invalid-free-in-unit_file_mask.patch # PATCH-FIX-SUSE detect virtualization layers on S390 (bnc#880438) -Patch281: 0001-detect-s390-virt.patch +Patch280: 0001-detect-s390-virt.patch # PATCH-FIX-UPSTREAM 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch arvidjaar@gmail.com -- Ensure legacy services are started after network is available -Patch282: 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch +Patch281: 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch283: 0002-units-add-missing-caps-so-that-GetAddresses-can-work.patch +Patch282: 0002-units-add-missing-caps-so-that-GetAddresses-can-work.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch284: 0003-units-order-systemd-tmpfiles-clean.service-after-tim.patch +Patch283: 0003-units-order-systemd-tmpfiles-clean.service-after-tim.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch285: 0005-po-add-Greek-translation.patch +Patch284: 0005-po-add-Greek-translation.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch286: 0006-hwdb-Update-database-of-Bluetooth-company-identifier.patch +Patch285: 0006-hwdb-Update-database-of-Bluetooth-company-identifier.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch287: 0007-po-add-German-translation.patch +Patch286: 0007-po-add-German-translation.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch288: 0009-core-clean-up-signal-reset-logic-when-reexec.patch +Patch287: 0009-core-clean-up-signal-reset-logic-when-reexec.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch289: 0010-util-treat-fuse.sshfs-as-a-network-filesystem.patch +Patch288: 0010-util-treat-fuse.sshfs-as-a-network-filesystem.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch290: 0011-build-sys-add-pthread-flag-for-libsystemd-shared.patch +Patch289: 0011-build-sys-add-pthread-flag-for-libsystemd-shared.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch291: 0012-core-transaction-avoid-misleading-error-message-when.patch +Patch290: 0012-core-transaction-avoid-misleading-error-message-when.patch # UDEV PATCHES # ============ @@ -669,6 +667,8 @@ Patch1035: 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch Patch1036: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch # PATCH-FIX-SUSE See bnc#882714 comment #51 Patch1037: 1037-udev-exclude-cd-dvd-from-block-device.patch +# PATCH-FIX-UPSTREAM 1038-udev-fix-invalid-free-in-enable_name_policy.patch +Patch1038: 1038-udev-fix-invalid-free-in-enable_name_policy.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1106,9 +1106,9 @@ cp %{SOURCE7} m4/ %patch277 -p0 %patch278 -p0 %patch279 -p0 -%patch280 -p0 +%patch280 -p1 %patch281 -p1 -%patch282 -p1 +%patch282 -p0 %patch283 -p0 %patch284 -p0 %patch285 -p0 @@ -1117,7 +1117,6 @@ cp %{SOURCE7} m4/ %patch288 -p0 %patch289 -p0 %patch290 -p0 -%patch291 -p0 # udev patches %patch1001 -p1 @@ -1158,6 +1157,7 @@ cp %{SOURCE7} m4/ %patch1035 -p1 %patch1036 -p1 %patch1037 -p1 +%patch1038 -p0 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index 0d46688d..981c8c3d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com + +- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch + to 1038-udev-fix-invalid-free-in-enable_name_policy.patch + ------------------------------------------------------------------- Tue Jun 24 11:27:27 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 28601524..c38fac87 100644 --- a/systemd.spec +++ b/systemd.spec @@ -558,31 +558,29 @@ Patch277: 0006-log-honour-the-kernel-s-quiet-cmdline-argument.patch # PATCH-FIX-UPSTREAM added at 2014/06/17 Patch278: 0001-core-fix-invalid-free-in-killall.patch # PATCH-FIX-UPSTREAM added at 2014/06/17 -Patch279: 0002-udev-fix-invalid-free-in-enable_name_policy.patch -# PATCH-FIX-UPSTREAM added at 2014/06/17 -Patch280: 0003-install-fix-invalid-free-in-unit_file_mask.patch +Patch279: 0003-install-fix-invalid-free-in-unit_file_mask.patch # PATCH-FIX-SUSE detect virtualization layers on S390 (bnc#880438) -Patch281: 0001-detect-s390-virt.patch +Patch280: 0001-detect-s390-virt.patch # PATCH-FIX-UPSTREAM 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch arvidjaar@gmail.com -- Ensure legacy services are started after network is available -Patch282: 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch +Patch281: 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch283: 0002-units-add-missing-caps-so-that-GetAddresses-can-work.patch +Patch282: 0002-units-add-missing-caps-so-that-GetAddresses-can-work.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch284: 0003-units-order-systemd-tmpfiles-clean.service-after-tim.patch +Patch283: 0003-units-order-systemd-tmpfiles-clean.service-after-tim.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch285: 0005-po-add-Greek-translation.patch +Patch284: 0005-po-add-Greek-translation.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch286: 0006-hwdb-Update-database-of-Bluetooth-company-identifier.patch +Patch285: 0006-hwdb-Update-database-of-Bluetooth-company-identifier.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch287: 0007-po-add-German-translation.patch +Patch286: 0007-po-add-German-translation.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch288: 0009-core-clean-up-signal-reset-logic-when-reexec.patch +Patch287: 0009-core-clean-up-signal-reset-logic-when-reexec.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch289: 0010-util-treat-fuse.sshfs-as-a-network-filesystem.patch +Patch288: 0010-util-treat-fuse.sshfs-as-a-network-filesystem.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch290: 0011-build-sys-add-pthread-flag-for-libsystemd-shared.patch +Patch289: 0011-build-sys-add-pthread-flag-for-libsystemd-shared.patch # PATCH-FIX-UPSTREAM added at 2014/06/24 -Patch291: 0012-core-transaction-avoid-misleading-error-message-when.patch +Patch290: 0012-core-transaction-avoid-misleading-error-message-when.patch # UDEV PATCHES # ============ @@ -664,6 +662,8 @@ Patch1035: 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch Patch1036: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch # PATCH-FIX-SUSE See bnc#882714 comment #51 Patch1037: 1037-udev-exclude-cd-dvd-from-block-device.patch +# PATCH-FIX-UPSTREAM 1038-udev-fix-invalid-free-in-enable_name_policy.patch +Patch1038: 1038-udev-fix-invalid-free-in-enable_name_policy.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1101,9 +1101,9 @@ cp %{SOURCE7} m4/ %patch277 -p0 %patch278 -p0 %patch279 -p0 -%patch280 -p0 +%patch280 -p1 %patch281 -p1 -%patch282 -p1 +%patch282 -p0 %patch283 -p0 %patch284 -p0 %patch285 -p0 @@ -1112,7 +1112,6 @@ cp %{SOURCE7} m4/ %patch288 -p0 %patch289 -p0 %patch290 -p0 -%patch291 -p0 # udev patches %patch1001 -p1 @@ -1153,6 +1152,7 @@ cp %{SOURCE7} m4/ %patch1035 -p1 %patch1036 -p1 %patch1037 -p1 +%patch1038 -p0 # ensure generate files are removed rm -f units/emergency.service