diff --git a/backport-pcap-config-mitigate-multilib-conflict.patch b/backport-pcap-config-mitigate-multilib-conflict.patch index 8b6b420ba3d66c58be121b4b8a95d12eb7c28d77..022fcd94056898db1fd25cf69741220e2066e79b 100644 --- a/backport-pcap-config-mitigate-multilib-conflict.patch +++ b/backport-pcap-config-mitigate-multilib-conflict.patch @@ -9,48 +9,32 @@ file. Hence remove libdir references from pcap-config, libdir is in dynamic linker path anyway. + --- pcap-config.in | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/pcap-config.in b/pcap-config.in -index 206be3b..75f2c9f 100644 +index 6039ef3..72297bf 100644 --- a/pcap-config.in +++ b/pcap-config.in -@@ -7,7 +7,6 @@ +@@ -11,7 +11,6 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" includedir="@includedir@" -libdir="@libdir@" - V_RPATH_OPT="@V_RPATH_OPT@" LIBS="@LIBS@" - PACKAGE_NAME="@PACKAGE_NAME@" -@@ -36,16 +35,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 - # -@@ -54,16 +43,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 "-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 "-I$includedir $LPATH $LIBS_STATIC" + echo "@LIBS@" elif [ "$show_cflags" = 1 ] then @@ -58,20 +42,20 @@ index 206be3b..75f2c9f 100644 + echo "" elif [ "$show_libs" = 1 ] then -- echo "-L$libdir -lpcap $LIBS" +- echo "$LPATH -l@PACKAGE_NAME@ $LIBS_STATIC" + echo "-lpcap @LIBS@" elif [ "$show_additional_libs" = 1 ] then - echo "$LIBS" -@@ -75,15 +64,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 "-I$includedir $LPATH -l@PACKAGE_NAME@ $LIBS" + echo "-lpcap" elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] then -- echo "-I$includedir" +- echo "-I$includedir $LPATH $LIBS" + echo "" elif [ "$show_cflags" = 1 ] then @@ -79,10 +63,9 @@ index 206be3b..75f2c9f 100644 + echo "" elif [ "$show_libs" = 1 ] then -- echo "-L$libdir $RPATH -l$PACKAGE_NAME" +- echo "$LPATH -l@PACKAGE_NAME@ $LIBS" + echo "-lpcap" - fi - fi --- -1.8.3.1 - + elif [ "$show_additional_libs" = 1 ] + then + echo "$LIBS" +-- diff --git a/libpcap-1.10.1-sw.patch b/libpcap-1.10.1-sw.patch old mode 100755 new mode 100644 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 234f8539371a54f6df82cea9db4d343bf72d91d6..498ae5919df414ec9b0613fe59f00d32bab7ee20 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 with advertising URL: http://www.tcpdump.org @@ -11,7 +11,7 @@ Patch0: backport-0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-e Patch1: backport-pcap-config-mitigate-multilib-conflict.patch Patch2: libpcap-1.10.1-sw.patch -BuildRequires: bison flex gcc git glibc-kernheaders >= 2.2.0 +BuildRequires: make bison flex gcc git glibc-kernheaders >= 2.2.0 %ifnarch i686 BuildRequires: bluez-devel @@ -64,6 +64,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{_mandir}/man* %changelog +* Mon Feb 06 2023 xinghe - 14:1.10.3-1 +- Type:requirements +- ID:NA +- SUG:NA +- DESC:update libpcap to 1.10.3 + * Thu Jul 28 2022 wuzx - 14:1.10.1-3 - add sw64 patch