[PATCH] libpcap: update to 1.10.0

[Rosen Penev]

On Sun, Jan 3, 2021 at 11:35 PM Bjørn Mork <bjorn at mork.no> wrote:
>
> Rosen Penev <rosenp at gmail.com> writes:
>
> > Simplify cmake option handling by putting everything in blocks.
> >
> > Add openssl patch as there's no easy way to disable.
> >
> > Rebase the skip manpages patch.
> >
> > Remove the monitor mode patch as it no longer applies.
> >
> > Remove flex patch as normal Makefile is no longer used.
> >
> > Remove USB path patch. While it is deprecated, the codepath is never
> > taken. /sys/bus/usb/devices is checked before hand. If it exists, the
> > function does stuff and returns. Additionally, this path is used
> > elsewhere in the code.
> >
> > Refresh other patches.
> >
> > Signed-off-by: Rosen Penev <rosenp at gmail.com>
> > ---
> >  package/libs/libpcap/Makefile                 |  21 ++--
> >  .../libs/libpcap/patches/100-no-openssl.patch |  10 ++
> >  .../libpcap/patches/102-skip-manpages.patch   | 110 +++++++++---------
> >  .../103-makefile_flex_workaround.patch        |  14 ---
> >  .../patches/201-space_optimization.patch      |   2 +-
> >  .../patches/203-undef_iw_mode_monitor.patch   |  11 --
> >  .../libpcap/patches/204-usb-bus-path.patch    |  13 ---
> >  7 files changed, 72 insertions(+), 109 deletions(-)
> >  create mode 100644 package/libs/libpcap/patches/100-no-openssl.patch
> >  delete mode 100644 package/libs/libpcap/patches/103-makefile_flex_workaround.patch
> >  delete mode 100644 package/libs/libpcap/patches/203-undef_iw_mode_monitor.patch
> >  delete mode 100644 package/libs/libpcap/patches/204-usb-bus-path.patch
> >
> > diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile
> > index 35ceb18c29..c4668d5d81 100644
> > --- a/package/libs/libpcap/Makefile
> > +++ b/package/libs/libpcap/Makefile
> > @@ -8,22 +8,21 @@
> >  include $(TOPDIR)/rules.mk
> >
> >  PKG_NAME:=libpcap
> > -PKG_VERSION:=1.9.1
> > -PKG_RELEASE:=3
> > +PKG_VERSION:=1.10.0
> > +PKG_RELEASE:=1
> >
> >  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
> >  PKG_SOURCE_URL:=http://www.us.tcpdump.org/release/ \
> >          http://www.tcpdump.org/release/
> > -PKG_HASH:=635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094
> > +PKG_HASH:=8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e
> >
> >  PKG_MAINTAINER:=Felix Fietkau <nbd at nbd.name>
> > +PKG_LICENSE:=BSD-3-Clause
> > +PKG_LICENSE_FILES:=LICENSE
> >
> >  PKG_ASLR_PIE_REGULAR:=1
> >  PKG_BUILD_PARALLEL:=1
> >
> > -PKG_LICENSE:=BSD-3-Clause
> > -PKG_LICENSE_FILES:=LICENSE
> > -
> >  include $(INCLUDE_DIR)/package.mk
> >  include $(INCLUDE_DIR)/cmake.mk
> >
> > @@ -48,11 +47,15 @@ endef
> >  CMAKE_OPTIONS += \
> >       -DBUILD_SHARED_LIBS=ON \
> >       -DBUILD_WITH_LIBNL=OFF \
> > +     -DINET6=O$(if $(CONFIG_IPV6),N,FF)
> >
> >  # grep 'option(DISABLE_' CMakeLists.txt | cut -f2 -d'(' | cut -f1 -d' ' | sort --unique
> >  CMAKE_OPTIONS += \
> > +     -DDISABLE_BLUETOOTH=O$(if $(CONFIG_PCAP_HAS_BT),FF,N) \
> >       -DDISABLE_DAG=ON \
> >       -DDISABLE_DBUS=ON \
> > +     -DDISABLE_DPDK=ON \
> > +     -DDISABLE_LINUX_USBMON=O$(if $(CONFIG_PCAP_HAS_USB),FF,N) \
> >       -DDISABLE_NETMAP=ON \
> >       -DDISABLE_RDMA=ON \
> >       -DDISABLE_SEPTEL=ON \
> > @@ -64,12 +67,6 @@ CMAKE_OPTIONS += \
> >       -DBDEBUG=OFF \
> >       -DYYDEBUG=OFF \
> >
> > -CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_USB)       ,,-DDISABLE_USB=ON)
> > -CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_BT)        ,,-DDISABLE_BLUETOOTH=ON)
> > -CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_NETFILTER) ,,-DPCAP_SUPPORT_NETFILTER=OFF)
> > -
> > -CMAKE_OPTIONS += $(if $(CONFIG_IPV6),-DINET6=ON,-DINET6=OFF)
> > -
> >  define Build/InstallDev
> >       $(call Build/InstallDev/cmake,$(1))
> >       $(SED) \
>
>
>
> And where did CONFIG_PCAP_HAS_NETFILTER go?
Oversight. Will add.
>
> I don't understand why you do these unnecessary style changes while
> updating package versions. You're obviously not testing them.  And you
> do add bugs. But whatever.
>
>
> Bjørn
>
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel