Attachment 132517 Details for Bug 176813 – file.txt

file.txt

file.txt (text/plain), 7.02 KB, created by Fabian Keil on 2013-03-10 14:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fabian Keil

Created: 2013-03-10 14:30:00 UTC

Size: 7.02 KB

patch

obsolete

>From 6bee0a26f28359a43c0ee85632c83f9b98c7d03b Mon Sep 17 00:00:00 2001
>From: Fabian Keil <fk@fabiankeil.de>
>Date: Sun, 3 Mar 2013 15:31:49 +0100
>Subject: [PATCH] Update www/privoxy from 3.0.19 to 3.0.21
>
>3.0.20 was a beta version.
>
>The upstream changes include two security fixes and a workaround
>for standards/173421. The complete ChangeLog is available at:
>http://www.privoxy.org/announce.txt
>
>The port-specific changes are:
>
>- Convert to the "new" OPTIONS framework (not using the
>  standard DOCS_DESC is intentional).
>- Delete the old-school pkg-install using USERS and GROUPS instead.
>- Sync pkg-descr with the upstream description.
>- Convert Makefile header.
>---
> www/privoxy/Makefile    | 64 ++++++++++++++++++++++++++-----------------------
> www/privoxy/distinfo    |  4 ++--
> www/privoxy/pkg-descr   |  3 ++-
> www/privoxy/pkg-install | 33 -------------------------
> 4 files changed, 38 insertions(+), 66 deletions(-)
> delete mode 100644 www/privoxy/pkg-install
>
>diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
>index b6a4c6b..8663c78 100644
>--- a/www/privoxy/Makefile
>+++ b/www/privoxy/Makefile
>@@ -1,13 +1,8 @@
>-# New ports collection makefile for:	privoxy
>-# Date created:				21 November 2002
>-# Whom:					John von Essen
>-#
>+# Created by: John von Essen
> # $FreeBSD$
>-#
> 
> PORTNAME=	privoxy
>-PORTVERSION=	3.0.19
>-PORTREVISION=	1
>+PORTVERSION=	3.0.21
> CATEGORIES=	www ipv6
> MASTER_SITES=	SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
> DISTNAME=	privoxy-${PORTVERSION}-stable-src
>@@ -33,44 +28,57 @@ CONFLICTS=	privoxy-devel-[0-9]*
> 
> MAN1=		privoxy.1
> 
>+USERS=		privoxy
>+GROUPS=		privoxy
>+
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-OPTIONS=	ACCEPT_FILTER "Enable support for accf_http(9)" Off \
>-		COMPRESSION "Support compression of buffered content" Off \
>-		DEBUG "Build with debugging symbols" Off \
>-		EDITOR "Support use of the web-based action editor" On \
>-		FORCE "Support bypassing of blocks" On \
>-		PRIVOXY_TOOLS "Install Privoxy-Log-Parser, uagen, etc." Off \
>-		TOGGLE "Support for remote toggling" On
>+OPTIONS_DEFINE=	ACCEPT_FILTER BROKEN_STRPTIME COMPRESSION DEBUG \
>+		DOCS EDITOR FORCE PRIVOXY_TOOLS TOGGLE
>+
>+ACCEPT_FILTER_DESC=	Support for accf_http(9)
>+BROKEN_STRPTIME_DESC=	Enable workaround for standards/173421
>+COMPRESSION_DESC=	Support compression of buffered content
>+DOCS_DESC=		Let Privoxy serve the user manual
>+EDITOR_DESC=		Support use of the web-based action editor
>+FORCE_DESC=		Support bypassing of blocks
>+PRIVOXY_TOOLS_DESC=	Install Privoxy-Log-Parser, uagen, etc.
>+TOGGLE_DESC=		Support for remote toggling
>+
>+OPTIONS_DEFAULT=	BROKEN_STRPTIME EDITOR DOCS FORCE TOGGLE
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
>-.if defined(WITH_ACCEPT_FILTER)
>+.if ${PORT_OPTIONS:MACCEPT_FILTER}
> CONFIGURE_ARGS+=	 --enable-accept-filter
> .endif
> 
>-.if defined(WITH_COMPRESSION)
>+.if ${PORT_OPTIONS:MCOMPRESSION}
> CONFIGURE_ARGS+=	 --enable-compression
> .endif
> 
>-.if defined(WITH_DEBUG)
>+.if ${PORT_OPTIONS:MDEBUG}
> CONFIGURE_ARGS+=	--with-debug
> .endif
> 
>-.if defined(WITHOUT_EDITOR)
>+.if ! ${PORT_OPTIONS:MEDITOR}
> CONFIGURE_ARGS+=	--disable-editor
> .endif
> 
>-.if defined(WITHOUT_FORCE)
>+.if ! ${PORT_OPTIONS:MFORCE}
> CONFIGURE_ARGS+=	--disable-force
> .endif
> 
>-.if defined(WITHOUT_TOGGLE)
>+.if ${PORT_OPTIONS:MBROKEN_STRPTIME}
>+CONFIGURE_ARGS+=	--enable-strptime-sanity-checks
>+.endif
>+
>+.if ! ${PORT_OPTIONS:MTOGGLE}
> CONFIGURE_ARGS+=	--disable-toggle
> .endif
> 
>-.if defined(WITH_PRIVOXY_TOOLS)
>+.if ${PORT_OPTIONS:MPRIVOXY_TOOLS}
> USE_PERL5_RUN=	yes
> RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
> PLIST_SUB+=	PRIVOXY_TOOLS=""
>@@ -85,7 +93,7 @@ post-patch:
> 		-e 's,^$actionsfile user$,#\1,' \
> 		-e 's,^$filterfile user$,#\1,' \
> 	${WRKSRC}/config
>-.if !defined(NOPORTDOCS)
>+.if ${PORT_OPTIONS:MDOCS}
> 	${REINPLACE_CMD} \
> 		-e 's,^#$user-manual$ http://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \
> 	${WRKSRC}/config
>@@ -96,15 +104,11 @@ post-patch:
> pre-configure:
> 	@cd ${WRKSRC}; ${AUTOHEADER}
> 
>-pre-su-install:
>-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
>-		${PKGINSTALL} ${PKGNAME} PRE-INSTALL
>-
> do-install:
> 	@${MKDIR} ${PREFIX}/etc/privoxy/templates
> 	@${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin
> 	@${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${PREFIX}/etc/privoxy/templates
>-.if defined(WITH_PRIVOXY_TOOLS)
>+.if ${PORT_OPTIONS:MPRIVOXY_TOOLS}
> .for privoxy_tool in privoxy-log-parser.pl privoxy-regression-test.pl uagen.pl
> 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${PREFIX}/bin
> .endfor
>@@ -121,7 +125,7 @@ do-install:
> 	@${CHMOD} 0640 ${EXAMPLESDIR}/${examplefile}
> .endfor
> 	@${INSTALL_MAN}  ${WRKSRC}/privoxy.1 ${MANPREFIX}/man/man1
>-.if !defined(NOPORTDOCS)
>+.if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${DOCSDIR}/user-manual
> 	@${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${DOCSDIR}/user-manual
> 	@${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${DOCSDIR}/user-manual
>@@ -133,4 +137,4 @@ post-install:
> 	@${CHMOD} 0750 /var/run/privoxy
> 	@${CAT} ${PKGMESSAGE}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
>index 1f38955..a3bfeef 100644
>--- a/www/privoxy/distinfo
>+++ b/www/privoxy/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (privoxy-3.0.19-stable-src.tar.gz) = 816e627b31caa3d9e71d0a8b83ac9ea7dcbeaaafef3c9a9c792696aa56255232
>-SIZE (privoxy-3.0.19-stable-src.tar.gz) = 1722316
>+SHA256 (privoxy-3.0.21-stable-src.tar.gz) = 5ec7e601948d2bd0ebf0ebe90eed7d49e7663c395ce16d0403e91ea2d459ddb8
>+SIZE (privoxy-3.0.21-stable-src.tar.gz) = 1733120
>diff --git a/www/privoxy/pkg-descr b/www/privoxy/pkg-descr
>index b0d9d33..ace31c2 100644
>--- a/www/privoxy/pkg-descr
>+++ b/www/privoxy/pkg-descr
>@@ -2,6 +2,7 @@ Privoxy is a non-caching web proxy with advanced filtering capabilities for
> enhancing privacy, modifying web page data and HTTP headers, controlling
> access, and removing ads and other obnoxious Internet junk. Privoxy has a
> flexible configuration and can be customized to suit individual needs and
>-tastes. It may be used in both stand-alone systems and multi-user networks.
>+tastes. It has application for both stand-alone systems and multi-user
>+networks.
> 
> WWW: http://www.privoxy.org/
>diff --git a/www/privoxy/pkg-install b/www/privoxy/pkg-install
>deleted file mode 100644
>index a00abc6..0000000
>--- a/www/privoxy/pkg-install
>+++ /dev/null
>@@ -1,33 +0,0 @@
>-#!/bin/sh
>-
>-if [ "$2" != "PRE-INSTALL" ]; then
>-    exit 0
>-fi
>-
>-PW=/usr/sbin/pw
>-ECHO=echo
>-USER=privoxy
>-GROUP=${USER}
>-UIDGID=201
>-
>-if ! ${PW} groupshow "${GROUP}" 2>/dev/null 1>&2; then
>-	if ${PW} groupadd ${GROUP} -g ${UIDGID}; then
>-		${ECHO} "Added group \"${GROUP}\"."
>-	else
>-                ${ECHO} "Adding group \"${GROUP}\" failed..."
>-                exit 1
>-        fi
>-fi
>-
>-if ! ${PW} usershow "${USER}" 2>/dev/null 1>&2; then
>-        if ${PW} useradd ${USER} -g ${GROUP} -h - \
>-                -s "/sbin/nologin" -d "/nonexistent" \
>-                -c "privoxy pseudo-user" -u ${UIDGID}; \
>-        then
>-                ${ECHO} "Added user \"${USER}\"."
>-        else
>-                ${ECHO} "Adding user \"${USER}\" failed..."
>-                exit 1
>-        fi
>-fi
>-exit 0
>-- 
>1.8.1.3

Actions: View

Attachments on bug 176813: 132517