aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2021-07-13 13:24:54 -0700
committerHauke Mehrtens <hauke@hauke-m.de>2021-08-08 19:50:46 +0200
commit065d4300c09051dd90e53001d6c6fa490216187f (patch)
tree9c1d4e96045fc42b95673e05257712a2b3b05359
parent7aff590ace5cda6246bd8d5c611cb91ae81e587c (diff)
downloadupstream-065d4300c09051dd90e53001d6c6fa490216187f.tar.gz
upstream-065d4300c09051dd90e53001d6c6fa490216187f.tar.bz2
upstream-065d4300c09051dd90e53001d6c6fa490216187f.zip
libpcap: update to 1.10.1
Switch to AUTORELEASE to avoid manual increments. Refreshed patches. Signed-off-by: Rosen Penev <rosenp@gmail.com>
-rw-r--r--package/libs/libpcap/Makefile6
-rw-r--r--package/libs/libpcap/patches/100-no-openssl.patch2
-rw-r--r--package/libs/libpcap/patches/102-skip-manpages.patch2
3 files changed, 5 insertions, 5 deletions
diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile
index 518744435b..d07c83ac6f 100644
--- a/package/libs/libpcap/Makefile
+++ b/package/libs/libpcap/Makefile
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libpcap
-PKG_VERSION:=1.10.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.10.1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.us.tcpdump.org/release/ \
http://www.tcpdump.org/release/
-PKG_HASH:=8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e
+PKG_HASH:=ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=BSD-3-Clause
diff --git a/package/libs/libpcap/patches/100-no-openssl.patch b/package/libs/libpcap/patches/100-no-openssl.patch
index 6424cf8c6f..56896ad8ba 100644
--- a/package/libs/libpcap/patches/100-no-openssl.patch
+++ b/package/libs/libpcap/patches/100-no-openssl.patch
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1006,7 +1006,6 @@ endif()
+@@ -1042,7 +1042,6 @@ endif()
#
# OpenSSL/libressl.
#
diff --git a/package/libs/libpcap/patches/102-skip-manpages.patch b/package/libs/libpcap/patches/102-skip-manpages.patch
index 57b780c1fe..79a365643e 100644
--- a/package/libs/libpcap/patches/102-skip-manpages.patch
+++ b/package/libs/libpcap/patches/102-skip-manpages.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] skip manpages
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -2701,57 +2701,6 @@ if(NOT MSVC)
+@@ -2732,57 +2732,6 @@ if(NOT MSVC)
if(MINGW)
find_program(LINK_EXECUTABLE ln)
endif(MINGW)