From patchwork Sun May 29 08:44:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Darbyshire-Bryant X-Patchwork-Id: 627484 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (caladan.dune.hu [78.24.191.180]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rHYGC50Mpz9t4c for ; Sun, 29 May 2016 18:44:34 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b=ZmJY0fy2; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 3E235B80716; Sun, 29 May 2016 10:44:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.1 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP; Sun, 29 May 2016 10:44:22 +0200 (CEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 78A57B806FD for ; Sun, 29 May 2016 10:44:20 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 HELO_IP_IN_CL_SUBNET=-1.2 (check from: .darbyshire-bryant. - helo: .emea01-am1-obe.outbound.protection.outlook. - helo-domain: .outlook.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -6.2 Received: from emea01-am1-obe.outbound.protection.outlook.com (mail-am1on0084.outbound.protection.outlook.com [157.56.112.84]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 29 May 2016 10:44:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=TbYimB8WTtHVA2ppc/ruFSpI2lPfosQESubBdmq+VIY=; b=ZmJY0fy2TdqgzKv5M6gqy4biEIqsY8ZAqWTlhfe9XqMpgKwldzmb9Ul1t8yXoep3s5OzgvDP13NBK2uzdgloGjE9YcK8rIQriFq/HO32kvTBG1GjcFK/5oy8up2pm7eo8Ofvy8Z4YyEoHviZOhPlnPEFwe/VfwMaYjXtGhrD9Lk= Authentication-Results: iki.fi; dkim=none (message not signed) header.d=none;iki.fi; dmarc=none action=none header.from=darbyshire-bryant.me.uk; Received: from Animal.darbyshire-bryant.me.uk (151.229.110.186) by HE1PR07MB0940.eurprd07.prod.outlook.com (10.162.27.146) with Microsoft SMTP Server (TLS) id 15.1.506.9; Sun, 29 May 2016 08:44:15 +0000 From: Kevin Darbyshire-Bryant To: Date: Sun, 29 May 2016 09:44:03 +0100 Message-ID: <1464511443-26702-1-git-send-email-kevin@darbyshire-bryant.me.uk> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [151.229.110.186] X-ClientProxiedBy: VI1PR0101CA0029.eurprd01.prod.exchangelabs.com (10.166.38.39) To HE1PR07MB0940.eurprd07.prod.outlook.com (10.162.27.146) X-MS-Office365-Filtering-Correlation-Id: 6b8aa1f7-a012-4d1a-139d-08d3879d6a9a X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0940; 2:kg7Rq1rrKkn1w2gDqo6C0lm7CXbqmrFrdwdms9g95y9xY0lk0bPOZh5JOUiE+dieDXsCKOtTlAFMctoprjZVJcLrg4gSM4z5Lr4vjplTnU6RBXb4kNVdXfeXdu5N4IqJhoFW7nCisTO4hLrgJ0xs7JnmbQHLpEc7nzptsmI0RladiydukEzk7doWBa1Y0djE; 3:rBbrzH3F3/8RPbXuXme8Ym82LCTFmCM9Mbsr1Fjp0nJDtNKYyDWbPItenkJpLSeW6x8Tl4jWK9zhbcUWNe0UR4WnX1K4oeaf24lcV1lLM+swQNN72UnNKZ3qCxYdVyFN; 25:oIRo4yVw31AOWG2uPur37o4jaKkllHgqUfNVleQXdWiI+3OxlJ7OiA1YhgKKUgPypHzDBoR6f1Nyz508Ns/yu/BHVLI597ca10FrODpJ98tRfKRdFpCfwZZQTmDDij5wGby5zt1tuIvyNtxQcXG7J0jHao8cHbH0dVXvNv83acMwIuPbt5tgWBBpf2nZqt97KAlOqvLtCLv0KiJnk9qCWfLHUSCZUj8BPB1SN6IFOL3RMg/rvvnyqC5jVEcaJRL/3pr/Pjazy4cuswgpmHCIYXvS0zZqBcJ3aawjhBuNBBsAEfEYop4s38zpFk8mTLaafS6Y2QFrd/CfxR89EGQv+3YItC+9op0KZ1lwybeAQAR29QDDyfjIw2EMDAFdoKpfDgL74diH7Kggp01SWZMgGIB8C4sFzcusMyB+q+OqX/U= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR07MB0940; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(191636701735510)(158342451672863); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040130)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041072)(6043046); SRVR:HE1PR07MB0940; BCL:0; PCL:0; RULEID:; SRVR:HE1PR07MB0940; X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0940; 4:faBLQgqboT+1IHWAbaDcjvQkM2CB8ffYutYUagrpSK78+SHF66Jm7dEUAxlLqVGP8sV53FdVwW86KtFQ8/sXtkbdE1iA96XZSAIxuVgZyZs0+PZCHAiNojr3p8V9Unm/NIdjssBxwGFeXzsofVTaAeZctU20F+CFOUnqPRqAAmJxf5TdDT+kfDnbHlENBON9VHzy2OX9kFrNRJNA1d5vBSqyjyIc4AqjgMKpwu8YDjp4QCdLSlnsiSUMSbk48qpqK5bEgS4mfB/IOAGQOdzN3oGrmse1s6G3uxLkzLt9U2qk66pO7rioDl1N7yISfOC4K2hDBo/CA0BxQFho/fpda/0ay8tmC+MZO6GP4KRBXmq1JjW7R1lVKQiuaSW+eciuvJ9WcRcPpJDQrI9nm1VoQYw63NeQsiB3jejAGlLFDqGCdAtAz30Jrh8Vgqg0k8XrRAs9Eh1CbkBXyAQ8sR36WeFdaC2zsfX4PuiSzPG7V8t+ACDobHxdDHFCUp+uvvDj X-Forefront-PRVS: 0957AD37A0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(288314003)(4326007)(10710500007)(53416004)(2906002)(5008740100001)(19580405001)(110136002)(36756003)(19580395003)(189998001)(7110500001)(33646002)(107886002)(66066001)(50226002)(81166006)(6116002)(3846002)(5004730100002)(50986999)(42186005)(47776003)(4001430100002)(74482002)(586003)(2351001)(2420400007)(229853001)(8676002)(5003940100001)(1720100001)(15650500001)(15975445007)(92566002)(77096005)(48376002)(86362001)(50466002)(15866825004); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR07MB0940; H:Animal.darbyshire-bryant.me.uk; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR07MB0940; 23:9icoLZahVUcSlkrrsJWJNYOyV4awMDym0tbqcnlhv?= =?us-ascii?Q?Tmdg0uBc41Kk1sffS6q7Vwwnd/XXU48h0n1slVZnmcWWZPnM0duOcSz7qyu0?= =?us-ascii?Q?I2M8tj9sDIt+Dv+FzcK0ctqB2FX0bSuaYA6kkQCYETDx+42UL8Vsa2R7NdT6?= =?us-ascii?Q?YnrgxmUWk+a0ttS4QeJlQqDsN4kEFP66URerXDtGo99eMlhps4/2kpylFBHI?= =?us-ascii?Q?m5K2/t6Po8NdtxaFh7zloIhjvqbcd3M9Zx6UKx6FZ/hU6eEDreapowTdJAgV?= =?us-ascii?Q?C8W32cHxVDBiPlnhtKe/Q4K0r4rHZr2CfXnGrKk5MIIWGU+imsVSYPxtkO/3?= =?us-ascii?Q?UsLmN2w6V4qrR0vXCzJhASomKya8hpYhIOp91yqd6kVoyR7Jjsrv0NFS+DsN?= =?us-ascii?Q?lToi23UHJrGnEpXvigM4yQ6j90USYA2d3TYUFtRfMn7+VK/T2a9J7zX1eO7U?= =?us-ascii?Q?eGB1Cl9fib4OLEW/683nam3eqXNj5pixGswTuEYvBVFa5IGflkQbPzoONeY0?= =?us-ascii?Q?1NY30QcMc1iU482c3iGOLRgg+CIyY7dFfTHfvqJqCMG1pPK86/RyVknjj26B?= =?us-ascii?Q?3VNPAQzD3JTzfB5MrrYJ/azfQ7GTDP4g6O+Dj9/XSeHiZ8R2N0Q09ItsN8z2?= =?us-ascii?Q?o6M1GZdsd8kb1ApfTqY+91Lf0es1mUaNZRGzoeDlfRCF+mhexUsXKMv1ZR0k?= =?us-ascii?Q?qP59Z3ydk2bFFY5h94o5/Nvq0D2OdmdLOcyRcs7AcVc6Ufxqtd6eR2Y9LNb1?= =?us-ascii?Q?833ovS04Hu8AKM3lAMx45IeWPoGbux42B0NNpTItGZ44PqIT6R7tLgsAnKDj?= =?us-ascii?Q?XaKX4IEfp/gH4ZtY/FRpjYzmpjk+WcEWFONflIvkwqgLfso7RXnKnTwgWsRC?= =?us-ascii?Q?ih8x+UbMcG9hZUaUyxEx9r0DHGE/bNN8AAg8/nJ3EFP4Tdbb1UAHHQsmGCMO?= =?us-ascii?Q?RmujHs9JKussreb6y3iakGpFYyoZfcTvsvt/rzDbMoiZ579+HRUJ4+TUzYHL?= =?us-ascii?Q?7FEuXZFeVa6S1THD5gzhL1oJcs357GH4M1XUiDdeD4s9/xl4lHwVv5/AEC5t?= =?us-ascii?Q?OCvqB+9Bmmtx0FINOhEyAp/e+GPxeUZy0Ls5NseqgkFCw8Jo9zSMu0r+aBt9?= =?us-ascii?Q?VFFbikivp9WWMmy0zR+EXcqVcnZ8xEu?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR07MB0940; 5:xkV+QR/CWIEdfy3WOYFgFajK7Z6MsJTsNYDuX7rHGpRI3CKFCHE4z+MrfZDiNF85MgpACQS6CJyGvJhcehrBWOXNjeAqK8N/94a4+vZ/U0WITyCm1r4KrcevKf1Bmykfne4qOC4WiJxeWXTjnFDb0w==; 24:giLfJWx3h1lyHHC6dAx6giuKC5Z74evCPeLTNlW+WOUnmdiyactmzrQvodmyBO9kKp8DdXX0DRsf0fCIpBN7CP9aLXrxzNnZ3cx/PShdWbU=; 7:kMbWAC9W6DYbHceLmpFDUDg4BVs2CCod/cDZeKs2XM60ioD3JpnYQZ4zKm+8ui4yCmwjYpRsR+KFDv0tavglt4/rkvEUrB8VSXeRqAqMY3SUOicuSF/6yuu3jnM4yPCpGJbe/23Gv3+KuJ+J7poOzkI8Q+iOYQC13F4rAgDKHP0tNvF8xp1XTGuaYKUcmyWk SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2016 08:44:15.3719 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR07MB0940 Subject: [OpenWrt-Devel] [PATCH] routing: miniupnpd: update to v2.0 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: openwrt-devel@lists.openwrt.org Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Update miniupnpd to v2.0 Refresh patches Signed-off-by: Kevin Darbyshire-Bryant --- miniupnpd/Makefile | 4 ++-- miniupnpd/patches/100-no-ssl.patch | 6 +++--- miniupnpd/patches/102-ipv6-ext-port.patch | 2 +- miniupnpd/patches/103-no-ipv6-autodetection.patch | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile index 1000929..0207036 100644 --- a/miniupnpd/Makefile +++ b/miniupnpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miniupnpd -PKG_VERSION:=1.9.20151212 +PKG_VERSION:=2.0 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://miniupnp.free.fr/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=86465b35f711ca9982d48b34c094033a +PKG_MD5SUM:=1c07a215dd9b362e75a9efc05e2fb3b4 PKG_MAINTAINER:=Markus Stenberg PKG_LICENSE:=BSD-3-Clause diff --git a/miniupnpd/patches/100-no-ssl.patch b/miniupnpd/patches/100-no-ssl.patch index 343e615..5caafc2 100644 --- a/miniupnpd/patches/100-no-ssl.patch +++ b/miniupnpd/patches/100-no-ssl.patch @@ -1,6 +1,6 @@ --- a/Makefile.linux +++ b/Makefile.linux -@@ -147,7 +147,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static +@@ -153,7 +153,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack) endif # ($(TEST),1) @@ -8,5 +8,5 @@ +# n/a - we don't enable https server for IGD v2 anyway +#LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl) - TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o - + TEST := $(shell $(PKG_CONFIG) --exists uuid && echo 1) + ifeq ($(TEST),1) diff --git a/miniupnpd/patches/102-ipv6-ext-port.patch b/miniupnpd/patches/102-ipv6-ext-port.patch index fdb2af4..806c7fd 100644 --- a/miniupnpd/patches/102-ipv6-ext-port.patch +++ b/miniupnpd/patches/102-ipv6-ext-port.patch @@ -1,6 +1,6 @@ --- a/pcpserver.c +++ b/pcpserver.c -@@ -1004,6 +1004,7 @@ static int CreatePCPMap_NAT(pcp_info_t * +@@ -982,6 +982,7 @@ static int CreatePCPMap_NAT(pcp_info_t * timestamp); if (r < 0) return PCP_ERR_NO_RESOURCES; diff --git a/miniupnpd/patches/103-no-ipv6-autodetection.patch b/miniupnpd/patches/103-no-ipv6-autodetection.patch index 61c023a..50d5a39 100644 --- a/miniupnpd/patches/103-no-ipv6-autodetection.patch +++ b/miniupnpd/patches/103-no-ipv6-autodetection.patch @@ -17,7 +17,7 @@ As the OpenWRT buildsystem already passes the right compile flags, we can skip t # testiptpinhole --- a/Makefile.linux +++ b/Makefile.linux -@@ -70,7 +70,6 @@ CPPFLAGS += -DIPTABLES_143 +@@ -73,7 +73,6 @@ CPPFLAGS += -DIPTABLES_143 endif CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc)