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

18 files changed, 137 insertions, 154 deletions

diff --git a/main/apk-tools/0001-version-fix-comparision-of-pre-suffixes.patch b/main/apk-tools/0001-version-fix-comparision-of-pre-suffixes.patch
deleted file mode 100644
index ad42d466..00000000
--- a/main/apk-tools/0001-version-fix-comparision-of-pre-suffixes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From cc4644a54e4bb92507f957832647d91f7f91c21b Mon Sep 17 00:00:00 2001
-From: Timo Teras <timo.teras@iki.fi>
-Date: Mon, 26 Oct 2009 09:33:12 +0200
-Subject: [PATCH 1/2] version: fix comparision of pre-suffixes
-
-got broke in 0b9bfa8d52ea7ec2cae562a71932a9cc6e2b9963 which
-fixed another corner case. hopefully it's good now. fixes #191.
----
- src/version.c |   17 ++++++++++++++---
- 1 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/src/version.c b/src/version.c
-index 97b87a6..4253042 100644
---- a/src/version.c
-+++ b/src/version.c
-@@ -207,12 +207,23 @@ int apk_version_compare_blob(apk_blob_t a, apk_blob_t b)
- 	if (av > bv)
- 		return APK_VERSION_GREATER;
- 
--	/* at and bt are the next expected token type */
-+	/* both have TOKEN_END or TOKEN_INVALID next? */
- 	if (at == bt)
- 		return APK_VERSION_EQUAL;
--	if (at < bt || bt == TOKEN_INVALID)
-+
-+	/* leading version components and their values are equal,
-+	 * now the non-terminating version is greater unless it's a suffix
-+	 * indicating pre-release */
-+	if (at == TOKEN_SUFFIX && get_token(&at, &a) < 0)
-+		return APK_VERSION_LESS;
-+	if (bt == TOKEN_SUFFIX && get_token(&bt, &b) < 0)
- 		return APK_VERSION_GREATER;
--	return APK_VERSION_LESS;
-+	if (at == TOKEN_END)
-+		return APK_VERSION_LESS;
-+	if (bt == TOKEN_END)
-+		return APK_VERSION_GREATER;
-+
-+	return APK_VERSION_EQUAL;
- }
- 
- int apk_version_compare(const char *str1, const char *str2)
--- 
-1.6.5
-
diff --git a/main/apk-tools/0002-db-fix-migration-and-pruning-of-symlinks-to-dirs.patch b/main/apk-tools/0002-db-fix-migration-and-pruning-of-symlinks-to-dirs.patch
deleted file mode 100644
index de2d3134..00000000
--- a/main/apk-tools/0002-db-fix-migration-and-pruning-of-symlinks-to-dirs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a7360395ea963334e80fb49d3fc36789d6f40685 Mon Sep 17 00:00:00 2001
-From: Timo Teras <timo.teras@iki.fi>
-Date: Mon, 26 Oct 2009 09:46:09 +0200
-Subject: [PATCH 2/2] db: fix migration and pruning of symlinks to dirs
-
-the old code treated a symlink to directory as file; it tried
-to calculate regular has of it. fix this by: 1) using no follow
-on migration and pruning stats, and 2) the helper function to
-check if it's point to directory and not calculate hash in that
-case. fixes #188.
----
- src/database.c |    6 ++++--
- src/io.c       |    2 +-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/database.c b/src/database.c
-index 16f8bb8..5b1d6bb 100644
---- a/src/database.c
-+++ b/src/database.c
-@@ -1810,7 +1810,7 @@ static void apk_db_purge_pkg(struct apk_database *db,
- 			if (!(diri->dir->flags & APK_DBDIRF_PROTECTED) ||
- 			    (apk_flags & APK_PURGE) ||
- 			    (file->csum.type != APK_CHECKSUM_NONE &&
--			     apk_file_get_info(db->root_fd, name, file->csum.type, &fi) == 0 &&
-+			     apk_file_get_info(db->root_fd, name, APK_FI_NOFOLLOW | file->csum.type, &fi) == 0 &&
- 			     apk_checksum_compare(&file->csum, &fi.csum) == 0))
- 				unlinkat(db->root_fd, name, 0);
- 			if (apk_verbosity >= 3)
-@@ -1868,6 +1868,7 @@ static void apk_db_migrate_files(struct apk_database *db,
- 			if (ofile != NULL &&
- 			    (diri->dir->flags & APK_DBDIRF_PROTECTED))
- 				cstype = ofile->csum.type;
-+			cstype |= APK_FI_NOFOLLOW;
- 
- 			r = apk_file_get_info(db->root_fd, name, cstype, &fi);
- 			if ((diri->dir->flags & APK_DBDIRF_PROTECTED) &&
-@@ -1882,7 +1883,8 @@ static void apk_db_migrate_files(struct apk_database *db,
- 				 * existing file */
- 				if (ofile == NULL ||
- 				    ofile->csum.type != file->csum.type)
--					apk_file_get_info(db->root_fd, name, file->csum.type, &fi);
-+					apk_file_get_info(db->root_fd, name,
-+						APK_FI_NOFOLLOW | file->csum.type, &fi);
- 				if ((apk_flags & APK_CLEAN_PROTECTED) ||
- 				    (file->csum.type != APK_CHECKSUM_NONE &&
- 				     apk_checksum_compare(&file->csum, &fi.csum) == 0))
-diff --git a/src/io.c b/src/io.c
-index 40590a2..3e292a7 100644
---- a/src/io.c
-+++ b/src/io.c
-@@ -487,7 +487,7 @@ int apk_file_get_info(int atfd, const char *filename, unsigned int flags,
- 		.device = st.st_dev,
- 	};
- 
--	if (checksum == APK_CHECKSUM_NONE)
-+	if (checksum == APK_CHECKSUM_NONE || S_ISDIR(st.st_mode))
- 		return 0;
- 
- 	if ((flags & APK_FI_NOFOLLOW) && S_ISLNK(st.st_mode)) {
--- 
-1.6.5
-
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 18a60a5e..c1de1d04 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,14 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.0_rc6
+pkgver=2.0_rc7
 pkgrel=0
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 subpackages="$pkgname-static"
 depends=
 makedepends="zlib-dev openssl-dev pkgconfig"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-version-fix-comparision-of-pre-suffixes.patch
-	0002-db-fix-migration-and-pruning-of-symlinks-to-dirs.patch
 	"
 
 
@@ -42,6 +40,4 @@ static() {
 		"$subpkgdir"/sbin/apk.static
 }
 
-md5sums="0209128debe2791e2380198af4ef5676  apk-tools-2.0_rc6.tar.bz2
-3772c9db20a6d90d355fe89741dd5991  0001-version-fix-comparision-of-pre-suffixes.patch
-ff7be1c68ad27a69fbeeae7b9a548270  0002-db-fix-migration-and-pruning-of-symlinks-to-dirs.patch"
+md5sums="8654e4e4e32ead79560890567caaea5e  apk-tools-2.0_rc7.tar.bz2"
diff --git a/main/gnutls/APKBUILD b/main/gnutls/APKBUILD
index b4675f79..d04571aa 100644
--- a/main/gnutls/APKBUILD
+++ b/main/gnutls/APKBUILD
@@ -2,17 +2,17 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnutls
 pkgver=2.8.5
-pkgrel=0
+pkgrel=1
 pkgdesc="A library which provides a secure connection"
 url="http://www.gnu.org/software/gnutls/"
 license="GPL"
 depends=
-makedepends="libgcrypt-dev libgpg-error-dev zlib-dev"
+makedepends="libgcrypt-dev libgpg-error-dev zlib-dev libtasn1-dev"
 install=
 subpackages="$pkgname-doc $pkgname-dev"
 source="http://ftp.gnu.org/pub/gnu/gnutls/$pkgname-$pkgver.tar.bz2"
 
-depends_dev="libgcrypt-dev libgpg-error-dev"
+depends_dev="libgcrypt-dev libgpg-error-dev libtasn1-dev"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD
index 99508831..bf490ed2 100644
--- a/main/libetpan/APKBUILD
+++ b/main/libetpan/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libetpan
 pkgver=0.58
-pkgrel=1
+pkgrel=2
 _dbver=4.8
 pkgdesc="a portable middleware for email access"
 url="http://www.etpan.org/"
@@ -9,7 +9,7 @@ license="custom:etpan"
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="db-dev cyrus-sasl-dev curl-dev expat-dev"
 depends=
-depends_dev="cyrus-sasl-dev"
+depends_dev="cyrus-sasl-dev db-dev"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build ()
diff --git a/main/man-pages/APKBUILD b/main/man-pages/APKBUILD
index c6f277c4..a827b0a7 100644
--- a/main/man-pages/APKBUILD
+++ b/main/man-pages/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=man-pages
 pkgver=3.23
 _posixver=2003-a
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux man pages"
 url="http://www.kernel.org/doc/man-pages/"
 license="GPL"
@@ -23,6 +23,9 @@ build ()
 			"$srcdir"/$pkgname-$pkgver/man$sect/
 	done
 	make prefix="$pkgdir"/usr install || return 1
+	# provided by libiconv-doc
+	rm "$pkgdir"/usr/share/man/man3/iconv*
+
 }
 md5sums="4d0263bded9ad02a123ce11114ef76ac  man-pages-3.23.tar.gz
 7c78aff03c0a6767ba483d34f19e4b09  man-pages-posix-2003-a.tar.bz2"
diff --git a/main/mkinitfs/0001-init-never-overwrite-existing-files.patch b/main/mkinitfs/0001-init-never-overwrite-existing-files.patch
new file mode 100644
index 00000000..970b13a0
--- /dev/null
+++ b/main/mkinitfs/0001-init-never-overwrite-existing-files.patch
@@ -0,0 +1,26 @@
+From bf94c9b9aa7884fc50d3110d69e2d28e413159ed Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 24 Nov 2009 12:23:38 +0000
+Subject: [PATCH] init: never overwrite existing files
+
+ref #197
+---
+ initramfs-init.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/initramfs-init.in b/initramfs-init.in
+index 04798de..bd97ace 100755
+--- a/initramfs-init.in
++++ b/initramfs-init.in
+@@ -372,7 +372,7 @@ if [ -n "$KOPT_chart" ]; then
+ fi
+ apkflags="--initdb --quiet --progress --force --no-network"
+ if [ -z "$KOPT_keep_apk_new" ]; then
+-	apkflags="$apkflags --clean-protected"
++	apkflags="$apkflags --clean-protected --never-overwrite"
+ fi
+ apk add --root $sysroot $repo_opt $apkflags $pkgs >/dev/null
+ eend $?
+-- 
+1.6.5.3
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index e8725a0f..8f2789fb 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,19 +1,22 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mkinitfs
 pkgver=2.0_rc6
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool to generate initramfs images for Alpine"
 url=http://git.alpinelinux.org/cgit/mkinitfs
-depends="busybox"
+depends="busybox apk-tools>=2.0_rc7"
 triggers="$pkgname.trigger:/usr/share/kernel/*"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+	0001-init-never-overwrite-existing-files.patch
 	"
 license="GPL-2"
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 
+	patch -p1 -i ../0001-init-never-overwrite-existing-files.patch || return 1
 	make || return 1
 	make install DESTDIR="$pkgdir" || return 1
 }
-md5sums="6b8945b2e3be747caf8cfb29230f180e  mkinitfs-2.0_rc6.tar.bz2"
+md5sums="6b8945b2e3be747caf8cfb29230f180e  mkinitfs-2.0_rc6.tar.bz2
+921aadd7e302d5e565e539e611be946e  0001-init-never-overwrite-existing-files.patch"
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 66be7961..e7554046 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=squid
 pkgver=2.7.7
 _ver=2.7.STABLE7
-pkgrel=0
+pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 url="http://www.squid-cache.org"
 install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -74,7 +74,7 @@ build() {
 		--enable-removal-policies="lru,heap" \
 		--enable-digest-auth-helpers="password" \
 		--enable-storeio="aufs,ufs,diskd,coss,null" \
-		--enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM" \
+		--enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \
 		--enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
 		--enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \
 		--enable-delay-pools --enable-arp-acl --enable-ssl \
diff --git a/testing/mediaproxy/APKBUILD b/testing/mediaproxy/APKBUILD
index cda81943..b8077fe8 100644
--- a/testing/mediaproxy/APKBUILD
+++ b/testing/mediaproxy/APKBUILD
@@ -2,13 +2,15 @@
 # Maintainer: 
 pkgname=mediaproxy
 pkgver=2.3.8
-pkgrel=1
+pkgrel=2
 pkgdesc="MediaProxy"
 url="http://www.ag-projects.com/MediaProxy/"
+pkgusers="kamailio"
+pkggroups="kamailio"
 license="GPL"
-depends="python"
+depends="python python-application python-gnutls twisted python-cjson iptables"
 makedepends="libnetfilter_conntrack-dev libnfnetlink-dev python26-buildutils
-	python26-setuptools python-application python-cjson python-gnutls python-dev twisted"
+	python26-setuptools python-dev"
 install=
 subpackages=""
 #subpackages="$pkgname-dev $pkgname-doc"
@@ -24,18 +26,20 @@ build() {
 
 	python setup.py install --root="$pkgdir"
 
-	echo "/usr/lib/python2.6/site-packages/$_pkgname-$pkgver-py2.6.egg" > "$pkgdir"/usr/lib/python2.6/site-packages/$_pkgname.pth
+	echo "/usr/lib/python2.6/site-packages/$_pkgname-$pkgver-py2.6.egg" \
+		> "$pkgdir"/usr/lib/python2.6/site-packages/$_pkgname.pth
 
-	sed -i -e 's:net.ipv4.ip_forward = 0:net.ipv4.ip_forward = 1:' /etc/sysctl.conf
-
-	install -D -m755 "$srcdir"/$pkgname-dispatcher.initd "$pkgdir"/etc/init.d/$pkgname-dispatcher
-	install -D -m755 "$srcdir"/$pkgname-relay.initd "$pkgdir"/etc/init.d/$pkgname-relay
-	install -D -m755 "$srcdir"/config.ini "$pkgdir"/etc/mediaproxy/config.ini
+	install -D -m755 "$srcdir"/$pkgname-dispatcher.initd \
+		"$pkgdir"/etc/init.d/$pkgname-dispatcher
+	install -D -m755 "$srcdir"/$pkgname-relay.initd \
+		"$pkgdir"/etc/init.d/$pkgname-relay
+	install -D -m755 "$srcdir"/config.ini \
+		"$pkgdir"/etc/mediaproxy/config.ini
 	install -d -o kamailio "$pkgdir"/etc/mediaproxy/tls/
 	install -d -o kamailio "$pkgdir"/var/run/$pkgname
 }
 
 md5sums="8914a2b69415946e5ffdb843823b3ef1  mediaproxy-2.3.8.tar.gz
-7fa7907b87777281c31e5ff49d8d5011  mediaproxy-dispatcher.initd
-842beb8bca2dbbf16a092fbc27ee4ac2  mediaproxy-relay.initd
+cf081e451ab5d8d5ff66a8d9fa6707d6  mediaproxy-dispatcher.initd
+1add855d86ead49c19798e9d86c69efe  mediaproxy-relay.initd
 d3df3569543d696ca102f131f7ad95e4  config.ini"
diff --git a/testing/mediaproxy/mediaproxy-dispatcher.initd b/testing/mediaproxy/mediaproxy-dispatcher.initd
index 77364104..9b37a7e0 100644
--- a/testing/mediaproxy/mediaproxy-dispatcher.initd
+++ b/testing/mediaproxy/mediaproxy-dispatcher.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 daemon=/usr/bin/media-dispatcher
-pidfile=/var/run/mediaproxy/mediaproxy-dispatcher.pid
+pidfile=/var/run/mediaproxy/dispatcher.pid
 
 depend() {
 	need net
@@ -11,11 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting Mediaproxy Dispatcher"
-	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
-		-- \
-		-u kamailio \
-		-g kamailio \
-		-P $pidfile \
+	start-stop-daemon --start --verbose --pidfile $pidfile --exec $daemon 
 	eend $?
 }
 
diff --git a/testing/mediaproxy/mediaproxy-relay.initd b/testing/mediaproxy/mediaproxy-relay.initd
index 73dc32aa..09b842f0 100644
--- a/testing/mediaproxy/mediaproxy-relay.initd
+++ b/testing/mediaproxy/mediaproxy-relay.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 
 daemon=/usr/bin/media-relay
-pidfile=/var/run/mediaproxy/mediaproxy-relay.pid
+pidfile=/var/run/mediaproxy/relay.pid
 
 depend() {
 	need net
@@ -11,8 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting Mediaproxy Relay"
-	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon \
-		-P $pidfile \
+	start-stop-daemon --start --quiet --pidfile $pidfile --exec $daemon 
 	eend $?
 }
 
diff --git a/x11/claws-mail/APKBUILD b/x11/claws-mail/APKBUILD
index ce6e225b..9a2f3585 100644
--- a/x11/claws-mail/APKBUILD
+++ b/x11/claws-mail/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=claws-mail
 pkgver=3.7.3
-pkgrel=1
+pkgrel=4
 pkgdesc="A GTK+ based e-mail client."
 url="http://www.claws-mail.org"
 license="GPL3"
 subpackages="$pkgname-dev $pkgname-doc"
-makedepends="gtk+-dev gnutls-dev startup-notification-dev enchant-dev
-	libsm-dev db-dev curl-dev dbus-glib-dev libetpan-dev"
+makedepends="gtk+-dev openssl-dev startup-notification-dev enchant-dev
+	libsm-dev gnutls-dev curl-dev dbus-glib-dev libetpan-dev openldap-dev"
 depends=
 #	gpgme-dev libetpan-dev 
 #pilot-link>=0.12.3-5
diff --git a/x11/dhcpcd-dbus/APKBUILD b/x11/dhcpcd-dbus/APKBUILD
new file mode 100644
index 00000000..ed4415af
--- /dev/null
+++ b/x11/dhcpcd-dbus/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=dhcpcd-dbus
+pkgver=0.4.2
+pkgrel=0
+pkgdesc="DBUS binding to dhcpcd"
+url="http://roy.marples.name/projects/dhcpcd-dbus"
+license="BSD"
+depends=""
+makedepends="dbus-dev pkgconfig"
+install=
+subpackages=
+source="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make PREFIX=/usr SYSCONFDIR=/etc/dbus-1/system.d
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" PREFIX=/usr SYSCONFDIR=/etc/dbus-1/system.d \
+		install
+}
+
+md5sums="c42ee474f21fd813abf5d04f56110a79  dhcpcd-dbus-0.4.2.tar.bz2"
diff --git a/x11/dhcpcd-ui/APKBUILD b/x11/dhcpcd-ui/APKBUILD
new file mode 100644
index 00000000..18bd1931
--- /dev/null
+++ b/x11/dhcpcd-ui/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=dhcpcd-ui
+pkgver=0.4.2
+pkgrel=1
+pkgdesc="A GTK+ monitor and configuration GUI for dhcpcd"
+url="http://roy.marples.name/projects/dhcpcd-dbus"
+license="BSD-2"
+depends="dhcpcd-dbus"
+makedepends="glib-dev gtk+-dev dbus-dev libnotify-dev pkgconfig"
+install=
+subpackages=
+source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make PREFIX=/usr
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make DESTDIR="$pkgdir" PREFIX=/usr SYSCONFDIR=/etc/dbus-1/system.d \
+		install
+}
+
+md5sums="be05ffb3f82830815b40901916ab17e0  dhcpcd-ui-0.4.2.tar.bz2"
diff --git a/x11/midori/APKBUILD b/x11/midori/APKBUILD
index a4209a22..e67f6bbf 100644
--- a/x11/midori/APKBUILD
+++ b/x11/midori/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=midori
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A lightweight web browser based on Gtk WebKit"
 url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
 license="GPL"
@@ -42,6 +42,6 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 	# PAX does not like the JIT
-	paxctl -c -m "$pkgdir"/usr/bin/midori
+	paxctl -c -m -p "$pkgdir"/usr/bin/midori
 }
 md5sums="3cee94c9a22316504a3ba99bc92e0245  midori-0.2.1.tar.bz2"
diff --git a/x11/slim-themes/APKBUILD b/x11/slim-themes/APKBUILD
index abc22c93..450ebbec 100644
--- a/x11/slim-themes/APKBUILD
+++ b/x11/slim-themes/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=slim-themes
 pkgver=1.2.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Themes Pack for Simple Login Manager"
 url="http://slim.berlios.de"
 license="GPL"
@@ -20,7 +20,8 @@ source="http://download.berlios.de/slim/slim-$pkgver-themepack1a.tar.gz
 	http://download.berlios.de/slim/slim-subway.tar.gz
 	http://download.berlios.de/slim/slim-wave.tar.gz
 	http://download.berlios.de/slim/slim-zenwalk.tar.gz
-	http://download.berlios.de/slim/slim-debian-moreblue.tar.bz2"
+	http://download.berlios.de/slim/slim-debian-moreblue.tar.bz2
+	http://download.berlios.de/slim/slim-1.3.1.tar.gz"
 
 build ()
 {
@@ -42,6 +43,7 @@ build ()
 	mv mindlock "$pkgdir"/usr/share/slim/themes
 	mv flower2 "$pkgdir"/usr/share/slim/themes
 	mv debian-moreblue "$pkgdir"/usr/share/slim/themes
+	mv slim-1.3.1/themes/default "$pkgdir"/usr/share/slim/themes
 	cd "$pkgdir"/usr/share/slim/themes
 	find . -type f -exec chmod 644 {} \;
 }
@@ -58,4 +60,5 @@ fde18fb892bccc383c93fb7ed07fbe84  slim-scotland-road.tar.gz
 8417022e369be012f1b7a4ee04edf0f9  slim-subway.tar.gz
 c727aab888dde774acc04403c84b5b3b  slim-wave.tar.gz
 7a0bd7a0736794e638668769b9c4c745  slim-zenwalk.tar.gz
-5f3818e01b0593d0e576fcd7e2c6bafa  slim-debian-moreblue.tar.bz2"
+5f3818e01b0593d0e576fcd7e2c6bafa  slim-debian-moreblue.tar.bz2
+727d0acb24c0fbf0751134c37a9c895f  slim-1.3.1.tar.gz"
diff --git a/x11/slim/APKBUILD b/x11/slim/APKBUILD
index 6476730e..c0e0a22f 100644
--- a/x11/slim/APKBUILD
+++ b/x11/slim/APKBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=slim
 pkgver=1.3.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Desktop-independent graphical login manager for X11"
 url="http://slim.berlios.de/"
 license="GPL-2"
 subpackages="$pkgname-doc"
 makedepends="libxmu-dev libpng-dev jpeg-dev libxft-dev"
-depends=""
+depends=
 install=
 source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
+	http://dev.alpinelinux.org/~/ncopa/alpine/slim-alpinelinux.tar.gz
 	$pkgname.logrotate
 	$pkgname.initd
 	slim-1.3.1-gcc4.4.patch
@@ -28,6 +29,7 @@ prepare() {
 		-e 's|login_cmd.*|login_cmd           exec /bin/sh -l /etc/X11/xinit/xinitrc|' \
 		-e 's|screenshot_cmd.*|screenshot_cmd      scrot /slim.png|' \
 		-e 's|imagemagick|scrot|' \
+		-e 's|current_theme.*|current_theme       alpinelinux|' \
 		slim.conf || return 1
 }
 
@@ -42,9 +44,17 @@ package() {
 
 	install -D -m755 ../slim.initd "$pkgdir"/etc/init.d/slim || return 1
 	install -D -m644 ../slim.logrotate "$pkgdir"/etc/logrotate.d/slim
+
+	# install our default theme
+	cd "$srcdir"/slim-alpinelinux
+	install -d "$pkgdir"/usr/share/slim/themes/alpinelinux
+	cp background.png panel.png slim.theme \
+		"$pkgdir"/usr/share/slim/themes/alpinelinux/
+	rm -rf "$pkgdir"/usr/share/slim/themes/default
 }
 
 md5sums="727d0acb24c0fbf0751134c37a9c895f  slim-1.3.1.tar.gz
+cd63232c7770b0e67a009a94c2a46b82  slim-alpinelinux.tar.gz
 43da096480bf72c3ccec8ad8400f34f0  slim.logrotate
 6ee3a023e56052528295034be809cfc6  slim.initd
 a00df4316e2392fff7e75daf5c826cae  slim-1.3.1-gcc4.4.patch