current/debian privoxy.service, NONE, 1.1 changelog, 1.30, 1.31 compat, 1.3, 1.4 control, 1.16, 1.17 copyright, 1.5, 1.6 init.d, 1.6, 1.7 logrotate, 1.2, 1.3 rules, 1.21, 1.22 watch, 1.3, 1.4 README.source, 1.1, NONE

Roland Rosenfeld <[email protected]>
Newsgroups gmane.comp.web.privoxy.cvs
Message-ID <[email protected]>
Update of /cvsroot/ijbswa/current/debian
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22145

Modified Files:
	changelog compat control copyright init.d logrotate rules 
	watch 
Added Files:
	privoxy.service 
Removed Files:
	README.source 
Log Message:
Add all Debian changes from 3.0.19-2 to 3.0.24-1


Index: control
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/control,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** control	27 Dec 2011 14:55:07 -0000	1.16
--- control	6 Feb 2016 12:29:53 -0000	1.17
***************
*** 3,16 ****
  Priority: optional
  Maintainer: Roland Rosenfeld <[email protected]>
! Build-Depends: debhelper (>= 5.0.0), autoconf, autotools-dev, libpcre3-dev,
!  jade, docbook-dsssl, docbook, w3m, sp, sgmlspl, groff, man2html, dpatch,
!  zlib1g-dev
! Standards-Version: 3.9.2
  Homepage: http://www.privoxy.org/
  
  Package: privoxy
  Architecture: any
! Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, logrotate,
!  adduser, lsb-base (>= 3.2-13)
  Recommends: doc-base
  Description: Privacy enhancing HTTP Proxy
--- 3,32 ----
  Priority: optional
  Maintainer: Roland Rosenfeld <[email protected]>
! Build-Depends: autoconf,
!                autotools-dev,
!                debhelper (>= 9),
!                dh-systemd (>= 1.4),
!                docbook,
!                docbook-dsssl,
!                docbook-utils,
!                groff,
!                jade,
!                libpcre3-dev,
!                man2html,
!                sgmlspl,
!                sp,
!                w3m,
!                zlib1g-dev
! Standards-Version: 3.9.7
  Homepage: http://www.privoxy.org/
  
  Package: privoxy
  Architecture: any
! Depends: adduser,
!          logrotate,
!          lsb-base (>= 3.2-13),
!          ${misc:Depends},
!          ${perl:Depends},
!          ${shlibs:Depends}
  Recommends: doc-base
  Description: Privacy enhancing HTTP Proxy

Index: compat
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/compat,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** compat	18 Jul 2006 14:48:48 -0000	1.3
--- compat	6 Feb 2016 12:29:53 -0000	1.4
***************
*** 1 ****
! 5
--- 1 ----
! 9

Index: init.d
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/init.d,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** init.d	27 Dec 2011 14:55:07 -0000	1.6
--- init.d	6 Feb 2016 12:29:53 -0000	1.7
***************
*** 43,49 ****
  fi
  
- # Load the VERBOSE setting and other rcS variables
- . /lib/init/vars.sh
- 
  # Define LSB log_* functions.
  # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
--- 43,46 ----
***************
*** 98,102 ****
  # Function that sends a SIGHUP to the daemon/service
  #
! do_reload() {
  	#
  	# If the daemon can reload its configuration without
--- 95,99 ----
  # Function that sends a SIGHUP to the daemon/service
  #
! do_rotate() {
  	#
  	# If the daemon can reload its configuration without
***************
*** 104,108 ****
  	# then implement that here.
  	#
! 	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
  	return 0
  }
--- 101,105 ----
  	# then implement that here.
  	#
! 	start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE --name $NAME
  	return 0
  }
***************
*** 112,132 ****
    start)
  	if [ "$RUN_DAEMON" = "no" ]; then
!             [ "$VERBOSE" != no ] && log_warning_msg "Not starting $DESC (disabled in $DEFAULTSFILE)."
              exit 0
  	fi
  
! 	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
  	do_start
  	case "$?" in
! 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
! 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
  	esac
  	;;
    stop)
! 	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
  	do_stop
  	case "$?" in
! 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
! 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
  	esac
  	;;
--- 109,129 ----
    start)
  	if [ "$RUN_DAEMON" = "no" ]; then
!             log_warning_msg "Not starting $DESC (disabled in $DEFAULTSFILE)."
              exit 0
  	fi
  
! 	log_daemon_msg "Starting $DESC" "$NAME"
  	do_start
  	case "$?" in
! 		0|1) log_end_msg 0 ;;
! 		2) log_end_msg 1 ;;
  	esac
  	;;
    stop)
! 	log_daemon_msg "Stopping $DESC" "$NAME"
  	do_stop
  	case "$?" in
! 		0|1) log_end_msg 0 ;;
! 		2) log_end_msg 1 ;;
  	esac
  	;;
***************
*** 140,143 ****
--- 137,145 ----
  	#log_end_msg $?
  	#;;
+   rotate)
+ 	log_daemon_msg "Closing open files" "$NAME"
+ 	do_rotate
+ 	log_end_msg $?
+ 	;;
    restart|force-reload)
  	#
***************
*** 146,150 ****
  	#
  	if [ "$RUN_DAEMON" = "no" ]; then
!             [ "$VERBOSE" != no ] && log_warning_msg "Not restarting $DESC (disabled in $DEFAULTSFILE)."
              exit 0
  	fi
--- 148,152 ----
  	#
  	if [ "$RUN_DAEMON" = "no" ]; then
!             log_warning_msg "Not restarting $DESC (disabled in $DEFAULTSFILE)."
              exit 0
  	fi
***************
*** 174,178 ****
    *)
  	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
! 	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
  	exit 3
  	;;
--- 176,180 ----
    *)
  	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
! 	echo "Usage: $SCRIPTNAME {start|stop|rotate|restart|force-reload|status}" >&2
  	exit 3
  	;;

Index: copyright
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/copyright,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** copyright	27 Dec 2011 14:55:07 -0000	1.5
--- copyright	6 Feb 2016 12:29:53 -0000	1.6
***************
*** 1,47 ****
! This package was debianized by Roland Rosenfeld <[email protected]> on
! Fri, 29 Mar 2002 11:52:03 +0100.
! 
! It was downloaded from http://www.privoxy.org/ and
! http://sourceforge.net/project/showfiles.php?group_id=11118
! 
! Upstream Authors: [email protected]
! 
! Current Development Team:
! 
!  Hal Burgiss (docs)
!  Jon Foster
!  Andreas Oesterhelt
!  David Schmidt (OS/2, Mac OSX ports)
! 
! Originally developed by:
! 
!  Junkbusters Corp.
!  Anonymous Coders
! 
! Copyright:     Written by and Copyright (C) 2001-2010 the
!                Privoxy team.  http://www.privoxy.org/
! 
!                Based on the Internet Junkbuster originally written
!                by and Copyright (C) 1997 Anonymous Coders and 
!                Junkbusters Corporation.  http://www.junkbusters.com
! 
!                This program is free software; you can redistribute it 
!                and/or modify it under the terms of the GNU General
!                Public License as published by the Free Software
!                Foundation; either version 2 of the License, or (at
!                your option) any later version.
! 
!                This program is distributed in the hope that it will
!                be useful, but WITHOUT ANY WARRANTY; without even the
!                implied warranty of MERCHANTABILITY or FITNESS FOR A
!                PARTICULAR PURPOSE.  See the GNU General Public
!                License for more details.
! 
!                The GNU General Public License should be included with
!                this file.  If not, you can view it at
!                http://www.gnu.org/copyleft/gpl.html
!                or write to the Free Software Foundation, Inc., 
!                51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  
! The complete GNU General Public License can be found at
! /usr/share/common-licenses/GPL-2
--- 1,34 ----
! Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
! Upstream-Name: Privoxy
! Upstream-Contact: Privoxy team <[email protected]>
! Source: http://sourceforge.net/projects/ijbswa/files/Sources/
  
! Files: *
! Copyright: Written by and Copyright (C) 2001-2014 the Privoxy team.
!            http://www.privoxy.org/
! License: GPL-2
!  Based on the Internet Junkbuster originally written
!  by and Copyright (C) 1997 Anonymous Coders and
!  Junkbusters Corporation.  http://www.junkbusters.com
!  .
!  This program is free software; you can redistribute it
!  and/or modify it under the terms of the GNU General
!  Public License as published by the Free Software
!  Foundation; either version 2 of the License, or (at
!  your option) any later version.
!  .
!  This program is distributed in the hope that it will
!  be useful, but WITHOUT ANY WARRANTY; without even the
!  implied warranty of MERCHANTABILITY or FITNESS FOR A
!  PARTICULAR PURPOSE.  See the GNU General Public
!  License for more details.
!  .
!  The GNU General Public License should be included with
!  this file.  If not, you can view it at
!  http://www.gnu.org/copyleft/gpl.html
!  or write to the Free Software Foundation, Inc.,
!  51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
!  .
!  On Debian systems, the full text of the GNU General Public
!  License version 2 can be found in the file
!  `/usr/share/common-licenses/GPL-2'.

Index: changelog
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/changelog,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** changelog	27 Dec 2011 14:55:07 -0000	1.30
--- changelog	6 Feb 2016 12:29:53 -0000	1.31
***************
*** 1,2 ****
--- 1,189 ----
+ privoxy (3.0.24-2) unstable; urgency=medium
+ 
+   * Upgrade Standards-Version to 3.9.7 (no changes).
+ 
+  -- Roland Rosenfeld <[email protected]>  Thu, 04 Feb 2016 19:35:59 +0100
+ 
+ privoxy (3.0.24-1) unstable; urgency=medium
+ 
+   * New upstream version 3.0.24.
+   * This fixes CVE-2016-1982 and CVE-2016-1983.
+   * Adapt all patches to new upstream version.
+ 
+  -- Roland Rosenfeld <[email protected]>  Fri, 22 Jan 2016 16:08:05 +0100
+ 
+ privoxy (3.0.23-5) unstable; urgency=medium
+ 
+   * Remove /lib/init/vars.sh from init script since it is no longer used.
+     As a consequence remove initscripts dependency (Closes: #804961).
+   * --enable-external-filters (Closes: #805296).
+ 
+  -- Roland Rosenfeld <[email protected]>  Mon, 16 Nov 2015 21:05:41 +0100
+ 
+ privoxy (3.0.23-4) unstable; urgency=medium
+ 
+   * Add rotate option to init.d script.
+   * Change logrotate to use rotate option (Closes: #783399).
+   * privoxy.service: define SuccessExitStatus=15.
+   * Set locales to C.UTF-8 for doc generation to make build reproducible.
+   * Run wrap-and-sort.
+   * 34_system-docbook2man: Use Debian docbook2man-spec.pl (from
+     docbook-utils) instead of local copy, to make package reproducible.
+   * Stop runing "make man2html", since this overrides "make man", which
+     should work reproducible.
+ 
+  -- Roland Rosenfeld <[email protected]>  Sat, 19 Sep 2015 15:05:41 +0200
+ 
+ privoxy (3.0.23-3) unstable; urgency=medium
+ 
+   * Since there are no new bugs found, this goes to unstable now.
+   * Depend on perl-base instead of full perl.
+ 
+  -- Roland Rosenfeld <[email protected]>  Sun, 26 Apr 2015 11:01:08 +0200
+ 
+ privoxy (3.0.23-2) experimental; urgency=low
+ 
+   * Fix cleanup to allow build twice in a row.
+   * Preserve auto build configuration from source package.
+   * This version checks and fails if the config file has erros
+     (Closes: #518006).
+   * init script is no longer silent (Closes: #543811).
+ 
+  -- Roland Rosenfeld <[email protected]>  Sat, 31 Jan 2015 12:31:26 +0100
+ 
+ privoxy (3.0.23-1) experimental; urgency=low
+ 
+   * New upstream version 3.0.23-stable.
+   * Update all patches.
+ 
+  -- Roland Rosenfeld <[email protected]>  Mon, 26 Jan 2015 14:15:47 +0100
+ 
+ privoxy (3.0.22-1) unstable; urgency=low
+ 
+   * New upstream version 3.0.22-stable.
+   * Update all patches.
+   * Upgrade to Standards-Version 3.9.5 (no changes).
+   * Add upstream GPG signature check.
+   * Convert debian/copyright to DEP5.
+ 
+  -- Roland Rosenfeld <[email protected]>  Sun, 16 Nov 2014 18:38:40 +0100
+ 
+ privoxy (3.0.21-7+deb8u1) jessie-security; urgency=high
+ 
+   * 40_CVE-2016-1982: Prevent invalid reads in case of corrupt
+     chunk-encoded content.
+   * 41_CVE-2016-1983: Remove empty Host headers in client requests.
+     Previously they would result in invalid reads.
+ 
+  -- Roland Rosenfeld <[email protected]>  Fri, 22 Jan 2016 17:09:48 +0100
+ 
+ privoxy (3.0.21-7) unstable; urgency=medium
+ 
+   * 37_CVE-2015-1380: denial of service.
+   * 38_CVE-2015-1381: multiple segmentation faults and memory leaks in the
+     pcrs code.
+   * 39_CVE-2015-1382: invalid read.
+   * These 3 patches Closes: #776490.
+ 
+  -- Roland Rosenfeld <[email protected]>  Wed, 28 Jan 2015 19:46:42 +0100
+ 
+ privoxy (3.0.21-5) unstable; urgency=low
+ 
+   * 34_CVE-2015-1030: Fix memory leak in rfc2553_connect_to().  CID 66382
+   * 35_CVE-2015-1031-CID66394: unmap(): Prevent use-after-free if the map 
+     only consists of one item.  CID 66394.
+   * 36_CVE-2015-1031-CID66376: pcrs_execute(): Consistently set *result to
+     NULL in case of errors.  Should make use-after-free in the caller less
+     likely.  CID 66391, CID 66376.
+   * These 3 patches Closes: #775167.
+   
+  -- Roland Rosenfeld <[email protected]>  Mon, 12 Jan 2015 08:44:23 +0100
+ 
+ privoxy (3.0.21-4) unstable; urgency=low
+ 
+   * Enable hardening=+all
+   * Hardcode PIDFile in privoxy.service, since this isn't allowed as
+     variable (Closes: #746262).
+ 
+  -- Roland Rosenfeld <[email protected]>  Sat, 10 May 2014 14:19:03 +0200
+ 
+ privoxy (3.0.21-3) unstable; urgency=low
+ 
+   * When starting via systemd, do not run daemon as root, and honour log
+     file configuration. Thanks to Carlos Maddela for providing a patch
+     (Closes: #745274)
+ 
+  -- Roland Rosenfeld <[email protected]>  Mon, 21 Apr 2014 17:24:01 +0200
+ 
+ privoxy (3.0.21-2) unstable; urgency=low
+ 
+   * Use autotools-dev for arm64 compatibility (Closes: #727948).
+   * Depend on initscripts >= 2.87dsf-8, (Closes: #564563).
+   * Add systemd support (Thanks to Michael Stapelberg) (Closes: #639635).
+   * Upgrade to Standards-Version 3.9.5 (no changes).
+ 
+  -- Roland Rosenfeld <[email protected]>  Sat, 12 Apr 2014 12:54:58 +0200
+ 
+ privoxy (3.0.21-1) unstable; urgency=low
+ 
+   * New upstream version 3.0.21-stable.
+   * This fixes CVE-2013-2503 (Closes: #702896).
+   * Update all patches.
+   * Upgrade to Standards-Version 3.9.4 (no changes).
+ 
+  -- Roland Rosenfeld <[email protected]>  Fri, 05 Jul 2013 14:46:54 +0200
+ 
+ privoxy (3.0.20-1) unstable; urgency=low
+ 
+   * New upstream version 3.0.20-beta.
+   * Update all patches.
+   * Remove 29_typos, which is incorporated upstream now.
+   * 33_manpage_hyphen: Replace all -- in man page by \-\- to make lintian
+     happy.
+ 
+  -- Roland Rosenfeld <[email protected]>  Thu, 24 Jan 2013 17:40:51 +0100
+ 
+ privoxy (3.0.19-2+deb7u3) wheezy-security; urgency=high
+ 
+   * 40_CVE-2016-1982: Prevent invalid reads in case of corrupt
+     chunk-encoded content.
+   * 41_CVE-2016-1983: Remove empty Host headers in client requests.
+     Previously they would result in invalid reads.
+ 
+  -- Roland Rosenfeld <[email protected]>  Fri, 22 Jan 2016 17:51:41 +0100
+ 
+ privoxy (3.0.19-2+deb7u2) wheezy-security; urgency=medium
+ 
+   * 38_CVE-2015-1381: multiple segmentation faults and memory leaks in the
+     pcrs code.
+   * 39_CVE-2015-1382: invalid read.
+   * These 2 patches Closes: #776490 in wheezy.
+ 
+  -- Roland Rosenfeld <[email protected]>  Wed, 28 Jan 2015 20:33:47 +0100
+ 
+ privoxy (3.0.19-2+deb7u1) stable-security; urgency=medium
+ 
+   * 35_CVE-2015-1031-CID66394: unmap(): Prevent use-after-free if the map 
+     only consists of one item.  CID 66394.
+   * 36_CVE-2015-1031-CID66376: pcrs_execute(): Consistently set *result to
+     NULL in case of errors.  Should make use-after-free in the caller less
+     likely.  CID 66391, CID 66376.
+   * These 2 patches Closes: #775167.
+ 
+  -- Roland Rosenfeld <[email protected]>  Sat, 17 Jan 2015 17:20:15 +0100
+ 
+ privoxy (3.0.19-2) unstable; urgency=low
+ 
+   * Migrate from dpatch to 3.0 (quilt) format.
+   * Reformat all patches.
+   * Change build depenency from dpatch to debhelper (>= 9).
+   * Change debian/compat to "9".
+   * Complete rewrite of debian/rules.
+   * Now uses hardening via debhelper.
+   * Remove README.source.
+   * Update to Standards-Version 3.9.3 (no changes).
+ 
+  -- Roland Rosenfeld <[email protected]>  Fri, 18 May 2012 21:24:55 +0200
+ 
  privoxy (3.0.19-1) unstable; urgency=low
  
***************
*** 29,32 ****
--- 216,246 ----
   -- Roland Rosenfeld <[email protected]>  Tue, 01 Mar 2011 21:10:26 +0100
  
+ privoxy (3.0.16-1+deb6u2) squeeze-lts; urgency=high
+ 
+   * Non-maintainer upload by the Squeeze LTS Team. 
+   * CVE-2016-1982
+     Prevent invalid reads in case of corrupt chunk-encoded content
+   * CVE-2016-1983
+     Remove empty Host headers in client requests; resulting in 
+     invalid reads.
+  
+  -- Thorsten Alteholz <[email protected]>  Fri, 22 Jan 2016 18:03:02 +0100
+ 
+ privoxy (3.0.16-1+deb6u1) squeeze-lts; urgency=medium
+ 
+   * Non-maintainer upload by the Squeeze LTS team.
+   * Thanks to Roland Rosenfeld for maintaining privoxy and preparing these
+     patches:
+     - 35_CVE-2015-1031-CID66394: unmap(): Prevent use-after-free if the map
+       only consists of one item.  CID 66394.
+     - 36_CVE-2015-1031-CID66376: pcrs_execute(): Consistently set *result to
+       NULL in case of errors.  Should make use-after-free in the caller less
+       likely.  CID 66391, CID 66376.
+     - 38_CVE-2015-1381: multiple segmentation faults and memory leaks in the
+       pcrs code.
+     - 39_CVE-2015-1382: invalid read.
+ 
+  -- Holger Levsen <[email protected]>  Wed, 28 Jan 2015 19:44:30 +0100
+ 
  privoxy (3.0.16-1) unstable; urgency=low
  
***************
*** 628,630 ****
  
   -- Roland Rosenfeld <[email protected]>  Fri, 29 Mar 2002 11:52:03 +0100
- 
--- 842,843 ----

Index: rules
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/rules,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** rules	27 Dec 2011 14:55:07 -0000	1.21
--- rules	6 Feb 2016 12:29:53 -0000	1.22
***************
*** 1,76 ****
  #!/usr/bin/make -f
  #
! # (C) 2002-2011 Roland Rosenfeld <[email protected]>, based on
! # Sample debian/rules that uses debhelper.
! # This file is public domain software, originally written by Joey Hess. 
! 
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
  
! # These are used for cross-compiling and for saving the configure script
! # from having to guess our platform (since we know it already)
! DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
! DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  
  DEBDIR=`pwd`/debian/privoxy
  
! # Include dpatch stuff.
! include /usr/share/dpatch/dpatch.make
! 
! OPTIMIZE=
! ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
!         OPTIMIZE=-O0
! else
!         OPTIMIZE=-O2
! endif
! 
! build: build-arch build-indep
! build-arch: build-stamp
! build-indep: build-stamp
! build-stamp: patch-stamp
! 	dh_testdir
  
  	autoheader
  	autoconf
! 	env CFLAGS="$(OPTIMIZE) -g" \
! 		./configure --prefix=/usr --sysconfdir=/etc \
! 		--mandir=/usr/share/man	$(WITHDEBUG) \
! 		--enable-zlib --enable-no-gifs \
  		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
- 	$(MAKE)
- 	$(MAKE) dok
- 	env -u LANG $(MAKE) man
- 	$(MAKE) man2html
- 
- 	touch build-stamp
  
! clean: clean1 unpatch
! clean1:
! 	dh_testdir
! 	dh_testroot
! 	rm -f build-stamp configure-stamp
  
  	[ ! -f GNUmakefile ] || $(MAKE) clean
  	[ ! -f GNUmakefile ] || $(MAKE) distclean
  	rm -f configure config.h GNUmakefile
  	rm -f privoxy.8
- 
  	rm -rf obj
  	rm -f ActivityConsole.jar
  	rm -f src/java/org/privoxy/activityconsole/*.class
- 
  	rm -f doc/source/ldp.dsl
  	rm -rf doc/source/temp
- 
  	dh_clean -Xrc.privoxy.orig
  
! install: build-stamp
! 	dh_testdir
! 	dh_testroot
! 	dh_clean -k -Xrc.privoxy.orig
! 	dh_installdirs
! 
  	install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
- 
  	install -m 644 config $(DEBDIR)/etc/privoxy/config
  	install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
--- 1,55 ----
  #!/usr/bin/make -f
  #
! # (c) 2002-2015 Roland Rosenfeld <[email protected]>
! #
  # Uncomment this to turn on verbose mode.
  #export DH_VERBOSE=1
+ #export DH_OPTIONS=-v
  
! export DEB_BUILD_MAINT_OPTIONS = hardening=+all
  
  DEBDIR=`pwd`/debian/privoxy
  
! %:
! 	dh $@ --with autotools_dev --with systemd
  
+ override_dh_auto_configure:
  	autoheader
  	autoconf
! 	dh_auto_configure -- \
! 		--prefix=/usr \
! 		--sysconfdir=/etc \
! 		--mandir=/usr/share/man \
! 		--enable-zlib \
! 		--enable-no-gifs \
! 		--enable-external-filters \
  		--with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular
  
! override_dh_auto_build:
! 	$(MAKE)
! # 	preserve auto build documentation from source package:
! 	tar cf debian/doc.tar README INSTALL AUTHORS doc/source doc/webserver
! 	env -u LANG LC_ALL=C.UTF-8 $(MAKE) dok
! 	rm -f doc/webserver/user-manual/*.bak
! 	env -u LANG LC_ALL=C.UTF-8 $(MAKE) man
  
+ override_dh_auto_clean:
+ #	restore auto build documentation from source package:
+ 	[ ! -f debian/doc.tar ] || tar xf debian/doc.tar
+ 	rm -f debian/doc.tar
+ 	find doc/source -name \*.html | xargs -r rm -f
  	[ ! -f GNUmakefile ] || $(MAKE) clean
  	[ ! -f GNUmakefile ] || $(MAKE) distclean
  	rm -f configure config.h GNUmakefile
  	rm -f privoxy.8
  	rm -rf obj
  	rm -f ActivityConsole.jar
  	rm -f src/java/org/privoxy/activityconsole/*.class
  	rm -f doc/source/ldp.dsl
  	rm -rf doc/source/temp
  	dh_clean -Xrc.privoxy.orig
  
! override_dh_auto_install:
  	install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
  	install -m 644 config $(DEBDIR)/etc/privoxy/config
  	install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action
***************
*** 101,142 ****
  	done
  
! # Build architecture-independent files here.
! binary-indep: build-stamp install
! # We have nothing to do by default.
! 
! # Build architecture-dependent files here.
! binary-arch: build-stamp install
! 	dh_testdir
! 	dh_testroot
! #	dh_installdebconf	
  	dh_installdocs -XCVS
  	(cd $(DEBDIR)/usr/share/doc/privoxy/; \
  	 mv privoxy-index.html index.html)
- 	dh_installexamples
- 	dh_installmenu
- 	dh_installlogrotate
- #	dh_installemacsen
- #	dh_installpam
- #	dh_installmime
- 	dh_installinit
- 	dh_installcron
- 	dh_installman
- 	dh_installinfo
- #	dh_undocumented
- 	dh_installchangelogs ChangeLog
- 	dh_link
- 	dh_strip
- 	dh_compress
- 	dh_fixperms
- #	dh_makeshlibs
- 	dh_installdeb
- 	dh_perl
- 	dh_shlibdeps
- 	dh_gencontrol
- 	dh_md5sums
- 	dh_builddeb
  
! binary: binary-indep binary-arch
! 
! .PHONY: build clean binary-indep binary-arch binary install patch unpatch \
! 	clean1
--- 80,89 ----
  	done
  
! override_dh_installdocs:
  	dh_installdocs -XCVS
  	(cd $(DEBDIR)/usr/share/doc/privoxy/; \
  	 mv privoxy-index.html index.html)
  
! override_dh_perl:
! #	We only need perl-base:
! 	dh_perl -d

Index: watch
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/watch,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** watch	20 Sep 2008 16:39:53 -0000	1.3
--- watch	6 Feb 2016 12:29:53 -0000	1.4
***************
*** 6,8 ****
  #http://sourceforge.net/project/showfiles.php?group_id=11118 http://prdownloads.sourceforge.net/ijbswa/privoxy-(.*)-stable-src.tar.gz\?download
  
! http://sf.net/ijbswa/privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz
--- 6,8 ----
  #http://sourceforge.net/project/showfiles.php?group_id=11118 http://prdownloads.sourceforge.net/ijbswa/privoxy-(.*)-stable-src.tar.gz\?download
  
! opts=pgpsigurlmangle=s/$/.asc/ http://sf.net/ijbswa/privoxy-(\d+.*)-(?:stable|beta)-src.tar.gz

--- README.source DELETED ---

Index: logrotate
===================================================================
RCS file: /cvsroot/ijbswa/current/debian/logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** logrotate	18 Jul 2006 14:48:48 -0000	1.2
--- logrotate	6 Feb 2016 12:29:53 -0000	1.3
***************
*** 7,15 ****
  	sharedscripts
  	postrotate
! 	        if [ -x /usr/sbin/invoke-rc.d ]; then
!         	        invoke-rc.d privoxy restart > /dev/null
  	        else
  			if [ -f /var/run/privoxy.pid ]; then
! 	        	        /etc/init.d/privoxy restart > /dev/null
  			fi
  	        fi
--- 7,15 ----
  	sharedscripts
  	postrotate
! 	        if which invoke-rc.d >/dev/null 2>&1; then
!         	        invoke-rc.d privoxy rotate > /dev/null
  	        else
  			if [ -f /var/run/privoxy.pid ]; then
! 	        	        /etc/init.d/privoxy rotate > /dev/null
  			fi
  	        fi

--- NEW FILE: privoxy.service ---
[Unit]
Description=Privacy enhancing HTTP Proxy

[Service]
Environment=PIDFILE=/var/run/privoxy.pid
Environment=OWNER=privoxy
Environment=CONFIGFILE=/etc/privoxy/config
Type=forking
PIDFile=/var/run/privoxy.pid
ExecStart=/usr/sbin/privoxy --pidfile $PIDFILE --user $OWNER $CONFIGFILE
ExecStopPost=/bin/rm -f $PIDFILE
SuccessExitStatus=15

[Install]
WantedBy=multi-user.target


------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.