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

7 files changed, 70 insertions, 26 deletions

diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index dd268479..c2177e5a 100644
--- a/main/dhcp/APKBUILD
+++ b/main/dhcp/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=dhcp
 pkgver=4.1.0_p1
 _realver=4.1.0p1
-pkgrel=4
+pkgrel=5
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
 url="https://www.isc.org/"
 license="GPL"
@@ -12,13 +12,18 @@ install="dhcp.pre-install dhcp.post-install dhcp.pre-upgrade dhcp.post-upgrade"
 subpackages="$pkgname-doc $pkgname-dev dhclient"
 source="http://ftp.isc.org/isc/dhcp/$pkgname-$_realver.tar.gz
 	linux_ipv6_discover.patch
+	dhcp-3.0-fix-perms.patch
 	dhcpd.confd
 	dhcpd.initd"
 
-build() {
+prepare() {
 	cd "$srcdir/$pkgname-$_realver"
+	patch -p1 -i "$srcdir"/dhcp-3.0-fix-perms.patch || return 1
 	patch -p1 -i ../linux_ipv6_discover.patch || return 1
+}
 
+build() {
+	cd "$srcdir/$pkgname-$_realver"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc/dhcp \
 		--with-cli-pid-file=/var/run/dhcp/dhclient.pid \
@@ -31,6 +36,10 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$_realver"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -D "$srcdir"/dhcpd.initd "$pkgdir"/etc/init.d/dhcpd
@@ -51,5 +60,6 @@ dhclient() {
 
 md5sums="325ff8338c5a21f89d5304ac13ffebdf  dhcp-4.1.0p1.tar.gz
 37abf1fb047a353e91b022fafdabf39a  linux_ipv6_discover.patch
+a9eaf182dae3984670da52f20ae10fba  dhcp-3.0-fix-perms.patch
 df32707f5bbe5363306420b5dc6e6b40  dhcpd.confd
 be2259371681bd4ab8a577b1b1a989ae  dhcpd.initd"
diff --git a/main/dhcp/dhcp-3.0-fix-perms.patch b/main/dhcp/dhcp-3.0-fix-perms.patch
new file mode 100644
index 00000000..78725c2c
--- /dev/null
+++ b/main/dhcp/dhcp-3.0-fix-perms.patch
@@ -0,0 +1,15 @@
+--- a/server/dhcpd.c	2003-11-05 14:08:09.000000000 -0800
++++ b/server/dhcpd.c	2003-11-05 14:15:32.000000000 -0800
+@@ -602,6 +602,12 @@
+ 	if (lftest)
+ 		exit (0);
+ 
++#if defined (PARANOIA)
++	/* Set proper permissions... */
++	if (lchown (path_dhcpd_db, set_uid, set_gid))
++		log_fatal ("lchown(%s, %d, %d): %m", path_dhcpd_db, (int) set_uid, (int) set_gid);
++#endif /* PARANOIA */
++
+ 	/* Discover all the network interfaces and initialize them. */
+ 	discover_interfaces (DISCOVER_SERVER);
+ 
diff --git a/main/fetchmail/APKBUILD b/main/fetchmail/APKBUILD
index f6427fa5..ec3529e7 100644
--- a/main/fetchmail/APKBUILD
+++ b/main/fetchmail/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com> 
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fetchmail
-pkgver=6.3.9
-pkgrel=4
+pkgver=6.3.13
+pkgrel=0
 pkgdesc="A remote-mail retrieval and forwarding utility"
 url="http://fetchmail.berlios.de/"
 license="GPL"
@@ -22,6 +22,10 @@ build() {
 		--with-ssl \
 		--disable-nls
 	make || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 	install -Dm755 "$srcdir"/fetchmail.initd "$pkgdir"/etc/init.d/fetchmail
 	install -d "$pkgdir"/var/lib/fetchmail "$pkgdir"/var/run/fetchmail
@@ -37,5 +41,5 @@ fetchmailconf() {
 	mv usr/lib "$subpkgdir"/usr/
 }
 
-md5sums="72c20ad2b9629f1a109668b05a84d823  fetchmail-6.3.9.tar.bz2
+md5sums="db792fb311bc358e95ed0437389269ac  fetchmail-6.3.13.tar.bz2
 b27fe01a7c25534d62d175c8ba22fc48  fetchmail.initd"
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 64cf90ff..ae071030 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.7
+pkgver=1.6.6
 pkgrel=0
 pkgdesc="GIT - the stupid content tracker"
 url="http://git.or.cz/"
@@ -42,5 +42,5 @@ perl() {
 }
 
 
-md5sums="0c2eb426cf596755d6d57a83c9a78be7  git-1.6.5.7.tar.bz2
+md5sums="25e4bcdc528b3ffadc6e59908a513881  git-1.6.6.tar.bz2
 e63a201556c4f089de790805c09a2e5b  bb-tar.patch"
diff --git a/main/libsndfile/APKBUILD b/main/libsndfile/APKBUILD
index 471c45a6..edfb9328 100644
--- a/main/libsndfile/APKBUILD
+++ b/main/libsndfile/APKBUILD
@@ -1,22 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsndfile
-pkgver=1.0.20
+pkgver=1.0.21
 pkgrel=0
 pkgdesc="A C library for reading and writing files containing sampled sound"
 url="http://www.mega-nerd.com/libsndfile"
 license="LGPL"
 subpackages="$pkgname-dev $pkgname-doc"
-depends="alsa-lib flac uclibc"
-makedepends="alsa-lib-dev flac-dev uclibc++-dev"
-source="http://www.mega-nerd.com/$pkgname/$pkgname-$pkgver.tar.gz"
+depends=
+makedepends="alsa-lib-dev flac-dev"
+source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz"
 
 build () {
 	cd "$srcdir"/$pkgname-$pkgver
-	export CXX="g++-uc"
 	./configure --prefix=/usr \
 		--disable-sqlite \
 		|| return 1
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="e0553e12c7a467af44693e95e2eac668  libsndfile-1.0.20.tar.gz"
+md5sums="880a40ec636ab2185b97f8927299b292  libsndfile-1.0.21.tar.gz"
diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD
index c8f0e1fb..45404557 100644
--- a/main/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ngircd
-pkgver=14.1
-pkgrel=1
+pkgver=15
+pkgrel=0
 pkgdesc="Next Generation IRC Daemon"
 url="http://ngircd.barton.de/"
 license="GPL"
@@ -12,8 +12,7 @@ source="ftp://ftp.berlios.de/pub/$pkgname/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
 	"
 
-build ()
-{
+build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	sed -i \
 		-e "s:/usr/local/etc/ngircd.motd:/etc/ngircd/ngircd.motd:" \
@@ -27,9 +26,13 @@ build ()
 		--without-ident \
 		--with-openssl
 	make || return 1
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="eef90855414c35bfb6590d17e24ee06f  ngircd-14.1.tar.gz
+md5sums="c183a85eba6fe51255983848f099c8ae  ngircd-15.tar.gz
 50d8388540a2e3eb0630e8ac6369f394  ngircd.initd"
diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD
index f497f2c1..b9d1f799 100644
--- a/main/zlib/APKBUILD
+++ b/main/zlib/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zlib
-pkgver=1.2.3.3
-pkgrel=7
+pkgver=1.2.3.4
+pkgrel=1
 pkgdesc="A compression/decompression Library"
 license=custom:zlib
 url="http://www.gzip.org/zlib"
@@ -10,14 +10,23 @@ source="ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-dev $pkgname-doc"
 
 build() {
-        cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr --libdir=/lib --shared
 	make || return 1
-	make install DESTDIR="$pkgdir" || return 1
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make install \
+		pkgconfigdir="/usr/lib/pkgconfig" \
+		LIBS="libz.so.1.2.3.4 libz.a" \
+		DESTDIR="$pkgdir" || return 1
+}
 
-	# we want the zlib.pc be a part of -dev package
-	mkdir -p "$pkgdir"/usr/lib
-	mv "$pkgdir"/lib/pkgconfig "$pkgdir"/usr/lib/
+dev() {
+	default_dev
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/libz.a "$subpkgdir"/lib/libz.a
 }
 
-md5sums="c444cf020e5f0e3323b11f5a2d8af8d3  zlib-1.2.3.3.tar.gz"
+md5sums="70cad33163abe3c234939a5c63bf95ea  zlib-1.2.3.4.tar.gz"