Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Nov 2016 17:58:54 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r426834 - in head/www/tinyproxy: . files
Message-ID:  <201611221758.uAMHwsjr063798@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Tue Nov 22 17:58:54 2016
New Revision: 426834
URL: https://svnweb.freebsd.org/changeset/ports/426834

Log:
  www/tinyproxy: update 1.8.3 -> 1.8.4
  
  - new WWW
  
  PR:		207051
  Changes:	https://github.com/tinyproxy/tinyproxy/releases
  Submitted by:	jason.mann+freebsd@gmail.com
  Approved by:	sunpoet (maintainer timeout)

Added:
  head/www/tinyproxy/files/patch-Makefile.am   (contents, props changed)
  head/www/tinyproxy/files/patch-configure.ac   (contents, props changed)
Deleted:
  head/www/tinyproxy/files/patch-Makefile.in
  head/www/tinyproxy/files/patch-configure
  head/www/tinyproxy/files/patch-etc-Makefile.in
Modified:
  head/www/tinyproxy/Makefile
  head/www/tinyproxy/distinfo
  head/www/tinyproxy/files/patch-src-main.c
  head/www/tinyproxy/pkg-descr

Modified: head/www/tinyproxy/Makefile
==============================================================================
--- head/www/tinyproxy/Makefile	Tue Nov 22 17:40:53 2016	(r426833)
+++ head/www/tinyproxy/Makefile	Tue Nov 22 17:58:54 2016	(r426834)
@@ -2,18 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	tinyproxy
-PORTVERSION=	1.8.3
-PORTREVISION=	1
+PORTVERSION=	1.8.4
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	https://banu.com/pub/tinyproxy/${PORTVERSION:R}/ \
-		LOCAL/sunpoet
 
-MAINTAINER=	sunpoet@FreeBSD.org
+MAINTAINER=	jason.mann+freebsd-ports@gmail.com
 COMMENT=	Small, efficient HTTP proxy server
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	REVERSE TRANSPARENT XHEADER
 REVERSE_DESC=		Reverse proxy support
@@ -24,19 +23,19 @@ CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin 
 		--program-transform-name=""
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	${PORTNAME}
-USES=		gmake
+USES=		autoreconf gmake
 
 REVERSE_CONFIGURE_ENABLE=	reverse
 TRANSPARENT_CONFIGURE_ENABLE=	transparent
 XHEADER_CONFIGURE_ENABLE=	xtinyproxy
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|tinyproxy/tinyproxy|tinyproxy|g; s|/etc/tinyproxy|${PREFIX}&|' \
 		${WRKSRC}/docs/man5/tinyproxy.conf.txt.in \
 		${WRKSRC}/docs/man8/tinyproxy.txt.in \
 		${WRKSRC}/etc/tinyproxy.conf.in
 	@${REINPLACE_CMD} -e '/\/usr\/share\/tinyproxy/d' ${WRKSRC}/etc/tinyproxy.conf.in
+	@${REINPLACE_CMD} -e 's/^#LogFile/LogFile/; s/^#PidFile/PidFile/' ${WRKSRC}/etc/tinyproxy.conf.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/tinyproxy.conf ${STAGEDIR}${PREFIX}/etc/tinyproxy.conf.sample

Modified: head/www/tinyproxy/distinfo
==============================================================================
--- head/www/tinyproxy/distinfo	Tue Nov 22 17:40:53 2016	(r426833)
+++ head/www/tinyproxy/distinfo	Tue Nov 22 17:58:54 2016	(r426834)
@@ -1,2 +1,3 @@
-SHA256 (tinyproxy-1.8.3.tar.gz) = 682416c8f0f733a8106c87bb395c631222569751fe4617bc381d0499b0f0c017
-SIZE (tinyproxy-1.8.3.tar.gz) = 266744
+TIMESTAMP = 1479837510
+SHA256 (tinyproxy-tinyproxy-1.8.4_GH0.tar.gz) = 1999c88c43e31ff4cb5e8379b76776a65fa3d326eea868cb5f88ef58a8f631de
+SIZE (tinyproxy-tinyproxy-1.8.4_GH0.tar.gz) = 124634

Added: head/www/tinyproxy/files/patch-Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/tinyproxy/files/patch-Makefile.am	Tue Nov 22 17:58:54 2016	(r426834)
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	2014-12-13 00:57:23 UTC
++++ Makefile.am
+@@ -2,7 +2,6 @@ SUBDIRS = \
+ 	src \
+ 	data \
+ 	etc \
+-	docs \
+ 	m4macros \
+ 	tests
+ 

Added: head/www/tinyproxy/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/tinyproxy/files/patch-configure.ac	Tue Nov 22 17:58:54 2016	(r426834)
@@ -0,0 +1,27 @@
+--- configure.ac.orig	2014-12-13 00:57:23 UTC
++++ configure.ac
+@@ -284,24 +284,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

Modified: head/www/tinyproxy/files/patch-src-main.c
==============================================================================
--- head/www/tinyproxy/files/patch-src-main.c	Tue Nov 22 17:40:53 2016	(r426833)
+++ head/www/tinyproxy/files/patch-src-main.c	Tue Nov 22 17:58:54 2016	(r426834)
@@ -1,6 +1,6 @@
---- src/main.c.orig	2011-08-16 12:14:34 UTC
+--- src/main.c.orig	2014-12-13 00:57:23 UTC
 +++ src/main.c
-@@ -407,12 +407,9 @@ main (int argc, char **argv)
+@@ -417,12 +417,9 @@ main (int argc, char **argv)
                  exit (EX_OSERR);
          }
  
@@ -10,16 +10,16 @@
 -        else
 -                log_message (LOG_WARNING,
 -                             "Not running as root, so not changing UID/GID.");
-+	/*To get this to run correctly on FreeBSD, we must
-+	  ceate the PID and log files before we drop privileges. 
-+	  Other ideas are welcome */
++	/* To get this to run correctly on FreeBSD, we must
++	   create the PID and log files before we drop privileges.
++	   Other ideas are welcome */
  
          /* Create log file after we drop privileges */
          if (setup_logging ()) {
-@@ -427,6 +424,13 @@ main (int argc, char **argv)
-                         exit (EX_OSERR);
+@@ -438,6 +435,13 @@ main (int argc, char **argv)
                  }
          }
+ 
 +        /* Switch to a different user if we're running as root */
 +        if (geteuid () == 0)
 +                change_user (argv[0]);
@@ -27,6 +27,6 @@
 +                log_message (LOG_WARNING,
 +                             "Not running as root, so not changing UID/GID.");
 +
- 
          if (child_pool_create () < 0) {
                  fprintf (stderr,
+                          "%s: Could not create the pool of children.\n",

Modified: head/www/tinyproxy/pkg-descr
==============================================================================
--- head/www/tinyproxy/pkg-descr	Tue Nov 22 17:40:53 2016	(r426833)
+++ head/www/tinyproxy/pkg-descr	Tue Nov 22 17:58:54 2016	(r426834)
@@ -1,11 +1,10 @@
-tinyproxy is a GPLed, lightweight HTTP proxy. Designed from the ground up to be
-fast and yet small, it is an ideal solution for sites where a full-featured
-HTTP proxy is required, but the system resources required to run a more
-demanding HTTP proxy are unavailable. tinyproxy is fully compatible with all
-existing web browsers, and has a number of useful features including
-anonymous mode.
+Tinyproxy is a light-weight HTTP/HTTPS proxy daemon for POSIX
+operating systems. Designed from the ground up to be fast and yet
+small, it is an ideal solution for use cases such as embedded
+deployments where a full featured HTTP proxy is required, but the
+system resources for a larger proxy are unavailable.
 
 Note that tinyproxy requires configuration to run in anonymizing
 mode. See tinyproxy.conf.sample for detail.
 
-WWW: https://banu.com/tinyproxy/
+WWW: https://tinyproxy.github.io/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611221758.uAMHwsjr063798>