[arch-commits] Commit in squid/repos (4 files)

Eric Belanger eric at archlinux.org
Fri Jun 13 04:11:57 UTC 2008 

    Date: Friday, June 13, 2008 @ 00:11:57
  Author: eric
Revision: 2721

Merged revisions 1864-2720 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/squid/trunk

........
  r2717 | kevin | 2008-06-12 22:19:41 -0400 (Thu, 12 Jun 2008) | 1 line
  
  upgpkg: squid 2.7.STABLE2-1
........

Modified:
  squid/repos/extra-x86_64/	(properties)
  squid/repos/extra-x86_64/PKGBUILD
  squid/repos/extra-x86_64/squid-makefiles.patch
  squid/repos/extra-x86_64/squid.install

-----------------------+
 PKGBUILD              |    6 +++---
 squid-makefiles.patch |   29 +++++++++++++++--------------
 squid.install         |    7 ++-----
 3 files changed, 20 insertions(+), 22 deletions(-)


Property changes on: squid/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /squid/trunk:1-1863
   + /squid/trunk:1-2720

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-13 02:38:05 UTC (rev 2720)
+++ extra-x86_64/PKGBUILD	2008-06-13 04:11:57 UTC (rev 2721)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=squid
-pkgver=2.6.STABLE20
+pkgver=2.7.STABLE2
 pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64)
@@ -12,10 +12,10 @@
 license=('GPL')
 backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid)
 install=$pkgname.install
-source=(http://www.squid-cache.org/Versions/v2/2.6/${pkgname}-${pkgver}.tar.bz2
+source=(http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${pkgver}.tar.bz2
         squid-makefiles.patch squid squid.conf.d squid.pam
         squid.cron)
-md5sums=('6e1d87e9ae47f825c814a954a6febc36' '935309e73d2a9c34cf9871cf1ff2f893'
+md5sums=('91c8e89737c6deeca9e7f08ba4cba80f' '082e53bb6e2c79bc44ac95c3d69145da'
          'd213b0cc1db72b749bb8c88716fdab39' '81f9a446d143f42c6a3f30304e91c39f'
          '270977cdd9b47ef44c0c427ab9034777' 'f47bb20c7be3089d78e6d2b491f7923b')
 

Modified: extra-x86_64/squid-makefiles.patch
===================================================================
--- extra-x86_64/squid-makefiles.patch	2008-06-13 02:38:05 UTC (rev 2720)
+++ extra-x86_64/squid-makefiles.patch	2008-06-13 04:11:57 UTC (rev 2721)
@@ -1,7 +1,7 @@
-diff -Naur squid-2.6.STABLE5-orig/helpers/basic_auth/SMB/Makefile.in squid-2.6.STABLE5/helpers/basic_auth/SMB/Makefile.in
---- squid-2.6.STABLE5-orig/helpers/basic_auth/SMB/Makefile.in	2006-10-29 21:21:19.000000000 -0500
-+++ squid-2.6.STABLE5/helpers/basic_auth/SMB/Makefile.in	2006-11-07 10:57:36.000000000 -0500
-@@ -262,7 +262,7 @@
+diff -Naur squid-2.7.STABLE2-orig/helpers/basic_auth/SMB/Makefile.in squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.in
+--- squid-2.7.STABLE2-orig/helpers/basic_auth/SMB/Makefile.in	2007-11-11 20:14:01.000000000 -0500
++++ squid-2.7.STABLE2/helpers/basic_auth/SMB/Makefile.in	2008-06-09 21:32:52.000000000 -0400
+@@ -268,7 +268,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  SMB_AUTH_HELPER = smb_auth.sh
@@ -10,10 +10,10 @@
  SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER)
  libexec_SCRIPTS = $(SMB_AUTH_HELPER)
  smb_auth_CFLAGS = -DSAMBAPREFIX=\"$(SAMBAPREFIX)\" -DHELPERSCRIPT=\"$(SMB_AUTH_HELPER_PATH)\"
-diff -Naur squid-2.6.STABLE5-orig/src/Makefile.in squid-2.6.STABLE5/src/Makefile.in
---- squid-2.6.STABLE5-orig/src/Makefile.in	2006-10-29 21:21:34.000000000 -0500
-+++ squid-2.6.STABLE5/src/Makefile.in	2006-11-07 11:00:21.000000000 -0500
-@@ -608,12 +608,12 @@
+diff -Naur squid-2.7.STABLE2-orig/src/Makefile.in squid-2.7.STABLE2/src/Makefile.in
+--- squid-2.7.STABLE2-orig/src/Makefile.in	2008-01-02 20:16:40.000000000 -0500
++++ squid-2.7.STABLE2/src/Makefile.in	2008-06-09 21:34:39.000000000 -0400
+@@ -653,13 +653,13 @@
  DEFAULT_CONFIG_FILE = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE = $(sysconfdir)/mime.conf
  DEFAULT_DNSSERVER = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
@@ -23,16 +23,17 @@
  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_PID_FILE = $(localstatedir)/run/squid.pid
+ DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state
 -DEFAULT_SWAP_DIR = $(localstatedir)/cache
-+DEFAULT_PID_FILE = $(localstatedir)/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-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`
-diff -Naur squid-2.6.STABLE5-orig/src/cf.data.pre squid-2.6.STABLE5/src/cf.data.pre
---- squid-2.6.STABLE5-orig/src/cf.data.pre	2006-10-12 16:48:48.000000000 -0400
-+++ squid-2.6.STABLE5/src/cf.data.pre	2006-11-07 11:02:05.000000000 -0500
-@@ -3280,7 +3280,7 @@
+diff -Naur squid-2.7.STABLE2-orig/src/cf.data.pre squid-2.7.STABLE2/src/cf.data.pre
+--- squid-2.7.STABLE2-orig/src/cf.data.pre	2008-05-31 16:49:45.000000000 -0400
++++ squid-2.7.STABLE2/src/cf.data.pre	2008-06-09 21:35:43.000000000 -0400
+@@ -3749,7 +3749,7 @@
  
  NAME: cache_effective_user
  TYPE: string
@@ -41,7 +42,7 @@
  LOC: Config.effectiveUser
  DOC_START
  	If you start Squid as root, it will change its effective/real
-@@ -3295,7 +3295,7 @@
+@@ -3763,7 +3763,7 @@
  
  NAME: cache_effective_group
  TYPE: string

Modified: extra-x86_64/squid.install
===================================================================
--- extra-x86_64/squid.install	2008-06-13 02:38:05 UTC (rev 2720)
+++ extra-x86_64/squid.install	2008-06-13 04:11:57 UTC (rev 2721)
@@ -9,11 +9,8 @@
   chown proxy.proxy var/{cache,log}/squid
 
   cat << EOF
-Upgrading to version 2.6:
- - winbind helpers are no longer included in the source
- - the configuration of transparent proxies has changed
-Release notes:
- http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE1-RELEASENOTES.html
+Release notes for version 2.7:
+    http://www.squid-cache.org/Versions/v2/2.7/RELEASENOTES.html
 
 EOF
 }

More information about the arch-commits mailing list