Merge git://dev.alpinelinux.org/aports

9 files changed, 227 insertions, 41 deletions

diff --git a/testing/freeradius-client/APKBUILD b/testing/freeradius-client/APKBUILD
deleted file mode 100644
index 01ff2e25aa..0000000000
--- a/testing/freeradius-client/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Francesco Colsita <francesco.colista@gmail.com>
-# Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
-pkgname=freeradius-client
-pkgver=1.1.6
-pkgrel=1
-pkgdesc="FreeRADIUS Client Software"
-url="http://wiki.freeradius.org/Radiusclient"
-arch="all"
-license="BSD"
-depends=
-makedepends="openssl-dev"
-install=
-subpackages="$pkgname-dev"
-source="ftp://ftp.freeradius.org/pub/radius/$pkgname-$pkgver.tar.bz2"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-}
-
-build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-	rm "$pkgdir"/usr/lib/*.la || return 1
-}
-
-md5sums="2e46564e450ae13aedb70dc133b158ac  freeradius-client-1.1.6.tar.bz2"
diff --git a/testing/perl-lwp-protocol-https/APKBUILD b/testing/perl-lwp-protocol-https/APKBUILD
new file mode 100644
index 0000000000..7c9f60a35f
--- /dev/null
+++ b/testing/perl-lwp-protocol-https/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 1
+# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+pkgname=perl-lwp-protocol-https
+_pkgreal=LWP-Protocol-https
+pkgver=6.02
+pkgrel=0
+pkgdesc="Provide https support for LWP::UserAgent"
+url="http://search.cpan.org/dist/LWP-Protocol-https/"
+arch="noarch"
+license="GPL PerlArtistic"
+cpandepends="perl-libwww perl-io-socket-ssl perl-mozilla-ca perl-net-http"
+cpanmakedepends=""
+depends="$cpandepends"
+makedepends="perl-dev $cpanmakedepends"
+subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/$_pkgreal-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+}
+
+build() {
+	cd "$_builddir"
+	make && make test
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+md5sums="a37185492b15ad5ac13da4aef48bd388  LWP-Protocol-https-6.02.tar.gz"
diff --git a/testing/perl-mozilla-ca/APKBUILD b/testing/perl-mozilla-ca/APKBUILD
new file mode 100644
index 0000000000..b23c19c34e
--- /dev/null
+++ b/testing/perl-mozilla-ca/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 1
+# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+pkgname=perl-mozilla-ca
+_pkgreal=Mozilla-CA
+pkgver=20110409
+pkgrel=0
+pkgdesc="Mozilla's CA cert bundle in PEM format"
+url="http://search.cpan.org/dist/Mozilla-CA/"
+arch="noarch"
+license="GPL PerlArtistic"
+cpandepends=""
+cpanmakedepends=""
+depends="$cpandepends"
+makedepends="perl-dev $cpanmakedepends"
+subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/A/AB/ABH/$_pkgreal-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+}
+
+build() {
+	cd "$_builddir"
+	make && make test
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+md5sums="b68cbbc2a364de8e2c418b46126221d0  Mozilla-CA-20110409.tar.gz"
diff --git a/testing/shorewall/APKBUILD b/testing/shorewall/APKBUILD
new file mode 100644
index 0000000000..05e05ca91c
--- /dev/null
+++ b/testing/shorewall/APKBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=shorewall
+pkgver=4.4.21
+pkgrel=0
+pkgdesc="Shoreline Firewall is an iptables-based firewall for Linux."
+url="http://www.shorewall.net/"
+arch="noarch"
+license="GPL-2"
+depends="iptables iproute2 perl"
+replaces="shorewall-common shorewall-perl"
+subpackages="$pkgname-doc"
+source="http://www1.shorewall.net/pub/shorewall/4.4/shorewall-$pkgver/shorewall-$pkgver.tar.bz2
+	shorewall.initd
+	shorewall-no-install-T.patch
+	"
+
+_builddir="src/$pkgname-$pkgver"
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+
+	PREFIX="${pkgdir}" ./install.sh || return 1
+	install -Dm755 "$srcdir"/shorewall.initd "$pkgdir"/etc/init.d/shorewall
+}
+
+doc() {
+	default_doc
+	mkdir -p "$subpkgdir/usr/share/shorewall"
+	mv "$pkgdir/usr/share/shorewall/configfiles" \
+		"$subpkgdir/usr/share/shorewall/"
+}
+
+md5sums="aac1823063489563330bf5dc57a26487  shorewall-4.4.21.tar.bz2
+71fb6da1f50f5c6e9dd35b60b3629531  shorewall.initd
+546ca14bae43f5046f193efc884c768b  shorewall-no-install-T.patch"
diff --git a/testing/shorewall/shorewall-no-install-T.patch b/testing/shorewall/shorewall-no-install-T.patch
new file mode 100644
index 0000000000..09567a5123
--- /dev/null
+++ b/testing/shorewall/shorewall-no-install-T.patch
@@ -0,0 +1,11 @@
+--- a/shorewall-4.4.21/install.sh
++++ b/shorewall-4.4.21/install.sh
+@@ -96,7 +96,7 @@
+ # INIT is the name of the script in the $DEST directory
+ # ARGS is "yes" if we've already parsed an argument
+ #
+-T="-T"
++T=
+ 
+ if [ -z "$DEST" ] ; then
+ 	DEST="/etc/init.d"
diff --git a/testing/shorewall/shorewall.initd b/testing/shorewall/shorewall.initd
new file mode 100644
index 0000000000..9dda676c57
--- /dev/null
+++ b/testing/shorewall/shorewall.initd
@@ -0,0 +1,80 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/files/shorewall.initd,v 1.2 2008/05/04 13:16:40 pva Exp $
+
+opts="start stop restart clear reset refresh check"
+
+depend() {
+	need net
+	provide firewall
+	after ulogd
+}
+
+start() {
+	ebegin "Starting firewall"
+	/sbin/shorewall -f start 1>/dev/null
+	eend $? 
+}
+
+stop() {
+	ebegin "Stopping firewall"
+	/sbin/shorewall stop 1>/dev/null
+	eend $?
+}
+
+restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
+	ebegin "Restarting firewall"
+	/sbin/shorewall status >/dev/null
+	if [ $? != 0 ] ; then
+	    svc_start
+	else
+	    if [ -f /var/lib/shorewall/restore ] ; then
+		/sbin/shorewall restore
+	    else
+		/sbin/shorewall restart 1>/dev/null
+	    fi
+	fi
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
+	/sbin/shorewall clear
+	eend $?
+}
+
+reset() {
+	# reset the packet and byte counters in the firewall
+
+	ebegin "Resetting the packet and byte counters in the firewall"
+	/sbin/shorewall reset
+	eend $?
+}
+
+refresh() {
+	# refresh the rules involving the broadcast addresses of firewall 
+	# interfaces, the black list, traffic control rules and 
+	# ECN control rules
+
+	ebegin "Refreshing firewall rules"
+	/sbin/shorewall refresh
+	eend $?
+}
+
+check() {
+	# perform cursory validation of the zones, interfaces, hosts, rules
+	# and policy files. CAUTION: does not parse and validate the generated 
+	# iptables commands.
+
+	ebegin "Checking configuration files"
+	/sbin/shorewall check
+	eend $?
+}
diff --git a/testing/unbound/APKBUILD b/testing/unbound/APKBUILD
index 64cae06d73..9d9acd120f 100644
--- a/testing/unbound/APKBUILD
+++ b/testing/unbound/APKBUILD
@@ -2,8 +2,10 @@
 # Maintainer:
 pkgname=unbound
 pkgver=1.4.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver"
+pkgusers="unbound"
+pkggroups="unbound"
 url="http://unbound.net/"
 arch="all"
 license="Custom"
@@ -13,8 +15,8 @@ makedepends="$depends_dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://unbound.net/downloads/unbound-$pkgver.tar.gz
-unbound.initd
-unbound.confd"
+	unbound.initd
+	unbound.confd"
 
 _builddir="$srcdir"/unbound-$pkgver
 prepare() {
@@ -34,7 +36,11 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
+		--with-pidfile=/var/run/unbound/unbound.pid \
+		--with-pic \
+		--with-username=unbound \
 		--with-libevent \
+		--with-ldns \
 		|| return 1
 	make || return 1
 }
@@ -42,12 +48,15 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/*.la || return 1
         install -m755 -D "$srcdir"/unbound.initd \
                 "$pkgdir"/etc/init.d/unbound || return 1
         install -m644 -D "$srcdir"/unbound.confd \
                 "$pkgdir"/etc/conf.d/unbound || return 1
+	install -d -o unbound -g unbound "$pkgdir"/var/run/unbound
+	chown unbound:unbound -R "$pkgdir"/etc/unbound
 }
 
 md5sums="6bbae378db76abfe0bd72c404e484597  unbound-1.4.10.tar.gz
-941663107bfd428f54d2cad11b0cefc9  unbound.initd
+455b7893a08e2f3e4ebce923e97c9724  unbound.initd
 10f8a73d14160571acea41fc89d914e7  unbound.confd"
diff --git a/testing/unbound/unbound.initd b/testing/unbound/unbound.initd
index e9e902c9b9..08944b60ef 100644
--- a/testing/unbound/unbound.initd
+++ b/testing/unbound/unbound.initd
@@ -7,6 +7,7 @@ opts="${opts} checkconfig reload"
 
 UNBOUND_BINARY=${UNBOUND_BINARY:-/usr/sbin/unbound}
 UNBOUND_CHECKCONF=${UNBOUND_CHECKCONF:-/usr/sbin/unbound-checkconf}
+UNBOUND_ANCHOR=${UNBOUND_ANCHOR:-/usr/sbin/unbound-anchor}
 UNBOUND_CONFFILE=${UNBOUND_CONFFILE:-/etc/unbound/${SVCNAME}.conf}
 
 depend() {
@@ -18,12 +19,14 @@ depend() {
 
 checkconfig() {
 	UNBOUND_PIDFILE=$("${UNBOUND_CHECKCONF}" -o pidfile "${UNBOUND_CONFFILE}")
+	UNBOUND_USER=$("${UNBOUND_CHECKCONF}" -o username "${UNBOUND_CONFFILE}")
 	return $?
 }
 
 start() {
 	checkconfig || return $?
 	ebegin "Starting unbound"
+	su -c "${UNBOUND_ANCHOR}" -s /bin/sh ${UNBOUND_USER}
 	start-stop-daemon --start --pidfile "${UNBOUND_PIDFILE}" \
 		--exec "${UNBOUND_BINARY}" -- -c "${UNBOUND_CONFFILE}"
 	eend $?
diff --git a/testing/unbound/unbound.pre-install b/testing/unbound/unbound.pre-install
index 10e5a7b8d4..1cfc2eff4d 100644
--- a/testing/unbound/unbound.pre-install
+++ b/testing/unbound/unbound.pre-install
@@ -1,4 +1,5 @@
 #!/bin/sh
 
-adduser -H -s /bin/false -D unbound 2>/dev/null
+addgroup -S unbound 2>/dev/null
+adduser -S -s /bin/false -D -H -h /etc/unbound -G unbound -g "Unbound user" unbound 2>/dev/null
 exit 0