From 0aa541511d41d23b562d4afc7b4a69cc12bd99c3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 17 Nov 2021 15:00:48 +0100 Subject: tinyproxy: update to 1.11.0 --- package/tinyproxy/Makefile | 21 +++++++++------------ package/tinyproxy/files/tinyproxy.conf | 22 ---------------------- package/tinyproxy/files/tinyproxy.init | 4 ++-- package/tinyproxy/patches/patch-Makefile_am | 10 ---------- package/tinyproxy/patches/patch-configure_ac | 27 --------------------------- 5 files changed, 11 insertions(+), 73 deletions(-) delete mode 100644 package/tinyproxy/patches/patch-Makefile_am delete mode 100644 package/tinyproxy/patches/patch-configure_ac diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index 933fb95e4..47894b558 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -4,33 +4,30 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= tinyproxy -PKG_VERSION:= 1.8.4 +PKG_VERSION:= 1.11.0 PKG_RELEASE:= 1 -PKG_HASH:= 1999c88c43e31ff4cb5e8379b76776a65fa3d326eea868cb5f88ef58a8f631de +PKG_HASH:= c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32 PKG_DESCR:= lightweight http and https proxy PKG_SECTION:= net/proxy PKG_URL:= https://tinyproxy.github.io -PKG_SITES:= https://github.com/tinyproxy/tinyproxy/archive/ - -DISTFILES:= $(PKG_VERSION).tar.gz +PKG_SITES:= https://github.com/tinyproxy/tinyproxy/releases/download/$(PKG_VERSION)/ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,TINYPROXY,tinyproxy,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -AUTOTOOL_STYLE:= autoreconf -CONFIGURE_ARGS+= --disable-regexcheck +CONFIGURE_ARGS+= --disable-manpage_support CONFIGURE_ENV+= ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes tinyproxy-install: - $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/sbin - $(INSTALL_DIR) $(IDIR_TINYPROXY)/etc + $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/bin + $(INSTALL_DIR) $(IDIR_TINYPROXY)/etc/tinyproxy $(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/share/tinyproxy $(INSTALL_DATA) ./files/tinyproxy.conf \ - $(IDIR_TINYPROXY)/etc - $(INSTALL_BIN) $(WRKINST)/usr/sbin/tinyproxy \ - $(IDIR_TINYPROXY)/usr/sbin/ + $(IDIR_TINYPROXY)/etc/tinyproxy/ + $(INSTALL_BIN) $(WRKINST)/usr/bin/tinyproxy \ + $(IDIR_TINYPROXY)/usr/bin/ $(INSTALL_DATA) $(WRKINST)/usr/share/tinyproxy/{default,stats,debug}.html \ $(IDIR_TINYPROXY)/usr/share/tinyproxy/ diff --git a/package/tinyproxy/files/tinyproxy.conf b/package/tinyproxy/files/tinyproxy.conf index 798231b12..c9ee8d178 100644 --- a/package/tinyproxy/files/tinyproxy.conf +++ b/package/tinyproxy/files/tinyproxy.conf @@ -136,28 +136,6 @@ PidFile "/var/run/tinyproxy/tinyproxy.pid" # MaxClients 100 -# -# These settings set the upper and lower limit for the number of -# spare servers which should be available. If the number of spare servers -# falls below MinSpareServers then new ones will be created. If the number -# of servers exceeds MaxSpareServers then the extras will be killed off. -# -MinSpareServers 5 -MaxSpareServers 20 - -# -# Number of servers to start initially. -# -StartServers 10 - -# -# MaxRequestsPerChild is the number of connections a thread will handle -# before it is killed. In practise this should be set to 0, which disables -# thread reaping. If you do notice problems with memory leakage, then set -# this to something like 10000 -# -MaxRequestsPerChild 0 - # # The following is the authorization controls. If there are any access # control keywords then the default action is to DENY. Otherwise, the diff --git a/package/tinyproxy/files/tinyproxy.init b/package/tinyproxy/files/tinyproxy.init index e0a8b9a81..9a140db56 100644 --- a/package/tinyproxy/files/tinyproxy.init +++ b/package/tinyproxy/files/tinyproxy.init @@ -13,10 +13,10 @@ autostart) start) mkdir -p /var/run/tinyproxy chown tinyproxy.tinyproxy /var/run/tinyproxy - /usr/sbin/tinyproxy + /usr/bin/tinyproxy ;; stop) - kill $(pgrep -f /usr/sbin/tinyproxy) + kill $(pgrep -f /usr/bin/tinyproxy) ;; restart) sh $0 stop diff --git a/package/tinyproxy/patches/patch-Makefile_am b/package/tinyproxy/patches/patch-Makefile_am deleted file mode 100644 index 443ae2e78..000000000 --- a/package/tinyproxy/patches/patch-Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- tinyproxy-1.8.3.orig/Makefile.am 2011-08-16 14:14:34.000000000 +0200 -+++ tinyproxy-1.8.3/Makefile.am 2014-04-07 08:43:20.000000000 +0200 -@@ -2,7 +2,6 @@ SUBDIRS = \ - src \ - data \ - etc \ -- docs \ - m4macros \ - tests - diff --git a/package/tinyproxy/patches/patch-configure_ac b/package/tinyproxy/patches/patch-configure_ac deleted file mode 100644 index b3fd83dc9..000000000 --- a/package/tinyproxy/patches/patch-configure_ac +++ /dev/null @@ -1,27 +0,0 @@ ---- tinyproxy-1.8.3.orig/configure.ac 2011-08-16 14:14:58.000000000 +0200 -+++ tinyproxy-1.8.3/configure.ac 2014-04-07 08:43:06.000000000 +0200 -@@ -282,24 +282,12 @@ AC_SUBST(CPPFLAGS) - AC_SUBST(LIBS) - AC_SUBST(ADDITIONAL_OBJECTS) - --# Check for asciidoc --AC_PATH_PROG(A2X, a2x, no) --AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") --if test x"$A2X" = x"no"; then -- AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.]) --fi -- - AC_CONFIG_FILES([ - Makefile - src/Makefile - data/Makefile - data/templates/Makefile - etc/Makefile --docs/Makefile --docs/man5/Makefile --docs/man5/tinyproxy.conf.txt --docs/man8/Makefile --docs/man8/tinyproxy.txt - m4macros/Makefile - tests/Makefile - tests/scripts/Makefile -- cgit v1.2.3