diff --git a/libpcap.spec b/libpcap.spec index be61c9f6e2f2fddd88ead37e6453df1253722301..7f62b6283766987f4ac6976fdf24c42936d3f14f 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,7 +1,7 @@ Name: libpcap Epoch: 14 Version: 1.9.1 -Release: 6 +Release: 7 Summary: A system-independent interface for user-level packet capture License: BSD with advertising URL: http://www.tcpdump.org @@ -13,6 +13,7 @@ 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 +Patch6: pcap-config-mitigate-multilib-conflict.patch BuildRequires: bison bluez-libs-devel flex gcc git glibc-kernheaders >= 2.2.0 @@ -63,6 +64,12 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{_mandir}/man* %changelog +* Sat Nov 28 2020 xiaqirong - 14:1.9.1-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:mitigate pcap config multilib conflict + * 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..c33f557ae24153cfc82ca438553d5b8f0dee7099 --- /dev/null +++ b/pcap-config-mitigate-multilib-conflict.patch @@ -0,0 +1,87 @@ +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 206be3b..75f2c9f 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