Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3953c7973d3c6758b2c68542d08c2ca7174a88d5
commit 3953c7973d3c6758b2c68542d08c2ca7174a88d5 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Tue Jun 10 13:28:57 2008 +0200 squid-3.0.STABLE6-1-i686 - version bump - drop patches which were for 2.6.x diff --git a/source/network-extra/squid/FrugalBuild b/source/network-extra/squid/FrugalBuild index dc394e7..271b95e 100644 --- a/source/network-extra/squid/FrugalBuild +++ b/source/network-extra/squid/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=squid -pkgver=2.6.STABLE20 +pkgver=3.0.STABLE6 pkgrel=1 pkgdesc="Squid Web Proxy Cache" url="http://www.squid-cache.org/"; @@ -11,21 +11,16 @@ rodepends=('dcron') groups=('network-extra') archs=('i686' 'x86_64') backup=(etc/squid/{mime,msntauth,squid}.conf) -up2date="lynx -dump $url/Versions/v2/2.6/|grep -1 Current|sed -n 's/.*-\([^ ]*\) .*/\1/;$ p'" -source=(http://www.squid-cache.org/Versions/v2/2.6/$pkgname-$pkgver.tar.bz2 \ - $pkgname-2.6.STABLE3-dirs.diff $pkgname-2.6.STABLE3-samba.diff \ - $pkgname-2.6.STABLE3-username.diff rc.squid squid) -sha1sums=('a58fd838ff14345f10f2f3f2d1839eb70bb6f394' \ - 'a1482482406661090951fa4c4304ca6604db2d14' \ - '8eacf8bd974c461162aaba72b5bc4109cc1104c7' \ - '7dbae27eeee7b62e685f6758a06d984b0b62668e' \ +up2date="lynx -dump http://www.squid-cache.org/Versions/|grep Stable -A 3|sed -n 's/.*\]\([0-9.]*\) .*STABLE\([0-9]*\) .*/\1.STABLE\2/;$ p'" +source=(http://www.squid-cache.org/Versions/v3/3.0/$pkgname-$pkgver.tar.bz2 \ + rc.squid squid) +sha1sums=('7cebed35c69ed233a5338586cd9a6f547a41d4d0' \ '3a8ce41ac3e6b48d0340a5577093a345cfae9242' \ '53042dd86e482d4a6eff9e34ecb01352439c5026') build() { Fpatchall - autoconf || return 1 Fmake --datadir=/usr/share/squid --sysconfdir=/etc/squid \ --libexecdir=/usr/lib/squid --localstatedir=/var \ --enable-auth="basic,digest,ntlm" \ diff --git a/source/network-extra/squid/squid-2.6.STABLE3-dirs.diff b/source/network-extra/squid/squid-2.6.STABLE3-dirs.diff deleted file mode 100644 index 4b12943..0000000 --- a/source/network-extra/squid/squid-2.6.STABLE3-dirs.diff +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru squid-2.5.STABLE9/src/Makefile.in squid-2.5.STABLE9.arch/src/Makefile.in ---- squid-2.5.STABLE9/src/Makefile.in 2004-09-25 17:37:59.000000000 -0400 -+++ squid-2.5.STABLE9.arch/src/Makefile.in 2005-04-15 06:08:13.000000000 -0400 -@@ -376,12 +376,12 @@ - DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf - DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf - DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'` --DEFAULT_LOG_PREFIX = $(localstatedir)/logs -+DEFAULT_LOG_PREFIX = $(localstatedir)/log/squid - DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log - DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log - DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log --DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid --DEFAULT_SWAP_DIR = $(localstatedir)/cache -+DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/run/squid.pid -+DEFAULT_SWAP_DIR = $(localstatedir)/cache/squid - DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'` - DEFAULT_DISKD = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'` diff --git a/source/network-extra/squid/squid-2.6.STABLE3-samba.diff b/source/network-extra/squid/squid-2.6.STABLE3-samba.diff deleted file mode 100644 index c33e7cb..0000000 --- a/source/network-extra/squid/squid-2.6.STABLE3-samba.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru squid-2.5.STABLE9/helpers/basic_auth/SMB/Makefile.in squid-2.5.STABLE9.arch/helpers/basic_auth/SMB/Makefile.in ---- squid-2.5.STABLE9/helpers/basic_auth/SMB/Makefile.in 2004-07-10 08:11:41.000000000 -0400 -+++ squid-2.5.STABLE9.arch/helpers/basic_auth/SMB/Makefile.in 2005-04-15 06:08:13.000000000 -0400 -@@ -128,7 +128,7 @@ - makesnmplib = @makesnmplib@ - - 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 --git a/source/network-extra/squid/squid-2.6.STABLE3-username.diff b/source/network-extra/squid/squid-2.6.STABLE3-username.diff deleted file mode 100644 index 0659e83..0000000 --- a/source/network-extra/squid/squid-2.6.STABLE3-username.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru squid-2.5.STABLE9/src/cf.data.pre squid-2.5.STABLE9.arch/src/cf.data.pre ---- squid-2.5.STABLE9/src/cf.data.pre 2005-02-22 19:06:34.000000000 -0500 -+++ squid-2.5.STABLE9.arch/src/cf.data.pre 2005-04-15 06:08:13.000000000 -0400 -@@ -2425,7 +2425,7 @@ - - NAME: cache_effective_user - TYPE: string --DEFAULT: nobody -+DEFAULT: proxy - LOC: Config.effectiveUser - DOC_START - If you start Squid as root, it will change its effective/real -@@ -2440,7 +2440,7 @@ - - NAME: cache_effective_group - TYPE: string --DEFAULT: none -+DEFAULT: proxy - LOC: Config.effectiveGroup - DOC_START - If you want Squid to run with a specific GID regardless of _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
