From 64e025467595db91da4e1539ca388c9ad16be598 Mon Sep 17 00:00:00 2001
From: prspkt <prspkt@protonmail.com>
Date: Thu, 3 Feb 2022 23:55:42 +0200
Subject: [PATCH] main/libnetfilter_log: upgrade to 1.0.2

 - Remove stale patches.
 - Clarify license, modernize.
---
 main/libnetfilter_log/APKBUILD         | 28 ++++++++------------------
 main/libnetfilter_log/sys-types.patch  | 21 -------------------
 main/libnetfilter_log/sys-types2.patch | 14 -------------
 3 files changed, 8 insertions(+), 55 deletions(-)
 delete mode 100644 main/libnetfilter_log/sys-types.patch
 delete mode 100644 main/libnetfilter_log/sys-types2.patch

diff --git a/main/libnetfilter_log/APKBUILD b/main/libnetfilter_log/APKBUILD
index 70928c14df26..64fec540517c 100644
--- a/main/libnetfilter_log/APKBUILD
+++ b/main/libnetfilter_log/APKBUILD
@@ -2,28 +2,17 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=libnetfilter_log
-pkgver=1.0.1
-pkgrel=5
+pkgver=1.0.2
+pkgrel=0
 pkgdesc="interface to packets that have been logged by the kernel packet filter"
 url="https://www.netfilter.org/projects/libnetfilter_log/"
 arch="all"
-license="GPL-2.0"
-depends_dev="linux-headers"
-makedepends="$depends_dev libnfnetlink-dev"
+license="GPL-2.0-only"
+makedepends="libmnl-dev libnfnetlink-dev linux-headers"
 subpackages="$pkgname-dev"
-source="https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-$pkgver.tar.bz2
-	sys-types.patch
-	sys-types2.patch
-	"
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	update_config_sub
-}
+source="https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -35,10 +24,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4088b9bf055fb4cd5f2e201a46a00def7642116b5d1695a371936b7b45eb93877944456506b45761bf2f3f81b40c161c1ecdcfb90532009f073dac3cedc6f436  libnetfilter_log-1.0.1.tar.bz2
-aa8b2502fd53bce2ffdb4607bcbb179b854d9544814eca43c5313392c39bf5f8abdc51e61629d26cce1df07b0499d793858020144eac6d4785ab96d59db8e364  sys-types.patch
-b2c93fc854cd52040637164f422ac9bc6cdf22585c638b45f500c30c59925131ff874fdf3dc231d948adf12b45744809d6278a79abd4a2887aa5a7b5e8e4cc9d  sys-types2.patch"
+sha512sums="
+6b33718b1dd7f4504bceae14001da3a652cec46a6725a5dee83a7b55028cfa8e768cba917f968a5d5b60fd9ff04edf6040ef271a68e5fb65858bf73f4f9ccf23  libnetfilter_log-1.0.2.tar.bz2
+"
diff --git a/main/libnetfilter_log/sys-types.patch b/main/libnetfilter_log/sys-types.patch
deleted file mode 100644
index 1662636cc600..000000000000
--- a/main/libnetfilter_log/sys-types.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7529487f70e244cd31ef84b037b1c32749c134a7 Mon Sep 17 00:00:00 2001
-From: Eric Leblond <eric@regit.org>
-Date: Sun, 4 Nov 2012 09:29:44 +0100
-Subject: Add include needed for integer type definition.
-
-
-diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h
-index 6b0d3b0..a1331de 100644
---- a/include/libnetfilter_log/libnetfilter_log.h
-+++ b/include/libnetfilter_log/libnetfilter_log.h
-@@ -9,6 +9,7 @@
- #ifndef __LIBNETFILTER_LOG_H
- #define __LIBNETFILTER_LOG_H
- 
-+#include <sys/types.h>
- #include <libnetfilter_log/linux_nfnetlink_log.h>
- 
- struct nflog_handle;
--- 
-cgit v0.10.2
-
diff --git a/main/libnetfilter_log/sys-types2.patch b/main/libnetfilter_log/sys-types2.patch
deleted file mode 100644
index e211453ecf88..000000000000
--- a/main/libnetfilter_log/sys-types2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/include/libnetfilter_log/libipulog.h b/include/libnetfilter_log/libipulog.h
-index 8a4ae2a..0994b4a 100644
---- a/include/libnetfilter_log/libipulog.h
-+++ b/include/libnetfilter_log/libipulog.h
-@@ -5,6 +5,8 @@
- #include <unistd.h>
- #include <fcntl.h>
- 
-+#include <sys/types.h>	/* for u_int*_t */
-+
- /* FIXME: glibc sucks */
- #ifndef MSG_TRUNC 
- #define MSG_TRUNC	0x20
-
-- 
GitLab