From d785e7b1a211b81fc55e11ae025661575d4b1a92 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 13 Jun 2017 20:20:32 +0200
Subject: tinyproxy: update to 1.8.4

---
 package/tinyproxy/Makefile             | 16 ++++++++--------
 package/tinyproxy/files/tinyproxy.conf |  6 +++---
 package/tinyproxy/files/tinyproxy.init |  3 ++-
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'package/tinyproxy')

diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile
index 00f03b0f2..933fb95e4 100644
--- a/package/tinyproxy/Makefile
+++ b/package/tinyproxy/Makefile
@@ -4,15 +4,15 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		tinyproxy
-PKG_VERSION:=		1.8.3
-PKG_RELEASE:=		2
-PKG_HASH:=		682416c8f0f733a8106c87bb395c631222569751fe4617bc381d0499b0f0c017
+PKG_VERSION:=		1.8.4
+PKG_RELEASE:=		1
+PKG_HASH:=		1999c88c43e31ff4cb5e8379b76776a65fa3d326eea868cb5f88ef58a8f631de
 PKG_DESCR:=		lightweight http and https proxy
 PKG_SECTION:=		net/proxy
-PKG_URL:=		https://www.banu.com/tinyproxy/
-PKG_SITES:=		https://www.banu.com/pub/tinyproxy/1.8/
+PKG_URL:=		https://tinyproxy.github.io
+PKG_SITES:=		https://github.com/tinyproxy/tinyproxy/archive/
 
-DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
+DISTFILES:=		$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk
 
@@ -25,10 +25,10 @@ CONFIGURE_ENV+=         ac_cv_func_malloc_0_nonnull=yes \
 
 tinyproxy-install:
 	$(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_TINYPROXY)/etc/tinyproxy
+	$(INSTALL_DIR) $(IDIR_TINYPROXY)/etc
 	$(INSTALL_DIR) $(IDIR_TINYPROXY)/usr/share/tinyproxy
 	$(INSTALL_DATA) ./files/tinyproxy.conf \
-		$(IDIR_TINYPROXY)/etc/tinyproxy
+		$(IDIR_TINYPROXY)/etc
 	$(INSTALL_BIN) $(WRKINST)/usr/sbin/tinyproxy \
 		$(IDIR_TINYPROXY)/usr/sbin/
 	$(INSTALL_DATA) $(WRKINST)/usr/share/tinyproxy/{default,stats,debug}.html \
diff --git a/package/tinyproxy/files/tinyproxy.conf b/package/tinyproxy/files/tinyproxy.conf
index 6460a2c88..798231b12 100644
--- a/package/tinyproxy/files/tinyproxy.conf
+++ b/package/tinyproxy/files/tinyproxy.conf
@@ -64,8 +64,8 @@ StatFile "/usr/share/tinyproxy/stats.html"
 # Where to log the information. Either LogFile or Syslog should be set,
 # but not both.
 #
-Logfile "/var/log/tinyproxy.log"
-# Syslog On
+#Logfile "/var/log/tinyproxy.log"
+Syslog On
 
 #
 # Set the logging level. Allowed settings are:
@@ -85,7 +85,7 @@ LogLevel Critical
 # PidFile: Write the PID of the main tinyproxy thread to this file so it
 # can be used for signalling purposes.
 #
-PidFile "/var/run/tinyproxy.pid"
+PidFile "/var/run/tinyproxy/tinyproxy.pid"
 
 #
 # Include the X-Tinyproxy header, which has the client's IP address when
diff --git a/package/tinyproxy/files/tinyproxy.init b/package/tinyproxy/files/tinyproxy.init
index 46cc6ee5a..e0a8b9a81 100644
--- a/package/tinyproxy/files/tinyproxy.init
+++ b/package/tinyproxy/files/tinyproxy.init
@@ -11,11 +11,12 @@ autostart)
 	exec sh $0 start
 	;;
 start)
+	mkdir -p /var/run/tinyproxy
+	chown tinyproxy.tinyproxy /var/run/tinyproxy
 	/usr/sbin/tinyproxy
 	;;
 stop)
 	kill $(pgrep -f /usr/sbin/tinyproxy)
-	rm /var/run/tinyproxy.pid
 	;;
 restart)
 	sh $0 stop
-- 
cgit v1.2.3