diff --git a/.gitignore b/.gitignore index d990f8f..1047b5e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ libpcap-1.1.1.tar.gz /libpcap-1.9.1.tar.gz /libpcap-1.10.0.tar.gz /libpcap-1.10.1.tar.gz +/libpcap-1.10.2.tar.gz diff --git a/0001-man-tcpdump-and-tcpslice-have-manpages-in-man8.patch b/0001-man-tcpdump-and-tcpslice-have-manpages-in-man8.patch index 51c9aae..7b5e87c 100644 --- a/0001-man-tcpdump-and-tcpslice-have-manpages-in-man8.patch +++ b/0001-man-tcpdump-and-tcpslice-have-manpages-in-man8.patch @@ -21,7 +21,7 @@ index 492c227..46a2a4b 100644 -.BR tcpslice (1), +.BR tcpdump (8), +.BR tcpslice (8), - .BR pcap-filter (@MAN_MISC_INFO@), + .BR \%pcap-filter (@MAN_MISC_INFO@), .BR pfconfig (8), .BR usermod (@MAN_ADMIN_COMMANDS@) -- diff --git a/0002-pcap-config-mitigate-multilib-conflict.patch b/0002-pcap-config-mitigate-multilib-conflict.patch index 8b6b420..f02dcb7 100644 --- a/0002-pcap-config-mitigate-multilib-conflict.patch +++ b/0002-pcap-config-mitigate-multilib-conflict.patch @@ -22,35 +22,18 @@ index 206be3b..75f2c9f 100644 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 - # + LIBS_STATIC="@LIBS_STATIC@" + @@ -54,16 +43,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 +41,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" + echo "$LIBS_STATIC" @@ -75,15 +64,15 @@ else # 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 +62,10 @@ 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 + elif [ "$show_additional_libs" = 1 ] + then -- 1.8.3.1 diff --git a/libpcap.spec b/libpcap.spec index ca57e76..76e055b 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -1,7 +1,7 @@ Name: libpcap Epoch: 14 -Version: 1.10.1 -Release: 4%{?dist} +Version: 1.10.2 +Release: 1%{?dist} Summary: A system-independent interface for user-level packet capture License: BSD with advertising URL: https://www.tcpdump.org/ @@ -92,6 +92,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libpcap.a %{_mandir}/man5/pcap*.5* %changelog +* Tue Jan 03 2023 Michal Ruprich - 14:1.10.2-1 +- New version 1.10.2 + * Thu Jul 21 2022 Fedora Release Engineering - 14:1.10.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 4ffc124..5aa611c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpcap-1.10.1.tar.gz) = 56c314f19c2b857742bf8abcb1e78066986aaa95cec339b75a3c8b70a9fa2b5167da98708352f9ec97a1cea2700cfb4e040bda108d58ac46cec9b7deab88d171 +SHA512 (libpcap-1.10.2.tar.gz) = ccacebf367db44ab74e588f88a4fd7cd82c58e478e6c35414ae36df58fb06d85d542597485b1d1393edfaacc2bc5d35578b7b87fee4965f6dfde10a03d2ddd32