Make up. Systemd support

8 files changed, 155 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d2a62aa5723..1d8c8904eff8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,33 @@
 # Generated by mksrcinfo v8
-# Sat May 28 10:36:17 UTC 2016
+# Sat May 28 10:37:18 UTC 2016
 pkgbase = flow-tools
 	pkgdesc = Netflow collector, analyser and report generator
 	pkgver = 0.68.5.1
-	pkgrel = 1
-	url = http://www.splintered.net/sw/flow-tools/
+	pkgrel = 2
+	url = https://code.google.com/archive/p/flow-tools
+	install = flow-tools.install
 	arch = i686
 	arch = x86_64
-	license = custom
-	depends = zlib
-	depends = tcp_wrappers
-	depends = libmariaclient
-	depends = postgresql-libs
-	source = http://flow-tools.googlecode.com/files/flow-tools-0.68.5.1.tar.bz2
-	md5sums = b8f9a4be19ec22ea6d4031c40a6d5a63
+	license = BSD 3
+	makedepends = make
+	makedepends = zlib
+	makedepends = openssl
+	makedepends = libmariadbclient
+	makedepends = postgresql-libs
+	makedepends = tcp_wrappers
+	makedepends = bison
+	makedepends = doxygen
+	backup = etc/flow-tools/flow-capture.conf
+	source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/flow-tools/flow-tools-0.68.5.1.tar.bz2
+	source = flow-capture.service
+	source = flow-capture.conf
+	source = flow-werror-fix.patch
+	source = sysusers.conf
+	sha256sums = 80bbd3791b59198f0d20184761d96ba500386b0a71ea613c214a50aa017a1f67
+	sha256sums = 9567fe9c69f2c0a75f55673318be784d13bd8e8f0b6fa8444c2de5efe97b4ccd
+	sha256sums = 842e0c6d1734494c13c5a99fb643b44d8d3bfd49d8d069c5c397a4c799628e64
+	sha256sums = 3bb79f03e1e83e74ea1abd0d39dc6d3c72943a7b281275e33f69e5d9640b4ac3
+	sha256sums = d961522f40350107a2869c68fa8315498b57a26a13d9519b2cd5905b9e306124
 
 pkgname = flow-tools
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..7c6927b4669a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+pkg/*
+src/*
+*.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index 0cc19e35e45b..1a3b78f0941b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,60 @@
-# Contributor: Lex Black <autumn-wind at web dot de>
-# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
+# Maintainer: Konstantin Shalygin <k0ste@k0ste.ru>
+# Contributor: Konstantin Shalygin <k0ste@k0ste.ru>
 
-pkgname=flow-tools
-pkgver=0.68.5.1
-pkgrel=1
+pkgname='flow-tools'
+pkgver='0.68.5.1'
+pkgrel='2'
 pkgdesc="Netflow collector, analyser and report generator"
 arch=('i686' 'x86_64')
-url="http://www.splintered.net/sw/flow-tools/"
-license=('custom')
-depends=('zlib' 'tcp_wrappers' 'libmariaclient' 'postgresql-libs')
-source=(http://flow-tools.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('b8f9a4be19ec22ea6d4031c40a6d5a63')
+url="https://code.google.com/archive/p/${pkgname}"
+license=('BSD 3')
+makedepends=('make' 'zlib' 'openssl' 'libmariadbclient' 'postgresql-libs' 'tcp_wrappers' 'bison' 'doxygen')
+source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+	"flow-capture.service"
+	"flow-capture.conf"
+	"flow-werror-fix.patch"
+	"sysusers.conf")
+sha256sums=('80bbd3791b59198f0d20184761d96ba500386b0a71ea613c214a50aa017a1f67'
+            '9567fe9c69f2c0a75f55673318be784d13bd8e8f0b6fa8444c2de5efe97b4ccd'
+            '842e0c6d1734494c13c5a99fb643b44d8d3bfd49d8d069c5c397a4c799628e64'
+            '3bb79f03e1e83e74ea1abd0d39dc6d3c72943a7b281275e33f69e5d9640b4ac3'
+            'd961522f40350107a2869c68fa8315498b57a26a13d9519b2cd5905b9e306124')
+install="${pkgname}.install"
+backup=("etc/${pkgname}/flow-capture.conf")
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-build() {
-	cd $srcdir/$pkgname-$pkgver
+  patch -p1 -i "../flow-werror-fix.patch"
 
-	./configure --prefix=/usr --enable-lfs --with-mysql=/usr\
-      		--with-pgsql=/usr
-	make
+  autoconf
+  ./configure \
+    --prefix=/usr \
+    --bindir=/usr/bin \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc/${pkgname} \
+    --localstatedir=/var \
+    --libdir=/usr/lib \
+    --datarootdir=/usr/share \
+    --datadir=/usr/share \
+    --infodir=/usr/share/info \
+    --with-openssl \
+    --with-mysql \
+    --with-postgresql
+}
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make
 }
 
 package() {
-	cd $srcdir/$pkgname-$pkgver
-
-	make DESTDIR=$pkgdir install
-	install -D -m444 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  pushd "${srcdir}"
+  install -dm775 -o 174 -g 174 "${pkgdir}/var/lib/${pkgname}"
+  install -Dm644 "flow-capture.service" "${pkgdir}/usr/lib/systemd/system/flow-capture.service"
+  install -Dm644 "sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/flow-tools.conf"
+  install -Dm644 "flow-capture.conf" "${pkgdir}/etc/${pkgname}/flow-capture.conf"
+  pushd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 "COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  popd
 }
diff --git a/flow-capture.conf b/flow-capture.conf
new file mode 100644
index 000000000000..ef9738a5d2e3
--- /dev/null
+++ b/flow-capture.conf
@@ -0,0 +1,2 @@
+# Change the source IP and port to what is used on your network
+OPTIONS="-n 287 -N 0 -w /var/lib/flow-tools -S 5 0/0/8818"
diff --git a/flow-capture.service b/flow-capture.service
new file mode 100644
index 000000000000..715b3e160cb2
--- /dev/null
+++ b/flow-capture.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Capture Traffic Netflow Data
+After=network.target
+
+[Service]
+User=flow-tools
+Group=flow-tools
+Type=simple
+EnvironmentFile=-/etc/flow-tools/flow-capture.conf
+ExecStart=/usr/bin/flow-capture -D $OPTIONS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/flow-tools.install b/flow-tools.install
new file mode 100644
index 000000000000..e3f44a89a179
--- /dev/null
+++ b/flow-tools.install
@@ -0,0 +1,13 @@
+post_install() {
+  /usr/bin/systemd-sysusers flow-tools.conf
+  /usr/bin/systemctl daemon-reload
+}
+
+post_upgrade() {
+  /usr/bin/systemctl daemon-reload
+}
+
+post_remove() {
+  /usr/bin/systemctl daemon-reload
+  /usr/bin/userdel flow-tools > /dev/null
+}
diff --git a/flow-werror-fix.patch b/flow-werror-fix.patch
new file mode 100644
index 000000000000..59b134993f33
--- /dev/null
+++ b/flow-werror-fix.patch
@@ -0,0 +1,49 @@
+diff --git a/lib/fterr.c b/lib/fterr.c
+index 1bb5c89..5b47207 100644
+--- a/lib/fterr.c
++++ b/lib/fterr.c
+@@ -112,7 +112,7 @@ void fterr_info(const char *fmt, ...)
+     fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2);
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+ } /* fterr_info */
+ 
+@@ -134,7 +134,7 @@ void fterr_err(int code, const char *fmt, ...)
+ 
+   if (fterr_flags & FTERR_SYSLOG) {
+     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
+-    syslog(LOG_INFO, buf2);
++    syslog(LOG_INFO, "%s", buf2);
+   }
+ 
+   if (fterr_exit)
+@@ -159,7 +159,7 @@ void fterr_errx(int code, const char *fmt, ...)
+   }
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+   if (fterr_exit)
+     fterr_exit(code);
+@@ -183,7 +183,7 @@ void fterr_warnx(const char *fmt, ...)
+   }
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+ } /* fterr_warnx */
+ 
+@@ -205,7 +205,7 @@ void fterr_warn(const char *fmt, ...)
+ 
+   if (fterr_flags & FTERR_SYSLOG) {
+     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
+-    syslog(LOG_INFO, buf2);
++    syslog(LOG_INFO, "%s", buf2);
+   }
+ 
+ } /* fterr_warn */
diff --git a/sysusers.conf b/sysusers.conf
new file mode 100644
index 000000000000..cf55a8584f57
--- /dev/null
+++ b/sysusers.conf
@@ -0,0 +1 @@
+u flow-tools 174 "Netflow tools" /var/lib/flow-tools