SF.net SVN: gar:[25651] csw/mgar/pkg/squid/trunk

[cgrzemba at users.sourceforge.net]

Revision: 25651
          http://sourceforge.net/p/gar/code/25651
Author:   cgrzemba
Date:     2016-04-07 14:55:30 +0000 (Thu, 07 Apr 2016)
Log Message:
-----------
squid/trunk: add some patches

Modified Paths:
--------------
    csw/mgar/pkg/squid/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/squid/trunk/files/bug4482.patch
    csw/mgar/pkg/squid/trunk/files/opt-cflags-configure.ap.patch

Modified: csw/mgar/pkg/squid/trunk/Makefile
===================================================================
--- csw/mgar/pkg/squid/trunk/Makefile	2016-04-07 11:42:51 UTC (rev 25650)
+++ csw/mgar/pkg/squid/trunk/Makefile	2016-04-07 14:55:30 UTC (rev 25651)
@@ -29,6 +29,10 @@
 # From http://bugs.squid-cache.org/show_bug.cgi?id=4057
 #PATCHFILES += bug4057.patch
 
+PATCHFILES += bug4482.patch
+# bug4483 integrated in squid-4
+PATCHFILES += opt-cflags-configure.ap.patch
+
 PACKAGES = CSWsquid
 RUNTIME_DEP_PKGS_CSWsquid += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWsquid += CSWlibldap2-4-2
@@ -142,10 +146,10 @@
 # Add #define until this is fixed:
 #   http://bugs.squid-cache.org/show_bug.cgi?id=4025
 EXTRA_CPPFLAGS += -DKRB5_DEPRECATED=1
-CONFIGURE_ARGS_OPT += --disable-strict-error-checking
+# CONFIGURE_ARGS_OPT += --disable-strict-error-checking
 
-CONFIGURE_ARGS_DBG += --disable-optimizations
-CONFIGURE_ARGS_DBG += --disable-inline
+# CONFIGURE_ARGS_DBG += --disable-optimizations
+# CONFIGURE_ARGS_DBG += --disable-inline
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
 # configure tests with 'id -u' and expects a uidnumber
@@ -180,6 +184,10 @@
 
 include gar/category.mk
 
+pre-configure:
+	cd $(WORKSRC) && autoreconf --force --install
+	@$(MAKECOOKIE)
+	
 post-install-modulated:
 	ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/logs

Added: csw/mgar/pkg/squid/trunk/files/bug4482.patch
===================================================================
--- csw/mgar/pkg/squid/trunk/files/bug4482.patch	                        (rev 0)
+++ csw/mgar/pkg/squid/trunk/files/bug4482.patch	2016-04-07 14:55:30 UTC (rev 25651)
@@ -0,0 +1,11 @@
+--- a/src/ip/Intercept.cc
++++ b/src/ip/Intercept.cc
+@@ -205,7 +205,7 @@ Ip::Intercept::IpfInterception(const Comm::ConnectionPointer &newConn, int silen
+         // warn once every 10 at critical level, then push down a level each repeated event
+         static int warningLevel = DBG_CRITICAL;
+         debugs(89, warningLevel, "IPF (IPFilter v4) NAT does not support IPv6. Please upgrade to IPFilter v5.1");
+-        warningLevel = ++warningLevel % 10;
++        warningLevel = (warningLevel+1) % 10;
+         return false;
+ #else
+         natLookup.nl_v = 6;

Added: csw/mgar/pkg/squid/trunk/files/opt-cflags-configure.ap.patch
===================================================================
--- csw/mgar/pkg/squid/trunk/files/opt-cflags-configure.ap.patch	                        (rev 0)
+++ csw/mgar/pkg/squid/trunk/files/opt-cflags-configure.ap.patch	2016-04-07 14:55:30 UTC (rev 25651)
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -400,7 +400,7 @@ AC_ARG_ENABLE(optimizations,
+ if test "x$enableval" = "xno" ; then
+   AC_MSG_NOTICE([Disabling compiler optimizations (-O flag)])
+   CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`"
+-  CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-O[[0-9]]*//'`"
++  CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-O[[0-9g]]*//'`"
+   enable_inline="no"
+ fi
+ ])
+@@ -3237,7 +3237,7 @@ case "$host" in
+   i386-*-solaris2.*)
+     if test "x$GCC" = "xyes"; then
+       AC_MSG_NOTICE([Removing -O for gcc on $host])
+-      CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`"
++      CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9g]]*//'`"
+     fi
+   ;;
+ 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.