Hello community,

here is the log from the commit of package ulogd for openSUSE:Factory checked 
in at 2020-04-18 00:26:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
 and      /work/SRC/openSUSE:Factory/.ulogd.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ulogd"

Sat Apr 18 00:26:52 2020 rev:16 rq:794270 version:2.0.7

Changes:
--------
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes      2019-12-23 
22:42:40.809956609 +0100
+++ /work/SRC/openSUSE:Factory/.ulogd.new.2738/ulogd.changes    2020-04-18 
00:26:55.337616455 +0200
@@ -1,0 +2,5 @@
+Wed Apr 15 15:13:12 UTC 2020 - Thorsten Kukuk <ku...@suse.com>
+
+- Use sysusers instead of shadow to create ulogd account
+
+-------------------------------------------------------------------

New:
----
  ulogd.conf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ulogd.spec ++++++
--- /var/tmp/diff_new_pack.vHxwgm/_old  2020-04-18 00:26:57.653621250 +0200
+++ /var/tmp/diff_new_pack.vHxwgm/_new  2020-04-18 00:26:57.657621259 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ulogd
 #
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,7 @@
 Source:         
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2
 Source2:        
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig
 Source4:        ulogd.service
+Source5:        ulogd.conf
 Patch1:         0001-build-adjust-configure-for-postgresql-10-11.patch
 Patch4:         ulogd-conf.diff
 
@@ -41,6 +42,8 @@
 BuildRequires:  pkg-config >= 0.21
 BuildRequires:  sqlite3-devel
 BuildRequires:  systemd-rpm-macros
+BuildRequires:  sysuser-shadow
+BuildRequires:  sysuser-tools
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(libmnl) >= 1.0.3
 BuildRequires:  pkgconfig(libnetfilter_acct) >= 1.0.1
@@ -49,8 +52,8 @@
 BuildRequires:  pkgconfig(libnfnetlink) >= 1.0.1
 BuildRequires:  pkgconfig(libpq)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires(pre): /usr/sbin/useradd
 %{?systemd_ordering}
+%sysusers_requires
 
 %description
 ulogd is a userspace logging daemon for netfilter/iptables related
@@ -97,6 +100,7 @@
 autoreconf -fi
 %configure --disable-static
 make %{?_smp_mflags}
+%sysusers_generate_pre %{SOURCE5} ulogd
 
 %install
 %make_install
@@ -108,10 +112,10 @@
 mkdir -p "$b/%_unitdir"
 install -pm0644 "%{S:4}" "$b/%_unitdir"
 ln -s /sbin/service "$b/%_sbindir/rc%name"
+mkdir -p "$b/%_sysusersdir"
+install -m 644 %{SOURCE5} "$b/%_sysusersdir/"
 
-%pre
-/usr/bin/getent passwd ulogd >/dev/null || \
-/usr/sbin/useradd -c "Userspace logging daemon for Netfilter" -r ulogd
+%pre -f ulogd.pre
 %service_add_pre ulogd.service
 
 %post
@@ -138,6 +142,7 @@
 %_libdir/%name/ulogd_output_XML.so*
 %_mandir/*/*
 %attr(0750,ulogd,root) /var/log/ulogd
+%_sysusersdir/ulogd.conf
 %_unitdir/ulogd.service
 %_sbindir/rc%name
 


++++++ ulogd.conf ++++++
# Type Name ID GECOS [HOME]
u ulogd - "Userspace logging daemon for Netfilter"

Reply via email to