Merge git://github.com/Barthalion/aports

9 files changed, 38 insertions, 92 deletions

diff --git a/testing/gitolite/APKBUILD b/testing/gitolite/APKBUILD
index 3a4eab3f99..11c26e7989 100644
--- a/testing/gitolite/APKBUILD
+++ b/testing/gitolite/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 
 pkgname=gitolite
-pkgver=3.03
+pkgver=3.04
 pkgrel=0
 pkgdesc='A centralized git server, with very fine-grained access control and many powerful features.'
 url='http://github.com/sitaramc/gitolite'
@@ -21,4 +21,4 @@ package() {
     ln -s /usr/lib/gitolite/gitolite ${pkgdir}/usr/bin/ || return 1
 }
 
-md5sums="5b66437e362e610595ad1d1b099e0812  gitolite-3.03.tar.gz"
+md5sums="a607da096dc49737adb24c1360b3f3c4  gitolite-3.04.tar.gz"
diff --git a/testing/libtorrent/APKBUILD b/testing/libtorrent/APKBUILD
deleted file mode 100644
index ec51d9046b..0000000000
--- a/testing/libtorrent/APKBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-
-pkgname=libtorrent
-pkgver=0.13.2
-pkgrel=0
-pkgdesc='BitTorrent library written in C++'
-url='http://libtorrent.rakshasa.no/'
-arch='all'
-license='GPL'
-makedepends='libsigc++-dev openssl-dev'
-subpackages="$pkgname-dev"
-options='libtool'
-source="http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz"
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--disable-debug \
-		|| return 1
-
-	make || return 1
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install || return 1
-}
-
-md5sums="96c0b81501357df402ab592f59ecaeab  libtorrent-0.13.2.tar.gz"
diff --git a/testing/ncmpcpp/APKBUILD b/testing/ncmpcpp/APKBUILD
index 88e1c4938c..c4678b6d77 100644
--- a/testing/ncmpcpp/APKBUILD
+++ b/testing/ncmpcpp/APKBUILD
@@ -1,26 +1,25 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ncmpcpp
-pkgver=0.5.8
+pkgver=0.5.10
 pkgrel=0
 pkgdesc="An almost exact clone of ncmpc with some new features."
 url="http://unkart.ovh.org/ncmpcpp/"
 arch="all"
 license="GPL"
-depends=""
 makedepends="curl-dev libmpdclient-dev taglib-dev ncurses-dev openssl-dev"
-install=
 subpackages="$pkgname-doc"
 source="http://unkart.ovh.org/ncmpcpp/ncmpcpp-$pkgver.tar.bz2"
 
 _builddir="$srcdir"/$pkgname-$pkgver
-build () 
-{ 
+build () {
 	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr \
 		--enable-unicode \
 		--enable-clock \
-		--with-taglib --with-curl
-	make
+		--with-taglib \
+		--with-curl \
+	|| return 1
+	make || return 1
 }
 
 package() {
@@ -28,4 +27,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="288952c6b4cf4fa3683f3f83a58da37c  ncmpcpp-0.5.8.tar.bz2"
+md5sums="298ed66325bcfe358e37e186c7ea4861  ncmpcpp-0.5.10.tar.bz2"
diff --git a/testing/rtorrent/APKBUILD b/testing/rtorrent/APKBUILD
deleted file mode 100644
index bc3dfad102..0000000000
--- a/testing/rtorrent/APKBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-
-pkgname=rtorrent
-pkgver=0.9.2
-pkgrel=0
-pkgdesc='Ncurses BitTorrent client based on libTorrent'
-url='http://libtorrent.rakshasa.no/'
-license='GPL'
-arch='all'
-makedepends='libsigc++-dev libtorrent-dev curl-dev xmlrpc-c-dev ncurses-dev'
-subpackages="$pkgname-doc"
-source="http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz"
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	export LDFLAGS="${LDFLAGS} -lpthread"
-	./configure \
-		--prefix=/usr \
-		--disable-debug \
-		--with-xmlrpc-c \
-		|| return 1
-
-	make || return 1
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -D doc/faq.xml "${pkgdir}"/usr/share/doc/rtorrent/faq.xml \
-		|| return 1
-	install -D doc/rtorrent.1 "${pkgdir}"/usr/share/man/man1/rtorrent.1 \
-		|| return 1
-	install -D doc/rtorrent.rc \
-		"${pkgdir}"/usr/share/doc/rtorrent/rtorrent.rc || return 1
-}
-
-md5sums="72c3e9ab859bda7cc8aa96c0b508b09f  rtorrent-0.9.2.tar.gz"
diff --git a/testing/ufw/APKBUILD b/testing/ufw/APKBUILD
index 02cd77ec93..733361b56f 100644
--- a/testing/ufw/APKBUILD
+++ b/testing/ufw/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgname=ufw
-pkgver=0.31.1
+pkgver=0.32
 pkgrel=0
 pkgdesc='Uncomplicated CLI tool managing a netfilter firewall'
 url='https://launchpad.net/ufw'
@@ -15,14 +15,13 @@ source="http://launchpad.net/$pkgname/$(echo $pkgver|cut -c1-4)/$pkgver/+downloa
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-
-	sed -e 's|/lib|/usr/lib|' -i setup.py || return 1
-	python setup.py install --root="$pkgdir" || return 1 # move /lib to /usr/lib
+ 
+    sed -e 's|/lib|/usr/lib|' -i setup.py || return 1
+	python setup.py install --root="$pkgdir"
 
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname || return 1
 	chmod 644 "$pkgdir"/etc/ufw/*.rules "$pkgdir"/usr/lib/ufw/*.rules || return 1
-	sed -i '7s/YES/NO/' "$pkgdir"/etc/default/ufw || return 1 #TODO: ipv6 support
 }
 
-md5sums="74b49d4d06e26359a55bf4ff576833a7  ufw-0.31.1.tar.gz
+md5sums="e9d314a6213c94ec6bddf107f7bbdb9f  ufw-0.32.tar.gz
 7bf1a3dee43b294bda8f2025e04164ce  ufw.initd"
diff --git a/testing/vnstat/APKBUILD b/testing/vnstat/APKBUILD
index 1c13ff8102..be2e25310e 100644
--- a/testing/vnstat/APKBUILD
+++ b/testing/vnstat/APKBUILD
@@ -2,15 +2,17 @@
 
 pkgname=vnstat
 pkgver=1.11
-pkgrel=0
+pkgrel=1
 pkgdesc='A console-based network traffic monitor'
 url='http://humdi.net/vnstat/'
 arch='all'
 license='GPL'
+install="$pkgname.pre-install"
 makedepends='gd-dev'
 subpackages="$pkgname-doc"
 source="http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz
-        vnstatd.initd"
+        vnstatd.initd
+        vnstatd.confd"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -21,8 +23,11 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 
-	install -D -m0755 "$srcdir"/vnstatd.initd "$pkgdir"/etc/init.d/vnstat \
-		|| return 1
+	install -D -m0755 "$srcdir"/vnstatd.initd \
+		"$pkgdir"/etc/init.d/vnstatd || return 1 
+	install -D -m0644 "$srcdir"/vnstatd.confd \
+		"$pkgdir"/etc/conf.d/vnstatd || return 1
+
 	install -D -m0644 examples/vnstat.cron \
 		"$pkgdir"/usr/share/doc/vnstat/examples/vnstat.cron || return 1
 	install -D -m0755 examples/vnstat.cgi \
@@ -30,4 +35,5 @@ package() {
 }
 
 md5sums="a5a113f9176cd61fb954f2ba297f5fdb  vnstat-1.11.tar.gz
-6c8a07d3388155c6cb23715ac8467700  vnstatd.initd"
+b439075575d307cd9373740fe59538f1  vnstatd.initd
+810205e9cd5328b4279bd9ab1b804c36  vnstatd.confd"
diff --git a/testing/vnstat/vnstat.pre-install b/testing/vnstat/vnstat.pre-install
new file mode 100644
index 0000000000..4cb61f2443
--- /dev/null
+++ b/testing/vnstat/vnstat.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+addgroup -S vnstat 2>/dev/null
+adduser -S -h /var/lib/ -H -s /bin/false -D -G vnstat vnstat 2>/dev/null
+exit 0
diff --git a/testing/vnstat/vnstatd.confd b/testing/vnstat/vnstatd.confd
new file mode 100644
index 0000000000..17901419aa
--- /dev/null
+++ b/testing/vnstat/vnstatd.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/vnstatd: config file for /etc/init.d/vnstatd
+
+# Adjust scheduling priority on vnstatd (default: 0)
+#VNSTATD_NICELEVEL="0"
+
+# Pass extra options to vnstatd
+#VNSTATD_EXTRAOPTS="--config /etc/vnstat.conf"
diff --git a/testing/vnstat/vnstatd.initd b/testing/vnstat/vnstatd.initd
index b3f136cef3..167e2cc307 100644
--- a/testing/vnstat/vnstatd.initd
+++ b/testing/vnstat/vnstatd.initd
@@ -1,7 +1,6 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/files/vnstatd.initd,v 1.6 2012/01/01 01:19:16 idl0r Exp $
 
 extra_started_commands="reload"
 
@@ -18,7 +17,7 @@ start() {
 		--pidfile "${VNSTATD_PIDFILE}" \
 		--user vnstat --group vnstat \
 		--nicelevel ${VNSTATD_NICELEVEL:-0} \
-		--exec /usr/bin/vnstatd -- \
+		--exec /usr/sbin/vnstatd -- \
 		-d ${VNSTATD_EXTRAOPTS} -p ${VNSTATD_PIDFILE}
 	eend $?
 }