From 61346d5a90c17d1caf2e0698a32d75ebc22c4fd5 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 22 Oct 2022 01:46:49 +0000
Subject: [PATCH] tinc: update to githash 2022-06-05 and addon (2)

- miniupnpc: update to 2.2.5
- build with meson
---
 packages/addons/service/tinc/package.mk       | 24 ++++++++----------
 .../tinc-0001-fix-autoconf-archive.patch      | 25 -------------------
 2 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100644 packages/addons/service/tinc/patches/tinc-0001-fix-autoconf-archive.patch

diff --git a/packages/addons/service/tinc/package.mk b/packages/addons/service/tinc/package.mk
index 668c051b9c..023025cbb0 100644
--- a/packages/addons/service/tinc/package.mk
+++ b/packages/addons/service/tinc/package.mk
@@ -2,18 +2,17 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tinc"
-PKG_VERSION="1.1pre18"
-PKG_SHA256="bd2d010a1bdeb1dd767f6fbc769fce2a2169119fb3d177df928c27d1f20b5775"
-PKG_REV="0"
+PKG_VERSION="4c6a9a9611442f958c3049a566ac4369653978e9"
+PKG_SHA256="409829f454fdfe87f7222f131de88006640709ff046e2241bfdb44a49a146059"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://www.tinc-vpn.org/"
-PKG_URL="https://github.com/gsliepen/tinc/archive/release-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain lzo miniupnpc ncurses openssl readline zlib"
+PKG_URL="https://github.com/gsliepen/tinc/archive/${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain lz4 lzo miniupnpc ncurses openssl readline zlib"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="tinc: a Virtual Private Network daemon"
 PKG_LONGDESC="tinc (${PKG_VERSION}) is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others."
-PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="+pic"
 
 PKG_IS_ADDON="yes"
@@ -21,14 +20,11 @@ PKG_ADDON_NAME="tinc"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-miniupnpc \
-                           --sysconfdir=/run"
-PKG_MAKE_OPTS_TARGET="SUBDIRS=src"
-PKG_MAKEINSTALL_OPTS_TARGET="SUBDIRS=src"
-
-make_target() {
-  :
-}
+PKG_MESON_OPTS_TARGET="-Dminiupnpc=enabled \
+                       -Ddocs=disabled \
+                       -Dsystemd=disabled \
+                       -Dtests=disabled \
+                       -Drunstatedir=/run"
 
 addon() {
   mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
diff --git a/packages/addons/service/tinc/patches/tinc-0001-fix-autoconf-archive.patch b/packages/addons/service/tinc/patches/tinc-0001-fix-autoconf-archive.patch
deleted file mode 100644
index b27cff0877..0000000000
--- a/packages/addons/service/tinc/patches/tinc-0001-fix-autoconf-archive.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9f1151cd9813477dafb939f3b0234a654e80a3b0 Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Tue, 28 Jan 2020 03:22:15 +0000
-Subject: [PATCH] fix API change since autoconf-archive-2019.01.06
-
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e69542e..19d1e31 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,7 @@ ACLOCAL_AMFLAGS = -I m4
- 
- EXTRA_DIST = COPYING.README README.android
- 
--@CODE_COVERAGE_RULES@
-+include $(top_srcdir)/aminclude_static.am
- 
- # If git describe works, force autoconf to run in order to make sure we have the
- # current version number from git in the resulting configure script.
--- 
-2.7.4
-