[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[4186] ipcop/trunk
From:       owes () users ! sourceforge ! net
Date:       2010-01-30 8:02:11
Message-ID: E1Nb8HT-0007le-VB () c3vjzd1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 4186
          http://ipcop.svn.sourceforge.net/ipcop/?rev=4186&view=rev
Author:   owes
Date:     2010-01-30 08:02:11 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Squid no longer builds (new libcap, and maybe our combination of linux,glibc). Use \
patch from Gentoo to fix that.

Modified Paths:
--------------
    ipcop/trunk/lfs/squid
    ipcop/trunk/updates/1.9.12/ROOTFILES.i486-1.9.12

Added Paths:
-----------
    ipcop/trunk/src/patches/squid-2.7.STABLE7_capability.patch

Modified: ipcop/trunk/lfs/squid
===================================================================
--- ipcop/trunk/lfs/squid	2010-01-29 21:16:08 UTC (rev 4185)
+++ ipcop/trunk/lfs/squid	2010-01-30 08:02:11 UTC (rev 4186)
@@ -37,7 +37,7 @@
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
-THISAPP    = squid-$(VER)
+THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = http://www.squid-cache.org/Versions/v2/2.7
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
@@ -90,6 +90,7 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_capability.patch
 
 	cd $(DIR_APP) && ./configure	--prefix=/usr \
 					--sysconfdir=/etc/squid \

Added: ipcop/trunk/src/patches/squid-2.7.STABLE7_capability.patch
===================================================================
--- ipcop/trunk/src/patches/squid-2.7.STABLE7_capability.patch	                       \
                (rev 0)
+++ ipcop/trunk/src/patches/squid-2.7.STABLE7_capability.patch	2010-01-30 08:02:11 \
UTC (rev 4186) @@ -0,0 +1,40 @@
+Squid contains a hack in src/tools.c which seems no longer needed with recent libcap
+Patch from http://bugs.gentoo.org/show_bug.cgi?id=264770
+--- squid-2.7.STABLE7.orig/configure.in	2009-02-04 01:44:06.000000000 +0100
++++ squid-2.7.STABLE7/configure.in	2009-06-23 20:59:28.000000000 +0200
+@@ -1694,7 +1694,6 @@
+ 	db.h \
+ 	db_185.h \
+ 	aio.h \
+-	sys/capability.h \
+ ,,,[
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -1728,6 +1727,13 @@
+ #endif
+ ])
+ 
++dnl Check for libcap header
++AC_ARG_ENABLE(caps,
++[  --disable-caps  disable usage of Linux capabilities library to control \
privileges]) ++if test "x$enable_caps" != xno; then
++	AC_CHECK_HEADERS( sys/capability.h )
++fi
++
+ dnl Check for IP-Filter headers. These are a bit nasty..
+ AC_CHECK_HEADERS( \
+ 	ip_compat.h \
+--- squid-2.7.STABLE7.orig/src/tools.c	2008-10-06 23:27:17.000000000 +0200
++++ squid-2.7.STABLE7/src/tools.c	2009-06-23 20:57:42.000000000 +0200
+@@ -42,11 +42,6 @@
+ 
+ #ifdef _SQUID_LINUX_
+ #if HAVE_SYS_CAPABILITY_H
+-#undef _POSIX_SOURCE
+-/* Ugly glue to get around linux header madness colliding with glibc */
+-#define _LINUX_TYPES_H
+-#define _LINUX_FS_H
+-typedef uint32_t __u32;
+ #include <sys/capability.h>
+ #endif
+ #endif

Modified: ipcop/trunk/updates/1.9.12/ROOTFILES.i486-1.9.12
===================================================================
--- ipcop/trunk/updates/1.9.12/ROOTFILES.i486-1.9.12	2010-01-29 21:16:08 UTC (rev \
                4185)
+++ ipcop/trunk/updates/1.9.12/ROOTFILES.i486-1.9.12	2010-01-30 08:02:11 UTC (rev \
4186) @@ -26,6 +26,8 @@
 /usr/sbin/lspci
 /usr/sbin/setpci
 /usr/share/pci.ids.gz
+## squid patched
+/usr/sbin/squid
 ## usb-modeswitch-1.1.0
 /etc/udev/rules.d/40-usb_modeswitch.rules
 /etc/usb_modeswitch.conf


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

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]