From 12639d1841ef1684f0e5b046763594d7a2b3c4d0 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 5 Apr 2019 22:55:03 +1000 Subject: [PATCH 01/11] Bump release --- libpcap.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libpcap.spec b/libpcap.spec index bd26280..c7797c4 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,12 +1,13 @@ %define major 1 %define libname %mklibname pcap %{major} %define devname %mklibname pcap -d + %bcond_without bluetooth Summary: A system-independent interface for user-level packet capture Name: libpcap Version: 1.8.1 -Release: 2 +Release: 3 License: BSD Group: System/Libraries Url: http://www.tcpdump.org/ From f97eb3c4026d400abdea8db040695a59dca1a12e Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Sun, 14 Apr 2019 01:47:34 +0000 Subject: [PATCH 02/11] MassBuild#1671: Increase release tag --- libpcap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpcap.spec b/libpcap.spec index c7797c4..13b8d85 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -7,7 +7,7 @@ Summary: A system-independent interface for user-level packet capture Name: libpcap Version: 1.8.1 -Release: 3 +Release: 4 License: BSD Group: System/Libraries Url: http://www.tcpdump.org/ From e99317a34c3628e6e55ea5abfa2ec88f4dca1fb5 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Mon, 14 Oct 2019 13:32:13 +1000 Subject: [PATCH 03/11] New version 1.9.1 Update files (libpcap.pc) --- .abf.yml | 4 +-- libpcap-1.8.1-error-include-libnl.patch | 22 ---------------- libpcap-1.8.1-lpthread.patch | 12 --------- ...ilib.patch => libpcap-1.9.1-multilib.patch | 25 +++++++++++++------ libpcap-man.patch | 12 --------- libpcap.spec | 15 ++++------- 6 files changed, 24 insertions(+), 66 deletions(-) delete mode 100644 libpcap-1.8.1-error-include-libnl.patch delete mode 100644 libpcap-1.8.1-lpthread.patch rename libpcap-multilib.patch => libpcap-1.9.1-multilib.patch (64%) delete mode 100644 libpcap-man.patch diff --git a/.abf.yml b/.abf.yml index 87171a8..ce81911 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - libpcap-1.8.1.tar.gz: 32d7526dde8f8a2f75baf40c01670602aeef7e39 - libpcap-1.8.1.tar.gz.sig: fa615314fc15ad4011f73aacf442f83fa037d661 + libpcap-1.9.1.tar.gz: 04d6e619defad5bb17af15f6d2304e79b649786c + libpcap-1.9.1.tar.gz.sig: d4a09d98f3aec7b19e4fe667c448e3cc83cd0ec1 diff --git a/libpcap-1.8.1-error-include-libnl.patch b/libpcap-1.8.1-error-include-libnl.patch deleted file mode 100644 index 61dfc4e..0000000 --- a/libpcap-1.8.1-error-include-libnl.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -453,10 +453,6 @@ - - incdir=-I/usr/include/libnl3 - libnldir= -- if test x$withval != x ; then -- libnldir=-L${withval}/lib/.libs -- incdir=-I${withval}/include -- fi - - # - # Try libnl 3.x first. -@@ -471,7 +467,7 @@ - AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x]) - AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE]) - AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api]) -- V_INCLS="$V_INCLS ${incdir}" -+ V_INCLS="${incdir} $V_INCLS" - have_any_nl="yes" - ],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 ) - diff --git a/libpcap-1.8.1-lpthread.patch b/libpcap-1.8.1-lpthread.patch deleted file mode 100644 index 3ce6f3a..0000000 --- a/libpcap-1.8.1-lpthread.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libpcap-1.8.1-orig/Makefile.in libpcap-1.8.1/Makefile.in ---- libpcap-1.8.1-orig/Makefile.in 2016-10-26 03:07:59.000000000 +0300 -+++ libpcap-1.8.1/Makefile.in 2017-02-03 02:10:18.946263843 +0300 -@@ -52,7 +52,7 @@ - DEFS = -DBUILDING_PCAP @DEFS@ @V_DEFS@ - ADDLOBJS = @ADDLOBJS@ - ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lpthread - CROSSFLAGS= - CFLAGS = @CFLAGS@ ${CROSSFLAGS} - LDFLAGS = @LDFLAGS@ ${CROSSFLAGS} diff --git a/libpcap-multilib.patch b/libpcap-1.9.1-multilib.patch similarity index 64% rename from libpcap-multilib.patch rename to libpcap-1.9.1-multilib.patch index 7eff7ed..fbc3bff 100644 --- a/libpcap-multilib.patch +++ b/libpcap-1.9.1-multilib.patch @@ -1,7 +1,16 @@ -diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in ---- libpcap/pcap-config.in.multilib 2011-11-23 14:28:54.580396515 +0100 -+++ libpcap/pcap-config.in 2011-11-23 14:36:47.408268484 +0100 -@@ -36,16 +36,6 @@ do +diff -urN libpcap-1.9.1/pcap-config.in libpcap-1.9.1-patched/pcap-config.in +--- libpcap-1.9.1/pcap-config.in 2019-10-01 00:38:32.000000000 +1000 ++++ libpcap-1.9.1-patched/pcap-config.in 2019-10-14 13:28:40.707338081 +1000 +@@ -11,8 +11,6 @@ + prefix="@prefix@" + exec_prefix="@exec_prefix@" + includedir="@includedir@" +-libdir="@libdir@" +-V_RPATH_OPT="@V_RPATH_OPT@" + LIBS="@LIBS@" + PACKAGE_NAME="@PACKAGE_NAME@" + +@@ -41,16 +39,6 @@ esac shift done @@ -18,7 +27,7 @@ diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in if [ "$static" = 1 ] then # -@@ -54,16 +44,16 @@ then +@@ -59,16 +47,16 @@ # if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] then @@ -39,11 +48,11 @@ diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in elif [ "$show_additional_libs" = 1 ] then echo "$LIBS" -@@ -75,15 +65,15 @@ else +@@ -80,15 +68,15 @@ # if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] then -- echo "-I$includedir -L$libdir $RPATH -lpcap" +- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME" + echo "-lpcap" elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] then @@ -55,7 +64,7 @@ diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in + echo "" elif [ "$show_libs" = 1 ] then -- echo "-L$libdir $RPATH -lpcap" +- echo "-L$libdir $RPATH -l$PACKAGE_NAME" + echo "-lpcap" fi fi diff --git a/libpcap-man.patch b/libpcap-man.patch deleted file mode 100644 index e37afbc..0000000 --- a/libpcap-man.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libpcap/pcap.3pcap.in.man libpcap/pcap.3pcap.in ---- libpcap/pcap.3pcap.in.man 2009-07-03 06:01:12.000000000 +0200 -+++ libpcap/pcap.3pcap.in 2009-07-03 15:00:12.000000000 +0200 -@@ -363,7 +363,7 @@ use an - script or some other configuration script to check whether the libpcap - 1.0 APIs are available and use them only if they are. - .SH SEE ALSO --autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8), -+autoconf(1), tcpdump(8), tcpslice(8), pcap-filter(@MAN_MISC_INFO@), pfconfig(8), - usermod(1M) - .SH AUTHORS - The original authors of libpcap are: diff --git a/libpcap.spec b/libpcap.spec index 13b8d85..418aa0c 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -6,17 +6,14 @@ Summary: A system-independent interface for user-level packet capture Name: libpcap -Version: 1.8.1 -Release: 4 +Version: 1.9.1 +Release: 1 License: BSD Group: System/Libraries Url: http://www.tcpdump.org/ Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz Source1: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz.sig -Patch0: libpcap-multilib.patch -Patch1: libpcap-man.patch -Patch2: libpcap-1.8.1-lpthread.patch -Patch3: libpcap-1.8.1-error-include-libnl.patch +Patch0: libpcap-1.9.1-multilib.patch BuildRequires: bison BuildRequires: flex %if %{with bluetooth} @@ -79,12 +76,13 @@ This package contains the development pcap library and its header files needed to compile applications such as tcpdump, etc. %files -n %{devname} -%doc README* CREDITS INSTALL.txt LICENSE CHANGES TODO +%doc README* CREDITS INSTALL.md LICENSE CHANGES TODO %{_bindir}/pcap-config %dir %{_includedir}/pcap %{_includedir}/pcap/*.h %{_includedir}/*.h %{_libdir}/libpcap.so +%{_libdir}/pkgconfig/libpcap.pc %{_mandir}/man1/pcap-config.1* %{_mandir}/man3/pcap* @@ -96,10 +94,7 @@ to compile applications such as tcpdump, etc. %build autoreconf -vfi -export CFLAGS="%{optflags} -fno-strict-aliasing" - %configure2_5x \ - --disable-static \ --enable-ipv6 \ %if %{with bluetooth} --enable-bluetooth \ From c0201a48a64c5e8ac07139e8e8e7e3cd6b22b21d Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sat, 4 Jan 2020 04:22:51 +0300 Subject: [PATCH 04/11] bot: rpm5 -> rpm4 (1) --- libpcap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpcap.spec b/libpcap.spec index 418aa0c..27fd287 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -94,7 +94,7 @@ to compile applications such as tcpdump, etc. %build autoreconf -vfi -%configure2_5x \ +%configure \ --enable-ipv6 \ %if %{with bluetooth} --enable-bluetooth \ @@ -106,7 +106,7 @@ autoreconf -vfi %install install -d %{buildroot}%{_bindir} -%makeinstall_std +%make_install # install additional headers install -m0644 pcap-int.h %{buildroot}%{_includedir}/ From 1e77c4c844e9e631caa5d884bd8d2bdc184628ee Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Sat, 4 Jan 2020 22:31:40 +0300 Subject: [PATCH 05/11] bot: rpm5 -> rpm4 (3) --- libpcap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpcap.spec b/libpcap.spec index 27fd287..bdb48a9 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -101,7 +101,7 @@ autoreconf -vfi %endif --with-pcap=linux -%make +%make_build %install install -d %{buildroot}%{_bindir} From 8975d7bddf47f12b0a1e5a264db3f16494a5cc90 Mon Sep 17 00:00:00 2001 From: NixTux Commit Bot Date: Mon, 13 Jan 2020 15:50:23 +0300 Subject: [PATCH 06/11] bot: rpm5 -> rpm4 (8) --- libpcap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpcap.spec b/libpcap.spec index bdb48a9..f8e3207 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -101,12 +101,12 @@ autoreconf -vfi %endif --with-pcap=linux -%make_build +%make %install install -d %{buildroot}%{_bindir} -%make_install +%makeinstall_std # install additional headers install -m0644 pcap-int.h %{buildroot}%{_includedir}/ From df0a4de8eb65bc5741d4db7b1df213e273078499 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Sat, 2 Jan 2021 18:33:43 +0000 Subject: [PATCH 07/11] version autoupdate [1.10.0] --- .abf.yml | 4 ++-- libpcap.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.abf.yml b/.abf.yml index ce81911..9fb90e3 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - libpcap-1.9.1.tar.gz: 04d6e619defad5bb17af15f6d2304e79b649786c - libpcap-1.9.1.tar.gz.sig: d4a09d98f3aec7b19e4fe667c448e3cc83cd0ec1 + libpcap-1.10.0.tar.gz: 3d8c1843ae4ea0d7871c8689b58508406e5743c9 + libpcap-1.10.0.tar.gz.sig: 6b1844a6234d32662d52d74136ba8306db538635 diff --git a/libpcap.spec b/libpcap.spec index f8e3207..d3ae194 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -6,7 +6,7 @@ Summary: A system-independent interface for user-level packet capture Name: libpcap -Version: 1.9.1 +Version: 1.10.0 Release: 1 License: BSD Group: System/Libraries From e9b27c198f46d6f52b110f548445f53ac09ca599 Mon Sep 17 00:00:00 2001 From: Andrey Grigorev Date: Wed, 11 Aug 2021 12:09:10 +0000 Subject: [PATCH 08/11] MassBuild#2340: Increase release tag --- libpcap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpcap.spec b/libpcap.spec index d3ae194..6b04232 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -7,7 +7,7 @@ Summary: A system-independent interface for user-level packet capture Name: libpcap Version: 1.10.0 -Release: 1 +Release: 2 License: BSD Group: System/Libraries Url: http://www.tcpdump.org/ From e17b08cf6f3f226e051ce241ba39377caffd8490 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Wed, 25 May 2022 21:22:27 +0000 Subject: [PATCH 09/11] version autoupdate [1.10.1] --- .abf.yml | 4 ++-- libpcap.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.abf.yml b/.abf.yml index 9fb90e3..b6c49c4 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - libpcap-1.10.0.tar.gz: 3d8c1843ae4ea0d7871c8689b58508406e5743c9 - libpcap-1.10.0.tar.gz.sig: 6b1844a6234d32662d52d74136ba8306db538635 + libpcap-1.10.1.tar.gz: 4343528176e0402cce807a09a97191069a1e3dd9 + libpcap-1.10.1.tar.gz.sig: 6b734289acfcbbf5c265b825c3ac6328b1553571 diff --git a/libpcap.spec b/libpcap.spec index 6b04232..779e869 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -6,8 +6,8 @@ Summary: A system-independent interface for user-level packet capture Name: libpcap -Version: 1.10.0 -Release: 2 +Version: 1.10.1 +Release: 1 License: BSD Group: System/Libraries Url: http://www.tcpdump.org/ From e1d898d3ce8e474572a8cc8550c610a5cb8c0748 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Fri, 24 Mar 2023 09:52:49 +1000 Subject: [PATCH 10/11] New version 1.10.3 --- .abf.yml | 3 +- libpcap-1.10.2-multilib.patch | 43 +++++++++++++++++++++ libpcap-1.9.1-multilib.patch | 70 ----------------------------------- libpcap.spec | 5 +-- 4 files changed, 46 insertions(+), 75 deletions(-) create mode 100644 libpcap-1.10.2-multilib.patch delete mode 100644 libpcap-1.9.1-multilib.patch diff --git a/.abf.yml b/.abf.yml index b6c49c4..5b59158 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,2 @@ sources: - libpcap-1.10.1.tar.gz: 4343528176e0402cce807a09a97191069a1e3dd9 - libpcap-1.10.1.tar.gz.sig: 6b734289acfcbbf5c265b825c3ac6328b1553571 + libpcap-1.10.3.tar.gz: 8c4bb621b044f01f060b68eb63ed0515780dca19 diff --git a/libpcap-1.10.2-multilib.patch b/libpcap-1.10.2-multilib.patch new file mode 100644 index 0000000..524977e --- /dev/null +++ b/libpcap-1.10.2-multilib.patch @@ -0,0 +1,43 @@ +--- libpcap-1.10.2/pcap-config.in.orig 2023-01-03 13:08:17.213734355 -0500 ++++ libpcap-1.10.2/pcap-config.in 2023-01-03 13:10:51.125222216 -0500 +@@ -111,16 +111,16 @@ then + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS" ++ echo "-l@PACKAGE_NAME@ $LIBS" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then +- echo "-I$includedir $LPATH $LIBS" ++ echo "$LIBS" + elif [ "$show_cflags" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_libs" = 1 ] + then +- echo "$LPATH -l@PACKAGE_NAME@ $LIBS" ++ echo "-l@PACKAGE_NAME@ $LIBS" + elif [ "$show_additional_libs" = 1 ] + then + echo "$LIBS" +@@ -138,15 +138,15 @@ else + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir $LPATH @RPATH@ -l@PACKAGE_NAME@" ++ echo "-l@PACKAGE_NAME@" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_cflags" = 1 ] + then +- echo "-I$includedir" ++ echo "" + elif [ "$show_libs" = 1 ] + then +- echo "$LPATH @RPATH@ -l@PACKAGE_NAME@" ++ echo "-l@PACKAGE_NAME@" + fi + fi diff --git a/libpcap-1.9.1-multilib.patch b/libpcap-1.9.1-multilib.patch deleted file mode 100644 index fbc3bff..0000000 --- a/libpcap-1.9.1-multilib.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -urN libpcap-1.9.1/pcap-config.in libpcap-1.9.1-patched/pcap-config.in ---- libpcap-1.9.1/pcap-config.in 2019-10-01 00:38:32.000000000 +1000 -+++ libpcap-1.9.1-patched/pcap-config.in 2019-10-14 13:28:40.707338081 +1000 -@@ -11,8 +11,6 @@ - prefix="@prefix@" - exec_prefix="@exec_prefix@" - includedir="@includedir@" --libdir="@libdir@" --V_RPATH_OPT="@V_RPATH_OPT@" - LIBS="@LIBS@" - PACKAGE_NAME="@PACKAGE_NAME@" - -@@ -41,16 +39,6 @@ - esac - shift - done --if [ "$V_RPATH_OPT" != "" ] --then -- # -- # If libdir isn't /usr/lib, add it to the run-time linker path. -- # -- if [ "$libdir" != "/usr/lib" ] -- then -- RPATH=$V_RPATH_OPT$libdir -- fi --fi - if [ "$static" = 1 ] - then - # -@@ -59,16 +47,16 @@ - # - if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] - then -- echo "-I$includedir -L$libdir -lpcap $LIBS" -+ echo "-lpcap @LIBS@" - elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] - then -- echo "-I$includedir -L$libdir $LIBS" -+ echo "@LIBS@" - elif [ "$show_cflags" = 1 ] - then -- echo "-I$includedir" -+ echo "" - elif [ "$show_libs" = 1 ] - then -- echo "-L$libdir -lpcap $LIBS" -+ echo "-lpcap @LIBS@" - elif [ "$show_additional_libs" = 1 ] - then - echo "$LIBS" -@@ -80,15 +68,15 @@ - # - if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] - then -- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME" -+ echo "-lpcap" - elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] - then -- echo "-I$includedir" -+ echo "" - elif [ "$show_cflags" = 1 ] - then -- echo "-I$includedir" -+ echo "" - elif [ "$show_libs" = 1 ] - then -- echo "-L$libdir $RPATH -l$PACKAGE_NAME" -+ echo "-lpcap" - fi - fi diff --git a/libpcap.spec b/libpcap.spec index 779e869..3653334 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -6,14 +6,13 @@ Summary: A system-independent interface for user-level packet capture Name: libpcap -Version: 1.10.1 +Version: 1.10.3 Release: 1 License: BSD Group: System/Libraries Url: http://www.tcpdump.org/ Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz -Source1: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz.sig -Patch0: libpcap-1.9.1-multilib.patch +Patch0: libpcap-1.10.2-multilib.patch BuildRequires: bison BuildRequires: flex %if %{with bluetooth} From 36f34a1731ca54e087a2653b66de21716c511739 Mon Sep 17 00:00:00 2001 From: Alexander Stefanov Date: Mon, 10 Apr 2023 14:09:50 +0000 Subject: [PATCH 11/11] version autoupdate [1.10.4] --- .abf.yml | 2 +- libpcap.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.abf.yml b/.abf.yml index 5b59158..8939942 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - libpcap-1.10.3.tar.gz: 8c4bb621b044f01f060b68eb63ed0515780dca19 + libpcap-1.10.4.tar.gz: 818cbe70179c73eebfe1038854665f33aac64245 diff --git a/libpcap.spec b/libpcap.spec index 3653334..ecd68a0 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -6,7 +6,7 @@ Summary: A system-independent interface for user-level packet capture Name: libpcap -Version: 1.10.3 +Version: 1.10.4 Release: 1 License: BSD Group: System/Libraries