Merge commit 'larena/master'

38 files changed, 55 insertions, 7 deletions

diff --git a/testing/amavisd-new/APKBUILD b/extra/amavisd-new/APKBUILD
index ba60326b..daad650d 100644
--- a/testing/amavisd-new/APKBUILD
+++ b/extra/amavisd-new/APKBUILD
@@ -30,16 +30,19 @@ build() {
 		if [ ! -d "${pkgdir}$dir" ]; then
 			mkdir -p ${pkgdir}$dir
 		fi
+		chown -R amavis.amavis $HOME
 	done
 
 	install -m 755 -o root -D amavisd $pkgdir/usr/sbin/amavisd
+	install -m 755 -o root -D amavisd-nanny $pkgdir/usr/bin/amavisd-nanny
+	install -m 755 -o root -D amavisd-release $pkgdir/usr/bin/amavisd-release
 	sed -e "s:^.*\$MYHOME = .*$:\$MYHOME = '$HOME';:" \
 	 -e 's:^.*\$TEMPBASE = .*$:\$TEMPBASE = "\$MYHOME/tmp";:' \
 	 -e 's:^.*\$db_home  = .*$:\$db_home = "$MYHOME/db";:' \
 	 -e "s:^.*\$QUARANTINEDIR = .*$:\$QUARANTINEDIR = '$QUARANTINE';:" \
 	 -e "s:^.*\$daemon_user  = 'vscan';\(.*\)$:\$daemon_user  = 'amavis';\1:" \
 	 -e "s:^.*\$daemon_group = 'vscan';\(.*\)$:\$daemon_group  = 'amavis';\1:" < amavisd.conf > amavisd.conf.alpine
-	install -m 640 -o root -D amavisd.conf.alpine ${pkgdir}${CONFIG}
+	install -m 640 -o root -g amavis -D amavisd.conf.alpine ${pkgdir}${CONFIG}
 	install -m 755 -D ../../amavisd.init $pkgdir/etc/init.d/amavisd
 }
 
diff --git a/testing/amavisd-new/amavisd-new.post-install b/extra/amavisd-new/amavisd-new.post-install
index 56cad39f..56cad39f 100755
--- a/testing/amavisd-new/amavisd-new.post-install
+++ b/extra/amavisd-new/amavisd-new.post-install
diff --git a/testing/amavisd-new/amavisd.init b/extra/amavisd-new/amavisd.init
index 55a46549..23f92af3 100644
--- a/testing/amavisd-new/amavisd.init
+++ b/extra/amavisd-new/amavisd.init
@@ -1,5 +1,7 @@
 #!/sbin/runscript
 
+PIDFILE="/var/amavis/amavisd.pid"
+
 depend() {
 	need net
 	use logger
@@ -9,13 +11,13 @@ depend() {
 
 start() {
 	ebegin "Starting amavisd-new"
-	start-stop-daemon --start --quiet --name amavisd --pidfile /var/amavis/amavisd.pid \
+	start-stop-daemon --start --quiet --name amavisd --pidfile ${PIDFILE} \
 	 --exec /usr/sbin/amavisd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping amavisd-new"
-	start-stop-daemon --stop --quiet --pidfile /var/run/amavis/amavisd.pid
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
 	eend $?
 }
diff --git a/extra/lha/APKBUILD b/extra/lha/APKBUILD
new file mode 100644
index 00000000..618b6853
--- /dev/null
+++ b/extra/lha/APKBUILD
@@ -0,0 +1,19 @@
+# Maintainer: Leonardo Arena <rnalrd@gmail.com>
+pkgname=lha
+pkgver=1.17
+pkgrel=0
+pkgdesc="Compression and archive utility for LH-7 format archives"
+url="http://www.infor.kanazawa-it.ac.jp/~ishii/lhaunix/"
+license="custom"
+subpackages=""
+depends="uclibc"
+makedepends=""
+install=
+source="http://www.infor.kanazawa-it.ac.jp/~ishii/lhaunix/linux/${pkgname}117.tar.gz"
+
+build ()
+{
+	install -D -m755 $srcdir/lha $pkgdir/usr/bin/lha
+}
+
+md5sums="7896188203cfaf5782d153c4dcd19f57  lha117.tar.gz"
diff --git a/extra/lua/APKBUILD b/extra/lua/APKBUILD
index e5ddf934..c42d1c9d 100644
--- a/extra/lua/APKBUILD
+++ b/extra/lua/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="A powerful light-weight programming language designed for extending app
 url="http://www.lua.org/"
 license="MIT"
 depends="readline"
-makedepends="readline-dev"
+makedepends="readline-dev libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.$pkgname.org/ftp/$pkgname-$pkgver.tar.gz
 	lua-5.1-make.patch
diff --git a/extra/nmap/APKBUILD b/extra/nmap/APKBUILD
index 367523d3..bb040787 100644
--- a/extra/nmap/APKBUILD
+++ b/extra/nmap/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=nmap 
 pkgver=4.76
-pkgrel=1
+pkgrel=2
 pkgdesc="A network exploration tool and security/port scanner"
 url="http:/nmap.org"
 license="custom:GPL"
-depends="pcre libpcap openssl-dev lua-dev uclibc++"
-makedepends="uclibc++-dev libpcap-dev"
+depends="pcre libpcap uclibc++ openssl lua"
+makedepends="uclibc++-dev libpcap-dev openssl-dev lua-dev"
 install=
 subpackages="$pkgname-doc $pkgname-nse"
 source="http://nmap.org/dist/$pkgname-$pkgver.tgz
diff --git a/testing/perl-archive-zip/APKBUILD b/extra/perl-archive-zip/APKBUILD
index 2f78683e..2f78683e 100644
--- a/testing/perl-archive-zip/APKBUILD
+++ b/extra/perl-archive-zip/APKBUILD
diff --git a/testing/perl-convert-binhex/APKBUILD b/extra/perl-convert-binhex/APKBUILD
index e0cc0b30..e0cc0b30 100644
--- a/testing/perl-convert-binhex/APKBUILD
+++ b/extra/perl-convert-binhex/APKBUILD
diff --git a/testing/perl-convert-tnef/APKBUILD b/extra/perl-convert-tnef/APKBUILD
index 352e26e7..352e26e7 100644
--- a/testing/perl-convert-tnef/APKBUILD
+++ b/extra/perl-convert-tnef/APKBUILD
diff --git a/testing/perl-convert-uulib/APKBUILD b/extra/perl-convert-uulib/APKBUILD
index b35d517d..b35d517d 100644
--- a/testing/perl-convert-uulib/APKBUILD
+++ b/extra/perl-convert-uulib/APKBUILD
diff --git a/testing/perl-crypt-openssl-random/APKBUILD b/extra/perl-crypt-openssl-random/APKBUILD
index 0b1e8ea9..0b1e8ea9 100644
--- a/testing/perl-crypt-openssl-random/APKBUILD
+++ b/extra/perl-crypt-openssl-random/APKBUILD
diff --git a/testing/perl-crypt-openssl-rsa/APKBUILD b/extra/perl-crypt-openssl-rsa/APKBUILD
index 4acae984..4acae984 100644
--- a/testing/perl-crypt-openssl-rsa/APKBUILD
+++ b/extra/perl-crypt-openssl-rsa/APKBUILD
diff --git a/testing/perl-db/APKBUILD b/extra/perl-db/APKBUILD
index 929d5872..929d5872 100644
--- a/testing/perl-db/APKBUILD
+++ b/extra/perl-db/APKBUILD
diff --git a/testing/perl-db_file/APKBUILD b/extra/perl-db_file/APKBUILD
index 7d3edc3a..7d3edc3a 100644
--- a/testing/perl-db_file/APKBUILD
+++ b/extra/perl-db_file/APKBUILD
diff --git a/testing/perl-digest-sha1/APKBUILD b/extra/perl-digest-sha1/APKBUILD
index 0b0909c5..0b0909c5 100644
--- a/testing/perl-digest-sha1/APKBUILD
+++ b/extra/perl-digest-sha1/APKBUILD
diff --git a/testing/perl-getopt-long/APKBUILD b/extra/perl-getopt-long/APKBUILD
index 431f52a9..431f52a9 100644
--- a/testing/perl-getopt-long/APKBUILD
+++ b/extra/perl-getopt-long/APKBUILD
diff --git a/testing/perl-html-parser/APKBUILD b/extra/perl-html-parser/APKBUILD
index fb7ea012..fb7ea012 100644
--- a/testing/perl-html-parser/APKBUILD
+++ b/extra/perl-html-parser/APKBUILD
diff --git a/testing/perl-inline/APKBUILD b/extra/perl-inline/APKBUILD
index f8e350c1..f8e350c1 100644
--- a/testing/perl-inline/APKBUILD
+++ b/extra/perl-inline/APKBUILD
diff --git a/testing/perl-io-stringy/APKBUILD b/extra/perl-io-stringy/APKBUILD
index f25ce216..f25ce216 100644
--- a/testing/perl-io-stringy/APKBUILD
+++ b/extra/perl-io-stringy/APKBUILD
diff --git a/testing/perl-mail-clamav/APKBUILD b/extra/perl-mail-clamav/APKBUILD
index c8ef7ea7..c8ef7ea7 100644
--- a/testing/perl-mail-clamav/APKBUILD
+++ b/extra/perl-mail-clamav/APKBUILD
diff --git a/testing/perl-mail-dkim/APKBUILD b/extra/perl-mail-dkim/APKBUILD
index 7fc9d69e..7fc9d69e 100644
--- a/testing/perl-mail-dkim/APKBUILD
+++ b/extra/perl-mail-dkim/APKBUILD
diff --git a/testing/perl-mail-domainkeys/APKBUILD b/extra/perl-mail-domainkeys/APKBUILD
index be3f83df..be3f83df 100644
--- a/testing/perl-mail-domainkeys/APKBUILD
+++ b/extra/perl-mail-domainkeys/APKBUILD
diff --git a/testing/perl-mail-spamassassin/APKBUILD b/extra/perl-mail-spamassassin/APKBUILD
index 6a3c8846..6a3c8846 100644
--- a/testing/perl-mail-spamassassin/APKBUILD
+++ b/extra/perl-mail-spamassassin/APKBUILD
diff --git a/testing/perl-mail-spf/APKBUILD b/extra/perl-mail-spf/APKBUILD
index 372398d6..372398d6 100644
--- a/testing/perl-mail-spf/APKBUILD
+++ b/extra/perl-mail-spf/APKBUILD
diff --git a/testing/perl-mail-tools/APKBUILD b/extra/perl-mail-tools/APKBUILD
index 0e133c30..0e133c30 100644
--- a/testing/perl-mail-tools/APKBUILD
+++ b/extra/perl-mail-tools/APKBUILD
diff --git a/testing/perl-mime-tools/APKBUILD b/extra/perl-mime-tools/APKBUILD
index 1bbfe33f..1bbfe33f 100644
--- a/testing/perl-mime-tools/APKBUILD
+++ b/extra/perl-mime-tools/APKBUILD
diff --git a/testing/perl-net-dns/APKBUILD b/extra/perl-net-dns/APKBUILD
index 2ce850ee..2ce850ee 100644
--- a/testing/perl-net-dns/APKBUILD
+++ b/extra/perl-net-dns/APKBUILD
diff --git a/testing/perl-net-ip/APKBUILD b/extra/perl-net-ip/APKBUILD
index d959c43d..d959c43d 100644
--- a/testing/perl-net-ip/APKBUILD
+++ b/extra/perl-net-ip/APKBUILD
diff --git a/testing/perl-net-server/APKBUILD b/extra/perl-net-server/APKBUILD
index 9e0bc32c..9e0bc32c 100644
--- a/testing/perl-net-server/APKBUILD
+++ b/extra/perl-net-server/APKBUILD
diff --git a/testing/perl-parse-recdescent/APKBUILD b/extra/perl-parse-recdescent/APKBUILD
index 8ee87e58..8ee87e58 100644
--- a/testing/perl-parse-recdescent/APKBUILD
+++ b/extra/perl-parse-recdescent/APKBUILD
diff --git a/testing/perl-test-pod/APKBUILD b/extra/perl-test-pod/APKBUILD
index df47aee2..df47aee2 100644
--- a/testing/perl-test-pod/APKBUILD
+++ b/extra/perl-test-pod/APKBUILD
diff --git a/testing/perl-time-date/APKBUILD b/extra/perl-time-date/APKBUILD
index 1c02dfe1..1c02dfe1 100644
--- a/testing/perl-time-date/APKBUILD
+++ b/extra/perl-time-date/APKBUILD
diff --git a/testing/perl-unix-syslog/APKBUILD b/extra/perl-unix-syslog/APKBUILD
index 59ece194..59ece194 100644
--- a/testing/perl-unix-syslog/APKBUILD
+++ b/extra/perl-unix-syslog/APKBUILD
diff --git a/testing/perl-uri-escape/APKBUILD b/extra/perl-uri-escape/APKBUILD
index 4cd3b727..4cd3b727 100644
--- a/testing/perl-uri-escape/APKBUILD
+++ b/extra/perl-uri-escape/APKBUILD
diff --git a/testing/spamassassin/APKBUILD b/extra/spamassassin/APKBUILD
index cca771b7..3da01a62 100644
--- a/testing/spamassassin/APKBUILD
+++ b/extra/spamassassin/APKBUILD
@@ -21,6 +21,8 @@ build() {
 	make DESTDIR="$pkgdir" install
 	install -m755 -D ../../spamd.init $pkgdir/etc/init.d/spamd
 	install -m644 -D ../../spamd.conf $pkgdir/etc/conf.d/spamd.conf
+	mkdir $pkgdir/usr/sbin
+	mv $pkgdir/usr/bin/spamd $pkgdir/usr/sbin/spamd
 	# creates file collision among perl modules
 	rm $pkgdir/usr/lib/perl5/5.10.0/i686-linux/perllocal.pod
 }
diff --git a/testing/spamassassin/spamd.conf b/extra/spamassassin/spamd.conf
index b6fca036..b6fca036 100644
--- a/testing/spamassassin/spamd.conf
+++ b/extra/spamassassin/spamd.conf
diff --git a/testing/spamassassin/spamd.init b/extra/spamassassin/spamd.init
index 89723889..89723889 100644
--- a/testing/spamassassin/spamd.init
+++ b/extra/spamassassin/spamd.init
diff --git a/extra/unarj/APKBUILD b/extra/unarj/APKBUILD
new file mode 100644
index 00000000..b2e0c726
--- /dev/null
+++ b/extra/unarj/APKBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Leonardo Arena <rnalrd@gmail.com>
+pkgname=unarj
+pkgver=2.63a
+pkgrel=0
+pkgdesc="Extracting, testing and  viewing the contents of archives created with the ARJ archiver"
+url="http://www.arjsoftware.com"
+license="custom"
+subpackages=""
+depends="uclibc"
+makedepends=""
+install=
+source="http://ibiblio.org/pub/Linux/utils/compress/$pkgname-$pkgver.tar.gz"
+
+build ()
+{
+	cd "$srcdir"/${pkgname}-${pkgver}
+	make || return 1
+	install -D -m755 unarj $pkgdir/usr/bin/unarj || return 1
+	#install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
+md5sums="a83d139c245f911f22cb1b611ec9768f  unarj-2.63a.tar.gz"