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

9 files changed, 69 insertions, 107 deletions

diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index a17597b1d9..f8f5aa49d5 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgdesc="Script to build Alpine Packages"
 pkgname=abuild
-pkgver=2.0_rc6
+pkgver=2.0_rc7
 pkgrel=0
 url=http://git.alpinelinux.org/cgit/abuild/
 source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2
@@ -17,4 +17,4 @@ build() {
 	install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf
 }
 
-md5sums="6e3332501deab8d0b71a66822aebb77a  abuild-2.0_rc6.tar.bz2"
+md5sums="cde72d1673d60a069c421c750d157c16  abuild-2.0_rc7.tar.bz2"
diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index ffa96bd446..c329e1ae27 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,20 +1,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-baselayout
-pkgver=2.0_beta1
-pkgrel=1
+pkgver=2.0_beta2
+pkgrel=0
 pkgdesc="Alpine base dir structure and init scripts"
 url=http://git.alpinelinux.org/cgit/alpine-baselayout
 depends=
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-profile-change-default-path.patch
 	"
 license=GPL-2
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 < ../0001-profile-change-default-path.patch || return 1
 	make
 	make install PREFIX= DESTDIR="$pkgdir" || return 1
 }
-md5sums="6b25fc0c261e9182a68582c38249a3e8  alpine-baselayout-2.0_beta1.tar.bz2
-085c7e50bb57307fd9a24ee8c14e4749  0001-profile-change-default-path.patch"
+md5sums="962bcd31be3ce2db90e997ddc9f612fc  alpine-baselayout-2.0_beta2.tar.bz2"
diff --git a/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch b/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch
deleted file mode 100644
index f7ce644d44..0000000000
--- a/main/alpine-conf/0001-lbu-remove-packages.list-if-exist.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From fbe26c92439f4b4f19ee09ec07798a5bbaec0d77 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 29 Jul 2009 19:30:36 +0000
-Subject: [PATCH] lbu: remove packages.list if exist
-
-fixes http://redmine.alpinelinux.org/issues/show/94
----
- lbu.in |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/lbu.in b/lbu.in
-index 48e615e..b84682a 100644
---- a/lbu.in
-+++ b/lbu.in
-@@ -233,6 +233,12 @@ cmd_package() {
- 	tmppkg="$tmpdir/$(basename $pkg)"
- 
- 	cd "${ROOT:-/}"
-+	# remove old package.list
-+	if [ -f etc/lbu/packages.list ] && [ -f var/lib/apk/world ]; then
-+		echo "Note: Removing /etc/lbu/packages.list."
-+		echo "      /var/lib/apk/world will be used."
-+		rm -f etc/lbu/packages.list
-+	fi
- 	currentlist=$(apk audit --backup -q)
- 	if [ -f var/lib/apk/world ]; then
- 		currentlist="$currentlist var/lib/apk/world"
-@@ -391,10 +397,10 @@ cmd_commit() {
- 		}' | xargs rm 2>/dev/null
- 
- 	# remove obsolete file. some older version of alpine needs this
--	# to be ble to upgrade
-+	# to be able to upgrade
- 	if [ -z "$DRYRUN" ] && [ -f $mnt/packages.list ]; then
- 		echo "Note: Removing packages.list from $(basename $mnt)."
--		echo "      $PACKAGES_LIST will be used."
-+		echo "      /var/lib/apk/world will be used."
- 		rm -f $mnt/packages.list
- 	fi
- 
--- 
-1.6.3.3
-
diff --git a/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch b/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch
deleted file mode 100644
index 066c8a02e3..0000000000
--- a/main/alpine-conf/0002-setup-disk-copy-apk-config-to-new-root.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2e3bdc6d581b3efc5446d3b765272f7125bc0cba Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 6 Aug 2009 12:08:06 +0000
-Subject: [PATCH 2/2] setup-disk: copy apk config to new root
-
----
- setup-disk.in |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/setup-disk.in b/setup-disk.in
-index 6a90d3a..e1a2c6d 100644
---- a/setup-disk.in
-+++ b/setup-disk.in
-@@ -42,8 +42,12 @@ install_mounted_root() {
- 
- 	echon "Installing system on $rootdev: "
- 	lbu package - | tar -C "$mnt" -zx
-+	# apk reads config from target root so we need to copy the config
-+	mkdir -p "$mnt"/etc/apk/keys/
-+	cp /etc/apk/keys/* "$mnt"/etc/apk/keys/
-+
- 	apk add -q --progress --root "$mnt" $(cat "$mnt"/var/lib/apk/world) \
--		linux-grsec acct mkinitfs
-+		acct linux-grsec alpine-base >/dev/null || return 1
- 	echo ""
- 	# make things bootable
- 	kernel=$(ls "$mnt"/lib/modules)
-@@ -61,7 +65,6 @@ install_mounted_root() {
- 			rootdisk="$rootdisk /dev/${i}"
- 		done
- 	fi
--	chroot "$mnt" /sbin/mkinitfs -F "$features" $kernel
- 
- 	# create an extlinux.conf
- 	sed '/append initrd/d' /media/*/syslinux.cfg > "$mnt"/boot/extlinux.conf
--- 
-1.6.4
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index e520e1e746..fc8d2dec96 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,26 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=2.0_beta3
-pkgrel=2
+pkgver=2.0_beta4
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 depends="openrc"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-lbu-remove-packages.list-if-exist.patch
-	0002-setup-disk-copy-apk-config-to-new-root.patch
 	"
 license="GPL-2"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	patch -p1 -i ../0001-lbu-remove-packages.list-if-exist.patch || return 1
-	patch -p1 -i ../0002-setup-disk-copy-apk-config-to-new-root.patch || return 1
 	make || return 1
 	make install PREFIX= DESTDIR="$pkgdir"
 	for i in commit exclude include status update; do
 		ln -s lbu "$pkgdir"/sbin/lbu_$i
 	done
 }
-md5sums="7786d6d526e96a3fdf51b9284d063caa  alpine-conf-2.0_beta3.tar.bz2
-b09f9702fc6599fcb7d9bfbc855c8b5c  0001-lbu-remove-packages.list-if-exist.patch
-6b32656c7d90567084753471fe9df972  0002-setup-disk-copy-apk-config-to-new-root.patch"
+md5sums="8228e51fd221284ee79aaeb889763a68  alpine-conf-2.0_beta4.tar.bz2"
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index ea77fa6855..fd2c351253 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
 pkgver=2.0_rc3
-pkgrel=0
+pkgrel=3
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 subpackages="$pkgname-static"
 depends=
@@ -27,6 +27,7 @@ build() {
 	ln -s apk apk_index
 	ln -s apk apk_info
 	ln -s apk apk_version
+	install -d "$pkgdir"/var/lib/apk "$pkgdir"/var/cache/misc
 }
 
 static() {
diff --git a/main/dhcp/APKBUILD b/main/dhcp/APKBUILD
index 284e15eeea..c73f945576 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=1
+pkgrel=2
 pkgdesc="ISC Dynamic Host Configuration Protocol (DHCP)"
 url="https://www.isc.org/"
 license="GPL"
@@ -11,12 +11,13 @@ makedepends=
 install="dhcp.pre-install dhcp.pre-upgrade dhcp.post-upgrade"
 subpackages="$pkgname-doc $pkgname-dev dhclient"
 source="http://ftp.isc.org/isc/dhcp/$pkgname-$_realver.tar.gz
-	$install
+	linux_ipv6_discover.patch
 	dhcpd.confd
 	dhcpd.initd"
 
 build() {
 	cd "$srcdir/$pkgname-$_realver"
+	patch -p1 -i ../linux_ipv6_discover.patch || return 1
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc/dhcp \
@@ -49,8 +50,6 @@ dhclient() {
 }
 
 md5sums="325ff8338c5a21f89d5304ac13ffebdf  dhcp-4.1.0p1.tar.gz
-19b28380eaae7d26027c29b623aeee07  dhcp.pre-install
-6cc49497f3c30ccd37fc7c032f7810c6  dhcp.pre-upgrade
-36d562e5b0e55a36e4224fd7cb843f6a  dhcp.post-upgrade
+37abf1fb047a353e91b022fafdabf39a  linux_ipv6_discover.patch
 df32707f5bbe5363306420b5dc6e6b40  dhcpd.confd
 6ed5ddba2b445ef60d27a8b7f5a0ee0b  dhcpd.initd"
diff --git a/main/dhcp/linux_ipv6_discover.patch b/main/dhcp/linux_ipv6_discover.patch
new file mode 100644
index 0000000000..ebf3865e6a
--- /dev/null
+++ b/main/dhcp/linux_ipv6_discover.patch
@@ -0,0 +1,50 @@
+diff -Naur dhcp-4.1.0a2/common/discover.c dhcp-4.1.0a2-mcn/common/discover.c
+--- dhcp-4.1.0a2/common/discover.c	2008-08-29 18:48:57.000000000 +0100
++++ dhcp-4.1.0a2-mcn/common/discover.c	2008-10-02 13:02:06.000000000 +0100
+@@ -443,15 +443,17 @@
+ 	}
+ 
+ #ifdef DHCPv6
+-	ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
+-	if (ifaces->fp6 == NULL) {
+-		log_error("Error opening '/proc/net/if_inet6' to "
+-			  "list IPv6 interfaces; %m");
+-		close(ifaces->sock);
+-		ifaces->sock = -1;
+-		fclose(ifaces->fp);
+-		ifaces->fp = NULL;
+-		return 0;
++	if (local_family == AF_INET6) {
++		ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
++		if (ifaces->fp6 == NULL) {
++			log_error("Error opening '/proc/net/if_inet6' to "
++				  "list IPv6 interfaces; %m");
++			close(ifaces->sock);
++			ifaces->sock = -1;
++			fclose(ifaces->fp);
++			ifaces->fp = NULL;
++			return 0;
++		}
+ 	}
+ #endif
+ 
+@@ -720,7 +722,8 @@
+ 	}
+ #ifdef DHCPv6
+ 	if (!(*err)) {
+-		return next_iface6(info, err, ifaces);
++		if (local_family == AF_INET6)
++			return next_iface6(info, err, ifaces);
+ 	}
+ #endif
+ 	return 0;
+@@ -736,7 +739,8 @@
+ 	close(ifaces->sock);
+ 	ifaces->sock = -1;
+ #ifdef DHCPv6
+-	fclose(ifaces->fp6);
++	if (local_family == AF_INET6)
++		fclose(ifaces->fp6);
+ 	ifaces->fp6 = NULL;
+ #endif
+ }
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index 1e740cb506..d0016e2fe3 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=samba
 pkgver=3.3.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 url="http://www.samba.org"
 license="GPL3"
@@ -67,13 +67,14 @@ winbind() {
 		usr/bin/wbinfo \
 		usr/bin/ntlm_auth \
 		usr/sbin/winbindd \
-		usr/lib/samba/idmap \
-		usr/lib/libwbclient* 
+		usr/lib/samba/idmap 
 }
 
 common() {
 	pkgdesc="Samba common files for both client an servers"
 	depends=
+	# we have moved libwbclient to samba-common
+	replaces="winbind"
 	cd "$pkgdir"
 	_mv_files \
 		usr/bin/net \
@@ -82,6 +83,7 @@ common() {
 		usr/bin/testparm \
 		usr/lib/samba/*.dat \
 		usr/lib/libtalloc* \
+		usr/lib/libwbclient* \
 		var/run/samba \
 		var/cache/samba \
 		var/log/samba