From 5da0f08749ef60133019bcf04774590c6a74cad35e87fe82cdb2383ccebebd2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Thu, 15 Nov 2012 09:35:19 +0000 Subject: [PATCH 1/2] Accepting request 141378 from home:dimstar:branches:Base:System Fix syntax error in rc.status.... I opted for 'patching the package' as gitorious is causing some odd issues.... fixes issues as posted by cartman: http://susepaste.org/view/raw/16573235 OBS-URL: https://build.opensuse.org/request/show/141378 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=419 --- aaa_base-syntax-error.patch | 13 +++++++++++++ aaa_base.changes | 5 +++++ aaa_base.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 aaa_base-syntax-error.patch diff --git a/aaa_base-syntax-error.patch b/aaa_base-syntax-error.patch new file mode 100644 index 0000000..aa45d4e --- /dev/null +++ b/aaa_base-syntax-error.patch @@ -0,0 +1,13 @@ +Index: aaa_base-12.3/files/etc/rc.status +=================================================================== +--- aaa_base-12.3.orig/files/etc/rc.status ++++ aaa_base-12.3/files/etc/rc.status +@@ -59,7 +59,7 @@ if test -z "$SYSTEMD_NO_WRAP" && /bin/mo + *) unset _rc_base ;; + esac + if test -n "$_rc_base" -a -x /bin/systemctl ; then +- exec /bin/systemctl $1 "${_rc_base} ++ exec /bin/systemctl $1 "${_rc_base}" + fi + unset _rc_base + fi diff --git a/aaa_base.changes b/aaa_base.changes index 7915ad8..7b0ccdb 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 15 09:04:44 UTC 2012 - dimstar@opensuse.org + +- Add aaa_base-syntax-error.patch: Fix syntax error in rc.status. + ------------------------------------------------------------------- Tue Nov 13 11:12:59 UTC 2012 - ro@suse.com diff --git a/aaa_base.spec b/aaa_base.spec index 3acc0e2..18b02cf 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -54,6 +54,8 @@ Source: aaa_base-%{version}.tar.gz # Source1: README.packaging.txt Source99: aaa_base-rpmlintrc +# PATCH-FIX-UPSTREAM aaa_base-syntax-error.patch dimstar@opensuse.org -- Fix syntax error. +Patch0: aaa_base-syntax-error.patch %description This package installs several important configuration files and central scripts. @@ -81,6 +83,7 @@ installed by default as it may degrade performance. %prep %setup -q +%patch0 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} From 42ea186c1e3608aa5f8b73586293bcac9d2b4d46835f96239dc19197955e85e5 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 15 Nov 2012 09:42:01 +0000 Subject: [PATCH 2/2] - remove boot.* again, new insserv shadows them OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=420 --- README.packaging.txt | 2 +- aaa_base-12.3.tar.gz | 4 ++-- aaa_base-syntax-error.patch | 13 ------------- aaa_base.changes | 5 +++++ aaa_base.spec | 7 ------- 5 files changed, 8 insertions(+), 23 deletions(-) delete mode 100644 aaa_base-syntax-error.patch diff --git a/README.packaging.txt b/README.packaging.txt index 123787d..584f754 100644 --- a/README.packaging.txt +++ b/README.packaging.txt @@ -6,7 +6,7 @@ to make changes, you have the following options: aaa_base packagers commit it for you The online repository is at: -http://gitorious.org/opensuse/aaa_base +http://github.com/openSUSE/aaa_base For building the package from git run the service directly: osc service disabledrun diff --git a/aaa_base-12.3.tar.gz b/aaa_base-12.3.tar.gz index 18daf06..060f916 100644 --- a/aaa_base-12.3.tar.gz +++ b/aaa_base-12.3.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b5cdf3876bbcf6565d71e19bdd7fc293c09029b92adbdfab3fc4c8d117ecfee -size 99977 +oid sha256:082f6e43e37740e6d2ea603d17bd13b0155762ce24517bafc2f2280a3520a0af +size 106215 diff --git a/aaa_base-syntax-error.patch b/aaa_base-syntax-error.patch deleted file mode 100644 index aa45d4e..0000000 --- a/aaa_base-syntax-error.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: aaa_base-12.3/files/etc/rc.status -=================================================================== ---- aaa_base-12.3.orig/files/etc/rc.status -+++ aaa_base-12.3/files/etc/rc.status -@@ -59,7 +59,7 @@ if test -z "$SYSTEMD_NO_WRAP" && /bin/mo - *) unset _rc_base ;; - esac - if test -n "$_rc_base" -a -x /bin/systemctl ; then -- exec /bin/systemctl $1 "${_rc_base} -+ exec /bin/systemctl $1 "${_rc_base}" - fi - unset _rc_base - fi diff --git a/aaa_base.changes b/aaa_base.changes index 7b0ccdb..ee760ae 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 15 09:37:55 UTC 2012 - coolo@suse.com + +- remove boot.* again, new insserv shadows them + ------------------------------------------------------------------- Thu Nov 15 09:04:44 UTC 2012 - dimstar@opensuse.org diff --git a/aaa_base.spec b/aaa_base.spec index 18b02cf..d659f59 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -54,8 +54,6 @@ Source: aaa_base-%{version}.tar.gz # Source1: README.packaging.txt Source99: aaa_base-rpmlintrc -# PATCH-FIX-UPSTREAM aaa_base-syntax-error.patch dimstar@opensuse.org -- Fix syntax error. -Patch0: aaa_base-syntax-error.patch %description This package installs several important configuration files and central scripts. @@ -83,7 +81,6 @@ installed by default as it may degrade performance. %prep %setup -q -%patch0 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} @@ -169,10 +166,6 @@ rm -f /root/.gnupg/secring.gpg.aaa_save # needed also with systemd /etc/init.d/boot.localnet /etc/init.d/powerfail -# needed for backward compat -/etc/init.d/boot.localfs -/etc/init.d/boot.rootfsck -/etc/init.d/boot.cleanup /etc/hushlogins %dir /lib/aaa_base /lib/aaa_base/convert_sysctl*