7 files changed, 4 insertions, 173 deletions
diff --git a/testing/dspam/0001-Support-for-parallell-builds.patch b/testing/dspam/0001-Support-for-parallell-builds.patch
deleted file mode 100644
index 7044d5f6e0..0000000000
--- a/testing/dspam/0001-Support-for-parallell-builds.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 80f81670323a09025ffb7d030be56e47aec5492c Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 6 Jan 2010 12:34:15 +0000
-Subject: [PATCH] Support for parallell builds
-
----
- src/Makefile.am |   12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6e8a774..49d6b16 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -134,7 +134,7 @@ libmysql_drv_la_LIBADD = $(libmysql_drv_libs) -L. -ldspam
- libmysql_drv_la_CPPFLAGS = $(libmysql_drv_cppflags)
- libmysql_drv_la_LDFLAGS = $(libmysql_drv_ldflags)
- libmysql_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion) 
--libmysql_drv_la_DEPENDENCIES =
-+libmysql_drv_la_DEPENDENCIES = libdspam.la
- 
- libpgsql_drv_la_SOURCES = \
- 	pgsql_drv.c pgsql_drv.h 
-@@ -142,7 +142,7 @@ libpgsql_drv_la_LIBADD = $(libpgsql_drv_libs) -L. -ldspam
- libpgsql_drv_la_CPPFLAGS = $(libpgsql_drv_cppflags)
- libpgsql_drv_la_LDFLAGS = $(libpgsql_drv_ldflags)
- libpgsql_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion)
--libpgsql_drv_la_DEPENDENCIES =
-+libpgsql_drv_la_DEPENDENCIES = libdspam.la
- 
- libsqlite_drv_la_SOURCES = \
- 	sqlite_drv.c sqlite_drv.h 
-@@ -150,7 +150,7 @@ libsqlite_drv_la_LIBADD = $(libsqlite_drv_libs) -L. -ldspam
- libsqlite_drv_la_CPPFLAGS = $(libsqlite_drv_cppflags)
- libsqlite_drv_la_LDFLAGS = $(libsqlite_drv_ldflags)
- libsqlite_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion)
--libsqlite_drv_la_DEPENDENCIES =
-+libsqlite_drv_la_DEPENDENCIES = libdspam.la
- 
- libsqlite3_drv_la_SOURCES = \
- 	sqlite3_drv.c sqlite3_drv.h 
-@@ -158,7 +158,7 @@ libsqlite3_drv_la_LIBADD = $(libsqlite3_drv_libs) -L. -ldspam
- libsqlite3_drv_la_CPPFLAGS = $(libsqlite3_drv_cppflags)
- libsqlite3_drv_la_LDFLAGS = $(libsqlite3_drv_ldflags)
- libsqlite3_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion)
--libsqlite3_drv_la_DEPENDENCIES =
-+libsqlite3_drv_la_DEPENDENCIES = libdspam.la
- 
- libhash_drv_la_SOURCES = \
- 	hash_drv.c hash_drv.h
-@@ -166,7 +166,7 @@ libhash_drv_la_LIBADD = $(libhash_drv_libs) -L. -ldspam
- libhash_drv_la_CPPFLAGS = $(libhash_drv_cppflags)
- libhash_drv_la_LDFLAGS = $(libhash_drv_ldflags)
- libhash_drv_la_LDFLAGS += -rpath '$(pkglibdir)' -version-info $(libversion)
--libhash_drv_la_DEPENDENCIES =
-+libhash_drv_la_DEPENDENCIES = libdspam.la
- 
- endif
- 
-@@ -181,6 +181,7 @@ dspam_SOURCES = \
- 	agent_shared.c agent_shared.h
- 
- dspam_LDADD = -lm pref.o libdspam.la
-+dspam_DEPENDENCIES = pref.o libdspam.la
- 
- dspamc_SOURCES = \
- 	config.h language.h \
-@@ -192,6 +193,7 @@ dspamc_SOURCES = \
- 
- dspamc_LDADD = -lm buffer.o config_shared.o error.o read_config.o pref.o nodetree.o util.o $(NETLIBS)
- dspamc_LDFLAGS = 
-+dspamc_DEPENDENCIES = buffer.o config_shared.o error.o read_config.o pref.o nodetree.o util.o 
- 
- # Failing of chgrp is expected and normal case when someone do
- #   make install DESTDIR=...
--- 
-1.6.6
-
diff --git a/testing/dspam/APKBUILD b/testing/dspam/APKBUILD
index 1bd1ca52fc..abd1835583 100644
--- a/testing/dspam/APKBUILD
+++ b/testing/dspam/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dspam
-pkgver=3.9.0_rc2
-_ver=3.9.0-RC2
-pkgrel=1
+pkgver=3.9.1_rc1
+_ver=3.9.1-RC1
+pkgrel=0
 pkgdesc="A statistical-algorithmic hybrid anti-spam filter"
 url="http://dspam.nuclearelephant.com/"
 pkgusers="dspam"
@@ -17,7 +17,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-mysql
 
 install= #dspam.install
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$_ver.tar.gz
-	0001-Support-for-parallell-builds.patch
 	dspam.logrotate
 	dspam.initd"
 
@@ -73,7 +72,6 @@ sqlite() {
 	mv "$pkgdir"/usr/lib/dspam/*sqlite* "$subpkgdir"/usr/lib/dspam/
 }
 
-md5sums="013dc6700f7c5a757b7a656626b36248  dspam-3.9.0-RC2.tar.gz
-0f9f6b32cab7b8e3ad342daad119535d  0001-Support-for-parallell-builds.patch
+md5sums="326677b30af2711a8fa4b52facb52f37  dspam-3.9.1-RC1.tar.gz
 a798e9a6e2d5c30724f84d004bb96339  dspam.logrotate
 7d1fb0820f4a23f593f22186ef77d02a  dspam.initd"
diff --git a/testing/icecast/APKBUILD b/testing/icecast/APKBUILD
deleted file mode 100644
index 80e23f14c5..0000000000
--- a/testing/icecast/APKBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contributor: Francesco Colista <francesco.colista@gmail.com>
-# Maintainer:  Francesco Colista <francesco.colista@gmail.com>
-pkgname=icecast
-pkgver=2.3.2
-pkgrel=5
-pkgdesc="Open source media server"
-url="http://www.icecast.org"
-arch="all"
-license="GPL"
-depends=
-install="$pkgname.pre-install"
-pkgusers="icecast"
-pkggroups="icecast"
-makedepends="libxslt-dev libxml2-dev libogg-dev libvorbis-dev libtheora-dev openssl-dev"
-subpackages="$pkgname-doc"
-source="http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
-	conf-change-owner.patch
-	icecast.initd
-	icecast.confd"
-
-prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	patch -p1 -i "$srcdir"/conf-change-owner.patch
-}
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure --prefix=/usr \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-
-	make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-	install -D -m755 ../icecast.initd "$pkgdir"/etc/init.d/icecast
-	install -D -m755 ../icecast.confd "$pkgdir"/etc/conf.d/icecast
-	install -d -D -o icecast -g icecast "$pkgdir"/var/log/icecast
-}
-
-md5sums="ff516b3ccd2bcc31e68f460cd316093f  icecast-2.3.2.tar.gz
-d65fe756a3811e21fd8327ec599206c8  conf-change-owner.patch
-9860c914e30d0cfac45eef4cc4e81535  icecast.initd
-37ceeb26f61551e712364a2dffa8c208  icecast.confd"
diff --git a/testing/icecast/conf-change-owner.patch b/testing/icecast/conf-change-owner.patch
deleted file mode 100644
index 5c87c1f0d0..0000000000
--- a/testing/icecast/conf-change-owner.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- icecast-2.3.2/conf/icecast.xml.in.orig
-+++ icecast-2.3.2/conf/icecast.xml.in
-@@ -164,11 +164,9 @@
- 
-     <security>
-         <chroot>0</chroot>
--        <!--
-         <changeowner>
--            <user>nobody</user>
--            <group>nogroup</group>
-+            <user>icecast</user>
-+            <group>icecast</group>
-         </changeowner>
--        -->
-     </security>
- </icecast>
diff --git a/testing/icecast/icecast.confd b/testing/icecast/icecast.confd
deleted file mode 100644
index 80cdfc57fb..0000000000
--- a/testing/icecast/icecast.confd
+++ /dev/null
@@ -1 +0,0 @@
-ICEC_OPTS="-b -c ${icecast_conf:-/etc/icecast.xml}"
diff --git a/testing/icecast/icecast.initd b/testing/icecast/icecast.initd
deleted file mode 100644
index b30027b2fe..0000000000
--- a/testing/icecast/icecast.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	after firewall
-}
-
-start() {
-	ebegin "Starting Icecast 2"
-	start-stop-daemon --start --exec /usr/bin/icecast \
-		-- ${ICEC_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Icecast 2"
-	start-stop-daemon --stop --exec /usr/bin/icecast
-	eend $?
-}
diff --git a/testing/icecast/icecast.pre-install b/testing/icecast/icecast.pre-install
deleted file mode 100644
index 7149ba7232..0000000000
--- a/testing/icecast/icecast.pre-install
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-adduser -h /var/log/icecast -s /bin/false -D icecast  2>/dev/null
-
-exit 0