[patch] Updated squid-${PV}-qafixes.patch

squid-3.1.1-qafixes.patch (text/plain), 3.00 KB, created by Cosmin Giradu on 2010-04-15 13:08:32 UTC

diff -Nru squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in
--- squid-3.1.1.orig/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-04-15 16:27:19.000000000 +0300
+++ squid-3.1.1/helpers/negotiate_auth/squid_kerb_auth/configure.in	2010-04-15 18:08:18.000000000 +0300
@@ -93,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)
@@ -117,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)
@@ -171,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)
@@ -200,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 -Nru squid-3.1.1.orig/src/forward.cc squid-3.1.1/src/forward.cc
--- squid-3.1.1.orig/src/forward.cc	2010-04-15 16:27:19.000000000 +0300
+++ squid-3.1.1/src/forward.cc	2010-04-15 18:19:20.000000000 +0300
@@ -999,8 +999,12 @@
                         break;
 
                     if (o->cmsg_level == SOL_IP && o->cmsg_type == IP_TOS) {
-                        int *tmp = (int*)CMSG_DATA(o);
-                        clientFde->upstreamTOS = (unsigned char)*tmp;
+                        union {
+                           unsigned char *pchar;
+                           int  *pint;
+                        } data;
+                        data.pchar = CMSG_DATA(o);
+                        clientFde->upstreamTOS = (unsigned char)*data.pint;
                         break;
                     }
                     pbuf += CMSG_LEN(o->cmsg_len);