43 files changed, 82 insertions, 141 deletions
diff --git a/core/binutils/APKBUILD b/core/binutils/APKBUILD
index 7142620ca..caed3abcd 100644
--- a/core/binutils/APKBUILD
+++ b/core/binutils/APKBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=binutils
-pkgver=2.19.51.0.3
+pkgver=2.19.51.0.9
 pkgdesc="Tools necessary to build programs"
 url=http://sources.redhat.com/binutils
 source=ftp://ftp.kernel.org/pub/linux/devel/binutils/$pkgname-$pkgver.tar.bz2
-depends="uclibc zlib"
+depends=
 makedepends="bison flex texinfo zlib-dev"
-license=GPL
+license="GPL"
 subpackages="$pkgname-doc"
 
 build() {
@@ -23,4 +23,4 @@ build() {
 	make || return 1
 	make install DESTDIR="$pkgdir" 
 }
-md5sums="c55a2b1eadf818d38e963060412fadca  binutils-2.19.51.0.3.tar.bz2"
+md5sums="023a3d0f50a18fdebcd5b0a50c8e41ad  binutils-2.19.51.0.9.tar.bz2"
diff --git a/core/git/git-1.6.0.4-noperl.patch b/core/git/git-1.6.0.4-noperl.patch
deleted file mode 100644
index 47d8302d8..000000000
--- a/core/git/git-1.6.0.4-noperl.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- git-1.6.0.4.orig/Makefile	Mon Nov 10 17:03:54 2008
-+++ git-1.6.0.4/Makefile	Mon Nov 10 17:04:04 2008
-@@ -130,6 +130,8 @@
- #
- # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
- # MakeMaker (e.g. using ActiveState under Cygwin).
-+
-+# Define NO_PERL if you do not want Perl scripts at all.
- #
- # Define NO_TCLTK if you do not want Tcl/Tk GUI.
- #
-@@ -263,6 +265,8 @@
- SCRIPT_SH += git-submodule.sh
- SCRIPT_SH += git-web--browse.sh
- 
-+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
-+ifndef NO_PERL
- SCRIPT_PERL += git-add--interactive.perl
- SCRIPT_PERL += git-archimport.perl
- SCRIPT_PERL += git-cvsexportcommit.perl
-@@ -271,11 +275,12 @@
- SCRIPT_PERL += git-relink.perl
- SCRIPT_PERL += git-send-email.perl
- SCRIPT_PERL += git-svn.perl
-+SCRIPTS += $(patsubst %.perl,%,$(SCRIPT_PERL)) \
-+			git-instaweb
-+else
-+SCRIPT_PERL =
-+endif
- 
--SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
--	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
--	  git-instaweb
--
- # Empty...
- EXTRA_PROGRAMS =
- 
-@@ -320,7 +325,10 @@
- ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
- 
- # what 'all' will build but not install in gitexecdir
--OTHER_PROGRAMS = git$X gitweb/gitweb.cgi
-+OTHER_PROGRAMS = git$X
-+ifndef NO_PERL
-+OTHER_PROGRAMS += gitweb/gitweb.cgi
-+endif
- 
- # Set paths to tools early so that they can be used for version tests.
- ifndef SHELL_PATH
-@@ -820,6 +828,10 @@
- 	endif
- endif
- 
-+ifdef NO_PERL
-+	BASIC_CFLAGS += -DNO_PERL
-+endif
-+
- ifdef ZLIB_PATH
- 	BASIC_CFLAGS += -I$(ZLIB_PATH)/include
- 	EXTLIBS += -L$(ZLIB_PATH)/$(lib) $(CC_LD_DYNPATH)$(ZLIB_PATH)/$(lib)
-@@ -1005,6 +1017,11 @@
- ifeq ($(TCLTK_PATH),)
- NO_TCLTK=NoThanks
- endif
-+ifeq ($(PERL_PATH),)
-+NO_PERL=NoThanks
-+export NO_PERL
-+export NO_PERL_MAKEMAKER
-+endif
- 
- QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
- QUIET_SUBDIR1  =
-@@ -1079,7 +1096,9 @@
- 	$(QUIET_SUBDIR0)git-gui $(QUIET_SUBDIR1) gitexecdir='$(gitexec_instdir_SQ)' all
- 	$(QUIET_SUBDIR0)gitk-git $(QUIET_SUBDIR1) all
- endif
-+ifndef NO_PERL
- 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' all
-+endif
- 	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1)
- 
- please_set_SHELL_PATH_to_a_more_modern_shell:
-@@ -1126,6 +1145,7 @@
- 	chmod +x $@+ && \
- 	mv $@+ $@
- 
-+ifndef NO_PERL
- $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
- 
- perl/perl.mak: GIT-CFLAGS perl/Makefile perl/Makefile.PL
-@@ -1185,6 +1205,7 @@
- 	    $@.sh > $@+ && \
- 	chmod +x $@+ && \
- 	mv $@+ $@
-+endif # NO_PERL
- 
- configure: configure.ac
- 	$(QUIET_GEN)$(RM) $@ $<+ && \
-@@ -1355,9 +1376,12 @@
- 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
- 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
- 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
--	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
-+	$(INSTALL) git$X git-upload-pack$X git-receive-pack$X git-upload-archive$X git-shell$X '$(DESTDIR_SQ)$(bindir_SQ)'
- 	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
-+ifndef NO_PERL
-+	$(INSTALL) git-cvsserver '$(DESTDIR_SQ)$(bindir_SQ)'
- 	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
-+endif
- ifndef NO_TCLTK
- 	$(MAKE) -C gitk-git install
- 	$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
-@@ -1451,9 +1475,11 @@
- 	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
- 	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
- 	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
--	$(RM) gitweb/gitweb.cgi
- 	$(MAKE) -C Documentation/ clean
-+ifndef NO_PERL
-+	$(RM) gitweb/gitweb.cgi
- 	$(MAKE) -C perl clean
-+endif
- 	$(MAKE) -C templates/ clean
- 	$(MAKE) -C t/ clean
- ifndef NO_TCLTK
diff --git a/core/mkinitfs/APKBUILD b/core/mkinitfs/APKBUILD
index 722157058..9851b70a5 100644
--- a/core/mkinitfs/APKBUILD
+++ b/core/mkinitfs/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
-pkgver=1.6
+pkgver=1.6.1
 pkgrel=0
 pkgdesc="Tool to generate initramfs images for Alpine"
 url=http://git.alpinelinux.org/cgit/mkinitfs
@@ -14,4 +14,4 @@ build() {
 	make
 	make install DESTDIR="$pkgdir" || return 1
 }
-md5sums="7e0c22452f2a43854ef3cb86df2e17fa  mkinitfs-1.6.tar.bz2"
+md5sums="6f0cfaf7bc49d8d0236759124187305e  mkinitfs-1.6.1.tar.bz2"
diff --git a/testing/amavisd-new/APKBUILD b/extra/amavisd-new/APKBUILD
index ba60326be..daad650da 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 56cad39f5..56cad39f5 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 55a465499..23f92af3f 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/chrony/APKBUILD b/extra/chrony/APKBUILD
index d6eb661ff..21f8924a6 100644
--- a/extra/chrony/APKBUILD
+++ b/extra/chrony/APKBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=chrony
 pkgver=1.23
-pkgrel=1
+pkgrel=2
 pkgdesc="NTP client and server programs"
 url="http://chrony.sunsite.dk/"
 license="GPL-2"
-depends="uclibc"
+depends=
 makedepends="texinfo"
 subpackages="$pkgname-doc"
 source="http://chrony.sunsite.dk/download/$pkgname-$pkgver.tar.gz
@@ -16,6 +16,7 @@ source="http://chrony.sunsite.dk/download/$pkgname-$pkgver.tar.gz
 	$pkgname-1.23-reply-ip.diff
 	chronyd.confd
 	chronyd.initd
+	chrony.conf
 	"
 
 build() {
@@ -45,6 +46,8 @@ build() {
 	mkdir -p "$pkgdir"/var/lib/chrony \
 		"$pkgdir"/var/log/chrony \
 		"$pkgdir"/etc/chrony
+	touch "$pkgdir"/etc/chrony/chrony.drift
+	install -m644 "$srcdir"/chrony.conf "$pkgdir"/etc/chrony/chrony.conf
 }
 md5sums="ffce77695e55d8efda19ab0b78309c23  chrony-1.23.tar.gz
 bd6bd57363865d3ed0c3187d0c9f7151  chrony-1.20-conf.c-gentoo.diff
@@ -53,4 +56,5 @@ d47015a34b6b2f9eebca77ef939cec72  chrony-1.21-makefile.diff
 39cbce9f66638b67623e1ee6bb0f943f  chrony-1.23-sources.diff
 caa6589a1a1cd56f64957e312d1ef84c  chrony-1.23-reply-ip.diff
 d5c09be46226774d22c08c5a4c28093a  chronyd.confd
-dac8aa4913d7c323abfa1719ddd7e5e4  chronyd.initd"
+dac8aa4913d7c323abfa1719ddd7e5e4  chronyd.initd
+46f42c52953d398ca44d6baa449618d7  chrony.conf"
diff --git a/extra/chrony/chrony.conf b/extra/chrony/chrony.conf
new file mode 100644
index 000000000..d99b1e01d
--- /dev/null
+++ b/extra/chrony/chrony.conf
@@ -0,0 +1,7 @@
+# default config
+
+server pool.ntp.org 
+initstepslew 10 pool.ntp.org
+commandkey 10
+keyfile /etc/chrony/chrony.keys
+driftfile /etc/chrony/chrony.drift
diff --git a/extra/lha/APKBUILD b/extra/lha/APKBUILD
new file mode 100644
index 000000000..705e51e07
--- /dev/null
+++ b/extra/lha/APKBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Leonardo Arena <rnalrd@gmail.com>
+pkgname=lha
+pkgver=1.14i
+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="$pkgname-doc"
+depends="uclibc"
+makedepends=""
+install=
+source="http://osdn.dl.sourceforge.jp/lha/22231/$pkgname-$pkgver-ac20050924p1.tar.gz"
+
+build ()
+{
+	cd $srcdir/$pkgname-$pkgver-ac20050924p1
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+	make "DESTDIR=$pkgdir" install
+	#install -D -m755 $srcdir/lha $pkgdir/usr/bin/lha
+}
+
+md5sums="9f52430410928ba4390a73a41a36d56f  lha-1.14i-ac20050924p1.tar.gz"
diff --git a/extra/lua/APKBUILD b/extra/lua/APKBUILD
index e5ddf934d..c42d1c9d2 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 367523d3b..bb0407876 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 2f78683ee..2f78683ee 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 e0cc0b30d..e0cc0b30d 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 352e26e72..352e26e72 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 b35d517de..b35d517de 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 0b1e8ea99..0b1e8ea99 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 4acae9848..4acae9848 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 929d58722..929d58722 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 7d3edc3ab..7d3edc3ab 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 0b0909c5d..0b0909c5d 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 431f52a98..431f52a98 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 fb7ea0125..fb7ea0125 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 f8e350c1d..f8e350c1d 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 f25ce2164..f25ce2164 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 c8ef7ea72..c8ef7ea72 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 7fc9d69ed..7fc9d69ed 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 be3f83df0..be3f83df0 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 6a3c88461..6a3c88461 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 372398d65..372398d65 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 0e133c30e..0e133c30e 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 1bbfe33fe..1bbfe33fe 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 2ce850ee4..2ce850ee4 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 d959c43d0..d959c43d0 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 9e0bc32ca..9e0bc32ca 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 8ee87e58b..8ee87e58b 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 df47aee24..df47aee24 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 1c02dfe16..1c02dfe16 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 59ece194b..59ece194b 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 4cd3b727e..4cd3b727e 100644
--- a/testing/perl-uri-escape/APKBUILD
+++ b/extra/perl-uri-escape/APKBUILD
diff --git a/testing/spamassassin/APKBUILD b/extra/spamassassin/APKBUILD
index cca771b77..3da01a62f 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 b6fca036f..b6fca036f 100644
--- a/testing/spamassassin/spamd.conf
+++ b/extra/spamassassin/spamd.conf
diff --git a/testing/spamassassin/spamd.init b/extra/spamassassin/spamd.init
index 89723889f..89723889f 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 000000000..b2e0c7260
--- /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"