Merge branch 'rosa2019.1' into rosa2019.0

.abf.yml

@@ -1,3 +1,3 @@
 sources:
-  libpcap-1.8.1.tar.gz: 32d7526dde8f8a2f75baf40c01670602aeef7e39
-  libpcap-1.8.1.tar.gz.sig: fa615314fc15ad4011f73aacf442f83fa037d661
+  libpcap-1.9.1.tar.gz: 04d6e619defad5bb17af15f6d2304e79b649786c
+  libpcap-1.9.1.tar.gz.sig: d4a09d98f3aec7b19e4fe667c448e3cc83cd0ec1

libpcap-1.8.1-error-include-libnl.patch

@@ -1,22 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -453,10 +453,6 @@
- 
-                 incdir=-I/usr/include/libnl3
-                 libnldir=
--                if test x$withval != x ; then
--                  libnldir=-L${withval}/lib/.libs
--                  incdir=-I${withval}/include
--                fi
- 
- 		#
- 		# Try libnl 3.x first.
-@@ -471,7 +467,7 @@
- 			AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
- 			AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
- 			AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
--			V_INCLS="$V_INCLS ${incdir}"
-+			V_INCLS="${incdir} $V_INCLS"
- 			have_any_nl="yes"
- 		],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
- 

libpcap-1.8.1-lpthread.patch

@@ -1,12 +0,0 @@
-diff -Naur libpcap-1.8.1-orig/Makefile.in libpcap-1.8.1/Makefile.in
---- libpcap-1.8.1-orig/Makefile.in	2016-10-26 03:07:59.000000000 +0300
-+++ libpcap-1.8.1/Makefile.in	2017-02-03 02:10:18.946263843 +0300
-@@ -52,7 +52,7 @@
- DEFS = -DBUILDING_PCAP @DEFS@ @V_DEFS@
- ADDLOBJS = @ADDLOBJS@
- ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lpthread
- CROSSFLAGS=
- CFLAGS = @CFLAGS@   ${CROSSFLAGS}
- LDFLAGS = @LDFLAGS@ ${CROSSFLAGS}

libpcap-1.9.1-multilib.patch

@@ -1,7 +1,16 @@
-diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
---- libpcap/pcap-config.in.multilib	2011-11-23 14:28:54.580396515 +0100
-+++ libpcap/pcap-config.in	2011-11-23 14:36:47.408268484 +0100
-@@ -36,16 +36,6 @@ do
+diff -urN libpcap-1.9.1/pcap-config.in libpcap-1.9.1-patched/pcap-config.in
+--- libpcap-1.9.1/pcap-config.in	2019-10-01 00:38:32.000000000 +1000
++++ libpcap-1.9.1-patched/pcap-config.in	2019-10-14 13:28:40.707338081 +1000
+@@ -11,8 +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 +39,6 @@
  	esac
  	shift
  done
@@ -18,7 +27,7 @@ diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
  if [ "$static" = 1 ]
  then
  	#
-@@ -54,16 +44,16 @@ then
+@@ -59,16 +47,16 @@
  	#
  	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
  	then
@@ -39,11 +48,11 @@ diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
  	elif [ "$show_additional_libs" = 1 ]
  	then
  		echo "$LIBS"
-@@ -75,15 +65,15 @@ else
+@@ -80,15 +68,15 @@
  	#
  	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
  	then
--		echo "-I$includedir -L$libdir $RPATH -lpcap"
+-		echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
 +		echo "-lpcap"
  	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
  	then
@@ -55,7 +64,7 @@ diff -up libpcap/pcap-config.in.multilib libpcap/pcap-config.in
 +		echo ""
  	elif [ "$show_libs" = 1 ]
  	then
--		echo "-L$libdir $RPATH -lpcap"
+-		echo "-L$libdir $RPATH -l$PACKAGE_NAME"
 +		echo "-lpcap"
  	fi
  fi

libpcap-man.patch

@@ -1,12 +0,0 @@
-diff -up libpcap/pcap.3pcap.in.man libpcap/pcap.3pcap.in
---- libpcap/pcap.3pcap.in.man	2009-07-03 06:01:12.000000000 +0200
-+++ libpcap/pcap.3pcap.in	2009-07-03 15:00:12.000000000 +0200
-@@ -363,7 +363,7 @@ use an
- script or some other configuration script to check whether the libpcap
- 1.0 APIs are available and use them only if they are.
- .SH SEE ALSO
--autoconf(1), tcpdump(1), tcpslice(1), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
-+autoconf(1), tcpdump(8), tcpslice(8), pcap-filter(@MAN_MISC_INFO@), pfconfig(8),
- usermod(1M)
- .SH AUTHORS
- The original authors of libpcap are:

libpcap.spec

@@ -6,17 +6,14 @@
 
 Summary:	A system-independent interface for user-level packet capture
 Name:		libpcap
-Version:	1.8.1
-Release:	5
+Version:	1.9.1
+Release:	1
 License:	BSD
 Group:		System/Libraries
 Url:		http://www.tcpdump.org/
 Source0:	http://www.tcpdump.org/release/%{name}-%{version}.tar.gz
 Source1:	http://www.tcpdump.org/release/%{name}-%{version}.tar.gz.sig
-Patch0:		libpcap-multilib.patch
-Patch1:		libpcap-man.patch
-Patch2:		libpcap-1.8.1-lpthread.patch
-Patch3:		libpcap-1.8.1-error-include-libnl.patch
+Patch0:		libpcap-1.9.1-multilib.patch
 BuildRequires:	bison
 BuildRequires:	flex
 %if %{with bluetooth}
@@ -79,12 +76,13 @@ This package contains the development pcap library and its header files needed
 to compile applications such as tcpdump, etc.
 
 %files -n %{devname}
-%doc README* CREDITS INSTALL.txt LICENSE CHANGES TODO
+%doc README* CREDITS INSTALL.md LICENSE CHANGES TODO
 %{_bindir}/pcap-config
 %dir %{_includedir}/pcap
 %{_includedir}/pcap/*.h
 %{_includedir}/*.h
 %{_libdir}/libpcap.so
+%{_libdir}/pkgconfig/libpcap.pc
 %{_mandir}/man1/pcap-config.1*
 %{_mandir}/man3/pcap*
 
@@ -96,10 +94,7 @@ to compile applications such as tcpdump, etc.
 
 %build
 autoreconf -vfi
-export CFLAGS="%{optflags} -fno-strict-aliasing"
-
 %configure2_5x \
-	--disable-static \
 	--enable-ipv6 \
 %if %{with bluetooth}
 	--enable-bluetooth \