From: Hauke Mehrtens Date: Fri, 1 Jan 2021 16:04:34 +0000 (+0100) Subject: ppp: Remove already applied patch X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7aa8c00e4b716f91d2b0d59c4101a29860ad929f;p=openwrt%2Fstaging%2Fthess.git ppp: Remove already applied patch This patch was already applied upstream and not needed here. Fixes: 06403981e1f2 ("ppp: update to version 2.4.7.git-2019-05-06") Signed-off-by: Hauke Mehrtens --- diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index cabe1ecbf3..48d7120a72 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/paulusmack/ppp diff --git a/package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch b/package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch deleted file mode 100644 index d6d44afbd0..0000000000 --- a/package/network/services/ppp/patches/540-save-pppol2tp_fd_str.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/pppd/plugins/pppol2tp/pppol2tp.c -+++ b/pppd/plugins/pppol2tp/pppol2tp.c -@@ -152,6 +152,10 @@ static int setdevname_pppol2tp(char **ar - if (pppol2tp_fd_str == NULL) - novm("PPPoL2TP FD"); - -+ pppol2tp_fd_str = strdup(*argv); -+ if (pppol2tp_fd_str == NULL) -+ novm("PPPoL2TP FD"); -+ - /* Setup option defaults. Compression options are disabled! */ - - modem = 0;