Merge ~sergiodj/ubuntu/+source/libpcap:bug1865501-pkg-config into ubuntu/+source/libpcap:ubuntu/bionic-devel

[Sergio Durigan Junior]

Users of libpcap cannot make use of its pkg-config file in order to automate the building process of applications that use the library, because the file is not being installed on Ubuntu bionic.

To reproduce the problem, one can do:

$ lxc launch ubuntu-daily:bionic libpcap-bug1865501
$ lxc shell libpcap-bug1865501
# apt update
# apt install libpcap-dev pkg-config -y
# pkg-config libpcap --libs

You will see an error like this:

Package libpcap was not found in the pkg-config search path.
Perhaps you should add the directory containing `libpcap.pc'
to the PKG_CONFIG_PATH environment variable
No package 'libpcap' found

The fix for this problem seems simple at the beginning: just install the .pc file and be done with it. However, bionic's version of the package doesn't have the .pc file, so I needed to backport the upstream patch that created the file. Then, I noticed that some variables (like PACKAGE_NAME) were not being expanded in the libpcap.pc.in template, so I had to chase and backport the upstream patches that correctly set these variables in the configure.ac. All in all, I had to backport 3 relatively simple upstream patches.

Then, the actual fix came from the Debian package:

https://salsa.debian.org/rfrancoise/libpcap/-/commit/580102f990009a7cb74cf94a5538b41c90ee0f3e
https://salsa.debian.org/rfrancoise/libpcap/-/commit/a0f1ea6e96c692ce69fab0fb2ee3a1fcbab3d258

The first commit didn't need to be cherry-picked because it was already applied; only the second commit was necessary.

There is a PPA with the proposed fix here:

https://launchpad.net/~sergiodj/+archive/ubuntu/libpcap-bug1865501

There are no dep8 tests. To test, I cloned and built the package mentioned by the reporter, which uses libpcap. You can do this inside the lxd container you set up above:

# git clone https://github.com/nhorman/dropwatch
# cd dropwatch
# ./autogen.sh && ./configure && make

[Christian Ehrhardt  (paelzer)]

Thanks for identifying the configure/make changes needed to get this working Sergio.
The changelog looks well.
The build log has a few warnings, but not related to your change.
The PPA works as intended and shows no other impact.

I double checked the backported patches for potential side-effects but found none \o/.
Never the less the config changes make this way more noisy and intrusive than I'd have hoped :-/

In the review I learned that libpcap had another - non standard - way to provide this data already.
=> /usr/bin/pcap-config
This was retained going forward for compatibility:
Focal:
$ $ pcap-config --static --additional-libs --libs --cflags
-I/usr/include -lpcap
Bionic:
root@b:~# pcap-config --static --libs --cflags --additional-libs
-I/usr/include -lpcap
Bionic + PPA:
root@b:~# pcap-config --static --libs --cflags --additional-libs
-I/usr/include -lpcap

+1 for the review on this.

Let us see what the SRU Team thinks of "more intrusive than we hoped" + "there is a (non standard) alternative". Both arguments against the SRU, but no clear show stoppers.

review: Approve

[Sergio Durigan Junior (sergiodj)]

On Tuesday, June 30 2020, Christian Ehrhardt  wrote:

> Thanks for identifying the configure/make changes needed to get this working Sergio.
> The changelog looks well.
> The build log has a few warnings, but not related to your change.
> The PPA works as intended and shows no other impact.
>
> I double checked the backported patches for potential side-effects but found none \o/.
> Never the less the config changes make this way more noisy and intrusive than I'd have hoped :-/

Thanks for the review, Christian!

Indeed, I was also negatively surprised when I noticed that I'd need to
backport more than the trivial libpcap.pc.in change in order to make
this work.

> In the review I learned that libpcap had another - non standard - way to provide this data already.
> => /usr/bin/pcap-config
> This was retained going forward for compatibility:
> Focal:
> $ $ pcap-config --static --additional-libs --libs --cflags
> -I/usr/include -lpcap
> Bionic:
> root@b:~# pcap-config --static --libs --cflags --additional-libs
> -I/usr/include -lpcap
> Bionic + PPA:
> root@b:~# pcap-config --static --libs --cflags --additional-libs
> -I/usr/include -lpcap

Ah, that's correct, thanks for pointing it out! As you can see, part of
the changes I backported even patched the pcap-config script.

> +1 for the review on this.
>
> Let us see what the SRU Team thinks of "more intrusive than we hoped" + "there is a (non standard) alternative". Both arguments against the SRU, but no clear show stoppers.

Yep, fingers crossed.

As you said, pcap-config is non-standard, and, as far I have seen, not
really well documented, which explains why this bug was filed. Let's
hope the SRU team considers this justification sufficient :-).

Thanks again!

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

[Christian Ehrhardt  (paelzer)]

Yeah so it is a valid change but maybe a bit too much for SRU - let's see what the SRU Team thinks.
Sponsored

To ssh://git.launchpad.net/ubuntu/+source/libpcap
 * [new tag] upload/1.8.1-6ubuntu1.18.04.2 -> upload/1.8.1-6ubuntu1.18.04.2

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libpcap_1.8.1-6ubuntu1.18.04.2.dsc: done.
  Uploading libpcap_1.8.1-6ubuntu1.18.04.2.debian.tar.xz: done.
  Uploading libpcap_1.8.1-6ubuntu1.18.04.2_source.buildinfo: done.
  Uploading libpcap_1.8.1-6ubuntu1.18.04.2_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

@Sergio - Do you know what happened here?

It is not in Bionic unapproved
https://launchpad.net/ubuntu/bionic/+queue?queue_state=1&queue_text=

Nor is it in proposed/released:
 libpcap | 1.8.1-6ubuntu1 | bionic | source
 libpcap | 1.8.1-6ubuntu1.18.04.1 | bionic-security | source
 libpcap | 1.8.1-6ubuntu1.18.04.1 | bionic-updates | source

Nor is there a denial by the SRU team on the bug.

I have copied my uploads log here which looked good 25 days ago - I'm puzzled.

Re-trying:
 ! [rejected] upload/1.8.1-6ubuntu1.18.04.2 -> upload/1.8.1-6ubuntu1.18.04.2 (already exists)
(as expected)

Again uploaded:
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libpcap_1.8.1-6ubuntu1.18.04.2.dsc: done.
  Uploading libpcap_1.8.1-6ubuntu1.18.04.2.debian.tar.xz: done.
  Uploading libpcap_1.8.1-6ubuntu1.18.04.2_source.buildinfo: done.
  Uploading libpcap_1.8.1-6ubuntu1.18.04.2_source.changes: done.
Successfully uploaded packages.

Need to check the feedback mail to that upload later ...

[Christian Ehrhardt  (paelzer)]

I see it in bionic-unapproved now, if you happen to know what this was please enlight me ...

[Sergio Durigan Junior (sergiodj)]

On Tuesday, July 28 2020, Christian Ehrhardt  wrote:

> I see it in bionic-unapproved now, if you happen to know what this was please enlight me ...

Thanks for looking into this, Christian. I have no idea what happened;
I assumed the upload was waiting to be reviewed by the SRU team (it was
one of the uploads I mentioned yesterday during the call). I apologize
for not checking bionic-unapproved; I guess I didn't know about it.

Anyway, thanks for making sure this is in the right state to be reviewed
by the SRU team.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

diff --git a/debian/changelog b/debian/changelog
index 6d2d86d..87bdeac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+libpcap (1.8.1-6ubuntu1.18.04.2) bionic; urgency=medium
+
+  * Install pkg-config file for libpcap (LP: #1865501).
+    - d/p/set-package-name-with-ac-init.patch: Set the PACKAGE_NAME
+      variable using autoconf's AC_INIT macro, so that we can use it
+      in the libpcap.pc.in file.
+    - d/p/use-m4-macro-to-get-version.patch: Use an M4 macro to
+      execute a "cat" command and obtain the version from the VERSION
+      file.
+    - d/p/install-pkg-config-file.patch: New patch from upstream,
+      which creates a libpcap.pc.in file and adjusts the Makefile to
+      install it.
+    - d/libpcap0.8-dev.install: Install libpcap.pc pkg-config file.
+      Thanks to Luca Boccassi for the Debian patch (Closes #922219).
+
+ -- Sergio Durigan Junior <[e-mail]>  Mon, 29 Jun 2020 17:49:04 -0400
+
 libpcap (1.8.1-6ubuntu1.18.04.1) bionic-security; urgency=medium
 
   * SECURITY UPDATE: pcapng reading buffer over-read.
diff --git a/debian/libpcap0.8-dev.install b/debian/libpcap0.8-dev.install
index 09f7c61..d4bd144 100644
--- a/debian/libpcap0.8-dev.install
+++ b/debian/libpcap0.8-dev.install
@@ -2,4 +2,5 @@ usr/bin
 usr/include/pcap*
 usr/lib/*/libpcap.a
 usr/lib/*/libpcap.so
+usr/lib/*/pkgconfig/libpcap.pc
 usr/share/man
diff --git a/debian/patches/install-pkg-config-file.patch b/debian/patches/install-pkg-config-file.patch
 new file mode 100644
index 0000000..b774ba6
--- /dev/null
+++ b/debian/patches/install-pkg-config-file.patch
@@ -0,0 +1,137 @@
+From: Guy Harris <[e-mail]>
+Date: Wed, 25 Apr 2018 17:22:45 -0700
+Subject: Add a pkg-config .pc file for libpcap.
+
+Addresses GitHub issue #374.
+
+Author: Guy Harris <[e-mail]>
+Origin: backport, https://github.com/the-tcpdump-group/libpcap/commit/a7deb6a241f8c71ca261adc45ac07c8427074792
+Bug: https://github.com/the-tcpdump-group/libpcap/issues/374
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libpcap/+bug/1865501
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+Last-Update: 2020-06-29
+---
+ Makefile.in   | 28 +++++++++++++++++++++-------
+ libpcap.pc.in | 18 ++++++++++++++++++
+ 2 files changed, 39 insertions(+), 7 deletions(-)
+ create mode 100644 libpcap.pc.in
+
+diff --git a/Makefile.in b/Makefile.in
+index d8562f1..44b9274 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -171,7 +171,7 @@ TAGFILES = \
+ 
+ CLEANFILES = $(OBJ) libpcap.* $(TESTS) \
+ 	$(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
+-	lex.yy.c pcap-config $(OBJ_PIC)
++	lex.yy.c pcap-config libpcap.pc $(OBJ_PIC)
+ 
+ MAN1 = pcap-config.1
+ 
+@@ -300,6 +300,7 @@ EXTRA_DIST = \
+ 	lbl/os-solaris2.h \
+ 	lbl/os-sunos4.h \
+ 	lbl/os-ultrix4.h \
++	libpcap.pc.in \
+ 	missing/getopt.c \
+ 	missing/getopt.h \
+ 	missing/snprintf.c \
+@@ -372,7 +373,7 @@ EXTRA_DIST = \
+ 	Win32/Prj/wpcap.vcxproj \
+ 	Win32/Prj/wpcap.vcxproj.filters
+ 
+-all: libpcap.a shared pcap-config
++all: libpcap.a shared libpcap.pc pcap-config
+ 
+ libpcap.a: $(OBJ)
+ 	@rm -f $@
+@@ -536,7 +537,7 @@ bpf_filter_pic.o: bpf_filter.c
+ 	$(CC) -fPIC $(FULL_CFLAGS) -c bpf_filter.c -o $@
+ 
+ #
+-# Generate the pcap-config script.
++# Generate the libpcap.pc file.
+ #
+ # Some Makes, e.g. AIX Make and Solaris Make, can't handle "--file=$@.tmp:$<";
+ # for example, the Solaris 9 make man page says
+@@ -547,7 +548,16 @@ bpf_filter_pic.o: bpf_filter.c
+ #
+ # and this is an explicit target entry.
+ #
+-# Therefore, instead of using $<, we explicitly put in $(srcdir)/pcap-config.in.
++# Therefore, instead of using $<, we explicitly put in $(srcdir)/libpcap.pc.in.
++#
++libpcap.pc: $(srcdir)/libpcap.pc.in ./config.status
++	@rm -f $@ $@.tmp
++	./config.status --file=$@.tmp:$(srcdir)/libpcap.pc.in
++	mv $@.tmp $@
++	chmod a+x $@
++
++#
++# Generate the pcap-config script.  See above.
+ #
+ pcap-config: $(srcdir)/pcap-config.in ./config.status
+ 	@rm -f $@ $@.tmp
+@@ -584,7 +594,7 @@ selpolltest: tests/selpolltest.c libpcap.a
+ valgrindtest: tests/valgrindtest.c libpcap.a
+ 	$(CC) $(FULL_CFLAGS) -I. -L. -o valgrindtest $(srcdir)/tests/valgrindtest.c libpcap.a $(LIBS)
+ 
+-install: install-shared install-archive pcap-config
++install: install-shared install-archive libpcap.pc pcap-config
+ 	[ -d $(DESTDIR)$(libdir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
+ 	[ -d $(DESTDIR)$(includedir) ] || \
+@@ -605,6 +615,9 @@ install: install-shared install-archive pcap-config
+ 	[ -d $(DESTDIR)$(bindir) ] || \
+ 	    (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir))
+ 	$(INSTALL_PROGRAM) pcap-config $(DESTDIR)$(bindir)/pcap-config
++	[ -d $(DESTDIR)$(libdir)/pkgconfig ] || \
++	    (mkdir -p $(DESTDIR)$(libdir)/pkgconfig; chmod 755 $(DESTDIR)$(libdir)/pkgconfig)
++	$(INSTALL_DATA) libpcap.pc $(DESTDIR)$(libdir)/pkgconfig/libpcap.pc
+ 	for i in $(MAN1); do \
+ 		$(INSTALL_DATA) $(srcdir)/$$i \
+ 		    $(DESTDIR)$(mandir)/man1/$$i; done
+@@ -708,6 +721,7 @@ uninstall: uninstall-shared
+ 	for i in $(PUBHDR); do \
+ 		rm -f $(DESTDIR)$(includedir)/$$i; done
+ 	-rmdir $(DESTDIR)$(includedir)/pcap
++	rm -f $(DESTDIR)/$(libdir)/pkgconfig/libpcap.pc
+ 	rm -f $(DESTDIR)/$(bindir)/pcap-config
+ 	for i in $(MAN1); do \
+ 		rm -f $(DESTDIR)$(mandir)/man1/$$i; done
+@@ -760,8 +774,8 @@ clean:
+ 
+ distclean: clean
+ 	rm -f Makefile config.cache config.log config.status \
+-	    config.h gnuc.h net os-proto.h bpf_filter.c pcap-config \
+-	    stamp-h stamp-h.in
++	    config.h gnuc.h net os-proto.h bpf_filter.c libpcap.pc \
++	    pcap-config stamp-h stamp-h.in
+ 	rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=)
+ 	rm -rf autom4te.cache
+ 
+diff --git a/libpcap.pc.in b/libpcap.pc.in
+new file mode 100644
+index 0000000..d74cbc5
+--- /dev/null
++++ b/libpcap.pc.in
+@@ -0,0 +1,18 @@
++#
++# pkg-config file for libpcap.
++#
++# These variables come from the configure script, so includedir and
++# libdir may be defined in terms of prefix and exec_prefix, so the
++# latter must be defined as well.
++#
++prefix="@prefix@"
++exec_prefix="@exec_prefix@"
++includedir="@includedir@"
++libdir="@libdir@"
++
++Name: libpcap
++Description: Platform-independent network traffic capture library
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -l@PACKAGE_NAME@
++Libs.private: @LIBS@
++Cflags: -I${includedir}
diff --git a/debian/patches/series b/debian/patches/series
index 6f38ebf..c09da53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,6 @@ pcap-config.diff
 0001-Revert-Add-file-capture-length-sanity-check-for-pcap.patch
 CVE-2019-15165-1.patch
 CVE-2019-15165-2.patch
+set-package-name-with-ac-init.patch
+use-m4-macro-to-get-version.patch
+install-pkg-config-file.patch
diff --git a/debian/patches/set-package-name-with-ac-init.patch b/debian/patches/set-package-name-with-ac-init.patch
 new file mode 100644
index 0000000..f1578fc
--- /dev/null
+++ b/debian/patches/set-package-name-with-ac-init.patch
@@ -0,0 +1,160 @@
+From: Sergio Durigan Junior <[e-mail]>
+Date: Mon, 29 Jun 2020 17:39:01 -0400
+Subject: Don't wire the library name into pcap-config.
+
+With autotools, set the package name with AC_INIT(), which now takes the
+package name and version as arguments, rather than the name of a file in
+the source directory.  That sets PACKAGE_NAME.
+
+With CMake, set PACKAGE_NAME to ${LIBRARY_NAME}.
+
+In pcap-config.in, use "-l@PACKAGE_NAME@", rather than -lpcap, as the
+library name.
+
+That means that pcap-config will use -lwpcap, rather than -lpcap, on
+Windows, where the library's name is wpcap rather than just pcap.
+
+Author: Guy Harris <[e-mail]>
+Origin: backport, https://github.com/the-tcpdump-group/libpcap/commit/c2e151358d7bc7c77dddb4ca00770034872cd081
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libpcap/+bug/1865501
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+Last-Update: 2020-06-29
+---
+ configure      | 31 ++++++++++++++++---------------
+ configure.ac   |  3 ++-
+ pcap-config.in |  5 +++--
+ 3 files changed, 21 insertions(+), 18 deletions(-)
+
+diff --git a/configure b/configure
+index 4c64875..fd14f5f 100755
+--- a/configure
++++ b/configure
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.69.
++# Generated by GNU Autoconf 2.69 for pcap 1.8.1.
+ #
+ #
+ # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+@@ -575,14 +575,13 @@ MFLAGS=
+ MAKEFLAGS=
+ 
+ # Identity of this package.
+-PACKAGE_NAME=
+-PACKAGE_TARNAME=
+-PACKAGE_VERSION=
+-PACKAGE_STRING=
+-PACKAGE_BUGREPORT=
+-PACKAGE_URL=
+-
+-ac_unique_file="pcap.c"
++PACKAGE_NAME='pcap'
++PACKAGE_TARNAME='pcap'
++PACKAGE_VERSION='1.8.1'
++PACKAGE_STRING='pcap 1.8.1'
++PACKAGE_BUGREPORT=''
++PACKAGE_URL=''
++
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+@@ -803,7 +802,7 @@ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-docdir='${datarootdir}/doc/${PACKAGE}'
++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+ infodir='${datarootdir}/info'
+ htmldir='${docdir}'
+ dvidir='${docdir}'
+@@ -1303,7 +1302,7 @@ if test "$ac_init_help" = "long"; then
+   # Omit some internal or obsolete options to make the list less imposing.
+   # This message is too long to be a string in the A/UX 3.1 sh.
+   cat <<_ACEOF
+-\`configure' configures this package to adapt to many kinds of systems.
++\`configure' configures pcap 1.8.1 to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+@@ -1351,7 +1350,7 @@ Fine tuning of the installation directories:
+   --infodir=DIR           info documentation [DATAROOTDIR/info]
+   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+   --mandir=DIR            man documentation [DATAROOTDIR/man]
+-  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
++  --docdir=DIR            documentation root [DATAROOTDIR/doc/pcap]
+   --htmldir=DIR           html documentation [DOCDIR]
+   --dvidir=DIR            dvi documentation [DOCDIR]
+   --pdfdir=DIR            pdf documentation [DOCDIR]
+@@ -1368,7 +1367,9 @@ _ACEOF
+ fi
+ 
+ if test -n "$ac_init_help"; then
+-
++  case $ac_init_help in
++     short | recursive ) echo "Configuration of pcap 1.8.1:";;
++   esac
+   cat <<\_ACEOF
+ 
+ Optional Features:
+@@ -1500,7 +1501,7 @@ fi
+ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
+-configure
++pcap configure 1.8.1
+ generated by GNU Autoconf 2.69
+ 
+ Copyright (C) 2012 Free Software Foundation, Inc.
+@@ -1965,7 +1966,7 @@ cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by $as_me, which was
++It was created by pcap $as_me 1.8.1, which was
+ generated by GNU Autoconf 2.69.  Invocation command line was
+ 
+   $ $0 $@
+diff --git a/configure.ac b/configure.ac
+index 46bbd67..9952e04 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,8 @@ dnl
+ #
+ 
+ AC_PREREQ(2.61)
+-AC_INIT(pcap.c)
++AC_INIT(pcap, 1.8.1)
++AC_SUBST(PACKAGE_NAME)
+ 
+ AC_CANONICAL_SYSTEM
+ 
+diff --git a/pcap-config.in b/pcap-config.in
+index 16522dd..945c52d 100644
+--- a/pcap-config.in
++++ b/pcap-config.in
+@@ -8,6 +8,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ includedir="@includedir@"
+ LIBS="@LIBS@"
++PACKAGE_NAME="@PACKAGE_NAME@"
+ 
+ static=0
+ show_cflags=0
+@@ -63,7 +64,7 @@ else
+ 	#
+ 	if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
+ 	then
+-		echo "-I$includedir -lpcap"
++		echo "-I$includedir -l$PACKAGE_NAME"
+ 	elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
+ 	then
+ 		echo "-I$includedir"
+@@ -72,6 +73,6 @@ else
+ 		echo "-I$includedir"
+ 	elif [ "$show_libs" = 1 ]
+ 	then
+-		echo "-lpcap"
++		echo "-l$PACKAGE_NAME"
+ 	fi
+ fi
diff --git a/debian/patches/use-m4-macro-to-get-version.patch b/debian/patches/use-m4-macro-to-get-version.patch
 new file mode 100644
index 0000000..8bb9b46
--- /dev/null
+++ b/debian/patches/use-m4-macro-to-get-version.patch
@@ -0,0 +1,27 @@
+From: Ali Abdulkadir <[e-mail]>
+Date: Wed, 4 Oct 2017 04:08:18 +0300
+Subject: Use a m4 macro to get version string from file
+
+Author: Ali Abdulkadir <[e-mail]>
+Origin: backport, https://github.com/the-tcpdump-group/libpcap/commit/263e6ca61e072cd8abe82b58e6b3f6539c2cdaaa
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libpcap/+bug/1865501
+Reviewed-By: Sergio Durigan Junior <[e-mail]>
+Last-Update: 2020-06-29
+---
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9952e04..febdb69 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,8 @@ dnl
+ #
+ 
+ AC_PREREQ(2.61)
+-AC_INIT(pcap, 1.8.1)
++
++AC_INIT(pcap, m4_esyscmd_s([cat VERSION]))
+ AC_SUBST(PACKAGE_NAME)
+ 
+ AC_CANONICAL_SYSTEM