[arch-commits] Commit in ulogd/trunk (5 files)

[Sébastien Luttringer]

    Date: Thursday, February 25, 2016 @ 00:18:14
  Author: seblu
Revision: 260235

upgpkg: ulogd 2.0.5-3

- FS#48242
- FS#48318

Added:
  ulogd/trunk/01-fix-FS#48318.patch
Modified:
  ulogd/trunk/PKGBUILD
  ulogd/trunk/ulogd.logrotate
  ulogd/trunk/ulogd.service
Deleted:
  ulogd/trunk/ulogd

-----------------------+
 01-fix-FS#48318.patch |   25 ++++++++++++++++++++++
 PKGBUILD              |   19 +++++++++++++---
 ulogd                 |   54 ------------------------------------------------
 ulogd.logrotate       |    2 -
 ulogd.service         |    1 
 5 files changed, 42 insertions(+), 59 deletions(-)

Added: 01-fix-FS#48318.patch
===================================================================
--- 01-fix-FS#48318.patch	                        (rev 0)
+++ 01-fix-FS#48318.patch	2016-02-24 23:18:14 UTC (rev 260235)
@@ -0,0 +1,25 @@
+From a82d9cfe03679b82ab4d9586c93ad377e9e27149 Mon Sep 17 00:00:00 2001
+From: Eric Leblond <eric at regit.org>
+Date: Fri, 5 Feb 2016 11:55:26 +0100
+Subject: [PATCH 2/2] ulogd: add missing newline in log message
+
+---
+ src/ulogd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ulogd.c b/src/ulogd.c
+index c8d9376..5b9a586 100644
+--- a/src/ulogd.c
++++ b/src/ulogd.c
+@@ -1515,7 +1515,7 @@ int main(int argc, char* argv[])
+ 
+ 	if (daemonize){
+ 		if (daemon(0, 0) < 0) {
+-			ulogd_log(ULOGD_FATAL, "can't daemonize: %s (%d)",
++			ulogd_log(ULOGD_FATAL, "can't daemonize: %s (%d)\n",
+ 				  errno, strerror(errno));
+ 			warn_and_exit(daemonize);
+ 		}
+-- 
+2.7.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-24 20:58:56 UTC (rev 260234)
+++ PKGBUILD	2016-02-24 23:18:14 UTC (rev 260235)
@@ -5,7 +5,7 @@
 
 pkgname=ulogd
 pkgver=2.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/ulogd/index.html'
@@ -32,13 +32,24 @@
 source=("http://www.netfilter.org/projects/ulogd/files/$pkgname-$pkgver.tar.bz2"{,.sig}
         "$pkgname.logrotate"
         "$pkgname.conf"
-        "$pkgname.service")
+        "$pkgname.service"
+        '01-fix-FS#48318.patch')
 md5sums=('f0f8fe1371fa28b5e06cb16aaa0111dd'
          'SKIP'
-         '95f05af0a0c8f5fdea5bd92ccb2fd465'
+         '50c392d3668ee9c69281f05f55430d0f'
          '2c8cbedb2fb455cba220ca35186ad846'
-         '2181602f38e165280b970ff80653c7b2')
+         '23a13ee4c118cb40b086bdb23d25eac2'
+         '8a9c41fc01bf65a798e44c7548dce8ac')
 
+prepare() {
+  for _f in "${source[@]}"; do
+    if [[ "$_f" =~ \.patch$ ]]; then
+      msg2 "Apply patch $_f"
+      patch -t -p1 -d $pkgname-$pkgver < "$_f"
+    fi
+  done
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure \

Deleted: ulogd
===================================================================
--- ulogd	2016-02-24 20:58:56 UTC (rev 260234)
+++ ulogd	2016-02-24 23:18:14 UTC (rev 260235)
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof /usr/sbin/ulogd
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting ulogd daemon"
-
-    [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid
-    PID=`get_pid`
-    if [ -z "$PID" ]; then
-       /usr/sbin/ulogd -d
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo `get_pid` > /var/run/ulogd.pid
-        add_daemon ulogd
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping ulog daemon"
-    PID=`get_pid`
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/ulogd.pid &> /dev/null
-      rm_daemon ulogd
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

Modified: ulogd.logrotate
===================================================================
--- ulogd.logrotate	2016-02-24 20:58:56 UTC (rev 260234)
+++ ulogd.logrotate	2016-02-24 23:18:14 UTC (rev 260235)
@@ -5,6 +5,6 @@
   create 0640 root root
 
   postrotate
-    systemctl kill --signal=SIGHUP ulogd.service || true
+    systemctl reload ulogd.service || true
   endscript
 }

Modified: ulogd.service
===================================================================
--- ulogd.service	2016-02-24 20:58:56 UTC (rev 260234)
+++ ulogd.service	2016-02-24 23:18:14 UTC (rev 260235)
@@ -5,6 +5,7 @@
 
 [Service]
 ExecStart=/usr/bin/ulogd
+ExecReload=/usr/bin/kill --signal HUP ${MAINPID}
 
 [Install]
 WantedBy=multi-user.target