commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2020-10-24 15:14:33
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new.3463 (New)
Package is "ulogd"
Sat Oct 24 15:14:33 2020 rev:17 rq:843034 version:2.0.7
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2020-04-18
00:26:55.337616455 +0200
+++ /work/SRC/openSUSE:Factory/.ulogd.new.3463/ulogd.changes2020-10-24
15:14:34.124035375 +0200
@@ -1,0 +2,5 @@
+Wed Oct 14 00:01:59 UTC 2020 - Jan Engelhardt
+
+- Modernize specfile constructs.
+
+---
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.EejjwD/_old 2020-10-24 15:14:35.004036473 +0200
+++ /var/tmp/diff_new_pack.EejjwD/_new 2020-10-24 15:14:35.004036473 +0200
@@ -51,8 +51,6 @@
BuildRequires: pkgconfig(libnetfilter_log) >= 1.0.0
BuildRequires: pkgconfig(libnfnetlink) >= 1.0.1
BuildRequires: pkgconfig(libpq)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%{?systemd_ordering}
%sysusers_requires
%description
@@ -99,7 +97,7 @@
%build
autoreconf -fi
%configure --disable-static
-make %{?_smp_mflags}
+%make_build
%sysusers_generate_pre %{SOURCE5} ulogd
%install
@@ -128,7 +126,6 @@
%service_del_postun ulogd.service
%files
-%defattr(-,root,root)
%config(noreplace) %_sysconfdir/ulogd.conf
%_sbindir/ulogd
%dir %_libdir/%name
@@ -149,19 +146,15 @@
# These are the dependency-heavy things:
%files mysql
-%defattr(-,root,root)
%_libdir/%name/ulogd_output_MYSQL.so*
%files pcap
-%defattr(-,root,root)
%_libdir/%name/ulogd_output_PCAP.so*
%files pgsql
-%defattr(-,root,root)
%_libdir/%name/ulogd_output_PGSQL.so*
%files sqlite3
-%defattr(-,root,root)
%_libdir/%name/ulogd_output_SQLITE3.so*
%changelog
commit ulogd for openSUSE:Factory
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.changes2020-04-18
00:26:55.337616455 +0200
@@ -1,0 +2,5 @@
+Wed Apr 15 15:13:12 UTC 2020 - Thorsten Kukuk
+
+- 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"
commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2019-12-23 22:39:56
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new.6675 (New)
Package is "ulogd"
Mon Dec 23 22:39:56 2019 rev:15 rq:757090 version:2.0.7
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2019-03-22
15:09:25.489387725 +0100
+++ /work/SRC/openSUSE:Factory/.ulogd.new.6675/ulogd.changes2019-12-23
22:42:40.809956609 +0100
@@ -1,0 +2,6 @@
+Sat Dec 14 01:46:06 UTC 2019 - Jan Engelhardt
+
+- Add missing BuildRequires on zlib-devel that was previously
+ implicitly pulled in.
+
+---
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.Rf61In/_old 2019-12-23 22:42:42.365957284 +0100
+++ /var/tmp/diff_new_pack.Rf61In/_new 2019-12-23 22:42:42.365957284 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ulogd
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
Summary:Userspace logging for Netfilter
License:GPL-2.0-only
Group: Productivity/Networking/Security
-Url:http://netfilter.org/projects/ulogd/
+URL:http://netfilter.org/projects/ulogd/
#Git-Clone:git://git.netfilter.org/ulogd2
#DL-URL: http://netfilter.org/projects/ulogd/files/
@@ -40,6 +40,8 @@
BuildRequires: lksctp-tools-devel
BuildRequires: pkg-config >= 0.21
BuildRequires: sqlite3-devel
+BuildRequires: systemd-rpm-macros
+BuildRequires: zlib-devel
BuildRequires: pkgconfig(libmnl) >= 1.0.3
BuildRequires: pkgconfig(libnetfilter_acct) >= 1.0.1
BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.2
@@ -47,7 +49,6 @@
BuildRequires: pkgconfig(libnfnetlink) >= 1.0.1
BuildRequires: pkgconfig(libpq)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: systemd-rpm-macros
Requires(pre): /usr/sbin/useradd
%{?systemd_ordering}
commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2019-03-22 15:09:22
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new.25356 (New)
Package is "ulogd"
Fri Mar 22 15:09:22 2019 rev:14 rq:687310 version:2.0.7
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2018-07-14
20:24:08.316019257 +0200
+++ /work/SRC/openSUSE:Factory/.ulogd.new.25356/ulogd.changes 2019-03-22
15:09:25.489387725 +0100
@@ -1,0 +2,5 @@
+Thu Mar 21 11:32:44 UTC 2019 - Jan Engelhardt
+
+- Add 0001-build-adjust-configure-for-postgresql-10-11.patch
+
+---
New:
0001-build-adjust-configure-for-postgresql-10-11.patch
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.8NeVXT/_old 2019-03-22 15:09:26.085387210 +0100
+++ /var/tmp/diff_new_pack.8NeVXT/_new 2019-03-22 15:09:26.089387206 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ulogd
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -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
+Patch1: 0001-build-adjust-configure-for-postgresql-10-11.patch
Patch4: ulogd-conf.diff
BuildRequires: autoconf >= 2.50
@@ -37,17 +38,18 @@
BuildRequires: libpcap-devel
BuildRequires: libtool
BuildRequires: lksctp-tools-devel
-BuildRequires: pkgconfig >= 0.21
-BuildRequires: postgresql-devel
+BuildRequires: pkg-config >= 0.21
BuildRequires: sqlite3-devel
BuildRequires: pkgconfig(libmnl) >= 1.0.3
BuildRequires: pkgconfig(libnetfilter_acct) >= 1.0.1
BuildRequires: pkgconfig(libnetfilter_conntrack) >= 1.0.2
BuildRequires: pkgconfig(libnetfilter_log) >= 1.0.0
BuildRequires: pkgconfig(libnfnetlink) >= 1.0.1
+BuildRequires: pkgconfig(libpq)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: systemd-rpm-macros
Requires(pre): /usr/sbin/useradd
+%{?systemd_ordering}
%description
ulogd is a userspace logging daemon for netfilter/iptables related
@@ -88,8 +90,7 @@
SQLite3 output target for ulogd.
%prep
-%setup -q
-%patch -P 4 -p1
+%autosetup -p1
%build
autoreconf -fi
@@ -97,8 +98,8 @@
make %{?_smp_mflags}
%install
+%make_install
b="%buildroot"
-make install DESTDIR="$b"
find "$b" -type f -iname "*.la" -delete
mkdir -p "$b/var/log/ulogd"
mkdir -p "$b/%_sysconfdir"
++ 0001-build-adjust-configure-for-postgresql-10-11.patch ++
>From 3b1ed1b767b664fdf7040ba9cf6c9d3f071250a0 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt
Date: Thu, 21 Mar 2019 12:16:45 +0100
Subject: [PATCH] build: adjust configure for postgresql 10/11
The openSUSE PostgreSQL 11 no longer ships the pg_config program.
Instead, there exists a .pc file (likewise in pg10), so make use of
that, by default.
The old --with-pgsql-inc and --with-pgsql-lib option are going away
and replaced by the standardized mechanisms pkg-config.m4 has in
store for when there is no .pc file or an unusual location:
./configure --with-pgsql pgsql_CFLAGS="-I/opt/pgsql/include" \
pgsql_LIBS="-L/opt/pgsql/lib -lpq"
---
acinclude.m4 | 84
configure.ac | 12 +-
output/pgsql/Makefile.am | 4 +-
3 files changed, 12 insertions(+), 88 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 8388c45..3b8b982 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -14,82 +14,14 @@ dnl @license AllPermissive
AC_DEFUN([CT_CHECK_POSTGRES_DB], [
-AC_ARG_WITH(pgsql,
- [ --with-pgsql=PREFIX Prefix of your PostgreSQL installation],
- [pg_prefix=$withval], [pg_prefix=])
-AC_ARG_WITH(pgsql-inc,
- [ --with-pgsql-inc=PATHPath to the include directory
of PostgreSQL],
- [pg_inc=$withval], [pg_inc=])
-AC_ARG_WITH(pgsql-lib,
- [ --with-pgsql-lib=PATHPath to the libraries of
PostgreSQL],
- [pg_lib=$withval], [pg_lib=])
-
-
-AC_SUBST(PQINCPATH)
-AC_SUBST(PQLIBPATH)
-AC_SUBST(PQLIBS)
-PQLIBS=-lpq
-
-if test "$pg_prefix" != "no"; then
-
commit ulogd for openSUSE:Factory
Hello community, here is the log from the commit of package ulogd for openSUSE:Factory checked in at 2018-07-14 20:24:03 Comparing /work/SRC/openSUSE:Factory/ulogd (Old) and /work/SRC/openSUSE:Factory/.ulogd.new (New) Package is "ulogd" Sat Jul 14 20:24:03 2018 rev:13 rq:621108 version:2.0.7 Changes: --- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2017-03-12 20:05:37.983892001 +0100 +++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2018-07-14 20:24:08.316019257 +0200 @@ -1,0 +2,12 @@ +Tue May 1 12:48:48 UTC 2018 - jeng...@inai.de + +- Update to new upstream release 2.0.7 + * ulogd: Use /dev/null as dummy logfile when logging to syslog + * json: output messages in JSONv1 format + * json: append timezone information to ISO-8601 date + * ulogd: fix crash when ipv4 packet is truncated + * ulogd: fix crash when plugin version are incorrect + * ulogd: use a RT scheduler by default + * ulogd: load all plugins by default + +--- Old: ulogd-2.0.5.tar.bz2 ulogd-2.0.5.tar.bz2.sig New: ulogd-2.0.7.tar.bz2 ulogd-2.0.7.tar.bz2.sig Other differences: -- ++ ulogd.spec ++ --- /var/tmp/diff_new_pack.chXkEV/_old 2018-07-14 20:24:09.348021910 +0200 +++ /var/tmp/diff_new_pack.chXkEV/_new 2018-07-14 20:24:09.364021951 +0200 @@ -1,7 +1,7 @@ # # spec file for package ulogd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ Name: ulogd -Version:2.0.5 +Version:2.0.7 Release:0 Summary:Userspace logging for Netfilter -License:GPL-2.0 +License:GPL-2.0-only Group: Productivity/Networking/Security Url:http://netfilter.org/projects/ulogd/ ++ ulogd-2.0.5.tar.bz2 -> ulogd-2.0.7.tar.bz2 ++ 41477 lines of diff (skipped) ++ ulogd-conf.diff ++ --- /var/tmp/diff_new_pack.chXkEV/_old 2018-07-14 20:24:09.760022969 +0200 +++ /var/tmp/diff_new_pack.chXkEV/_new 2018-07-14 20:24:09.760022969 +0200 @@ -2,10 +2,10 @@ ulogd.conf.in | 29 +++-- 1 file changed, 11 insertions(+), 18 deletions(-) -Index: ulogd-2.0.4/ulogd.conf.in +Index: ulogd-2.0.7/ulogd.conf.in === ulogd-2.0.4.orig/ulogd.conf.in -+++ ulogd-2.0.4/ulogd.conf.in +--- ulogd-2.0.7.orig/ulogd.conf.in ulogd-2.0.7/ulogd.conf.in @@ -6,9 +6,10 @@ # GLOBAL OPTIONS ## @@ -18,7 +18,7 @@ # loglevel: debug(1), info(3), notice(5), error(7) or fatal(8) (default 5) # loglevel=1 -@@ -57,9 +58,6 @@ plugin="@pkglibdir@/ulogd_output_GRAPHIT +@@ -58,9 +59,6 @@ logfile="/var/log/ulogd.log" # this is a stack for packet-based logging via LOGEMU #stack=log2:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU @@ -26,9 +26,9 @@ -#stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU - # this is a stack for packet-based logging via LOGEMU with filtering on MARK - #stack=log2:NFLOG,mark1:MARK,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU + #stack=log2:NFLOG,base1:BASE,mark1:MARK,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU -@@ -174,34 +172,29 @@ numeric_label=1 # you can label the log +@@ -175,34 +173,29 @@ numeric_label=1 # you can label the log #netlink_socket_buffer_maxsize=1085440 #bind=1 @@ -68,7 +68,7 @@ #timestamp=0 # device name to be used in JSON message #device="My awesome Netfilter firewall" -@@ -212,7 +205,7 @@ sync=1 +@@ -216,7 +209,7 @@ sync=1 [pcap1] #default file is /var/log/ulogd.pcap @@ -77,22 +77,20 @@ sync=1 [mysql1] -@@ -297,12 +290,12 @@ procedure="INSERT_PACKET_FULL" +@@ -301,18 +294,18 @@ procedure="INSERT_PACKET_FULL" [sqlite3_ct] table="ulog_ct" -db="/var/log/ulogd.sqlite3db" +db="/var/log/ulogd/ulogd.sqlite3db" - buffer=200 [sqlite3_pkt] table="ulog_pkt" -db="/var/log/ulogd.sqlite3db" +db="/var/log/ulogd/ulogd.sqlite3db" - buffer=200 [sys2] -@@ -310,7 +303,7 @@ facility=LOG_LOCAL2 + facility=LOG_LOCAL2 [nacct1] sync = 1
commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2017-03-12 20:05:36
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new (New)
Package is "ulogd"
Sun Mar 12 20:05:36 2017 rev:12 rq:478684 version:2.0.5
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2015-05-18
22:28:46.0 +0200
+++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2017-03-12
20:05:37.983892001 +0100
@@ -1,0 +2,6 @@
+Sat Mar 11 16:15:30 UTC 2017 - jeng...@inai.de
+
+- Drop init.d script and insserv use.
+- Propagate useradd failure and abort install if necessary.
+
+---
Old:
etc-init.d-ulogd
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.CAUAwl/_old 2017-03-12 20:05:38.679793529 +0100
+++ /var/tmp/diff_new_pack.CAUAwl/_new 2017-03-12 20:05:38.683792963 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ulogd
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,7 +28,6 @@
#DL-URL: http://netfilter.org/projects/ulogd/files/
Source:
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2
Source2:
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig
-Source3:etc-init.d-ulogd
Source4:ulogd.service
Patch4: ulogd-conf.diff
@@ -95,48 +94,32 @@
%build
autoreconf -fi
%configure --disable-static
-make %{?_smp_mflags};
+make %{?_smp_mflags}
%install
-b="%buildroot";
-make install DESTDIR="$b";
-find "$b" -type f -iname "*.la" -delete;
-mkdir -p "$b/var/log/ulogd";
-mkdir -p "$b/%_sysconfdir";
-install -pm0644 ulogd.conf "$b/%_sysconfdir/";
-%if 0%{?_unitdir:1}
-mkdir -p "$b/%_unitdir";
-install -pm0644 "%{S:4}" "$b/%_unitdir";
-%else
-mkdir -p "$b/%_initrddir" "$b/%_sbindir";
-install -pm0755 "%{S:3}" "$b/%_initrddir/%name";
-ln -s "%_initrddir/%name" "$b/%_sbindir/rc%name";
-%endif
+b="%buildroot"
+make install DESTDIR="$b"
+find "$b" -type f -iname "*.la" -delete
+mkdir -p "$b/var/log/ulogd"
+mkdir -p "$b/%_sysconfdir"
+install -pm0644 ulogd.conf "$b/%_sysconfdir/"
+mkdir -p "$b/%_unitdir"
+install -pm0644 "%{S:4}" "$b/%_unitdir"
+ln -s /sbin/service "$b/%_sbindir/rc%name"
%pre
/usr/bin/getent passwd ulogd >/dev/null || \
-/usr/sbin/useradd -c "Userspace logging daemon for Netfilter" -r ulogd || :
-%if 0%{?_unitdir:1}
+/usr/sbin/useradd -c "Userspace logging daemon for Netfilter" -r ulogd
%service_add_pre ulogd.service
-%endif
-%if 0%{?_unitdir:1}
%post
%service_add_post ulogd.service
-%endif
-%if 0%{?_unitdir:1}
%preun
%service_del_preun ulogd.service
-%endif
%postun
-%if 0%{?suse_version}
-%insserv_cleanup
-%endif
-%if 0%{?_unitdir:1}
%service_del_postun ulogd.service
-%endif
%files
%defattr(-,root,root)
@@ -153,12 +136,8 @@
%_libdir/%name/ulogd_output_XML.so*
%_mandir/*/*
%attr(0750,ulogd,root) /var/log/ulogd
-%if 0%{?_unitdir:1}
%_unitdir/ulogd.service
-%else
-%_initddir/%name
%_sbindir/rc%name
-%endif
# These are the dependency-heavy things:
commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2015-05-18 22:28:42
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new (New)
Package is ulogd
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2014-12-05
21:03:56.0 +0100
+++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2015-05-18
22:28:46.0 +0200
@@ -1,0 +2,8 @@
+Sun May 10 21:19:03 UTC 2015 - jeng...@inai.de
+
+- Update to new upstream release 2.0.5
+* JSON output on bigendian arches was fixed
+* Support absence of ipt_ULOG.h
+- Remove 0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch
+
+---
Old:
0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch
ulogd-2.0.4.tar.bz2
ulogd-2.0.4.tar.bz2.sig
New:
ulogd-2.0.5.tar.bz2
ulogd-2.0.5.tar.bz2.sig
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.H2h6PH/_old 2015-05-18 22:28:46.0 +0200
+++ /var/tmp/diff_new_pack.H2h6PH/_new 2015-05-18 22:28:46.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ulogd
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ulogd
-Version:2.0.4
+Version:2.0.5
Release:0
Summary:Userspace logging for Netfilter
License:GPL-2.0
@@ -30,7 +30,6 @@
Source2:
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig
Source3:etc-init.d-ulogd
Source4:ulogd.service
-Patch1: 0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch
Patch4: ulogd-conf.diff
BuildRequires: autoconf = 2.50
@@ -91,7 +90,7 @@
%prep
%setup -q
-%patch -P 1 -P 4 -p1
+%patch -P 4 -p1
%build
autoreconf -fi
++ ulogd-2.0.4.tar.bz2 - ulogd-2.0.5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ulogd-2.0.4/aclocal.m4 new/ulogd-2.0.5/aclocal.m4
--- old/ulogd-2.0.4/aclocal.m4 2014-03-23 16:39:30.0 +0100
+++ new/ulogd-2.0.5/aclocal.m4 2015-05-01 20:07:25.0 +0200
@@ -180,6 +180,61 @@
fi[]dnl
])# PKG_CHECK_MODULES
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+[pkg-config installation directory @:@]pkg_default[@:@])
+AC_ARG_WITH([pkgconfigdir],
+[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+[with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+[pkg-config arch-independent installation directory @:@]pkg_default[@:@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+[with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# ---
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable=][$3][], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file
commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2014-12-05 21:04:04
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new (New)
Package is ulogd
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2014-04-26
10:12:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2014-12-05
21:03:56.0 +0100
@@ -1,0 +2,7 @@
+Thu Nov 27 10:44:52 UTC 2014 - jeng...@inai.de
+
+- Add 0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch
+ to cope with new linux-glibc-devel which lacks ipt_ULOG.h needed
+ for compilation.
+
+---
New:
0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.flQxlJ/_old 2014-12-05 21:03:57.0 +0100
+++ /var/tmp/diff_new_pack.flQxlJ/_new 2014-12-05 21:03:57.0 +0100
@@ -24,52 +24,31 @@
Group: Productivity/Networking/Security
Url:http://netfilter.org/projects/ulogd/
-#Freecode-URL: http://freecode.com/projects/ulogd/
#Git-Clone:git://git.netfilter.org/ulogd2
#DL-URL: http://netfilter.org/projects/ulogd/files/
Source:
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2
Source2:
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig
Source3:etc-init.d-ulogd
Source4:ulogd.service
+Patch1: 0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch
Patch4: ulogd-conf.diff
-#BuildRequires: autoconf = 2.50
-#BuildRequires: automake = 1.11
+BuildRequires: autoconf = 2.50
+BuildRequires: automake = 1.11
+BuildRequires: libmysqlclient-devel
BuildRequires: libpcap-devel
-#BuildRequires: libtool
+BuildRequires: libtool
BuildRequires: lksctp-tools-devel
BuildRequires: pkgconfig = 0.21
BuildRequires: postgresql-devel
-%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
+BuildRequires: sqlite3-devel
BuildRequires: pkgconfig(libmnl) = 1.0.3
BuildRequires: pkgconfig(libnetfilter_acct) = 1.0.1
BuildRequires: pkgconfig(libnetfilter_conntrack) = 1.0.2
BuildRequires: pkgconfig(libnetfilter_log) = 1.0.0
BuildRequires: pkgconfig(libnfnetlink) = 1.0.1
-%else
-BuildRequires: libmnl-devel = 1.0.3
-BuildRequires: libnetfilter_acct-devel = 1.0.1
-BuildRequires: libnetfilter_conntrack-devel = 1.0.2
-BuildRequires: libnetfilter_log-devel = 1.0.0
-BuildRequires: libnfnetlink-devel = 1.0.1
-%endif
-%if 0%{?suse_version}
-BuildRequires: libmysqlclient-devel
-BuildRequires: sqlite3-devel
-%endif
-%if 0%{?redhat_version} || 0%{?centos_version} || 0%{?fedora_version}
-BuildRequires: mysql-devel
-BuildRequires: sqlite-devel = 3
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-%if 0%{?suse_version} = 1210
-BuildRequires: systemd
-%systemd_requires
-%endif
-%if 0%{?suse_version}
-Requires(postun): %insserv_prereq
-%endif
+BuildRequires: systemd-rpm-macros
Requires(pre): /usr/sbin/useradd
%description
@@ -112,9 +91,10 @@
%prep
%setup -q
-%patch -P 4 -p1
+%patch -P 1 -P 4 -p1
%build
+autoreconf -fi
%configure --disable-static
make %{?_smp_mflags};
++ 0001-include-keep-a-copy-of-linux-netfilter_ipv4-ipt_ULOG.patch ++
From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso pa...@netfilter.org
Date: Fri, 7 Nov 2014 18:33:01 +0100
Subject: [PATCH] include: keep a copy of linux/netfilter_ipv4/ipt_ULOG.h
This fixes compilation if you use a Linux kernel = 3.17. This problem
occurs since ULOG was removed from mainstream:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e61f1437dc326ae2ef2f310c50b4eb
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=986
Signed-off-by: Pablo Neira Ayuso pa...@netfilter.org
---
configure.ac | 2 +-
include/linux/Makefile.am| 4 +--
include/linux/netfilter_ipv4/Makefile.am | 1 +
include/linux/netfilter_ipv4/ipt_ULOG.h | 49
4 files changed, 53 insertions(+), 3 deletions(-)
create mode 100644 include/linux/netfilter_ipv4/Makefile.am
create mode 100644 include/linux/netfilter_ipv4/ipt_ULOG.h
diff --git a/configure.ac b/configure.ac
index 522c345..c5f573c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,7 +142,7 @@ dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile
include/libipulog/Makefile \
include/linux/Makefile include/linux/netfilter/Makefile \
- libipulog/Makefile \
+
commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2014-04-26 10:12:01
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new (New)
Package is ulogd
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2013-11-30
16:23:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2014-04-26
10:12:01.0 +0200
@@ -1,0 +2,7 @@
+Fri Apr 18 12:37:59 UTC 2014 - jeng...@inai.de
+
+- Update to new upstream release 2.0.4
+* ulogd 2.0.4 features a new JSON output plugin allowing easy
+ integration with log management systems.
+
+---
Old:
ulogd-2.0.3.tar.bz2
ulogd-2.0.3.tar.bz2.sig
New:
ulogd-2.0.4.tar.bz2
ulogd-2.0.4.tar.bz2.sig
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.gOnGYj/_old 2014-04-26 10:12:02.0 +0200
+++ /var/tmp/diff_new_pack.gOnGYj/_new 2014-04-26 10:12:02.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ulogd
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ulogd
-Version:2.0.3
+Version:2.0.4
Release:0
Summary:Userspace logging for Netfilter
License:GPL-2.0
@@ -125,13 +125,13 @@
mkdir -p $b/var/log/ulogd;
mkdir -p $b/%_sysconfdir;
install -pm0644 ulogd.conf $b/%_sysconfdir/;
-mkdir -p $b/%_initrddir $b/%_sbindir;
-install -pm0755 %{S:3} $b/%_initrddir/%name;
-ln -s %_initrddir/%name $b/%_sbindir/rc%name;
-
%if 0%{?_unitdir:1}
mkdir -p $b/%_unitdir;
install -pm0644 %{S:4} $b/%_unitdir;
+%else
+mkdir -p $b/%_initrddir $b/%_sbindir;
+install -pm0755 %{S:3} $b/%_initrddir/%name;
+ln -s %_initrddir/%name $b/%_sbindir/rc%name;
%endif
%pre
@@ -141,16 +141,13 @@
%service_add_pre ulogd.service
%endif
-%post
%if 0%{?_unitdir:1}
+%post
%service_add_post ulogd.service
%endif
-%preun
-%if 0%{?suse_version}
-%stop_on_removal ulogd
-%endif
%if 0%{?_unitdir:1}
+%preun
%service_del_preun ulogd.service
%endif
@@ -165,9 +162,7 @@
%files
%defattr(-,root,root)
%config(noreplace) %_sysconfdir/ulogd.conf
-%_initddir/%name
%_sbindir/ulogd
-%_sbindir/rc%name
%dir %_libdir/%name
%_libdir/%name/ulogd_[fir]*.so*
%_libdir/%name/ulogd_output_GRAPHITE.so*
@@ -181,6 +176,9 @@
%attr(0750,ulogd,root) /var/log/ulogd
%if 0%{?_unitdir:1}
%_unitdir/ulogd.service
+%else
+%_initddir/%name
+%_sbindir/rc%name
%endif
# These are the dependency-heavy things:
++ ulogd-2.0.3.tar.bz2 - ulogd-2.0.4.tar.bz2 ++
1862 lines of diff (skipped)
retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/ulogd-2.0.3/build-aux/missing new/ulogd-2.0.4/build-aux/missing
--- old/ulogd-2.0.3/build-aux/missing 2013-11-19 19:32:15.0 +0100
+++ new/ulogd-2.0.4/build-aux/missing 2014-03-23 16:39:32.0 +0100
@@ -1,7 +1,7 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard pin...@iro.umontreal.ca, 1996.
@@ -160,7 +160,7 @@
;;
autom4te*)
echo You might have modified some maintainer files that require
- echo the 'automa4te' program to be rebuilt.
+ echo the 'autom4te' program to be rebuilt.
program_details 'autom4te'
;;
bison*|yacc*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/ulogd-2.0.3/config.h.in new/ulogd-2.0.4/config.h.in
--- old/ulogd-2.0.3/config.h.in 2013-11-19 19:32:15.0 +0100
+++ new/ulogd-2.0.4/config.h.in 2014-03-23 16:39:31.0 +0100
@@ -34,9 +34,6 @@
/* Define to 1 if you have the `pq' library (-lpq). */
#undef HAVE_LIBPQ
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-#undef HAVE_LIBPTHREAD
-
/* Define to 1 if you have the memory.h header file.
commit ulogd for openSUSE:Factory
Hello community, here is the log from the commit of package ulogd for openSUSE:Factory checked in at 2013-11-30 14:24:47 Comparing /work/SRC/openSUSE:Factory/ulogd (Old) and /work/SRC/openSUSE:Factory/.ulogd.new (New) Package is ulogd Changes: --- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2013-03-08 13:42:15.0 +0100 +++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2013-11-30 16:23:24.0 +0100 @@ -1,0 +2,9 @@ +Sat Nov 23 04:40:13 UTC 2013 - jeng...@inai.de + +- Update to new upstream release 2.0.3 +* Optional backlog system to avoid event loss in case of database + downtime +* Optional running mode where acquisition is made in one thread + and queries to databases are made in separate threads + +--- Old: ulogd-2.0.2.tar.bz2 ulogd-2.0.2.tar.bz2.sig New: ulogd-2.0.3.tar.bz2 ulogd-2.0.3.tar.bz2.sig Other differences: -- ++ ulogd.spec ++ --- /var/tmp/diff_new_pack.4Q7Iw2/_old 2013-11-30 16:23:25.0 +0100 +++ /var/tmp/diff_new_pack.4Q7Iw2/_new 2013-11-30 16:23:25.0 +0100 @@ -17,7 +17,7 @@ Name: ulogd -Version:2.0.2 +Version:2.0.3 Release:0 Summary:Userspace logging for Netfilter License:GPL-2.0 ++ ulogd-2.0.2.tar.bz2 - ulogd-2.0.3.tar.bz2 ++ 23973 lines of diff (skipped) ++ ulogd-conf.diff ++ --- /var/tmp/diff_new_pack.4Q7Iw2/_old 2013-11-30 16:23:25.0 +0100 +++ /var/tmp/diff_new_pack.4Q7Iw2/_new 2013-11-30 16:23:25.0 +0100 @@ -2,10 +2,10 @@ ulogd.conf.in | 27 ++- 1 file changed, 10 insertions(+), 17 deletions(-) -Index: ulogd-2.0.2/ulogd.conf.in +Index: ulogd-2.0.3/ulogd.conf.in === ulogd-2.0.2.orig/ulogd.conf.in -+++ ulogd-2.0.2/ulogd.conf.in +--- ulogd-2.0.3.orig/ulogd.conf.in ulogd-2.0.3/ulogd.conf.in @@ -6,9 +6,10 @@ # GLOBAL OPTIONS ## @@ -63,12 +63,12 @@ [pcap1] #default file is /var/log/ulogd.pcap --#file=/var/log/ulogd.pcap -+file=/var/log/ulogd/ulogd.pcap +-#file=/var/log/ulogd.pcap ++#file=/var/log/ulogd/ulogd.pcap sync=1 [mysql1] -@@ -263,12 +256,12 @@ procedure=INSERT_PACKET_FULL +@@ -282,12 +275,12 @@ procedure=INSERT_PACKET_FULL [sqlite3_ct] table=ulog_ct @@ -83,7 +83,7 @@ buffer=200 [sys2] -@@ -276,7 +269,7 @@ facility=LOG_LOCAL2 +@@ -295,7 +288,7 @@ facility=LOG_LOCAL2 [nacct1] sync = 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2013-03-08 13:42:14
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new (New)
Package is ulogd, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2012-12-07
14:52:32.0 +0100
+++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2013-03-08
13:42:15.0 +0100
@@ -1,0 +2,9 @@
+Mon Mar 4 14:51:49 UTC 2013 - jeng...@inai.de
+
+- Update to new upstream release 2.0.2
+* Add GRAPHITE output module
+* Add src, dst and protocol filters to nfct plugin
+* Fix parsing of ipv6 flowlabel and tc fields
+* Add additional ip6 header fields to database scripts
+
+---
Old:
ulogd-2.0.1.g11.tar.xz
New:
ulogd-2.0.2.tar.bz2
ulogd-2.0.2.tar.bz2.sig
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.5pNBwc/_old 2013-03-08 13:42:16.0 +0100
+++ /var/tmp/diff_new_pack.5pNBwc/_new 2013-03-08 13:42:16.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ulogd
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,18 @@
Name: ulogd
-Version:2.0.1.g11
+Version:2.0.2
Release:0
Summary:Userspace logging for Netfilter
License:GPL-2.0
Group: Productivity/Networking/Security
Url:http://netfilter.org/projects/ulogd/
+#Freecode-URL: http://freecode.com/projects/ulogd/
#Git-Clone:git://git.netfilter.org/ulogd2
#DL-URL: http://netfilter.org/projects/ulogd/files/
-Source: %name-%version.tar.xz
-#Source2:
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig
+Source:
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2
+Source2:
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig
Source3:etc-init.d-ulogd
Source4:ulogd.service
Patch4: ulogd-conf.diff
@@ -35,22 +36,22 @@
#BuildRequires: autoconf = 2.50
#BuildRequires: automake = 1.11
BuildRequires: libpcap-devel
-BuildRequires: libtool
+#BuildRequires: libtool
BuildRequires: lksctp-tools-devel
BuildRequires: pkgconfig = 0.21
BuildRequires: postgresql-devel
%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
-BuildRequires: pkgconfig(libmnl) = 1.0.0
+BuildRequires: pkgconfig(libmnl) = 1.0.3
BuildRequires: pkgconfig(libnetfilter_acct) = 1.0.1
-BuildRequires: pkgconfig(libnetfilter_conntrack) = 1.0.0
+BuildRequires: pkgconfig(libnetfilter_conntrack) = 1.0.2
BuildRequires: pkgconfig(libnetfilter_log) = 1.0.0
-BuildRequires: pkgconfig(libnfnetlink) = 1.0.0
+BuildRequires: pkgconfig(libnfnetlink) = 1.0.1
%else
-BuildRequires: libmnl-devel = 1.0.0
+BuildRequires: libmnl-devel = 1.0.3
BuildRequires: libnetfilter_acct-devel = 1.0.1
-BuildRequires: libnetfilter_conntrack-devel = 1.0.0
+BuildRequires: libnetfilter_conntrack-devel = 1.0.2
BuildRequires: libnetfilter_log-devel = 1.0.0
-BuildRequires: libnfnetlink-devel = 1.0.0
+BuildRequires: libnfnetlink-devel = 1.0.1
%endif
%if 0%{?suse_version}
BuildRequires: libmysqlclient-devel
@@ -140,8 +141,8 @@
%service_add_pre ulogd.service
%endif
-%if 0%{?_unitdir:1}
%post
+%if 0%{?_unitdir:1}
%service_add_post ulogd.service
%endif
@@ -169,6 +170,7 @@
%_sbindir/rc%name
%dir %_libdir/%name
%_libdir/%name/ulogd_[fir]*.so*
+%_libdir/%name/ulogd_output_GRAPHITE.so*
%_libdir/%name/ulogd_output_GPRINT.so*
%_libdir/%name/ulogd_output_LOGEMU.so*
%_libdir/%name/ulogd_output_NACCT.so*
++ ulogd-2.0.1.g11.tar.xz - ulogd-2.0.2.tar.bz2 ++
21804 lines of diff (skipped)
++ ulogd-conf.diff ++
--- /var/tmp/diff_new_pack.5pNBwc/_old 2013-03-08 13:42:16.0 +0100
+++ /var/tmp/diff_new_pack.5pNBwc/_new 2013-03-08 13:42:16.0 +0100
@@ -1,18 +1,12 @@
---
- ulogd.conf.in | 29 ++---
- 1 file changed, 10 insertions(+), 19 deletions(-)
+ ulogd.conf.in | 27 ++-
+ 1 file changed, 10 insertions(+), 17 deletions(-)
-Index: ulogd2/ulogd.conf.in
+Index: ulogd-2.0.2/ulogd.conf.in
===
ulogd2.orig/ulogd.conf.in
-+++ ulogd2/ulogd.conf.in
-@@ -1,15 +1,14 @@
- # Example configuration for ulogd
--# $Id$
--# Adapted to Debian by Achilleas Kotsis achi...@debian.gr
-
- [global]
-
commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2012-12-07 14:52:22
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new (New)
Package is ulogd, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2012-06-28
17:07:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2012-12-07
14:52:32.0 +0100
@@ -1,0 +2,9 @@
+Mon Oct 8 12:37:12 UTC 2012 - jeng...@inai.de
+
+- Update to new upstream release 2.0.1
+* This releases includes support for the nfacct extended iptables
+ accounting infrastructure.
+- Snapshot 2.0.1+git11
+* Build fixes for 2.0.1
+
+---
Old:
ulogd-2.0.0.tar.bz2
New:
ulogd-2.0.1.g11.tar.xz
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.dJvD7A/_old 2012-12-07 14:52:34.0 +0100
+++ /var/tmp/diff_new_pack.dJvD7A/_new 2012-12-07 14:52:34.0 +0100
@@ -17,7 +17,7 @@
Name: ulogd
-Version:2.0.0
+Version:2.0.1.g11
Release:0
Summary:Userspace logging for Netfilter
License:GPL-2.0
@@ -25,9 +25,11 @@
Url:http://netfilter.org/projects/ulogd/
#Git-Clone:git://git.netfilter.org/ulogd2
-Source: %name-%version.tar.bz2
-Source2:etc-init.d-ulogd
-Source3:ulogd.service
+#DL-URL: http://netfilter.org/projects/ulogd/files/
+Source: %name-%version.tar.xz
+#Source2:
http://netfilter.org/projects/ulogd/files/%name-%version.tar.bz2.sig
+Source3:etc-init.d-ulogd
+Source4:ulogd.service
Patch4: ulogd-conf.diff
#BuildRequires: autoconf = 2.50
@@ -37,15 +39,27 @@
BuildRequires: lksctp-tools-devel
BuildRequires: pkgconfig = 0.21
BuildRequires: postgresql-devel
+%if 0%{?suse_version} = 1140 || 0%{?fedora_version}
BuildRequires: pkgconfig(libmnl) = 1.0.0
-BuildRequires: pkgconfig(libnetfilter_acct) = 1.0.0
+BuildRequires: pkgconfig(libnetfilter_acct) = 1.0.1
BuildRequires: pkgconfig(libnetfilter_conntrack) = 1.0.0
BuildRequires: pkgconfig(libnetfilter_log) = 1.0.0
BuildRequires: pkgconfig(libnfnetlink) = 1.0.0
+%else
+BuildRequires: libmnl-devel = 1.0.0
+BuildRequires: libnetfilter_acct-devel = 1.0.1
+BuildRequires: libnetfilter_conntrack-devel = 1.0.0
+BuildRequires: libnetfilter_log-devel = 1.0.0
+BuildRequires: libnfnetlink-devel = 1.0.0
+%endif
%if 0%{?suse_version}
BuildRequires: libmysqlclient-devel
BuildRequires: sqlite3-devel
%endif
+%if 0%{?redhat_version} || 0%{?centos_version} || 0%{?fedora_version}
+BuildRequires: mysql-devel
+BuildRequires: sqlite-devel = 3
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} = 1210
@@ -111,12 +125,12 @@
mkdir -p $b/%_sysconfdir;
install -pm0644 ulogd.conf $b/%_sysconfdir/;
mkdir -p $b/%_initrddir $b/%_sbindir;
-install -pm0755 %{S:2} $b/%_initrddir/%name;
+install -pm0755 %{S:3} $b/%_initrddir/%name;
ln -s %_initrddir/%name $b/%_sbindir/rc%name;
%if 0%{?_unitdir:1}
mkdir -p $b/%_unitdir;
-install -pm0644 %{S:3} $b/%_unitdir;
+install -pm0644 %{S:4} $b/%_unitdir;
%endif
%pre
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit ulogd for openSUSE:Factory
Hello community,
here is the log from the commit of package ulogd for openSUSE:Factory checked
in at 2012-06-28 17:07:42
Comparing /work/SRC/openSUSE:Factory/ulogd (Old)
and /work/SRC/openSUSE:Factory/.ulogd.new (New)
Package is ulogd, Maintainer is m...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/ulogd/ulogd.changes 2012-06-26
17:41:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.ulogd.new/ulogd.changes 2012-06-28
17:07:45.0 +0200
@@ -1,0 +2,7 @@
+Tue Jun 26 22:23:03 UTC 2012 - jeng...@inai.de
+
+- Update to 2.0.0 final release
+* add documentation about SIGUSR2 handling
+* (compile fail-fixing patches were merged, no functional changes)
+
+---
Old:
ulogd-2.0.0~beta4+git51.tar.xz
ulogd-automake.diff
ulogd-buffer.diff
ulogd-libmnl.diff
ulogd-pcap.diff
New:
ulogd-2.0.0.tar.bz2
Other differences:
--
++ ulogd.spec ++
--- /var/tmp/diff_new_pack.69LqYd/_old 2012-06-28 17:07:46.0 +0200
+++ /var/tmp/diff_new_pack.69LqYd/_new 2012-06-28 17:07:46.0 +0200
@@ -17,28 +17,21 @@
Name: ulogd
-Version:2.0.0.beta4
+Version:2.0.0
Release:0
-%define pkname ulogd
-%define llver 2.0.0~beta4+git51
Summary:Userspace logging for Netfilter
License:GPL-2.0
Group: Productivity/Networking/Security
Url:http://netfilter.org/projects/ulogd/
#Git-Clone:git://git.netfilter.org/ulogd2
-%define git_snapshot 1
-Source: ulogd-%llver.tar.xz
+Source: %name-%version.tar.bz2
Source2:etc-init.d-ulogd
Source3:ulogd.service
-Patch1: ulogd-automake.diff
-Patch2: ulogd-libmnl.diff
-Patch3: ulogd-buffer.diff
Patch4: ulogd-conf.diff
-Patch5: ulogd-pcap.diff
-BuildRequires: autoconf
-BuildRequires: automake = 1.6
+#BuildRequires: autoconf = 2.50
+#BuildRequires: automake = 1.11
BuildRequires: libpcap-devel
BuildRequires: libtool
BuildRequires: lksctp-tools-devel
@@ -46,15 +39,15 @@
BuildRequires: postgresql-devel
BuildRequires: pkgconfig(libmnl) = 1.0.0
BuildRequires: pkgconfig(libnetfilter_acct) = 1.0.0
-BuildRequires: pkgconfig(libnetfilter_conntrack) = 0.0.95
+BuildRequires: pkgconfig(libnetfilter_conntrack) = 1.0.0
BuildRequires: pkgconfig(libnetfilter_log) = 1.0.0
-BuildRequires: pkgconfig(libnfnetlink) = 0.0.39
+BuildRequires: pkgconfig(libnfnetlink) = 1.0.0
%if 0%{?suse_version}
BuildRequires: libmysqlclient-devel
BuildRequires: sqlite3-devel
%endif
-BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
%if 0%{?suse_version} = 1210
BuildRequires: systemd
%systemd_requires
@@ -103,11 +96,10 @@
SQLite3 output target for ulogd.
%prep
-%setup -qn ulogd2
-%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1
+%setup -q
+%patch -P 4 -p1
%build
-autoreconf -fi;
%configure --disable-static
make %{?_smp_mflags};
@@ -161,14 +153,14 @@
%_initddir/%name
%_sbindir/ulogd
%_sbindir/rc%name
-%dir %_libdir/%pkname
-%_libdir/%pkname/ulogd_[fir]*.so*
-%_libdir/%pkname/ulogd_output_GPRINT.so*
-%_libdir/%pkname/ulogd_output_LOGEMU.so*
-%_libdir/%pkname/ulogd_output_NACCT.so*
-%_libdir/%pkname/ulogd_output_OPRINT.so*
-%_libdir/%pkname/ulogd_output_SYSLOG.so*
-%_libdir/%pkname/ulogd_output_XML.so*
+%dir %_libdir/%name
+%_libdir/%name/ulogd_[fir]*.so*
+%_libdir/%name/ulogd_output_GPRINT.so*
+%_libdir/%name/ulogd_output_LOGEMU.so*
+%_libdir/%name/ulogd_output_NACCT.so*
+%_libdir/%name/ulogd_output_OPRINT.so*
+%_libdir/%name/ulogd_output_SYSLOG.so*
+%_libdir/%name/ulogd_output_XML.so*
%_mandir/*/*
%attr(0750,ulogd,root) /var/log/ulogd
%if 0%{?_unitdir:1}
@@ -179,18 +171,18 @@
%files mysql
%defattr(-,root,root)
-%_libdir/%pkname/ulogd_output_MYSQL.so*
+%_libdir/%name/ulogd_output_MYSQL.so*
%files pcap
%defattr(-,root,root)
-%_libdir/%pkname/ulogd_output_PCAP.so*
+%_libdir/%name/ulogd_output_PCAP.so*
%files pgsql
%defattr(-,root,root)
-%_libdir/%pkname/ulogd_output_PGSQL.so*
+%_libdir/%name/ulogd_output_PGSQL.so*
%files sqlite3
%defattr(-,root,root)
-%_libdir/%pkname/ulogd_output_SQLITE3.so*
+%_libdir/%name/ulogd_output_SQLITE3.so*
%changelog
++ ulogd-2.0.0~beta4+git51.tar.xz - ulogd-2.0.0.tar.bz2 ++
85938 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
