diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2009-09-19 11:58:16 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2009-09-19 11:58:16 +0000 |
| commit | 6f4d33e8117ed7721930487dc815449441abc7d1 (patch) | |
| tree | 5908305495cca56d6397d79a38f843c623a91cf8 /net-proxy/squid/files | |
| parent | add ~arm, bug #272088 (diff) | |
| download | gentoo-2-6f4d33e8117ed7721930487dc815449441abc7d1.tar.gz gentoo-2-6f4d33e8117ed7721930487dc815449441abc7d1.tar.bz2 gentoo-2-6f4d33e8117ed7721930487dc815449441abc7d1.zip | |
Fix rpath security check failures reported by scanelf (#280639).
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'net-proxy/squid/files')
| -rw-r--r-- | net-proxy/squid/files/squid-3.1.0.13_beta-qafixes.patch | 91 |
1 files changed, 50 insertions, 41 deletions
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) |