main/squid: move version 3.2 from testing

1 files changed, 55 insertions, 252 deletions

diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 27858362eb..8f2dc8cd11 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -1,9 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=squid
-pkgver=2.7.9
-_ver=2.7.STABLE9
-pkgrel=4
+pkgver=3.2.0.12
+pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -11,89 +10,76 @@ pkgusers="squid"
 pkggroups="squid"
 arch="all"
 license="GPL-2"
-depends="$pkgname-errors-english logrotate"
-makedepends="openssl-dev perl-dev autoconf automake heimdal-dev"
-subpackages="$pkgname-doc
-	squid_kerb_auth
-	$pkgname-errors-armenian:errors_armenian
-	$pkgname-errors-azerbaijani:errors_azerbaijani
-	$pkgname-errors-bulgarian:errors_bulgarian
-	$pkgname-errors-catalan:errors_catalan 
-	$pkgname-errors-czech:errors_czech
-	$pkgname-errors-danish:errors_danish
-	$pkgname-errors-dutch:errors_dutch
-	$pkgname-errors-english:errors_english
-	$pkgname-errors-estonian:errors_estonian
-	$pkgname-errors-finnish:errors_finnish
-	$pkgname-errors-french:errors_french
-	$pkgname-errors-german:errors_german
-	$pkgname-errors-greek:errors_greek
-	$pkgname-errors-hebrew:errors_hebrew
-	$pkgname-errors-hungarian:errors_hungarian
-	$pkgname-errors-italian:errors_italian
-	$pkgname-errors-japanese:errors_japanese
-	$pkgname-errors-korean:errors_korean
-	$pkgname-errors-lithuanian:errors_lithuanian
-	$pkgname-errors-polish:errors_polish
-	$pkgname-errors-portuguese:errors_portuguese
-	$pkgname-errors-romanian:errors_romanian
-	$pkgname-errors-russian-1251:errors_russian_1251
-	$pkgname-errors-russian-koi8-r:errors_russian_koi8_r
-	$pkgname-errors-serbian:errors_serbian
-	$pkgname-errors-simplify_chinese:errors_simplify_chinese
-	$pkgname-errors-slovak:errors_slovak
-	$pkgname-errors-spanish:errors_spanish
-	$pkgname-errors-swedish:errors_swedish
-	$pkgname-errors-traditional_chinese:errors_traditional_chinese
-	$pkgname-errors-turkish:errors_turkish
-	$pkgname-errors-ukrainian-1251:errors_ukrainian_1251
-	$pkgname-errors-ukrainian-koi8-u:errors_ukrainian_koi8_u
-	$pkgname-errors-ukrainian-utf8:errors_ukrainian_utf8"
-
-source="http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${_ver}.tar.bz2
+depends="logrotate"
+makedepends="openssl-dev perl-dev autoconf automake heimdal-dev libtool
+	libcap-dev"
+subpackages="$pkgname-doc"
+linguas="af ar az bg ca cs da de el es et fa fi fr he hu hy id it ja ko lt
+	lv ms nl oc pl pt ro ru sk sl sr sv th tr uk uz vi zh"
+langdir="/usr/share/squid/errors"
+
+source="http://www.squid-cache.org/Versions/v3/3.2/squid-$pkgver.tar.bz2
+	squid-3.2.0.12-loggable-urlgroup.patch
 	squid.initd
 	squid.confd
-	squid-2.7-gentoo.patch
-	squid-2-heimdal.patch
-	squid-2.7-ims-content-type.patch
-	squid-2.7-loggable-urlgroup.patch
 	$pkgname.logrotate
 	"
+
 pkgusers="squid"
 pkggroups="squid"
 
-build() {
-	cd "$srcdir/$pkgname-$_ver"
-
-	for i in "$srcdir"/*.patch; do
-		msg "Applying $i..."
-		patch -p1 -i $i || return 1
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
 	done
+#	./bootstrap.sh
+}
 
-	touch NEWS AUTHORS
-	aclocal && autoconf && automake -a || return 1
+build() {
+	cd "$_builddir"
 
-	./configure --prefix=/usr --datadir=/usr/share/squid \
-		--sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \
+	./configure --prefix=/usr \
+		--datadir=/usr/share/squid \
+		--sysconfdir=/etc/squid \
+		--libexecdir=/usr/lib/squid \
 		--localstatedir=/var \
-		--enable-auth="basic,digest,ntlm,negotiate" \
+		--disable-strict-error-checking \
 		--enable-removal-policies="lru,heap" \
 		--enable-digest-auth-helpers="password" \
-		--enable-storeio="aufs,ufs,diskd,coss,null" \
 		--enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \
 		--enable-epoll \
 		--enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
-		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \
+		--enable-ntlm-auth-helpers="fakeauth,no_check,smb_lm" \
 		--enable-negotiate-auth-helpers="squid_kerb_auth" \
-		--enable-delay-pools --enable-arp-acl --enable-ssl \
-		--enable-linux-netfilter --enable-ident-lookups \
-		--enable-useragent-log --enable-cache-digests --enable-referer-log \
-		--enable-async-io --enable-truncate --enable-arp-acl \
-		--enable-htcp --enable-carp --enable-poll --with-maxfd=4096 \
+		--disable-mit \
+		--enable-heimdal \
+		--enable-delay-pools \
+		--enable-arp-acl \
+		--enable-ssl \
+		--enable-linux-netfilter \
+		--enable-ident-lookups \
+		--enable-useragent-log \
+		--enable-cache-digests \
+		--enable-referer-log \
+		--enable-async-io \
+		--enable-truncate \
+		--enable-arp-acl \
+		--enable-htcp \
+		--enable-carp \
+		--enable-poll --with-maxfd=4096 \
 		--enable-follow-x-forwarded-for \
-		 --with-large-files
+		--with-large-files \
+		|| return 1
 
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
@@ -114,191 +100,8 @@ squid_kerb_auth() {
 	mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/
 }
 
-_mv_error() {
-	local d=usr/share/squid/errors
-	mkdir -p "$subpkgdir/$d"
-	mv "$pkgdir/$d/${1}" "$subpkgdir/$d/" || return 1
-	# last one removed the dir
-	rmdir "$pkgdir/$d" 2>/dev/null
-	return 0
-}
-
-errors_armenian() {
-	depends="$pkgname"
-	_mv_error Armenian
-}
-
-errors_azerbaijani() {
-	depends="$pkgname"
-	_mv_error Azerbaijani
-}
-
-errors_bulgarian() {
-	depends="$pkgname"
-	_mv_error Bulgarian
-}
-
-errors_catalan() {
-	depends="$pkgname"
-	_mv_error Catalan
-}
-
-errors_czech() {
-	depends="$pkgname"
-	_mv_error Czech
-}
-
-errors_danish() {
-	depends="$pkgname"
-	_mv_error Danish
-}
-
-errors_dutch() {
-	depends="$pkgname"
-	_mv_error Dutch
-}
-
-errors_english() {
-	depends=
-	_mv_error English
-}
-
-errors_estonian() {
-	depends="$pkgname"
-	_mv_error Estonian
-}
-
-errors_finnish() {
-	depends="$pkgname"
-	_mv_error Finnish
-}
-
-errors_french() {
-	depends="$pkgname"
-	_mv_error French
-}
-
-errors_german() {
-	depends="$pkgname"
-	_mv_error German
-}
-
-errors_greek() {
-	depends="$pkgname"
-	_mv_error Greek
-}
-
-errors_hebrew() {
-	depends="$pkgname"
-	_mv_error Hebrew
-}
-
-errors_hungarian() {
-	depends="$pkgname"
-	_mv_error Hungarian
-}
-
-errors_italian() {
-	depends="$pkgname"
-	_mv_error Italian
-}
-
-errors_japanese() {
-	depends="$pkgname"
-	_mv_error Japanese
-}
-
-errors_korean() {
-	depends="$pkgname"
-	_mv_error Korean
-}
-
-errors_lithuanian() {
-	depends="$pkgname"
-	_mv_error Lithuanian
-}
-
-errors_polish() {
-	depends="$pkgname"
-	_mv_error Polish
-}
-
-errors_portuguese() {
-	depends="$pkgname"
-	_mv_error Portuguese
-}
-
-errors_romanian() {
-	depends="$pkgname"
-	_mv_error Romanian
-}
-
-errors_russian_1251() {
-	depends="$pkgname"
-	_mv_error Russian-1251
-}
-
-errors_russian_koi8_r() {
-	depends="$pkgname"
-	_mv_error Russian-koi8-r
-}
-
-errors_serbian() {
-	depends="$pkgname"
-	_mv_error Serbian
-}
-
-errors_simplify_chinese() {
-	depends="$pkgname"
-	_mv_error Simplify_Chinese
-}
-
-errors_slovak() {
-	depends="$pkgname"
-	_mv_error Slovak
-}
-
-errors_spanish() {
-	depends="$pkgname"
-	_mv_error Spanish
-}
-
-errors_swedish() {
-	depends="$pkgname"
-	_mv_error Swedish
-}
-
-errors_traditional_chinese() {
-	depends="$pkgname"
-	_mv_error Traditional_Chinese
-}
-
-errors_turkish() {
-	depends="$pkgname"
-	_mv_error Turkish
-}
-
-errors_ukrainian_1251() {
-	depends="$pkgname"
-	_mv_error Ukrainian-1251
-}
-
-errors_ukrainian_koi8_u() {
-	depends="$pkgname"
-	_mv_error Ukrainian-koi8-u
-}
-
-errors_ukrainian_utf8() {
-	depends="$pkgname"
-	_mv_error Ukrainian-utf8
-}
-
-
-md5sums="3c6642c85470b1079207d43bba25a819  squid-2.7.STABLE9.tar.bz2
+md5sums="f11b71b7c58a2a20e87707d4ba441743  squid-3.2.0.12.tar.bz2
+084f7b1af1ac0cb8fea35c7a0905a80e  squid-3.2.0.12-loggable-urlgroup.patch
 57fed05adc40acab6a5480ec7a014154  squid.initd
 44b052db7910f386ef88ddcf69c9ba4e  squid.confd
-3827f71d940b47eb385a1a1d92a51d66  squid-2.7-gentoo.patch
-614b97126ad9eecf728095f2de63d33d  squid-2-heimdal.patch
-549377b5a6b673bf19ea6c34003d122c  squid-2.7-ims-content-type.patch
-d4efa24094b011e77bc7bf45291c0ee9  squid-2.7-loggable-urlgroup.patch
 58823e0b86bc2dc71d270208b7b284b4  squid.logrotate"