testing/ulogd: downgraded to stable v1.24

(cherry picked from commit 52acbbbac2fb6d855b928d5e6cdd1a21e2687276)

4 files changed, 45 insertions, 24 deletions

diff --git a/testing/ulogd/APKBUILD b/testing/ulogd/APKBUILD
index 80573600fb..657b53314f 100644
--- a/testing/ulogd/APKBUILD
+++ b/testing/ulogd/APKBUILD
@@ -1,53 +1,59 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname=ulogd
+<<<<<<< HEAD
 pkgver=2.0.0_beta3
 _pkgver=2.0.0beta3
 pkgrel=1
+=======
+pkgver=1.24
+pkgrel=0
+>>>>>>> 52acbbb... testing/ulogd: downgraded to stable v1.24
 pkgdesc="A userspace logging daemon for netfilter/iptables related logging"
 url="http://netfilter.org/projects/ulogd/index.html"
 license="GPL"
 depends=
-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"
+makedepends="sqlite-dev postgresql-dev libpcap-dev libnfnetlink-dev
+libnetfilter_conntrack-dev pkgconfig openssl-dev"
+subpackages="$pkgname-sqlite $pkgname-pgsql $pkgname-doc"
+source="http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2
+	ulogd.initd
+	ulogd.confd"
+
+_builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$srcdir/$pkgname-$_pkgver"
+	cd "$_builddir"
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make || return 1
+		--infodir=/usr/share/info \
+		--with-pgsql \
+		--with-sqlite3 \
+		--with-pgsql-log-ip-as-string
+	make -j1|| return 1
 }
 
 package() {
-	cd "$srcdir/$pkgname-$_pkgver"
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 ulogd.conf "$pkgdir"/etc/ulogd.conf
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+	mkdir -p $pkgdir/usr/share/doc/$pkgname
+	cp doc/*table* doc/*.txt doc/*.html $pkgdir/usr/share/doc/$pkgname
 }
 
 sqlite() {
-	depends="$pkgname sqlite"
 	mkdir -p "$subpkgdir"/usr/lib/ulogd/
-	mv "$pkgdir"/usr/lib/ulogd/ulogd_output_SQLITE3.so "$subpkgdir"/usr/lib/ulogd/
+	mv "$pkgdir"/usr/lib/ulogd/ulogd_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/
+	mv "$pkgdir"/usr/lib/ulogd/ulogd_PGSQL.so "$subpkgdir"/usr/lib/ulogd/
 }
 
-
-md5sums="be8137d3b7ae70ebbce7ca8852b9e901  ulogd-2.0.0beta3.tar.bz2
-5eedaae6102a4e90b3b89f051f54fbf1  ulogd.initd"
+md5sums="05b4ed2926b9a22aaeaf642917bbf8ff  ulogd-1.24.tar.bz2
+bd2f808297a9c67e0dc51aa57a1805e0  ulogd.initd
+b9b2fa217ee02211debee5a5dffdcda7  ulogd.confd"
diff --git a/testing/ulogd/ulogd.confd b/testing/ulogd/ulogd.confd
new file mode 100644
index 0000000000..ac035b24c9
--- /dev/null
+++ b/testing/ulogd/ulogd.confd
@@ -0,0 +1,2 @@
+# Argument to be passed to ulog daemon
+ARGS="-d"
diff --git a/testing/ulogd/ulogd.initd b/testing/ulogd/ulogd.initd
index 4413327baf..8cf5567f53 100644
--- a/testing/ulogd/ulogd.initd
+++ b/testing/ulogd/ulogd.initd
@@ -20,7 +20,8 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting ulogd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
+	start-stop-daemon --start --quiet --exec /usr/sbin/ulogd -- \
+	$ARGS >/dev/null 2>&1
 	eend $?
 }	
 
diff --git a/testing/ulogd/ulogd.logrotate b/testing/ulogd/ulogd.logrotate
new file mode 100644
index 0000000000..6974d41b15
--- /dev/null
+++ b/testing/ulogd/ulogd.logrotate
@@ -0,0 +1,12 @@
+/var/log/ulogd.log /var/log/ulog.syslogemu {
+	rotate 4
+	daily
+	missingok
+	notifempty
+	compress
+	delaycompress
+	sharedscripts
+	postrotate
+		/etc/init.d/ulogd reload &>/dev/null
+	endscript
+}