From 01293222970e4c8397ba71899877ce0f6bda39df5420dd7d5d15d68627317f9f Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 3 Jul 2012 08:59:58 +0000 Subject: [PATCH 1/4] Accepting request 126790 from home:dimstar:branches:Base:System - Add aaa_base-bnc756012.patch: unset ftp_proxy is not the same as ftp_proxy="", which can drip libproxy over. (bnc#756012) OBS-URL: https://build.opensuse.org/request/show/126790 OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=374 --- aaa_base-bnc756012.patch | 70 ++++++++++++++++++++++++++++++++++++++++ aaa_base.changes | 6 ++++ aaa_base.spec | 2 ++ 3 files changed, 78 insertions(+) create mode 100644 aaa_base-bnc756012.patch diff --git a/aaa_base-bnc756012.patch b/aaa_base-bnc756012.patch new file mode 100644 index 0000000..f89e5ab --- /dev/null +++ b/aaa_base-bnc756012.patch @@ -0,0 +1,70 @@ +Index: files/etc/profile.d/profile.csh +=================================================================== +--- files/etc/profile.d/profile.csh.orig ++++ files/etc/profile.d/profile.csh +@@ -50,23 +50,23 @@ foreach line ( "`/bin/grep -vh '^#' $sys + set proxy_enabled=${val:q} + breaksw + case HTTP_PROXY=*: +- if (! ${%val} ) continue ++ if (! ${%proxy_enabled} == yes ) continue + setenv http_proxy ${val:q} + breaksw + case HTTPS_PROXY=*: +- if (! ${%val} ) continue ++ if (! ${%proxy_enabled} == yes ) continue + setenv https_proxy ${val:q} + breaksw + case FTP_PROXY=*: +- if (! ${%val} ) continue ++ if (! ${%proxy_enabled} == yes ) continue + setenv ftp_proxy ${val:q} + breaksw + case GOPHER_PROXY=*: +- if (! ${%val} ) continue ++ if (! ${%proxy_enabled} == yes ) continue + setenv gopher_proxy ${val:q} + breaksw + case NO_PROXY=*: +- if (! ${%val} ) continue ++ if (! ${%proxy_enabled} == yes ) continue + setenv no_proxy ${val:q} + breaksw + case DEFAULT_WM=*: +Index: files/etc/profile.d/profile.sh +=================================================================== +--- files/etc/profile.d/profile.sh.orig ++++ files/etc/profile.d/profile.sh +@@ -45,27 +45,27 @@ do + PROXY_ENABLED="${val}" + ;; + HTTP_PROXY=*) +- test -n "$val" || continue ++ test "$PROXY_ENABLED" = "yes" || continue + http_proxy="${val}" + export http_proxy + ;; + HTTPS_PROXY=*) +- test -n "$val" || continue ++ test "$PROXY_ENABLED" = "yes" || continue + https_proxy="${val}" + export https_proxy + ;; + FTP_PROXY=*) +- test -n "$val" || continue ++ test "$PROXY_ENABLED" = "yes" || continue + ftp_proxy="${val}" + export ftp_proxy + ;; + GOPHER_PROXY=*) +- test -n "$val" || continue ++ test "$PROXY_ENABLED" = "yes" || continue + gopher_proxy="${val}" + export gopher_proxy + ;; + NO_PROXY=*) +- test -n "$val" || continue ++ test "$PROXY_ENABLED" = "yes" || continue + no_proxy="${val}" + export no_proxy + NO_PROXY="${val}" diff --git a/aaa_base.changes b/aaa_base.changes index 3098db2..166f57e 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jul 1 14:57:08 UTC 2012 - dimstar@opensuse.org + +- Add aaa_base-bnc756012.patch: unset ftp_proxy is not the same + as ftp_proxy="", which can drip libproxy over. (bnc#756012) + ------------------------------------------------------------------- Fri Jun 29 08:20:45 UTC 2012 - lnussel@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index 58f96e7..956fa0d 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -45,6 +45,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # run make package in checkout out git repo to recreate Source: aaa_base.tar.bz2 Source99: aaa_base-rpmlintrc +Patch0: aaa_base-bnc756012.patch %description This package installs several important configuration files. Central @@ -73,6 +74,7 @@ installed by default as it may degrade performance. %prep %setup -n aaa_base +%patch0 %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} From 64673edc1440f6454f72f574e7a11c66f13548715be901e1ba96247e63f305a8 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 4 Jul 2012 09:23:26 +0000 Subject: [PATCH 2/4] - support beeing called as rc* symlink wrapper (bnc#769902) - use systemctl instead of loop for --status-all (bnc#769902) OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=375 --- aaa_base.changes | 6 ++++++ aaa_base.tar.bz2 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 166f57e..78f209d 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 4 09:23:13 UTC 2012 - lnussel@suse.de + +- support beeing called as rc* symlink wrapper (bnc#769902) +- use systemctl instead of loop for --status-all (bnc#769902) + ------------------------------------------------------------------- Sun Jul 1 14:57:08 UTC 2012 - dimstar@opensuse.org diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index 97d4063..7599c11 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fe7ce03da5ea5ea882b77a74d940b9600246df4e7dc7f0c893bf32d1c10a27b4 -size 114160 +oid sha256:b88f9ca6cea5413245520b22945979c035adf2e658d1815a1e0e5b994de57292 +size 114471 From 0df29427eee9dc16b9f7352c4099997574e57ed7ba266bc20141bb39564a9b44 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 4 Jul 2012 09:40:57 +0000 Subject: [PATCH 3/4] re-geneate from git which includes the patch OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=376 --- aaa_base.changes | 2 +- aaa_base.spec | 2 -- aaa_base.tar.bz2 | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 78f209d..6669263 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Wed Jul 4 09:23:13 UTC 2012 - lnussel@suse.de +Wed Jul 4 09:40:15 UTC 2012 - lnussel@suse.de - support beeing called as rc* symlink wrapper (bnc#769902) - use systemctl instead of loop for --status-all (bnc#769902) diff --git a/aaa_base.spec b/aaa_base.spec index 956fa0d..58f96e7 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -45,7 +45,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # run make package in checkout out git repo to recreate Source: aaa_base.tar.bz2 Source99: aaa_base-rpmlintrc -Patch0: aaa_base-bnc756012.patch %description This package installs several important configuration files. Central @@ -74,7 +73,6 @@ installed by default as it may degrade performance. %prep %setup -n aaa_base -%patch0 %build make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index 7599c11..8a2a9ae 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b88f9ca6cea5413245520b22945979c035adf2e658d1815a1e0e5b994de57292 -size 114471 +oid sha256:2545ec7faf6073fe22438ce9ae9e778d0ab895de6d9902709a4162c50946952b +size 114500 From 2bd7db35d139527ecb08885eca15f97bdf229c6daa99984ce4abe7c22e09fb9e Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 4 Jul 2012 09:41:20 +0000 Subject: [PATCH 4/4] remove obsolete file OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=377 --- aaa_base-bnc756012.patch | 70 ---------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 aaa_base-bnc756012.patch diff --git a/aaa_base-bnc756012.patch b/aaa_base-bnc756012.patch deleted file mode 100644 index f89e5ab..0000000 --- a/aaa_base-bnc756012.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: files/etc/profile.d/profile.csh -=================================================================== ---- files/etc/profile.d/profile.csh.orig -+++ files/etc/profile.d/profile.csh -@@ -50,23 +50,23 @@ foreach line ( "`/bin/grep -vh '^#' $sys - set proxy_enabled=${val:q} - breaksw - case HTTP_PROXY=*: -- if (! ${%val} ) continue -+ if (! ${%proxy_enabled} == yes ) continue - setenv http_proxy ${val:q} - breaksw - case HTTPS_PROXY=*: -- if (! ${%val} ) continue -+ if (! ${%proxy_enabled} == yes ) continue - setenv https_proxy ${val:q} - breaksw - case FTP_PROXY=*: -- if (! ${%val} ) continue -+ if (! ${%proxy_enabled} == yes ) continue - setenv ftp_proxy ${val:q} - breaksw - case GOPHER_PROXY=*: -- if (! ${%val} ) continue -+ if (! ${%proxy_enabled} == yes ) continue - setenv gopher_proxy ${val:q} - breaksw - case NO_PROXY=*: -- if (! ${%val} ) continue -+ if (! ${%proxy_enabled} == yes ) continue - setenv no_proxy ${val:q} - breaksw - case DEFAULT_WM=*: -Index: files/etc/profile.d/profile.sh -=================================================================== ---- files/etc/profile.d/profile.sh.orig -+++ files/etc/profile.d/profile.sh -@@ -45,27 +45,27 @@ do - PROXY_ENABLED="${val}" - ;; - HTTP_PROXY=*) -- test -n "$val" || continue -+ test "$PROXY_ENABLED" = "yes" || continue - http_proxy="${val}" - export http_proxy - ;; - HTTPS_PROXY=*) -- test -n "$val" || continue -+ test "$PROXY_ENABLED" = "yes" || continue - https_proxy="${val}" - export https_proxy - ;; - FTP_PROXY=*) -- test -n "$val" || continue -+ test "$PROXY_ENABLED" = "yes" || continue - ftp_proxy="${val}" - export ftp_proxy - ;; - GOPHER_PROXY=*) -- test -n "$val" || continue -+ test "$PROXY_ENABLED" = "yes" || continue - gopher_proxy="${val}" - export gopher_proxy - ;; - NO_PROXY=*) -- test -n "$val" || continue -+ test "$PROXY_ENABLED" = "yes" || continue - no_proxy="${val}" - export no_proxy - NO_PROXY="${val}"