diff --git a/0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch b/0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch index 6d7532c345fe6508f876cd34ec3c887a4cdbf4b7..a1e1344db436b06feec0a7e0ed73a5326e7fd0dd 100644 --- a/0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch +++ b/0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch @@ -9,11 +9,11 @@ Subject: [PATCH 3/4] pcap-linux: apparently ctc interfaces on s390 has 1 file changed, 4 insertions(+) diff --git a/pcap-linux.c b/pcap-linux.c -index 900ebbc..58292c3 100644 +index 878f27f..6917203 100644 --- a/pcap-linux.c +++ b/pcap-linux.c -@@ -3197,6 +3197,10 @@ activate_new(pcap_t *handle) - handle->linktype = DLT_LINUX_SLL; +@@ -2474,6 +2474,10 @@ activate_pf_packet(pcap_t *handle, int is_any_device) + } } + /* Hack to make things work on s390 ctc interfaces */ @@ -24,6 +24,5 @@ index 900ebbc..58292c3 100644 handle->errbuf); if (handlep->ifindex == -1) { -- -1.8.3.1 - +2.23.0 diff --git a/libpcap-1.10.1.tar.gz b/libpcap-1.10.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8833720642bbe78d8d86611242b8ab9c20572f3f Binary files /dev/null and b/libpcap-1.10.1.tar.gz differ diff --git a/libpcap.spec b/libpcap.spec index 2f1962709a7b2ecbd64750e90d2d5d9251132a33..0dbd063904553efc9918f1beacaf6690d6de936b 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,18 +1,14 @@ Name: libpcap Epoch: 14 -Version: 1.9.1 -Release: 6 +Version: 1.10.1 +Release: 1 Summary: A system-independent interface for user-level packet capture License: BSD with advertising URL: http://www.tcpdump.org Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz Patch0: 0003-pcap-linux-apparently-ctc-interfaces-on-s390-has-eth.patch -Patch1: clean-up-signed-vs-unsigned-do-more-error-checking-in-the-parser.patch -Patch2: fix-optimize-add-a-bunch-of-overflow-checks.patch -Patch3: 0611-With-MSVC-abort-if-_BitScanForward-returns-0.patch -Patch4: 0875-optimize-make-some-variables-unsigned.patch -Patch5: 0876-optimize-fix-some-of-those-changes.patch +Patch1: pcap-config-mitigate-multilib-conflict.patch BuildRequires: bison bluez-libs-devel flex gcc git glibc-kernheaders >= 2.2.0 @@ -63,6 +59,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{_mandir}/man* %changelog +* Fri Oct 15 2020 xinghe - 14:1.10.1-1 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:upgrade to 1.10.1 + * Fri Aug 07 2020 lunankun - 14:1.9.1-6 - Type:bugfix - ID:NA diff --git a/pcap-config-mitigate-multilib-conflict.patch b/pcap-config-mitigate-multilib-conflict.patch new file mode 100644 index 0000000000000000000000000000000000000000..4ae580542061b2be04f3f622ccfa47e8c238630f --- /dev/null +++ b/pcap-config-mitigate-multilib-conflict.patch @@ -0,0 +1,89 @@ +From 5b80ca39b1f01177e98c78bbc622dfda6f7a7e71 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Mon, 29 Sep 2014 08:27:15 +0200 +Subject: [PATCH 2/4] pcap-config: mitigate multilib conflict + +libdir path is different on 64bit and 32bit arches. Hence when installing both +multilib versions on the system yum complains about conflicting pcap-config +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 54ca42f..830a6c7 100644 +--- a/pcap-config.in ++++ b/pcap-config.in +@@ -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@" +@@ -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 + # + 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 +69,15 @@ else + # + 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 +-- +1.8.3.1 +