From d36675bece519f5b8090822a5a17dc02e9656953 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 3 Jul 2012 08:59:58 +0000
Subject: [PATCH] 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..7d54678
--- /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 00881e5..f7714ce 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 25d8123..f390672 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}