From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Fri, 1 Apr 2011 13:11:29 +0000 (+0200)
Subject: squid: Update to version 3.1.0.15.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=321c867a9f92db1eba4d65ea479c4831ce3a2da0;p=ipfire-3.x.git

squid: Update to version 3.1.0.15.

Fixes bug #126

Added libcap dependency for transparent proxy support. Removed patch for smb auth.
---

diff --git a/pkgs/squid/patches/squid-3.1.0.15-smb-path.patch b/pkgs/squid/patches/squid-3.1.0.15-smb-path.patch
deleted file mode 100644
index 27bcc971f..000000000
--- a/pkgs/squid/patches/squid-3.1.0.15-smb-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up squid-3.1.8/helpers/basic_auth/SMB/Makefile.am.smb-path squid-3.1.8/helpers/basic_auth/SMB/Makefile.am
---- squid-3.1.8/helpers/basic_auth/SMB/Makefile.am.smb-path	2010-09-04 05:25:57.000000000 +0200
-+++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.am	2010-09-05 18:38:05.000000000 +0200
-@@ -9,14 +9,14 @@
- include $(top_srcdir)/src/Common.am
- 
- # SAMBAPREFIX must point to the directory where Samba has been installed.
--# By default, Samba is installed in /usr/local/samba. If you changed this
-+# By default, Samba is installed in /usr. If you changed this
- # by using the --prefix option when configuring Samba, you need to change
- # SAMBAPREFIX accordingly.
- 
- ## FIXME: autoconf should test for the samba path.
- 
- SMB_AUTH_HELPER	= smb_auth.sh
--SAMBAPREFIX=/usr/local/samba
-+SAMBAPREFIX=/usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- 
- libexec_SCRIPTS	= $(SMB_AUTH_HELPER)
-diff -up squid-3.1.8/helpers/basic_auth/SMB/Makefile.in.smb-path squid-3.1.8/helpers/basic_auth/SMB/Makefile.in
---- squid-3.1.8/helpers/basic_auth/SMB/Makefile.in.smb-path	2010-09-04 05:26:21.000000000 +0200
-+++ squid-3.1.8/helpers/basic_auth/SMB/Makefile.in	2010-09-05 18:39:47.000000000 +0200
-@@ -291,11 +291,11 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdi
- 	-I$(srcdir)
- 
- # SAMBAPREFIX must point to the directory where Samba has been installed.
--# By default, Samba is installed in /usr/local/samba. If you changed this
-+# By default, Samba is installed in /usr. If you changed this
- # by using the --prefix option when configuring Samba, you need to change
- # SAMBAPREFIX accordingly.
- SMB_AUTH_HELPER = smb_auth.sh
--SAMBAPREFIX = /usr/local/samba
-+SAMBAPREFIX = /usr
- SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
- libexec_SCRIPTS = $(SMB_AUTH_HELPER)
- smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"
diff --git a/pkgs/squid/squid.nm b/pkgs/squid/squid.nm
index d560a6267..9031e6812 100644
--- a/pkgs/squid/squid.nm
+++ b/pkgs/squid/squid.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = squid
-PKG_VER        = 3.1.8
-PKG_REL        = 0
+PKG_VER        = 3.1.11
+PKG_REL        = 1
 
 PKG_MAINTAINER = Christian Schmidt <christian.schmidt@ipfire.org>
 PKG_GROUPS     = Networking/Daemons
@@ -35,9 +35,11 @@ PKG_LICENSE    = GPLv2+
 PKG_SUMMARY    = The Squid proxy caching server.
 
 PKG_BUILD_DEPS+= gcc-c++ libxml2-devel openssl-devel openldap-devel samba-devel \
-	iptables-devel $(PKG_DEPS) pam-devel
+	iptables-devel $(PKG_DEPS) pam-devel libcap-devel
 PKG_DEPS      += /usr/bin/smbclient
 
+PKG_REQUIRES_FILTER = perl\(Authen::Smb\)
+
 define PKG_DESCRIPTION
 	Squid is a high-performance proxy caching server for Web clients, \
 	supporting FTP, gopher, and HTTP data objects. Unlike traditional \
@@ -48,7 +50,7 @@ define PKG_DESCRIPTION
 
 endef
 
-PKG_TARBALL    = $(THISAPP).tar.bz2
+PKG_TARBALL    = $(THISAPP).tar.gz
 
 CONFIGURE_OPTIONS += \
 	--datadir=/usr/lib/squid \