From 45c0fcedca2ecd198a89daf6bac42352827052e0970a18e03e498d32caa303ac Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Feb 2011 04:35:33 +0000 Subject: [PATCH 1/7] Update BuildRequires OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_log?expand=0&rev=8 --- libnetfilter_log.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libnetfilter_log.spec b/libnetfilter_log.spec index 9b3468b..a856c0e 100644 --- a/libnetfilter_log.spec +++ b/libnetfilter_log.spec @@ -28,7 +28,8 @@ Url: http://netfilter.org/projects/libnetfilter_log/ Source: http://netfilter.org/projects/libnetfilter_log/files/%{name}-%{version}.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libnfnetlink-devel linux-kernel-headers >= 2.6.14 pkg-config +BuildRequires: libnfnetlink-devel >= 0.0.41 +BuildRequires: linux-kernel-headers >= 2.6.14, pkg-config >= 0.19 Summary: Userspace library for accessing logged packets %description From cf0717aee7d422a8e4440c747190bf0f779fdf0889317a839d25615caad39e99 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Aug 2011 18:52:48 +0000 Subject: [PATCH 2/7] Combine %name%soname to %lname and smaller cleanups OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_log?expand=0&rev=9 --- libnetfilter_log.spec | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/libnetfilter_log.spec b/libnetfilter_log.spec index a856c0e..79e3583 100644 --- a/libnetfilter_log.spec +++ b/libnetfilter_log.spec @@ -17,9 +17,8 @@ # norootforbuild -%define soname 1 - Name: libnetfilter_log +%define lname %{name}1 Version: 1.0.0 Release: 1 License: GNU GPL v2 @@ -38,29 +37,25 @@ packets that have been logged by the kernel packet filter. It is is part of a system that deprecates the old syslog/dmesg based packet logging. This library has been previously known as libnfnetlink_log. -%define debug_package_requires %{name}%{soname} = %{version}-%{release} - -%package -n %{name}%{soname} - +%define debug_package_requires %lname = %{version}-%{release} +%package -n %lname Group: System/Libraries PreReq: glibc Summary: Userspace library for accessing logged packets -%description -n %{name}%{soname} +%description -n %lname libnetfilter_log is a userspace library providing interface to packets that have been logged by the kernel packet filter. It is is part of a system that deprecates the old syslog/dmesg based packet logging. This library has been previously known as libnfnetlink_log. -%package -n %{name}-devel - - +%package devel Group: Development/Libraries/C and C++ -Requires: %{name}%{soname} = %{version} libnfnetlink-devel +Requires: %lname = %{version} libnfnetlink-devel Summary: Userspace library for accessing logged packets -%description -n %{name}-devel +%description devel libnetfilter_log is a userspace library providing interface to packets that have been logged by the kernel packet filter. It is is part of a system that deprecates the old syslog/dmesg based packet @@ -71,25 +66,22 @@ logging. This library has been previously known as libnfnetlink_log. %build %configure --disable-static -%__make %{?_smp_mflags} +make %{?_smp_mflags} %install %makeinstall find %{buildroot} -name "*.la" -delete -%post -n %{name}%{soname} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -n %{name}%{soname} -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%clean -test "%{buildroot}" != "/" && %__rm -rf %{buildroot} - -%files -n %{name}%{soname} +%files -n %lname %defattr(-,root,root) -%{_libdir}/libnetfilter_log.so.%{soname}* -%{_libdir}/libnetfilter_log_libipulog.so.%{soname}* +%{_libdir}/libnetfilter_log.so.* +%{_libdir}/libnetfilter_log_libipulog.so.* -%files -n %{name}-devel +%files devel %defattr(-,root,root) %{_includedir}/libnetfilter_log %{_libdir}/libnetfilter_log.so From 8efc7501f316b137c43a784f70bec3c464807bcff3153f1d504d206a16a9af06 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Aug 2011 18:52:57 +0000 Subject: [PATCH 3/7] Run spec-beautifier over specfile OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_log?expand=0&rev=10 --- libnetfilter_log.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libnetfilter_log.spec b/libnetfilter_log.spec index 79e3583..092024b 100644 --- a/libnetfilter_log.spec +++ b/libnetfilter_log.spec @@ -23,10 +23,10 @@ Version: 1.0.0 Release: 1 License: GNU GPL v2 Group: Productivity/Networking/Security -Url: http://netfilter.org/projects/libnetfilter_log/ -Source: http://netfilter.org/projects/libnetfilter_log/files/%{name}-%{version}.tar.bz2 +URL: http://netfilter.org/projects/libnetfilter_log/ +Source: http://netfilter.org/projects/libnetfilter_log/files/%name-%version.tar.bz2 Source2: baselibs.conf -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %_tmppath/%name-%version-build BuildRequires: libnfnetlink-devel >= 0.0.41 BuildRequires: linux-kernel-headers >= 2.6.14, pkg-config >= 0.19 Summary: Userspace library for accessing logged packets @@ -37,7 +37,7 @@ packets that have been logged by the kernel packet filter. It is is part of a system that deprecates the old syslog/dmesg based packet logging. This library has been previously known as libnfnetlink_log. -%define debug_package_requires %lname = %{version}-%{release} +%define debug_package_requires %lname = %version-%release %package -n %lname Group: System/Libraries @@ -52,7 +52,7 @@ logging. This library has been previously known as libnfnetlink_log. %package devel Group: Development/Libraries/C and C++ -Requires: %lname = %{version} libnfnetlink-devel +Requires: %lname = %version, libnfnetlink-devel Summary: Userspace library for accessing logged packets %description devel @@ -70,7 +70,7 @@ make %{?_smp_mflags} %install %makeinstall -find %{buildroot} -name "*.la" -delete +find %buildroot -name "*.la" -delete %post -n %lname -p /sbin/ldconfig @@ -78,14 +78,14 @@ find %{buildroot} -name "*.la" -delete %files -n %lname %defattr(-,root,root) -%{_libdir}/libnetfilter_log.so.* -%{_libdir}/libnetfilter_log_libipulog.so.* +%_libdir/libnetfilter_log.so.* +%_libdir/libnetfilter_log_libipulog.so.* %files devel %defattr(-,root,root) -%{_includedir}/libnetfilter_log -%{_libdir}/libnetfilter_log.so -%{_libdir}/libnetfilter_log_libipulog.so -%{_libdir}/pkgconfig/libnetfilter_log.pc +%_includedir/libnetfilter_log +%_libdir/libnetfilter_log.so +%_libdir/libnetfilter_log_libipulog.so +%_libdir/pkgconfig/libnetfilter_log.pc %changelog From 38ab68002b54dbdbb792821a904bfd756d49d4be63edf4787588a0883d63d318 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 1 Aug 2011 18:53:21 +0000 Subject: [PATCH 4/7] Make build work for Fedorean systems OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_log?expand=0&rev=11 --- libnetfilter_log.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libnetfilter_log.spec b/libnetfilter_log.spec index 092024b..6ac600b 100644 --- a/libnetfilter_log.spec +++ b/libnetfilter_log.spec @@ -27,8 +27,7 @@ URL: http://netfilter.org/projects/libnetfilter_log/ Source: http://netfilter.org/projects/libnetfilter_log/files/%name-%version.tar.bz2 Source2: baselibs.conf BuildRoot: %_tmppath/%name-%version-build -BuildRequires: libnfnetlink-devel >= 0.0.41 -BuildRequires: linux-kernel-headers >= 2.6.14, pkg-config >= 0.19 +BuildRequires: libnfnetlink-devel >= 0.0.41, pkgconfig >= 0.19 Summary: Userspace library for accessing logged packets %description From aff74e0ce77bb9f27c4a9c5b43bb792db9795bd103fac88bc76be9aec6b02689 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 29 Dec 2011 21:26:31 +0000 Subject: [PATCH 5/7] SPDX; separate includedir OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_log?expand=0&rev=12 --- libnetfilter_log.changes | 6 ++++++ libnetfilter_log.spec | 18 ++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/libnetfilter_log.changes b/libnetfilter_log.changes index 36dae7f..c498c10 100644 --- a/libnetfilter_log.changes +++ b/libnetfilter_log.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 29 21:25:32 UTC 2011 - jengelh@medozas.de + +- Use SPDX format for License: tag +- Use separate include directory to detect compile errors + ------------------------------------------------------------------- Fri Jul 16 10:51:21 UTC 2010 - jengelh@medozas.de diff --git a/libnetfilter_log.spec b/libnetfilter_log.spec index 6ac600b..d5b0ae5 100644 --- a/libnetfilter_log.spec +++ b/libnetfilter_log.spec @@ -1,7 +1,7 @@ # -# spec file for package libnetfilter_log (Version 1.0.0) +# spec file for package libnetfilter_log # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -15,19 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild + Name: libnetfilter_log %define lname %{name}1 Version: 1.0.0 Release: 1 -License: GNU GPL v2 +License: GPL-2.0 Group: Productivity/Networking/Security URL: http://netfilter.org/projects/libnetfilter_log/ Source: http://netfilter.org/projects/libnetfilter_log/files/%name-%version.tar.bz2 Source2: baselibs.conf -BuildRoot: %_tmppath/%name-%version-build -BuildRequires: libnfnetlink-devel >= 0.0.41, pkgconfig >= 0.19 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: libnfnetlink-devel >= 0.0.41 pkgconfig >= 0.19 Summary: Userspace library for accessing logged packets %description @@ -36,8 +36,6 @@ packets that have been logged by the kernel packet filter. It is is part of a system that deprecates the old syslog/dmesg based packet logging. This library has been previously known as libnfnetlink_log. -%define debug_package_requires %lname = %version-%release - %package -n %lname Group: System/Libraries PreReq: glibc @@ -64,7 +62,7 @@ logging. This library has been previously known as libnfnetlink_log. %setup -q %build -%configure --disable-static +%configure --disable-static --includedir=%_includedir/%name-%version make %{?_smp_mflags} %install @@ -82,7 +80,7 @@ find %buildroot -name "*.la" -delete %files devel %defattr(-,root,root) -%_includedir/libnetfilter_log +%_includedir/libnetfilter_log* %_libdir/libnetfilter_log.so %_libdir/libnetfilter_log_libipulog.so %_libdir/pkgconfig/libnetfilter_log.pc From f39aa6d2bdf5fc712739e80dc7a8228378bc7afdbaca575879c13cb3ca19335e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 1 Jan 2012 00:14:31 +0000 Subject: [PATCH 6/7] BuildRequire updates OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_log?expand=0&rev=13 --- libnetfilter_log.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libnetfilter_log.spec b/libnetfilter_log.spec index d5b0ae5..bf04f37 100644 --- a/libnetfilter_log.spec +++ b/libnetfilter_log.spec @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_log # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -23,11 +23,12 @@ Version: 1.0.0 Release: 1 License: GPL-2.0 Group: Productivity/Networking/Security -URL: http://netfilter.org/projects/libnetfilter_log/ +Url: http://netfilter.org/projects/libnetfilter_log/ Source: http://netfilter.org/projects/libnetfilter_log/files/%name-%version.tar.bz2 Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libnfnetlink-devel >= 0.0.41 pkgconfig >= 0.19 +BuildRequires: autoconf automake >= 1.6 libtool +BuildRequires: pkgconfig >= 0.23 pkgconfig(libnfnetlink) >= 0.0.41 Summary: Userspace library for accessing logged packets %description @@ -38,7 +39,6 @@ logging. This library has been previously known as libnfnetlink_log. %package -n %lname Group: System/Libraries -PreReq: glibc Summary: Userspace library for accessing logged packets %description -n %lname @@ -62,12 +62,15 @@ logging. This library has been previously known as libnfnetlink_log. %setup -q %build +if [ ! -e configure ]; then + ./autogen.sh; +fi; %configure --disable-static --includedir=%_includedir/%name-%version make %{?_smp_mflags} %install %makeinstall -find %buildroot -name "*.la" -delete +rm -f "%buildroot/%_libdir"/*.la; %post -n %lname -p /sbin/ldconfig @@ -75,8 +78,8 @@ find %buildroot -name "*.la" -delete %files -n %lname %defattr(-,root,root) -%_libdir/libnetfilter_log.so.* -%_libdir/libnetfilter_log_libipulog.so.* +%_libdir/libnetfilter_log.so.1* +%_libdir/libnetfilter_log_libipulog.so.1* %files devel %defattr(-,root,root) From 7264cdcec6390f3611bd9b01eb8b6407f7aabfbffbff6c38032acf9be7e3e304 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 2 Jan 2012 21:18:22 +0000 Subject: [PATCH 7/7] libnetfilter_log 1.0.1 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_log?expand=0&rev=14 --- libnetfilter_log-1.0.0.tar.bz2 | 3 --- libnetfilter_log-1.0.1.tar.bz2 | 3 +++ libnetfilter_log-1.0.1.tar.bz2.sig | Bin 0 -> 543 bytes libnetfilter_log.changes | 6 ++++++ libnetfilter_log.spec | 7 ++++--- 5 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 libnetfilter_log-1.0.0.tar.bz2 create mode 100644 libnetfilter_log-1.0.1.tar.bz2 create mode 100644 libnetfilter_log-1.0.1.tar.bz2.sig diff --git a/libnetfilter_log-1.0.0.tar.bz2 b/libnetfilter_log-1.0.0.tar.bz2 deleted file mode 100644 index 4d9e759..0000000 --- a/libnetfilter_log-1.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c24e1c2c2054d5cb1e4359ef7ad4a5a3360904e277b761cc8ccf78dacd38567c -size 239548 diff --git a/libnetfilter_log-1.0.1.tar.bz2 b/libnetfilter_log-1.0.1.tar.bz2 new file mode 100644 index 0000000..22206d9 --- /dev/null +++ b/libnetfilter_log-1.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74e0fe75753dba3ac114531b5e73240452c789a3f3adccf5c51217da1d933b21 +size 262545 diff --git a/libnetfilter_log-1.0.1.tar.bz2.sig b/libnetfilter_log-1.0.1.tar.bz2.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..a6fcae23e699ff4de3f035752c130bb3c46097267a7f30f54ce3336b9acbef84 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-e34!Zyf2@s?aABnqPSj?bF5C3ff%cPg+p}+<;2I^_I z#l5x5lW5g5Q}OOeiJx@b|8j=);pVp~0<3Es(2WaF`n&LM<^ zUYaJCrav30<8xpxGHUUV5B}uftjVdSjeN%-D|jFe879NjCb4j%7UAI!NWK#@qR@i) zM^kw;brRIS(OJ^BAibur;2sOU(`83mE(DrR@?p{`siT{R|GzX3cJk zOQ=k_&sFF-?G7On|37GZz5}Z8rBDvJnOvJuL#oCYHcoron+4EV^U`7r$J$bH0eE;* htox= 1.6 libtool BuildRequires: pkgconfig >= 0.23 pkgconfig(libnfnetlink) >= 0.0.41