This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 77a04db2e55eaed242cb4d167e9b3c9e0525a480 (commit) via 321c867a9f92db1eba4d65ea479c4831ce3a2da0 (commit) from e70cb6b345c55441302dfa02a6a00ded1dde2e02 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 77a04db2e55eaed242cb4d167e9b3c9e0525a480 Merge: e70cb6b 321c867 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Apr 1 15:16:26 2011 +0200
Merge remote-tracking branch 'maniacikarus/proxy'
commit 321c867a9f92db1eba4d65ea479c4831ce3a2da0 Author: Christian Schmidt maniacikarus@ipfire.org Date: Fri Apr 1 15:11:29 2011 +0200
squid: Update to version 3.1.0.15.
Fixes bug #126
Added libcap dependency for transparent proxy support. Removed patch for smb auth.
-----------------------------------------------------------------------
Summary of changes: pkgs/squid/patches/squid-3.1.0.15-smb-path.patch | 37 ---------------------- pkgs/squid/squid.nm | 10 +++-- 2 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 pkgs/squid/patches/squid-3.1.0.15-smb-path.patch
Difference in files: 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 27bcc97..0000000 --- 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 d560a62..9031e68 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 \
hooks/post-receive -- IPFire 3.x development tree