Browse Source

Merge pull request #16745 from neheb/tinc2

tinc: update to 1.1pre18
lilik-openwrt-22.03
Alexandru Ardelean 3 years ago
committed by GitHub
parent
commit
e2055b5433
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 16 deletions
  1. +11
    -16
      net/tinc/Makefile
  2. +10
    -0
      net/tinc/patches/010-code-libtool.patch

+ 11
- 16
net/tinc/Makefile View File

@ -8,23 +8,24 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tinc
PKG_VERSION:=1.1-git
PKG_RELEASE:=3
PKG_VERSION:=1.1pre18
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=http://tinc-vpn.org/git/tinc
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=3ee0d5dd
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=fe57dcce5c17ec2cea96fefc69c5af977df7d457f1ae7c4775e00a21878a2c19
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://tinc-vpn.org/packages
PKG_HASH:=2757ddc62cf64b411f569db2fa85c25ec846c0db110023f6befb33691f078986
PKG_MAINTAINER:=Erwan Mas <erwan@mas.nom.fr>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:tinc:tinc
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:=zlib lzo openssl
PKG_BUILD_DEPENDS:=zlib lzo openssl
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@ -34,7 +35,6 @@ define Package/tinc
DEPENDS:=+kmod-tun +liblzo +libopenssl +librt +zlib
TITLE:=VPN tunneling daemon
URL:=http://www.tinc-vpn.org/
MAINTAINER:=Erwan Mas <erwan@mas.nom.fr>
SUBMENU:=VPN
endef
@ -43,8 +43,6 @@ define Package/tinc/description
encryption to create a secure private network between hosts on the Internet.
endef
TARGET_CFLAGS += -std=gnu99
CONFIGURE_ARGS += \
--with-kernel="$(LINUX_DIR)" \
--disable-curses \
@ -52,9 +50,6 @@ CONFIGURE_ARGS += \
--with-lzo-include="$(STAGING_DIR)/usr/include/lzo" \
--with-zlib="$(STAGING_DIR)/usr"
CONFIGURE_VARS += \
ac_cv_have_decl_OpenSSL_add_all_algorithms=yes
define Package/tinc/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/tinc $(1)/usr/sbin/


+ 10
- 0
net/tinc/patches/010-code-libtool.patch View File

@ -0,0 +1,10 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = COPYING.README README.android
-@CODE_COVERAGE_RULES@
# 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.

Loading…
Cancel
Save