diff --git a/libpcap-1.10.1.tar.gz b/libpcap-1.10.1.tar.gz deleted file mode 100644 index 8833720642bbe78d8d86611242b8ab9c20572f3f..0000000000000000000000000000000000000000 Binary files a/libpcap-1.10.1.tar.gz and /dev/null differ diff --git a/libpcap-1.10.3.tar.gz b/libpcap-1.10.3.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..6c0ae61161d15dd08b938becf4b99fadeddb0425 Binary files /dev/null and b/libpcap-1.10.3.tar.gz differ diff --git a/libpcap.spec b/libpcap.spec index 745e70eb58575d94b42b20534eda50bbf0268463..5c834b4fee1aef54fd1e9da2a408773abd595532 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,7 +1,7 @@ Name: libpcap Epoch: 14 -Version: 1.10.1 -Release: 3 +Version: 1.10.3 +Release: 1 Summary: A system-independent interface for user-level packet capture License: BSD URL: http://www.tcpdump.org @@ -11,7 +11,7 @@ Patch0: 0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch Patch1: pcap-config-mitigate-multilib-conflict.patch Patch2: libpcap-Add-sw64-architecture.patch -BuildRequires: bison flex gcc glibc-kernheaders >= 2.2.0 +BuildRequires: make bison flex gcc glibc-kernheaders >= 2.2.0 %ifnarch i686 BuildRequires: bluez-libs-devel @@ -64,6 +64,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{_mandir}/man* %changelog +* Tue Jan 31 2023 xinghe - 14:1.10.3-1 +- Type:requirements +- ID:NA +- SUG:NA +- DESC:update libpcap to 1.10.3 + * Mon Nov 7 2022 wuzx - 14:1.10.1-3 - Type:feature - CVE:NA diff --git a/pcap-config-mitigate-multilib-conflict.patch b/pcap-config-mitigate-multilib-conflict.patch index 4ae580542061b2be04f3f622ccfa47e8c238630f..022fcd94056898db1fd25cf69741220e2066e79b 100644 --- a/pcap-config-mitigate-multilib-conflict.patch +++ b/pcap-config-mitigate-multilib-conflict.patch @@ -15,7 +15,7 @@ path anyway. 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/pcap-config.in b/pcap-config.in -index 54ca42f..830a6c7 100644 +index 6039ef3..72297bf 100644 --- a/pcap-config.in +++ b/pcap-config.in @@ -11,7 +11,6 @@ @@ -23,67 +23,49 @@ index 54ca42f..830a6c7 100644 exec_prefix="@exec_prefix@" includedir="@includedir@" -libdir="@libdir@" - V_RPATH_OPT="@V_RPATH_OPT@" LIBS="@LIBS@" - PACKAGE_NAME="@PACKAGE_NAME@" -@@ -41,16 +40,6 @@ do - 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 +48,16 @@ then + LIBS_STATIC="@LIBS_STATIC@" + VERSION="@PACKAGE_VERSION@" +@@ -90,16 +89,16 @@ then # if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] then -- echo "-I$includedir -L$libdir -lpcap $LIBS" -+ echo "-lpcap @LIBS@" +- echo "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS_STATIC" ++ echo "-lpcap @LIBS@" elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] then -- echo "-I$includedir -L$libdir $LIBS" -+ echo "@LIBS@" +- echo "-I$includedir $LPATH $LIBS_STATIC" ++ echo "@LIBS@" elif [ "$show_cflags" = 1 ] then - echo "-I$includedir" -+ echo "" ++ echo "" elif [ "$show_libs" = 1 ] then -- echo "-L$libdir -lpcap $LIBS" -+ echo "-lpcap @LIBS@" +- echo "$LPATH -l@PACKAGE_NAME@ $LIBS_STATIC" ++ echo "-lpcap @LIBS@" elif [ "$show_additional_libs" = 1 ] then - echo "$LIBS" -@@ -80,15 +69,15 @@ else + echo "$LIBS_STATIC" +@@ -117,16 +116,16 @@ then # if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] then -- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME" -+ echo "-lpcap" +- echo "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS" ++ echo "-lpcap" elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] then -- echo "-I$includedir" -+ echo "" +- echo "-I$includedir $LPATH $LIBS" ++ echo "" elif [ "$show_cflags" = 1 ] then - echo "-I$includedir" -+ echo "" ++ echo "" elif [ "$show_libs" = 1 ] then -- echo "-L$libdir $RPATH -l$PACKAGE_NAME" -+ echo "-lpcap" - fi - fi --- -1.8.3.1 - +- echo "$LPATH -l@PACKAGE_NAME@ $LIBS" ++ echo "-lpcap" + elif [ "$show_additional_libs" = 1 ] + then + echo "$LIBS" +--