From 03eab9b63b8e813108b3e7f0db50a3041515472e Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sun, 26 Mar 2023 13:27:02 -0600 Subject: [PATCH 1/7] strongswan: Fix indent for hw_offload, interface, priority Signed-off-by: Philip Prindeville --- net/strongswan/Makefile | 2 +- net/strongswan/files/swanctl.init | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/strongswan/Makefile b/net/strongswan/Makefile index 8c38c703d..3bac8210c 100644 --- a/net/strongswan/Makefile +++ b/net/strongswan/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strongswan PKG_VERSION:=5.9.10 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/ diff --git a/net/strongswan/files/swanctl.init b/net/strongswan/files/swanctl.init index 9d34b1041..b7af78446 100644 --- a/net/strongswan/files/swanctl.init +++ b/net/strongswan/files/swanctl.init @@ -331,10 +331,10 @@ config_child() { [ -n "$local_subnet" ] && swanctl_xappend4 "local_ts = $local_subnet" [ -n "$remote_subnet" ] && swanctl_xappend4 "remote_ts = $remote_subnet" - [ -n "$hw_offload" ] && swanctl_append4 "hw_offload = $hw_offload" + [ -n "$hw_offload" ] && swanctl_xappend4 "hw_offload = $hw_offload" [ $ipcomp -eq 1 ] && swanctl_xappend4 "ipcomp = 1" - [ -n "$interface" ] && swanctl_append4 "interface = $interface" - [ -n "$priority" ] && swanctl_append4 "priority = $priority" + [ -n "$interface" ] && swanctl_xappend4 "interface = $interface" + [ -n "$priority" ] && swanctl_xappend4 "priority = $priority" [ -n "$if_id" ] && { swanctl_xappend4 "if_id_in = $if_id" ; swanctl_xappend4 "if_id_out = $if_id" ; } [ -n "$startaction" -a "$startaction" != "none" ] && swanctl_xappend4 "start_action = $startaction" [ -n "$closeaction" -a "$closeaction" != "none" ] && swanctl_xappend4 "close_action = $closeaction" From 216b6b61a83f04451aeea1c16aa2a67b7437549a Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sun, 26 Mar 2023 13:52:55 -0600 Subject: [PATCH 2/7] strongswan: simplify indentation Allow passing multiple config lines with the same indent level. Signed-off-by: Philip Prindeville --- net/strongswan/files/swanctl.init | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/net/strongswan/files/swanctl.init b/net/strongswan/files/swanctl.init index b7af78446..3af15f19e 100644 --- a/net/strongswan/files/swanctl.init +++ b/net/strongswan/files/swanctl.init @@ -63,9 +63,12 @@ file_reset() { xappend() { local file="$1" - shift + local indent="$2" + shift 2 - echo "$@" >> "$file" + for cmd in "$@"; do + echo "$indent$cmd" >> "$file" + done } swan_reset() { @@ -77,23 +80,23 @@ swan_xappend() { } swan_xappend0() { - swan_xappend "$@" + swan_xappend "" "$@" } swan_xappend1() { - swan_xappend " ""$@" + swan_xappend " " "$@" } swan_xappend2() { - swan_xappend " ""$@" + swan_xappend " " "$@" } swan_xappend3() { - swan_xappend " ""$@" + swan_xappend " " "$@" } swan_xappend4() { - swan_xappend " ""$@" + swan_xappend " " "$@" } swanctl_reset() { @@ -105,23 +108,23 @@ swanctl_xappend() { } swanctl_xappend0() { - swanctl_xappend "$@" + swanctl_xappend "" "$@" } swanctl_xappend1() { - swanctl_xappend " ""$@" + swanctl_xappend " " "$@" } swanctl_xappend2() { - swanctl_xappend " ""$@" + swanctl_xappend " " "$@" } swanctl_xappend3() { - swanctl_xappend " ""$@" + swanctl_xappend " " "$@" } swanctl_xappend4() { - swanctl_xappend " ""$@" + swanctl_xappend " " "$@" } warning() { @@ -335,7 +338,7 @@ config_child() { [ $ipcomp -eq 1 ] && swanctl_xappend4 "ipcomp = 1" [ -n "$interface" ] && swanctl_xappend4 "interface = $interface" [ -n "$priority" ] && swanctl_xappend4 "priority = $priority" - [ -n "$if_id" ] && { swanctl_xappend4 "if_id_in = $if_id" ; swanctl_xappend4 "if_id_out = $if_id" ; } + [ -n "$if_id" ] && swanctl_xappend4 "if_id_in = $if_id" "if_id_out = $if_id" [ -n "$startaction" -a "$startaction" != "none" ] && swanctl_xappend4 "start_action = $startaction" [ -n "$closeaction" -a "$closeaction" != "none" ] && swanctl_xappend4 "close_action = $closeaction" swanctl_xappend4 "esp_proposals = $esp_proposal" From 5476cb94651686db1e6e4fe653ed79f7e8debdb5 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sun, 26 Mar 2023 16:23:50 -0600 Subject: [PATCH 3/7] beanstalkd: Update to 1.13 Signed-off-by: Philip Prindeville --- net/beanstalkd/Makefile | 19 ++- net/beanstalkd/patches/900-makefile.patch | 114 ------------------ net/beanstalkd/patches/901-fix-headers.patch | 11 -- .../patches/902-replace-posix_fallocate.patch | 18 --- .../patches/903-fix-size_t-format-spec | 11 ++ 5 files changed, 19 insertions(+), 154 deletions(-) delete mode 100644 net/beanstalkd/patches/900-makefile.patch delete mode 100644 net/beanstalkd/patches/901-fix-headers.patch delete mode 100644 net/beanstalkd/patches/902-replace-posix_fallocate.patch create mode 100644 net/beanstalkd/patches/903-fix-size_t-format-spec diff --git a/net/beanstalkd/Makefile b/net/beanstalkd/Makefile index 97c2608eb..6606f931f 100644 --- a/net/beanstalkd/Makefile +++ b/net/beanstalkd/Makefile @@ -1,20 +1,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=beanstalkd -PKG_VERSION:=1.9 -PKG_RELEASE:=2 +PKG_VERSION:=1.13 +PKG_RELEASE:=1 -# for now, build from latest commit since releases are infrequent and -# useful fixes trickle in... -PKG_SOURCE_URL:=https://github.com/kr/beanstalkd.git -PKG_SOURCE_VERSION:=b7b4a6a14b7e8d096dc8cbc255b23be17a228cbb +PKG_SOURCE_URL:=https://github.com/beanstalkd/$(PKG_NAME)/archive/refs/tags +PKG_SOURCE_VERSION:=1.13 -PKG_SOURCE_PROTO:=git -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=6d5155ab347b731640495b1f0df6a4a849e84194d2ef0c2ec6af3879ee1aca2c +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-v$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE_URL_FILE:=v$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-v$(PKG_VERSION) -PKG_HASH:=6d5155ab347b731640495b1f0df6a4a849e84194d2ef0c2ec6af3879ee1aca2c +PKG_HASH:=26292dcdc0a7011d2f8ad968612f2cd8b2ef07687224876015399ae85e9e5263 PKG_MAINTAINER:=Philip Prindeville PKG_LICENSE:=MIT diff --git a/net/beanstalkd/patches/900-makefile.patch b/net/beanstalkd/patches/900-makefile.patch deleted file mode 100644 index 3cac7178b..000000000 --- a/net/beanstalkd/patches/900-makefile.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,17 +1,16 @@ --PREFIX=/usr/local --BINDIR=$(DESTDIR)$(PREFIX)/bin --CFLAGS=-Wall -Werror\ -- -Wformat=2\ -- -g\ -- --LDFLAGS= --OS=$(shell uname|tr A-Z a-z) --INSTALL=install -- --VERS=$(shell ./vers.sh) --TARG=beanstalkd --MOFILE=main.o --OFILES=\ -+PREFIX ?= /usr/local -+BINDIR = $(DESTDIR)$(PREFIX)/bin -+CFLAGS += -Wall -Werror -Wformat=2 -g -+LDFLAGS += -+LDLIBS ?= -+ -+OS ?= $(shell uname | tr 'A-Z' 'a-z') -+INSTALL ?= install -+ -+VERS = $(shell ./vers.sh) -+TARG = beanstalkd -+MOFILE = main.o -+OFILES = \ - $(OS).o\ - conn.o\ - file.o\ -@@ -29,52 +28,44 @@ OFILES=\ - vers.o\ - walg.o\ - --TOFILES=\ -+TOFILES = \ - testheap.o\ - testjobs.o\ - testserv.o\ - testutil.o\ - --HFILES=\ -+HFILES = \ - dat.h\ - sd-daemon.h\ - - ifeq ($(OS),linux) -- --LDLIBS=\ -- -lrt\ -- -+ LDLIBS += -lrt - endif - --CLEANFILES=\ -+CLEANFILES = \ - vers.c\ - --.PHONY: all - all: $(TARG) - - $(TARG): $(OFILES) $(MOFILE) - $(LINK.o) -o $@ $^ $(LDLIBS) - --.PHONY: install - install: $(BINDIR)/$(TARG) - - $(BINDIR)/%: % - $(INSTALL) -d $(dir $@) - $(INSTALL) $< $@ - --CLEANFILES:=$(CLEANFILES) $(TARG) -+CLEANFILES := $(CLEANFILES) $(TARG) - - $(OFILES) $(MOFILE): $(HFILES) - --.PHONY: clean - clean: - rm -f *.o $(CLEANFILES) - --.PHONY: check - check: ct/_ctcheck - ct/_ctcheck - --.PHONY: bench - bench: ct/_ctcheck - ct/_ctcheck -b - -@@ -88,11 +79,8 @@ ct/ct.o ct/_ctcheck.o: ct/ct.h ct/intern - - $(TOFILES): $(HFILES) ct/ct.h - --CLEANFILES:=$(CLEANFILES) ct/_* ct/*.o -+CLEANFILES += ct/_* ct/*.o - --ifneq ($(shell ./verc.sh),$(shell cat vers.c 2>/dev/null)) --.PHONY: vers.c --endif - vers.c: - ./verc.sh >vers.c - -@@ -100,3 +88,9 @@ doc/beanstalkd.1 doc/beanstalkd.1.html: - ronn $< - - freebsd.o: darwin.c -+ -+.PHONY: all install clean check bench -+ -+ifneq ($(shell ./verc.sh),$(shell cat vers.c 2>/dev/null)) -+.PHONY: vers.c -+endif diff --git a/net/beanstalkd/patches/901-fix-headers.patch b/net/beanstalkd/patches/901-fix-headers.patch deleted file mode 100644 index 3c97abce7..000000000 --- a/net/beanstalkd/patches/901-fix-headers.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sd-daemon.c -+++ b/sd-daemon.c -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/net/beanstalkd/patches/902-replace-posix_fallocate.patch b/net/beanstalkd/patches/902-replace-posix_fallocate.patch deleted file mode 100644 index 3371ff438..000000000 --- a/net/beanstalkd/patches/902-replace-posix_fallocate.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/linux.c -+++ b/linux.c -@@ -1,4 +1,6 @@ - #define _XOPEN_SOURCE 600 -+#include -+#include - #include - #include - #include -@@ -19,7 +21,7 @@ static int epfd; - int - rawfalloc(int fd, int len) - { -- return posix_fallocate(fd, 0, len); -+ return ftruncate(fd, len); - } - - diff --git a/net/beanstalkd/patches/903-fix-size_t-format-spec b/net/beanstalkd/patches/903-fix-size_t-format-spec new file mode 100644 index 000000000..01043a694 --- /dev/null +++ b/net/beanstalkd/patches/903-fix-size_t-format-spec @@ -0,0 +1,11 @@ +--- a/net.c ++++ b/net.c +@@ -158,7 +158,7 @@ make_unix_socket(char *path) + memset(&addr, 0, sizeof(struct sockaddr_un)); + addr.sun_family = AF_UNIX; + if (strlen(path) > maxlen) { +- warnx("socket path %s is too long (%ld characters), where maximum allowed is %ld", ++ warnx("socket path %s is too long (%zu characters), where maximum allowed is %zu", + path, strlen(path), maxlen); + return -1; + } From 5aaecff6d51e364b7325235d25382f99a0b4078f Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sun, 26 Mar 2023 18:18:51 -0600 Subject: [PATCH 4/7] perl-cgi: Update to 4.56 Signed-off-by: Philip Prindeville --- lang/perl-cgi/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/perl-cgi/Makefile b/lang/perl-cgi/Makefile index f79b9627e..04dade2f5 100644 --- a/lang/perl-cgi/Makefile +++ b/lang/perl-cgi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-cgi -PKG_VERSION:=4.54 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=4.56 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://www.cpan.org/authors/id/L/LE/LEEJO PKG_SOURCE:=CGI-$(PKG_VERSION).tar.gz -PKG_HASH:=9608a044ae2e87cefae8e69b113e3828552ddaba0d596a02f9954c6ac17fa294 +PKG_HASH:=2d36d930b89ecdfbcc7d6d4740821bd466a0218abf1bd413568640b2f43799b7 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/CGI-$(PKG_VERSION) PKG_MAINTAINER:=Marcel Denia , \ From 8450d5570e95e128559237c81c507d4bf8b6addf Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Sun, 26 Mar 2023 18:26:45 -0600 Subject: [PATCH 5/7] perl-text-csv_xs: Update to 1.50 Signed-off-by: Philip Prindeville --- lang/perl-text-csv_xs/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/perl-text-csv_xs/Makefile b/lang/perl-text-csv_xs/Makefile index a9aeb25ce..cdaa17152 100644 --- a/lang/perl-text-csv_xs/Makefile +++ b/lang/perl-text-csv_xs/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-text-csv_xs -PKG_VERSION:=1.47 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.50 +PKG_RELEASE:=1 PKG_SOURCE:=Text-CSV_XS-$(PKG_VERSION).tgz PKG_SOURCE_URL:=https://cpan.metacpan.org/authors/id/H/HM/HMBRAND -PKG_HASH:=4bbaffbdfb68505ef3326dc748e63ebe0db31157b78ca8dfcb8c3cd1d1313262 +PKG_HASH:=85b5e1bed7e11dc0413d4e920cee25d980de47376c0048029041cf461eac96b1 PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Text-CSV_XS-$(PKG_VERSION) PKG_MAINTAINER:=Philip Prindeville From 91f2fec680f3f307433602ad9f9c023ff151b164 Mon Sep 17 00:00:00 2001 From: Mikhail Zhilkin Date: Mon, 27 Mar 2023 17:59:21 +0000 Subject: [PATCH 6/7] transmission-web-control: fix web interface files path Transmission 4.0 web interface files changed from /web to /public_html This fixes https://github.com/openwrt/packages/issues/20737 Signed-off-by: Mikhail Zhilkin --- net/transmission-web-control/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/transmission-web-control/Makefile b/net/transmission-web-control/Makefile index 616b57567..449705178 100644 --- a/net/transmission-web-control/Makefile +++ b/net/transmission-web-control/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=transmission-web-control -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ronggang/transmission-web-control @@ -34,8 +34,8 @@ define Build/Compile endef define Package/transmission-web-control/install - $(INSTALL_DIR) $(1)/usr/share/transmission/web - $(CP) $(PKG_BUILD_DIR)/src/* $(1)/usr/share/transmission/web + $(INSTALL_DIR) $(1)/usr/share/transmission/public_html + $(CP) $(PKG_BUILD_DIR)/src/* $(1)/usr/share/transmission/public_html endef $(eval $(call BuildPackage,transmission-web-control)) From 11f95a6a7e6d2b02329e3075ccdc77711d5d2f45 Mon Sep 17 00:00:00 2001 From: Christian Lachner Date: Wed, 29 Mar 2023 08:07:58 +0200 Subject: [PATCH 7/7] haproxy: update to v2.6.12 - Update haproxy PKG_VERSION and PKG_HASH - See changes: http://git.haproxy.org/?p=haproxy-2.6.git;a=shortlog Signed-off-by: Christian Lachner --- net/haproxy/Makefile | 4 ++-- net/haproxy/get-latest-patches.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile index f1ca348cf..17f893480 100644 --- a/net/haproxy/Makefile +++ b/net/haproxy/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haproxy -PKG_VERSION:=2.6.11 +PKG_VERSION:=2.6.12 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src -PKG_HASH:=e0bc430ac407747b077bc88ee6922b4616fa55a9e0f3ec84438dfb055eb9a715 +PKG_HASH:=58f9edb26bf3288f4b502658399281cc5d6478468bd178eafe579c8f41895854 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh index 3ba8f872e..c5f8c7031 100755 --- a/net/haproxy/get-latest-patches.sh +++ b/net/haproxy/get-latest-patches.sh @@ -1,7 +1,7 @@ #!/bin/sh CLONEURL=https://git.haproxy.org/git/haproxy-2.6.git -BASE_TAG=v2.6.11 +BASE_TAG=v2.6.12 TMP_REPODIR=tmprepo PATCHESDIR=patches