--- /dev/null
+diff -up squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath squid-3.0.STABLE1/contrib/url-normalizer.pl
+--- squid-3.0.STABLE1/contrib/url-normalizer.pl.perlpath 1996-12-06 18:54:31.000000000 +0100
++++ squid-3.0.STABLE1/contrib/url-normalizer.pl 2008-01-23 12:07:50.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl -Tw
++#!/usr/bin/perl -Tw
+
+ # From: Markus Gyger <mgyger@itr.ch>
+ #
--- /dev/null
+diff -up squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8
+--- squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8.from_manpg 2008-06-22 05:35:49.000000000 +0200
++++ squid-3.0.STABLE7/helpers/basic_auth/NCSA/ncsa_auth.8 2007-06-06 18:25:30.000000000 +0200
+@@ -1,38 +1,38 @@
+-.\" This file is distributed in the hope that it will be useful,
+-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+-.\" the GNU General Public License for more details.
+-.\"
+-.\" You should have received a copy of the GNU General Public License
+-.\" along with this file; if not, write to the Free Software
+-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+-.\" MA 02111-1307 USA
+-.\"
+-.\" HISTORY:
+-.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
+-.TH ncsa_auth 8 "May 16, 2006" "Squid NCSA Auth helper"
+-.SH NAME
+-ncsa_auth \- NCSA httpd-style password file authentication helper for Squid
+-\fB
+-.SH SYNOPSIS
+-.nf
+-.fam C
+-\fBncsa_auth\fP \fIpasswdfile\fP
+-.fam T
+-.fi
+-.SH DESCRIPTION
+-\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA/Apache httpd-style password file when using basic HTTP authentication.
+-.PP
+-The only parameter is the password file. It must have permissions to be read by the user that Squid is running as (cache_effective_user in squid.conf).
+-.PP
+-This password file can be manipulated using htpasswd.
+-.SH OPTIONS
+-Only specify the password file name.
+-.SH EXAMPLE
+-\fBncsa_auth\fP /etc/squid/squid.pass
+-.SH SECURITY
+-\fBncsa_auth\fP must have access to the password file to be executed.
+-.SH SEE ALSO
+-\fBhtpasswd\fP(1), \fBsquid\fP(8)
+-.SH AUTHOR
+-Manpage written by Rodrigo Rubira Branco <rrbranco@br.ibm.com>
++.\" This file is distributed in the hope that it will be useful,\r
++.\" but WITHOUT ANY WARRANTY; without even the implied warranty of\r
++.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See\r
++.\" the GNU General Public License for more details.\r
++.\"\r
++.\" You should have received a copy of the GNU General Public License\r
++.\" along with this file; if not, write to the Free Software\r
++.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston,\r
++.\" MA 02111-1307 USA\r
++.\"\r
++.\" HISTORY:\r
++.\" 2006-05-16, created by Rodrigo Rubira Branco <rrbranco@br.ibm.com>\r
++.TH ncsa_auth 8 "May 16, 2006" "User Manuals" "User Manuals"\r
++.SH NAME\r
++ncsa_auth \- NCSA httpd-style password file authentication helper for Squid\r
++\fB\r
++.SH SYNOPSIS\r
++.nf\r
++.fam C\r
++\fBncsa_auth\fP \fIpasswdfile\fP \r
++.fam T\r
++.fi\r
++.SH DESCRIPTION\r
++\fBncsa_auth\fP allows Squid to read and authenticate user and password information from an NCSA httpd-style password file when using basic HTTP authentication.\r
++.PP\r
++The only parameter is the password file. It must have permissions to be read by the user that Squid is running as. By default this user is proxy. This can be changed using the cache_effective_user directive in the squid.conf file.\r
++.PP\r
++This password file can be manipulated using htpasswd.\r
++.SH OPTIONS\r
++Only specify the password file name.\r
++.SH EXAMPLE\r
++\fBncsa_auth\fP /etc/squid/squid.pass\r
++.SH SECURITY\r
++\fBncsa_auth\fP must have access to the password file to be executed.\r
++.SH SEE ALSO\r
++\fBhtpasswd\fP(1), \fBsquid\fP(8)\r
++.SH AUTHOR\r
++Manpage written by Rodrigo Rubira Branco <rrbranco@br.ibm.com>\r
--- /dev/null
+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)\"
--- /dev/null
+diff -up squid-3.0.STABLE9/src/cf.data.pre.config squid-3.0.STABLE9/src/cf.data.pre
+--- squid-3.0.STABLE9/src/cf.data.pre.config 2008-09-09 18:06:44.000000000 +0200
++++ squid-3.0.STABLE9/src/cf.data.pre 2008-10-19 23:34:17.000000000 +0200
+@@ -2135,7 +2136,7 @@ DOC_END
+
+ NAME: logfile_rotate
+ TYPE: int
+-DEFAULT: 10
++DEFAULT: 0
+ LOC: Config.Log.rotateNumber
+ DOC_START
+ Specifies the number of logfile rotations to make when you
+@@ -3254,11 +3256,11 @@ COMMENT_END
+
+ NAME: cache_mgr
+ TYPE: string
+-DEFAULT: webmaster
++DEFAULT: root
+ LOC: Config.adminEmail
+ DOC_START
+ Email-address of local cache manager who will receive
+- mail if the cache dies. The default is "webmaster."
++ mail if the cache dies. The default is "root."
+ DOC_END
+
+ NAME: mail_from
--- /dev/null
+diff -up squid-3.1.0.9/QUICKSTART.location squid-3.1.0.9/QUICKSTART
+--- squid-3.1.0.9/QUICKSTART.location 2009-06-26 12:35:27.000000000 +0200
++++ squid-3.1.0.9/QUICKSTART 2009-07-17 14:03:10.000000000 +0200
+@@ -12,10 +12,9 @@ After you retrieved, compiled and instal
+ INSTALL in the same directory), you have to configure the squid.conf
+ file. This is the list of the values you *need* to change, because no
+ sensible defaults could be defined. Do not touch the other variables
+-for now. We assume you have installed Squid in the default location:
+-/usr/local/squid
++for now.
+
+-Uncomment and edit the following lines in /usr/local/squid/etc/squid.conf:
++Uncomment and edit the following lines in /etc/squid/squid.conf:
+
+ ==============================================================================
+
+@@ -56,7 +55,7 @@ cache_effective_user
+ Some configuration lines which are optional but may be needed.
+
+
+-cache_dir ufs /usr/local/squid/var/cache 100 16 256
++cache_dir ufs /var/spool/squid 100 16 256
+
+ Add here (first number, here 100) the amount of hard disk space
+ (in megabytes) to devote to caching.
+@@ -84,12 +83,12 @@ After editing squid.conf to your liking,
+ line TWICE:
+
+ To create any disk cache_dir configured:
+- % /usr/local/squid/sbin/squid -z
++ % /usr/sbin/squid -z
+
+ To start squid:
+- % /usr/local/squid/sbin/squid
++ % /usr/sbin/squid
+
+-Check in the cache.log (/usr/local/squid/var/logs/cache.log) that
++Check in the cache.log (/var/log/squid/cache.log) that
+ everything is all right.
+
+ Once Squid created all its files (it can take several minutes on some
include $(PKGROOT)/Include
PKG_NAME = squid
-PKG_VER = 3.0.STABLE25
+PKG_VER = 3.1.8
PKG_REL = 0
-PKG_MAINTAINER =
+PKG_MAINTAINER = Christian Schmidt <christian.schmidt@ipfire.org>
PKG_GROUP = Networking/Daemons
PKG_URL = http://www.squid-cache.org/
PKG_LICENSE = GPLv2+
PKG_SUMMARY = The Squid proxy caching server.
-PKG_BUILD_DEPS+= gcc-c++ libxml2-devel openssl-devel openldap-devel
+PKG_BUILD_DEPS+= gcc-c++ libxml2-devel openssl-devel openldap-devel samba-devel \
+ iptables-devel $(PKG_DEPS)
+PKG_DEPS += /usr/bin/smbclient
define PKG_DESCRIPTION
Squid is a high-performance proxy caching server for Web clients, \
--libexecdir=/usr/lib/squid \
--localstatedir=/var \
--sysconfdir=/etc/squid \
- --enable-storeio="aufs,diskd,ufs,null" \
+ --enable-storeio="aufs,diskd,ufs" \
--enable-removal-policies="heap,lru" \
--enable-icmp \
--enable-delay-pools \
--enable-kill-parent-hack \
--enable-snmp \
--enable-arp-acl \
+ --enable-ipf-transparent \
--enable-htcp \
--enable-ssl \
--enable-forw-via-db \
--enable-internal-dns \
--enable-auth=basic,ntlm \
--enable-basic-auth-helpers="LDAP,MSNT,multi-domain-NTLM,PAM,NCSA,SMB,squid_radius_auth" \
- --enable-ntlm-auth-helpers="SMB" \
+ --enable-ntlm-auth-helpers="smb_lm,no_check,fakeauth" \
--enable-ntlm-fail-open \
+ --with-filedescriptors=16384 \
--enable-unlinkd \
--with-pthreads \
--with-aio \
define STAGE_INSTALL_CMDS
rm -vf $(BUILDROOT)/etc/squid/errors
rmdir $(BUILDROOT)/var/logs
- ln -svf ../../usr/lib/squid/errors/English $(BUILDROOT)/etc/squid/errors
-mkdir -pv $(BUILDROOT)/var/log/cache $(BUILDROOT)/var/log/squid
touch $(BUILDROOT)/var/log/squid/access.log
projects / ipfire-3.x.git / commitdiff
