From be95ccbc8c0eea9a8e27e813bf0c5c4119ebde09 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 16 Mar 2022 11:12:52 +0000 Subject: xl2tpd: bump to version 1.3.17 The typo fix patch was merged upstream Signed-off-by: Yousong Zhou --- net/xl2tpd/patches/0002-Skip-building-pfc.patch | 59 ++++++++++++++++++++++ .../0002-xl2tpd-control-fix-typo-in-usage.patch | 20 -------- net/xl2tpd/patches/0003-Skip-building-pfc.patch | 59 ---------------------- 3 files changed, 59 insertions(+), 79 deletions(-) create mode 100644 net/xl2tpd/patches/0002-Skip-building-pfc.patch delete mode 100644 net/xl2tpd/patches/0002-xl2tpd-control-fix-typo-in-usage.patch delete mode 100644 net/xl2tpd/patches/0003-Skip-building-pfc.patch (limited to 'net/xl2tpd/patches') diff --git a/net/xl2tpd/patches/0002-Skip-building-pfc.patch b/net/xl2tpd/patches/0002-Skip-building-pfc.patch new file mode 100644 index 000000000..4ec98f38a --- /dev/null +++ b/net/xl2tpd/patches/0002-Skip-building-pfc.patch @@ -0,0 +1,59 @@ +From f374c10c77d25863606566edcddaf02481f25032 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou +Date: Fri, 18 Oct 2019 11:29:03 +0000 +Subject: [PATCH] Skip building pfc + +It can cause build failure, see [1] + + [1] https://github.com/openwrt/packages/issues/10270 +--- + Makefile | 15 +++------------ + 1 file changed, 3 insertions(+), 12 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -115,10 +115,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin + MANDIR?=$(DESTDIR)${PREFIX}/share/man + + +-all: $(EXEC) pfc $(CONTROL_EXEC) ++all: $(EXEC) $(CONTROL_EXEC) + + clean: +- rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC) ++ rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC) + + $(EXEC): $(OBJS) $(HDRS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) +@@ -126,10 +126,6 @@ $(EXEC): $(OBJS) $(HDRS) + $(CONTROL_EXEC): $(CONTROL_SRCS) + $(CC) $(CFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@ + +-pfc: +- $(CC) $(CFLAGS) -c contrib/pfc.c +- $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS) +- + romfs: + $(ROMFSINST) /bin/$(EXEC) + +@@ -142,7 +138,7 @@ packagingprep: + sed -i "s/Version: .*/Version: ${XL2TPDBASEVERSION}/" packaging/*/*.spec + sed -i "s/PKG_VERSION:=.*/PKG_VERSION:=${XL2TPDBASEVERSION}/" packaging/openwrt/Makefile + +-install: ${EXEC} pfc ${CONTROL_EXEC} ++install: ${EXEC} ${CONTROL_EXEC} + install -d -m 0755 ${SBINDIR} + install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC) + install -d -m 0755 ${MANDIR}/man5 +@@ -151,11 +147,6 @@ install: ${EXEC} pfc ${CONTROL_EXEC} + install -m 0644 doc/xl2tpd-control.8 ${MANDIR}/man8/ + install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \ + ${MANDIR}/man5/ +- # pfc +- install -d -m 0755 ${BINDIR} +- install -m 0755 pfc ${BINDIR}/pfc +- install -d -m 0755 ${MANDIR}/man1 +- install -m 0644 contrib/pfc.1 ${MANDIR}/man1/ + # control exec + install -d -m 0755 ${SBINDIR} + install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC) 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 -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"); - } - diff --git a/net/xl2tpd/patches/0003-Skip-building-pfc.patch b/net/xl2tpd/patches/0003-Skip-building-pfc.patch deleted file mode 100644 index 4ec98f38a..000000000 --- a/net/xl2tpd/patches/0003-Skip-building-pfc.patch +++ /dev/null @@ -1,59 +0,0 @@ -From f374c10c77d25863606566edcddaf02481f25032 Mon Sep 17 00:00:00 2001 -From: Yousong Zhou -Date: Fri, 18 Oct 2019 11:29:03 +0000 -Subject: [PATCH] Skip building pfc - -It can cause build failure, see [1] - - [1] https://github.com/openwrt/packages/issues/10270 ---- - Makefile | 15 +++------------ - 1 file changed, 3 insertions(+), 12 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -115,10 +115,10 @@ BINDIR?=$(DESTDIR)${PREFIX}/bin - MANDIR?=$(DESTDIR)${PREFIX}/share/man - - --all: $(EXEC) pfc $(CONTROL_EXEC) -+all: $(EXEC) $(CONTROL_EXEC) - - clean: -- rm -f $(OBJS) $(EXEC) pfc.o pfc $(CONTROL_EXEC) -+ rm -f $(OBJS) $(EXEC) $(CONTROL_EXEC) - - $(EXEC): $(OBJS) $(HDRS) - $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS) -@@ -126,10 +126,6 @@ $(EXEC): $(OBJS) $(HDRS) - $(CONTROL_EXEC): $(CONTROL_SRCS) - $(CC) $(CFLAGS) $(LDFLAGS) $(CONTROL_SRCS) -o $@ - --pfc: -- $(CC) $(CFLAGS) -c contrib/pfc.c -- $(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS) -- - romfs: - $(ROMFSINST) /bin/$(EXEC) - -@@ -142,7 +138,7 @@ packagingprep: - sed -i "s/Version: .*/Version: ${XL2TPDBASEVERSION}/" packaging/*/*.spec - sed -i "s/PKG_VERSION:=.*/PKG_VERSION:=${XL2TPDBASEVERSION}/" packaging/openwrt/Makefile - --install: ${EXEC} pfc ${CONTROL_EXEC} -+install: ${EXEC} ${CONTROL_EXEC} - install -d -m 0755 ${SBINDIR} - install -m 0755 $(EXEC) ${SBINDIR}/$(EXEC) - install -d -m 0755 ${MANDIR}/man5 -@@ -151,11 +147,6 @@ install: ${EXEC} pfc ${CONTROL_EXEC} - install -m 0644 doc/xl2tpd-control.8 ${MANDIR}/man8/ - install -m 0644 doc/xl2tpd.conf.5 doc/l2tp-secrets.5 \ - ${MANDIR}/man5/ -- # pfc -- install -d -m 0755 ${BINDIR} -- install -m 0755 pfc ${BINDIR}/pfc -- install -d -m 0755 ${MANDIR}/man1 -- install -m 0644 contrib/pfc.1 ${MANDIR}/man1/ - # control exec - install -d -m 0755 ${SBINDIR} - install -m 0755 $(CONTROL_EXEC) ${SBINDIR}/$(CONTROL_EXEC) -- cgit v1.2.3