From: Yousong Zhou <redacted>
Date: Wed, 16 Mar 2022 11:12:52 +0000 (+0000)
Subject: xl2tpd: bump to version 1.3.17
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=be95ccbc8c0eea9a8e27e813bf0c5c4119ebde09;p=openwrt-packages.git

xl2tpd: bump to version 1.3.17

The typo fix patch was merged upstream

Signed-off-by: Yousong Zhou <redacted>
---

diff --git a/net/xl2tpd/Makefile b/net/xl2tpd/Makefile
index 6ee96cd50..15074090c 100644
--- a/net/xl2tpd/Makefile
+++ b/net/xl2tpd/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xl2tpd
-PKG_VERSION:=1.3.16
-PKG_RELEASE:=2
+PKG_VERSION:=1.3.17
+PKG_RELEASE:=1
 PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -19,7 +19,7 @@ PKG_SOURCE_URL:=https://github.com/xelerance/xl2tpd.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=bbb5e21967ec036bb59e18d2a8792b29d7525a1ba13de49f0b80325ab7bce2c6
+PKG_MIRROR_HASH:=5fbc1fe5a01ebd5b0eb2929b85e68eb271e29cc2989320aa1ae2b32f0ac0e540
 
 PKG_INSTALL:=1
 
diff --git a/net/xl2tpd/patches/0003-Skip-building-pfc.patch b/net/xl2tpd/patches/0002-Skip-building-pfc.patch
similarity index 100%
rename from net/xl2tpd/patches/0003-Skip-building-pfc.patch
rename to net/xl2tpd/patches/0002-Skip-building-pfc.patch
diff --git a/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch b/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch
deleted file mode 100644
index 200688e9b..000000000
--- a/net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 06bd6af97055071be5ed0f83a808032688a503db Mon Sep 17 00:00:00 2001
-From: Yousong Zhou <yszhou4tech@gmail.com>
-Date: Thu, 12 Nov 2020 14:33:05 +0800
-Subject: [PATCH] xl2tpd-control: fix typo in usage
-
----
- xl2tpd-control.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/xl2tpd-control.c
-+++ b/xl2tpd-control.c
-@@ -96,7 +96,7 @@ void usage()
-             "   --help  show this help message\n\n"
-             "List of supported commands:\n"
-             "add-lac, status-lac, remove-lac, connect-lac, disconnect-lac\n"
--            "add-lns, status-lns, remove-lns, avaliable\n\n"
-+            "add-lns, status-lns, remove-lns, available\n\n"
-             "See xl2tpd-control(8) man page for more details.\n");
- }
-