Fix rpath security check failures reported by scanelf (#280639).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 65 insertions, 49 deletions

diff --git a/net-proxy/squid/ChangeLog b/net-proxy/squid/ChangeLog
index 4acf7a7c8eec..3cb04d0fd6cb 100644
--- a/net-proxy/squid/ChangeLog
+++ b/net-proxy/squid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squid
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.283 2009/09/12 06:34:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/ChangeLog,v 1.284 2009/09/19 11:58:15 mrness Exp $
+
+*squid-3.1.0.13_beta-r2 (19 Sep 2009)
+
+  19 Sep 2009; Alin Năstac <mrness@gentoo.org>
+  -squid-3.1.0.13_beta-r1.ebuild, +squid-3.1.0.13_beta-r2.ebuild,
+  files/squid-3.1.0.13_beta-qafixes.patch:
+  Fix rpath security check failures reported by scanelf (#280639).
 
 *squid-3.0.19 (12 Sep 2009)
 
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 5ea4a68dc650..c824bbc529af 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -15,7 +15,7 @@ AUX squid-3.0.19-cross-compile.patch 1234 RMD160 211ac61245bcf4bc7bbdac69fe49a67
 AUX squid-3.0.19-gentoo.patch 13095 RMD160 579701b8461fc340181e89d1f27f52473a3a7c26 SHA1 926b5e44a3e3b129ccb955e570af4caa856b7697 SHA256 af1e67885e531a47d74c672e3ef94095e25d6f3b35d5c12395f1b41a03bb30a2
 AUX squid-3.1.0.13_beta-cve-2009-2855.patch 1159 RMD160 a45298f835852e1a3cfc793ea3a81569c24fe87b SHA1 c329b19f632652bd7f6c36e36b793ebdf8551097 SHA256 30e03878fead8aad19ce3739bddce6c42d62ea572feb6a4387393e24b92ee580
 AUX squid-3.1.0.13_beta-gentoo.patch 12746 RMD160 c231d5ff2fa0f925f040575d758d8ea145124436 SHA1 0a2b8149b88a40710b877cb68ce70451dd9654a1 SHA256 191305a90a663742ce04f2d05a8a15ee79c429906a323da18d52c90a266ff9f1
-AUX squid-3.1.0.13_beta-qafixes.patch 3996 RMD160 5987f180c321749d7b92e2e6d7c0e8aedfbc63b5 SHA1 0edd1ea0c848b4dacf5f1b55bd3e585afb0592e7 SHA256 4a2b15985716c305e2ea76acbea4cf692f7ee0ba0ef43658be171cbe039c2186
+AUX squid-3.1.0.13_beta-qafixes.patch 4374 RMD160 7680091baa7a94362a096a60723f29bc025d1b0b SHA1 dd846563e541f039f2822e4ff2d965d758445959 SHA256 89132cc2cf4682c9175b14208efe772fe66b49a1f5d7e93b9d07f76f818aa5ee
 AUX squid.confd 541 RMD160 e248f8fdc3ce732267614652f17bd88472e62b76 SHA1 995df246caffb2a74be2df3072d7ff5fbd024a9d SHA256 982d829f3862c5543af82acd4f7bb123ebe3e9d1c5eff0911f5345262811f2e1
 AUX squid.cron 143 RMD160 0706a7ad04691b9a93a2897c319008440483ba11 SHA1 6138db0eccb7320e707b8d60c2970ef684e29336 SHA256 4c9e2afe5b0bba583ce896233ea1f9262beeb1b6cf51b4adb48d5f5c03933b2f
 AUX squid.initd 2269 RMD160 b65ca980aedd37551223370d8bacae4f328d8e39 SHA1 363e4d74451f902974e080a51e6400c79863081d SHA256 580facfdc771c49460633ebd8e8ea2d736431929ee89e83c3ddea5d203178f4f
@@ -29,13 +29,13 @@ DIST squid-3.1.0.13.tar.gz 3247124 RMD160 263a42af1ff2d9a967862f77389f9bd3bd6b9b
 EBUILD squid-2.7.6-r2.ebuild 6039 RMD160 b5355c33e3a7b9dce57f75da87da71854d880321 SHA1 aac17f4c96fd9e104d595f8ceadf0c6799284aac SHA256 7873717f430431b12c5405fadd7fa3e62d6374991cb077f6b53e43dbec9e9d92
 EBUILD squid-3.0.18-r1.ebuild 6438 RMD160 3f2e0054891d77062da0445e95a60281ab3ab878 SHA1 ad8cb75bf4d0b44c6943de10d4f98f5bee64b451 SHA256 69bb7ef4a8c789e061955e69aeb7d9ca20fb29c2b5764211532a8bd34cbea580
 EBUILD squid-3.0.19.ebuild 6397 RMD160 5da0e96af88034dd79f189b4f7cdc2b46de52394 SHA1 a10e3c993d6021535522d9dcf351d29ad3e307db SHA256 eb8e057287c8cc6f2272496439cfddc0b7dbc0d2130dbdbead32d3ca1c38a7a8
-EBUILD squid-3.1.0.13_beta-r1.ebuild 6638 RMD160 516a8f26627ff6cd94862831b368ab3a4bef0236 SHA1 1d7b00f0f1be808e38e7d08edb08354302d417a2 SHA256 36ab5d0b147708d55da86da85ce0c504d9e472a1a3d4a61f9b69bd9058a55e3f
-MISC ChangeLog 61220 RMD160 ec01a4709ddfc83e0a62956697d9b93b0e4bfe95 SHA1 a80aaf217e8160e3ba37788f75024b4c080669bc SHA256 c25bbe071406a17e979a7844cd3370fc9b8d7256f97c896924bf4967a66aad69
+EBUILD squid-3.1.0.13_beta-r2.ebuild 6638 RMD160 7e8c5e11faaf8d10ce44a2457fe7b3f0149a252e SHA1 8189105b515603c0b6ee1de21fd1bab463619516 SHA256 42a5b73b165932657ff4718a83a5965dea007067c2a6b7be93094719399ff5f8
+MISC ChangeLog 61484 RMD160 6deb9f844ff8f8a851ded9cbfa535e9cd2255cd8 SHA1 586b2d6783360b6abf2046ee32110fd9383cbb73 SHA256 c0fe83c5f1eac54ff57d6b00c480cad38d55092774b4a161adaf2d2f99ef960f
 MISC metadata.xml 815 RMD160 ef81660620d9fa0746bc415a7e6e6cf8a5500b98 SHA1 7a420824358267ae8c85256da092d1fba8727dcd SHA256 943b6f547b43197636ac4ec29ad23423770ec621cdb1b495306d95ab14da09ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqrQRIACgkQ9A5kJBGSrsvFcwCdH3d5me0bRphdQ7LZip4ZoM7t
-5NkAn2QSM9Go2hM+Y0mHLvUvwIAiCldX
-=w3L8
+iEYEARECAAYFAkq0x2EACgkQ9A5kJBGSrsuHMACgnOyR44ANzXtVIAFi5xuhq8zO
+gfkAnA8VW5/ng0ff3eSfIetI1CK1aPEV
+=9Xro
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squid/files/squid-3.1.0.13_beta-qafixes.patch b/net-proxy/squid/files/squid-3.1.0.13_beta-qafixes.patch
index 12f9144018aa..bea2d6f279c6 100644
--- a/net-proxy/squid/files/squid-3.1.0.13_beta-qafixes.patch
+++ b/net-proxy/squid/files/squid-3.1.0.13_beta-qafixes.patch
@@ -1,6 +1,54 @@
+diff -Nru squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in
+--- squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-09-19 13:30:54.000000000 +0200
++++ squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-09-19 13:33:38.000000000 +0200
+@@ -94,7 +94,7 @@
+                        else
+                          ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
+                          if test "x$ac_gssapi_libs" != "x" ; then
+-                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                           LIBS="$LIBS $ac_gssapi_libs"
+                          else
+                            for lib in $ac_gss_libs; do
+                              AC_CHECK_LIB($lib,main)
+@@ -118,7 +118,7 @@
+                      fi
+                      ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
+                      if test "x$ac_gssapi_libs" != "x" ; then
+-                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                         LIBS="$LIBS $ac_gssapi_libs"
+                      else
+                          for lib in $ac_gss_libs; do
+                             AC_CHECK_LIB($lib,main)
+@@ -172,7 +172,7 @@
+                              ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
+                              LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
+                            fi
+-                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                           LIBS="$LIBS $ac_gssapi_libs"
+                          else
+                            for lib in $ac_gss_libs; do
+                              AC_CHECK_LIB($lib,main)
+@@ -201,7 +201,7 @@
+                            ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
+                            LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
+                          fi
+-                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
++                         LIBS="$LIBS $ac_gssapi_libs"
+                      else
+                          for lib in $ac_gss_libs; do
+                             AC_CHECK_LIB($lib,main)
+@@ -425,6 +425,8 @@
+   [ squid_dir=$withval ]
+ )
+ 
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ eval ac_p_include=$includedir
+ CPPFLAGS="$CPPFLAGS -I$ac_p_include -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
+ AC_CACHE_CHECK([for SQUID at '$squid_dir' ],ac_cv_have_squid,[
 diff -Nru squid-3.1.0.13.orig/src/forward.cc squid-3.1.0.13/src/forward.cc
 --- squid-3.1.0.13.orig/src/forward.cc	2009-08-04 15:32:17.000000000 +0200
-+++ squid-3.1.0.13/src/forward.cc	2009-08-06 23:34:54.000000000 +0200
++++ squid-3.1.0.13/src/forward.cc	2009-09-19 13:33:38.000000000 +0200
 @@ -995,7 +995,12 @@
                          break;
  
@@ -17,7 +65,7 @@ diff -Nru squid-3.1.0.13.orig/src/forward.cc squid-3.1.0.13/src/forward.cc
                      p += CMSG_LEN(o->cmsg_len);
 diff -Nru squid-3.1.0.13.orig/src/ftp.cc squid-3.1.0.13/src/ftp.cc
 --- squid-3.1.0.13.orig/src/ftp.cc	2009-08-04 15:32:17.000000000 +0200
-+++ squid-3.1.0.13/src/ftp.cc	2009-08-06 23:32:39.000000000 +0200
++++ squid-3.1.0.13/src/ftp.cc	2009-09-19 13:33:38.000000000 +0200
 @@ -534,16 +534,18 @@
  void
  FtpStateData::loginParser(const char *login, int escaped)
@@ -41,42 +89,3 @@ diff -Nru squid-3.1.0.13.orig/src/ftp.cc squid-3.1.0.13/src/ftp.cc
              if (escaped)
                  rfc1738_unescape(user);
          }
-diff -Nru squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in
---- squid-3.1.0.13.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-08-19 19:00:43.000000000 +0200
-+++ squid-3.1.0.13/helpers/negotiate_auth/squid_kerb_auth/configure.in	2009-08-22 12:53:13.000000000 +0200
-@@ -94,7 +94,7 @@
-                        else
-                          ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
-                          if test "x$ac_gssapi_libs" != "x" ; then
--                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+                           LIBS="$LIBS $ac_gssapi_libs"
-                          else
-                            for lib in $ac_gss_libs; do
-                              AC_CHECK_LIB($lib,main)
-@@ -118,7 +118,7 @@
-                      fi
-                      ac_gssapi_libs=`krb5-config --libs gssapi 2>/dev/null`
-                      if test "x$ac_gssapi_libs" != "x" ; then
--                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+                         LIBS="$LIBS $ac_gssapi_libs"
-                      else
-                          for lib in $ac_gss_libs; do
-                             AC_CHECK_LIB($lib,main)
-@@ -172,7 +172,7 @@
-                              ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
-                              LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
-                            fi
--                           LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+                           LIBS="$LIBS $ac_gssapi_libs"
-                          else
-                            for lib in $ac_gss_libs; do
-                              AC_CHECK_LIB($lib,main)
-@@ -201,7 +201,7 @@
-                            ac_libdir=`echo $ac_gssapi_libs | sed -e 's/.*-L//' | sed -e 's/ .*//'`  
-                            LDFLAGS="$LDFLAGS $w_flag$ac_libdir$w_flag_2"
-                          fi
--                         LDFLAGS="$LDFLAGS $ac_gssapi_libs"
-+                         LIBS="$LIBS $ac_gssapi_libs"
-                      else
-                          for lib in $ac_gss_libs; do
-                             AC_CHECK_LIB($lib,main)
diff --git a/net-proxy/squid/squid-3.1.0.13_beta-r1.ebuild b/net-proxy/squid/squid-3.1.0.13_beta-r2.ebuild
index 4639df2dfb41..5e3a8ebc199a 100644
--- a/net-proxy/squid/squid-3.1.0.13_beta-r1.ebuild
+++ b/net-proxy/squid/squid-3.1.0.13_beta-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.13_beta-r1.ebuild,v 1.1 2009/08/22 12:57:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.1.0.13_beta-r2.ebuild,v 1.1 2009/09/19 11:58:15 mrness Exp $
 
 EAPI="2"