Merge remote branch 'clandmeter/master'

7 files changed, 137 insertions, 48 deletions

diff --git a/extra/irssi-svn/APKBUILD b/extra/irssi-svn/APKBUILD
deleted file mode 100644
index 301c8832bd..0000000000
--- a/extra/irssi-svn/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
-pkgname=irssi-svn
-pkgver=20090104
-pkgrel=0
-pkgdesc="A modular textUI IRC client with IPv6 support"
-url="http://irssi.org"
-license='GPL'
-depends="glib ncurses openssl"
-makedepends="glib-dev openssl-dev ncurses-dev"
-source="http://www.irssi.org/files/snapshots/irssi-20090104.tar.gz"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-perl"
-
-build() {
-	cd "$srcdir"/irssi-0.8.13-svn
-
-        ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --mandir=/usr/share/man \
-        --with-perl=module
-        make || return 1
-        make DESTDIR="$pkgdir/" install
-
-}
-
-perl() {
-	depends="$pkgname perl"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
-	mkdir -p "$subpkgdir"/usr/share/irssi
-	mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi/
-}
-
-md5sums="27dcecc11b971d428e5783b4088e1c49  irssi-20090104.tar.gz"
diff --git a/extra/irssi/APKBUILD b/extra/irssi/APKBUILD
index eb12e945f7..c0dcc72ddb 100644
--- a/extra/irssi/APKBUILD
+++ b/extra/irssi/APKBUILD
@@ -1,24 +1,34 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=irssi
-pkgver=0.8.12
+pkgver=0.8.13_rc1
+_pkgver=0.8.13-rc1
 pkgrel=0
 pkgdesc="A modular textUI IRC client with IPv6 support"
 url="http://irssi.org/"
 license='GPL'
 depends="glib ncurses openssl"
-makedepends="glib-dev openssl-dev ncurses-dev"
-source="http://irssi.org/files/irssi-0.8.12.tar.bz2"
-subpackages="$pkgname-doc"
+makedepends="glib-dev openssl-dev ncurses-dev perl-dev pkgconfig"
+source="http://irssi.org/files/irssi-${_pkgver}.tar.bz2"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-perl"
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-${_pkgver}"
 
 	./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --mandir=/usr/share/man \
-        --with-perl=no
-        make || return 1
-        make DESTDIR="$pkgdir/" install
+	--sysconfdir=/etc \
+	--mandir=/usr/share/man \
+	--with-perl=module
+	make || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-md5sums="e407b557b3cfc7c91ce4de2571dd79cb  irssi-0.8.12.tar.bz2"
+perl() {
+	depends="$pkgname perl"
+	mkdir -p "$subpkgdir"/usr/share/irssi
+	mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi/
+	mkdir -p "$subpkgdir"/usr/lib/irssi
+	mv "$pkgdir"/usr/lib/irssi/modules "$subpkgdir"/usr/lib/irssi/
+	mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
+}
+
+md5sums="b7543c08d6709b148a1907e2a3fb6f10  irssi-0.8.13-rc1.tar.bz2"
diff --git a/extra/libnfnetlink/APKBUILD b/extra/libnfnetlink/APKBUILD
index 924f62e121..63519aec0c 100644
--- a/extra/libnfnetlink/APKBUILD
+++ b/extra/libnfnetlink/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnfnetlink
-pkgver=0.0.40
+pkgver=0.0.41
 pkgrel=0
 pkgdesc="low-level library for netfilter related kernel/userspace communication"
 url="http://www.netfilter.org/projects/libnfnetlink/"
@@ -21,4 +21,4 @@ build() {
 	make || return 1
 	make DESTDIR="$pkgdir" install
 }
-md5sums="3fe19dc4b05ba7e7e6216123097c2819  libnfnetlink-0.0.40.tar.bz2"
+md5sums="5d844ea1f557bad0364d5b85cd10c796  libnfnetlink-0.0.41.tar.bz2"
diff --git a/extra/logrotate/APKBUILD b/extra/logrotate/APKBUILD
index 4ff47f222a..e29b27e1ea 100644
--- a/extra/logrotate/APKBUILD
+++ b/extra/logrotate/APKBUILD
@@ -6,9 +6,9 @@ pkgdesc="Tool to rotate logfiles"
 url="https://fedorahosted.org/logrotate/"
 license="GPL"
 depends="uclibc popt"
-makedepends="popt-dev"
+makedepends="popt-dev wget"
 subpackages="$pkgname-doc"
-source="http://alpine.nethq.org/clandmeter/src/logrotate-3.7.8.tar.gz"
+source="https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.8.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/testing/libnetfilter_log/APKBUILD b/testing/libnetfilter_log/APKBUILD
new file mode 100644
index 0000000000..b2c4dfcc26
--- /dev/null
+++ b/testing/libnetfilter_log/APKBUILD
@@ -0,0 +1,26 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
+pkgname=libnetfilter_log
+pkgver=0.0.16
+pkgrel=0
+pkgdesc="interface to packets that have been logged by the kernel packet filter"
+url="http://www.netfilter.org/projects/libnetfilter_log/"
+license="GPL-2"
+depends="libnfnetlink"
+makedepends="libnfnetlink-dev pkgconfig"
+subpackages="$pkgname-dev"
+source="http://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-0.0.16.tar.bz2"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+	make DESTDIR="$pkgdir" install
+
+}
+
+md5sums="4ffcf46dad9d0c81f6611dd185639694  libnetfilter_log-0.0.16.tar.bz2"
diff --git a/testing/ulogd/APKBUILD b/testing/ulogd/APKBUILD
new file mode 100644
index 0000000000..cc36f0ce7a
--- /dev/null
+++ b/testing/ulogd/APKBUILD
@@ -0,0 +1,49 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+pkgname=ulogd
+pkgver=2.0.0_beta3
+_pkgver=2.0.0beta3
+pkgrel=0
+pkgdesc="A userspace logging daemon for netfilter/iptables related logging"
+url="http://netfilter.org/projects/ulogd/index.html"
+license="GPL"
+depends="libnfnetlink libnetfilter_conntrack libnetfilter_log"
+makedepends="sqlite-dev mysql-dev postgresql-dev libpcap-dev libnfnetlink-dev
+libnetfilter_conntrack-dev libnetfilter_log-dev pkgconfig openssl-dev"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-sqlite $pkgname-pgsql $pkgname-mysql"
+source="http://netfilter.org/projects/ulogd/files/ulogd-2.0.0beta3.tar.bz2
+	ulogd.initd"
+
+build() {
+	cd "$srcdir/$pkgname-$_pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+	make DESTDIR="$pkgdir" install
+	install -Dm644 ulogd.conf "$pkgdir"/etc/ulogd.conf
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+}
+
+sqlite() {
+	depends="$pkgname sqlite"
+	mkdir -p "$subpkgdir"/usr/lib/ulogd/
+	mv "$pkgdir"/usr/lib/ulogd/ulogd_output_SQLITE3.so "$subpkgdir"/usr/lib/ulogd/
+}
+
+pgsql() {
+        depends="$pkgname libpq"
+	mkdir -p "$subpkgdir"/usr/lib/ulogd/
+	mv "$pkgdir"/usr/lib/ulogd/ulogd_output_PGSQL.so "$subpkgdir"/usr/lib/ulogd/
+}
+
+mysql() {
+        depends="$pkgname libmysqlclient openssl"
+        mkdir -p "$subpkgdir"/usr/lib/ulogd/
+        mv "$pkgdir"/usr/lib/ulogd/ulogd_output_MYSQL.so "$subpkgdir"/usr/lib/ulogd/
+}
+
+
+md5sums="be8137d3b7ae70ebbce7ca8852b9e901  ulogd-2.0.0beta3.tar.bz2
+5f5eb551b60591aed49376ed2fa149be  ulogd.initd"
diff --git a/testing/ulogd/ulogd.initd b/testing/ulogd/ulogd.initd
new file mode 100644
index 0000000000..792e4eb438
--- /dev/null
+++ b/testing/ulogd/ulogd.initd
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/app-admin/ulogd/files/ulogd,v 1.2 2004/07/13 16:32:25 aliz Exp $
+
+opts="reload"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e /etc/ulogd.conf ]; then
+		eerror "You need /etc/ulogd.conf"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting ulogd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
+	eend $?
+}	
+
+stop() {
+	ebegin "Stopping ulogd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
+	eend $?
+}	
+
+reload() {
+        ebegin "Reloading ulogd.conf file"
+	killall -HUP ulogd &>/dev/null
+	eend $?
+}	
+