Merge branch 'master' of git://git.alpinelinux.org/aports

11 files changed, 68 insertions, 37 deletions

diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 18760fbf..57ad324c 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -1,8 +1,10 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bind
-pkgver=9.6.1_p1
-pkgrel=1
+pkgver=9.6.1_p2
+_ver=${pkgver%_p*}
+_p=${pkgver#*_p}
+pkgrel=0
 pkgdesc="BIND - Berkeley Internet Name Domain - Name Server and tools"
 url="http://www.isc.org"
 license="as-is"
@@ -10,7 +12,7 @@ depends=
 makedepends="openssl-dev"
 install="$pkgname.pre-install $pkgname.post-install"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-tools"
-source="http://ftp.isc.org/isc/bind9/9.6.0-P1/bind-9.6.0-P1.tar.gz
+source="http://ftp.isc.org/isc/bind9/${_ver}-P${_p}/bind-${_ver}-P${_p}.tar.gz
 	bind.so_bsdcompat.patch
 	$pkgname.initd
 	$pkgname.confd
@@ -20,8 +22,10 @@ source="http://ftp.isc.org/isc/bind9/9.6.0-P1/bind-9.6.0-P1.tar.gz
 	$pkgname.named.ca
 	"
 
-build() {
-	cd "$srcdir/bind-9.6.0-P1"
+_builddir="$srcdir/bind-${_ver}-P${_p}"
+
+prepare() {
+	cd "$_builddir"
 
 	### http://bugs.gentoo.org/show_bug.cgi?id=227333
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE" 
@@ -36,7 +40,10 @@ build() {
 	done
 
 	patch -p0 -i "$srcdir"/bind.so_bsdcompat.patch || return 1
+}
 
+build() {
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
@@ -53,6 +60,10 @@ build() {
 		--infodir=/usr/share/info
 
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/named || return 1
@@ -81,7 +92,7 @@ tools() {
 	done
 }
 
-md5sums="886b7eae55cfdc8cd8d2ca74a2f99c6e  bind-9.6.0-P1.tar.gz
+md5sums="435bc2e26e470d46ddf2acb24abb6ea6  bind-9.6.1-P2.tar.gz
 f270a5b0a28ab6e818840c5c368ddbcc  bind.so_bsdcompat.patch
 92914193cc603d8d81ef00534ce9c1c9  bind.initd
 8b05a287976d66d51c18b73ee7523671  bind.confd
diff --git a/main/dnsmasq/APKBUILD b/main/dnsmasq/APKBUILD
index b346ef4d..b1545f34 100644
--- a/main/dnsmasq/APKBUILD
+++ b/main/dnsmasq/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dnsmasq
-pkgver=2.50
-pkgrel=1
+pkgver=2.51
+pkgrel=0
 pkgdesc="Small forwarding DNS server"
 url="http://www.thekelleys.org.uk/dnsmasq/"
 license="GPL-2"
@@ -13,7 +13,6 @@ source="http://www.thekelleys.org.uk/dnsmasq/$pkgname-$pkgver.tar.gz
 	"
 
 build() {
-	# src_unpack
 	cd "$srcdir/$pkgname-$pkgver"
 	sed -i -e 's/^AWK.*/AWK = awk/' Makefile
 	make PREFIX=/usr \
@@ -22,6 +21,10 @@ build() {
 		DBUS_CFLAGS= \
 		DBUS_MINOR= \
 		all || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make PREFIX=/usr \
 		DESTDIR="$pkgdir" \
 		DBUS_LIBS= \
@@ -32,6 +35,6 @@ build() {
 	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 	install dnsmasq.conf.example "$pkgdir"/etc/dnsmasq.conf
 }
-md5sums="f7b1e17c590e493039537434c57c9de7  dnsmasq-2.50.tar.gz
+md5sums="97465261a6de5258a3c3edfe51ca16a4  dnsmasq-2.51.tar.gz
 db46459322a0c7d9ce4f68251fd265c4  dnsmasq.initd
 5990c2d2cb92209feacf8f3a5a7d0831  dnsmasq.confd"
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index b3cfab97..d048a14e 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
-pkgver=1.6.5.3
+pkgver=1.6.5.5
 pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
@@ -42,5 +42,5 @@ perl() {
 }
 
 
-md5sums="a1dbc3da46cbf33c4367db689853c142  git-1.6.5.3.tar.bz2
+md5sums="fd575f22e67adbea1d17e5bc66a80f8d  git-1.6.5.5.tar.bz2
 e63a201556c4f089de790805c09a2e5b  bb-tar.patch"
diff --git a/main/ipsec-tools/APKBUILD b/main/ipsec-tools/APKBUILD
index 4a5203d9..0f1e4a2f 100644
--- a/main/ipsec-tools/APKBUILD
+++ b/main/ipsec-tools/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=ipsec-tools
 pkgver=0.8_alpha20090903
 _myver=0.8-alpha20090903
-pkgrel=3
+pkgrel=4
 pkgdesc="User-space IPsec tools for various IPsec implementations"
 url="http://ipsec-tools.sourceforge.net/"
 license="BSD"
@@ -52,4 +52,4 @@ md5sums="8ec28d4e89c0f5e49ae2caa7463fbcfd  ipsec-tools-0.8-alpha20090903.tar.gz
 2d00250cf72da7f2f559c91b65a48747  racoon.confd
 13bda94a598aabf593280e04ea16065d  50-reverse-connect.patch
 baa13d7f0f48955c792f7fcd42a8587a  60-debug-quick.patch
-fa96631e4471096d93af0e74968f6d16  initial-contact-fix.diff"
+69e06c5cc3a0c1cc8b10ddc89d1e644b  initial-contact-fix.diff"
diff --git a/main/ipsec-tools/initial-contact-fix.diff b/main/ipsec-tools/initial-contact-fix.diff
index 8eef3731..370418be 100644
--- a/main/ipsec-tools/initial-contact-fix.diff
+++ b/main/ipsec-tools/initial-contact-fix.diff
@@ -4,7 +4,7 @@ RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/admin.c,v
 retrieving revision 1.32
 diff -u -r1.32 admin.c
 --- src/racoon/admin.c	3 Sep 2009 09:29:07 -0000	1.32
-+++ src/racoon/admin.c	9 Dec 2009 12:58:48 -0000
++++ src/racoon/admin.c	10 Dec 2009 14:38:47 -0000
 @@ -299,9 +299,8 @@
  		break;
  
@@ -30,8 +30,8 @@ RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.c,v
 retrieving revision 1.31
 diff -u -r1.31 handler.c
 --- src/racoon/handler.c	22 Nov 2009 19:34:55 -0000	1.31
-+++ src/racoon/handler.c	9 Dec 2009 12:58:48 -0000
-@@ -966,6 +966,20 @@
++++ src/racoon/handler.c	10 Dec 2009 14:38:48 -0000
+@@ -966,6 +966,22 @@
  }
  
  void
@@ -43,6 +43,8 @@ diff -u -r1.31 handler.c
 +	LIST_FOREACH(p, &ctdtree, chain) {
 +		if (cmpsaddr(remote, p->remote) == 0) {
 +			LIST_REMOVE(p, chain);
++			racoon_free(p->remote);
++			racoon_free(p);
 +			break;
 +		}
 +	}	
@@ -58,7 +60,7 @@ RCS file: /cvsroot/src/crypto/dist/ipsec-tools/src/racoon/handler.h,v
 retrieving revision 1.22
 diff -u -r1.22 handler.h
 --- src/racoon/handler.h	3 Sep 2009 09:29:07 -0000	1.22
-+++ src/racoon/handler.h	9 Dec 2009 12:58:48 -0000
++++ src/racoon/handler.h	10 Dec 2009 14:38:48 -0000
 @@ -518,6 +518,7 @@
  
  extern struct contacted *getcontacted __P((struct sockaddr *));
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index 8b39b77b..506607df 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lvm2
-pkgver=2.02.54
+pkgver=2.02.56
 pkgrel=0
 pkgdesc="Logical Volume Manager 2 utilities"
 url="http://sourceware.org/lvm2/"
@@ -45,6 +45,6 @@ dm() {
 	mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/
 }
 
-md5sums="6a33416469652b01aa48cefbe9cac8c1  LVM2.2.02.54.tgz
+md5sums="0326c0c7fd53c2043dcedec169c59a4c  LVM2.2.02.56.tgz
 6f65f902cf19f144a42b8d6aceadf395  lvm.initd
 ec36d5fe4561220304e406c5c797e71f  lvm.confd"
diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD
index 0272bca5..9dddeca7 100644
--- a/main/mpg123/APKBUILD
+++ b/main/mpg123/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mpg123
-pkgver=1.9.0
+pkgver=1.10.0
 pkgrel=0
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 url="http://sourceforge.net/projects/mpg123"
@@ -20,6 +20,10 @@ build() {
 		--with-cpu=i386_fpu \
 		--with-audio="alsa oss" || return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
 
@@ -29,4 +33,4 @@ dev() {
 	mv "$subpkgdir"/usr/lib/mpg123/output_* "$pkgdir"/usr/lib/mpg123/
 }
 
-md5sums="0ea1a5d45680c847a9594188f582d284  mpg123-1.9.0.tar.bz2"
+md5sums="0005c9a89c381484e2d2ff450b3dfe5e  mpg123-1.10.0.tar.bz2"
diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD
index 02b0dbb9..f423c478 100644
--- a/main/nano/APKBUILD
+++ b/main/nano/APKBUILD
@@ -1,9 +1,8 @@
 # Contributor: ms13sp <ms13sp@gmail.com>
 # Maintainer: ms13sp <ms13sp@gmail.com>
 pkgname=nano
-pkgver=2.0.9
-pkgmaj=2.0
-pkgrel=2
+pkgver=2.2.0
+pkgrel=0
 pkgdesc="Text Editor. GNU nano is designed to be a free replacement for the Pico text editor."
 url="http://www.nano-editor.org/"
 license="GPL"
@@ -11,7 +10,7 @@ depends=
 makedepends="ncurses-dev"
 install=
 subpackages="$pkgname-doc"
-source="http://www.nano-editor.org/dist/v$pkgmaj/$pkgname-$pkgver.tar.gz"
+source="http://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -24,7 +23,11 @@ build() {
 		--disable-nls \
 		--disable-speller
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="2be94dc43fb60fff4626a2401a977220  nano-2.0.9.tar.gz"
+md5sums="b34ea8fac9563b0485f39a065b5893bf  nano-2.2.0.tar.gz"
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index e7554046..fa13a0ab 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=squid
 pkgver=2.7.7
 _ver=2.7.STABLE7
-pkgrel=1
+pkgrel=2
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -82,7 +82,8 @@ build() {
 		--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
+		--enable-follow-x-forwarded-for \
+		 --with-large-files
 
 	make || return 1
 	make DESTDIR="$pkgdir" install
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD
index 4a4ad417..13fd74ac 100644
--- a/main/sudo/APKBUILD
+++ b/main/sudo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sudo
-pkgver=1.7.2_p1
-_realver=1.7.2p1
+pkgver=1.7.2_p2
+_realver=1.7.2p2
 pkgrel=0
 pkgdesc="Give certain users the ability to run some commands as root"
 url="http://www.sudo.ws/sudo/"
@@ -20,7 +20,11 @@ build() {
 		--without-offensive-insults \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$_realver"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="4449d466a774f5ce401c9c0e3866c026  sudo-1.7.2p1.tar.gz"
+md5sums="2a19cf1ab4afc94fe19d0d0899d4cd45  sudo-1.7.2p2.tar.gz"
diff --git a/main/xvidcore/APKBUILD b/main/xvidcore/APKBUILD
index 64858bf8..20a071cc 100644
--- a/main/xvidcore/APKBUILD
+++ b/main/xvidcore/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xvidcore
-pkgver=1.2.1
-pkgrel=1
+pkgver=1.2.2
+pkgrel=0
 pkgdesc="XviD is an open source MPEG-4 video codec"
 url="http://www.xvid.org/"
 license="GPL"
@@ -10,16 +10,19 @@ depends=
 makedepends="nasm"
 source="http://downloads.xvid.org/downloads/$pkgname-$pkgver.tar.bz2"
 
-build () 
-{ 
+build() {
 	cd "$srcdir"/$pkgname/build/generic
 	./configure --prefix=/usr \
 		--disable-assembly
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname/build/generic
 	make DESTDIR="$pkgdir" install
 	cd "$pkgdir"/usr/lib
 	mylib=$(basename libxvidcore.so.*)
 	ln -sf ${mylib} libxvidcore.so.4
 	ln -sf ${mylib} libxvidcore.so
 }
-md5sums="8c4470ae8e5a104abedb39f6c70e2a40  xvidcore-1.2.1.tar.bz2"
+md5sums="6a3473a12c8a1fa7bdc2b5cb829fab58  xvidcore-1.2.2.tar.bz2"