Merge in changes from Debian packages 3.0.0-3 to 3.0.0-5

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644 (file)
index 0000000..1e13c06
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,11 @@
+privoxy for Debian
+==================
+
+- enable-edit-actions and enable-remote-toggle are disabled in the
+  Debian package for security reasons, because these options allow
+  every user of your privoxy to change its configuration. If you still
+  want to use these features, you can enable them in
+  /etc/privoxy/config and do a "/etc/init.d/privoxy restart".
+
+Roland Rosenfeld <roland@debian.org>
+$Id$

diff --git a/debian/changelog b/debian/changelog
index 310b525..fa2b646 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,44 @@ privoxy (3.1.1-0) unstable; urgency=low
   
  -- Devin Bayer <devin@elektrono.com>  Sat, 25 May 2002 22:49:30 -0400
 
   
  -- Devin Bayer <devin@elektrono.com>  Sat, 25 May 2002 22:49:30 -0400
 

+privoxy (3.0.0-5) unstable; urgency=low
+
+  * Stop build-depending on special versions of libc6-dev and gcc.
+    Hopefully all auto-builders run new versions which shouldn't cause
+    trouble (Closes: #182267)  
+
+ -- Roland Rosenfeld <roland@debian.org>  Mon, 24 Feb 2003 19:07:11 +0100
+
+privoxy (3.0.0-4) unstable; urgency=low
+
+  * Set "enable-edit-actions 0" and "enable-remote-toggle 0" in config
+    file, instead of simply commenting out these two lines.  Mention this
+    configuration change in README.Debian (Closes: #172965, #172966).
+  * Add new "cgi" user-manual, which sends the user manual to the client
+    and activate it in config file (Closes: #148128).
+  * Build-Depend on libc6-dev (>> 2.2.5) to avoid problems with pthread
+    (Closes: #158306, #162693).
+  * Don't search for user bsmtp in /etc/passwd before using adduser.
+    adduser handles already existing users correct.
+  * Remove /etc/provoxy on purge (Closes: #164039).
+  * Upgrade to Standards-Version 3.5.8:
+    - remove support for DEB_BUILD_OPTION "debug"
+    - add support for DEB_BUILD_OPTION "noopt"
+  * Upgrade to debhelper >=4 and use debian/compat instead of DH_COMPAT.
+  * Upgrade config.guess and config.sub (from autotools-dev 20030110.1).
+  * Remove no-pthread workaround for hppa and build-depend on gcc >=3.2.2,
+    which supports -pthread on hppa, too.
+
+ -- Roland Rosenfeld <roland@debian.org>  Sun, 23 Feb 2003 13:34:11 +0100
+
+privoxy (3.0.0-3) unstable; urgency=low
+
+  * Add aliases "wafer" and "vanilla-wafer" for "send-wafer" and
+    "send-vanilla-wafer" to actionlist to provide backward compatibility
+    to 2.9.14 (Closes: #154647).
+
+ -- Roland Rosenfeld <roland@debian.org>  Sun,  8 Sep 2002 11:43:38 +0200
+

 privoxy (3.0.0-2) unstable; urgency=low
 
   * Recompile with libc6 from testing (instead of unstable).
 privoxy (3.0.0-2) unstable; urgency=low
 
   * Recompile with libc6 from testing (instead of unstable).

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/debian/control b/debian/control
index 9ee2ba3..85ff2b3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: privoxy
 Section: web
 Priority: optional
 Maintainer: Roland Rosenfeld <roland@debian.org>
 Section: web
 Priority: optional
 Maintainer: Roland Rosenfeld <roland@debian.org>

-Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev
-Standards-Version: 3.5.6
+Build-Depends: debhelper (>= 4.0.0), autoconf, libpcre3-dev
+Standards-Version: 3.5.8

 
 Package: privoxy
 Architecture: any
 
 Package: privoxy
 Architecture: any

diff --git a/debian/postinst b/debian/postinst
index 8f1028d..1c1f126 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -25,11 +25,8 @@ set -e
 
 case "$1" in
     configure)
 
 case "$1" in
     configure)

-        if ! grep -q '^privoxy:' /etc/passwd
-        then
-            adduser --system --home /etc/privoxy --ingroup nogroup \
-                    --disabled-password privoxy >/dev/null
-        fi
+        adduser --quiet --system --home /etc/privoxy --ingroup nogroup \
+                --disabled-password privoxy

         chown -R privoxy.adm /var/log/privoxy
         chmod 750 /var/log/privoxy
        chown privoxy /etc/privoxy/*.action /etc/privoxy/trust
         chown -R privoxy.adm /var/log/privoxy
         chmod 750 /var/log/privoxy
        chown privoxy /etc/privoxy/*.action /etc/privoxy/trust

diff --git a/debian/postrm b/debian/postrm
index 2c9e371..b3cb9f7 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -20,11 +20,8 @@ set -e
 
 case "$1" in
     purge)
 
 case "$1" in
     purge)

-        echo "Removing user privoxy"

         userdel privoxy || echo "WARNING: Problem removing user privoxy."
         userdel privoxy || echo "WARNING: Problem removing user privoxy."

-
-        echo "Deleting privoxy log files"
-        rm -rf /var/log/privoxy
+        rm -rf /var/log/privoxy /etc/privoxy

         ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         ;;
 
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

diff --git a/debian/rules b/debian/rules
index 63e4111..ad7116a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 

-# This is the debhelper compatibility version to use.
-export DH_COMPAT=3
-

 # 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)
 # 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)


@@ -15,17 +12,11 @@ DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEBDIR=`pwd`/debian/privoxy
 
 
 DEBDIR=`pwd`/debian/privoxy
 

-CFLAGS="-O2"
-WITHDEBUG=""
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -g
-       WITHDEBUG="--with-debug"
-endif
-
-# hppa doesn't support -pthread option, so we complety disable pthread
-# on hppa until there is a better solution in configure.
-ifeq "$(DEB_HOST_GNU_TYPE)" "hppa-linux"
-       WITHOUTPTHREAD="--disable-pthread"
+OPTIMIZE=
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        OPTIMIZE=-O0
+else
+        OPTIMIZE=-O2

 endif
 
 configure: configure-stamp
 endif
 
 configure: configure-stamp


@@ -34,9 +25,9 @@ configure-stamp:
 
        autoheader
        autoconf
 
        autoheader
        autoconf

-       env CFLAGS=$(CFLAGS) \
+       env CFLAGS="$(OPTIMIZE) -g" \

                ./configure --prefix=/usr --sysconfdir=/etc \
                ./configure --prefix=/usr --sysconfdir=/etc \

-               --mandir=/usr/share/man $(WITHDEBUG) $(WITHOUTPTHREAD) \
+               --mandir=/usr/share/man $(WITHDEBUG) \

                --with-docbook=no
 
        touch configure-stamp
                --with-docbook=no
 
        touch configure-stamp


@@ -71,9 +62,10 @@ install: build
        install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
 
        sed -e 's/^\(\(trust\|proxy\)-info-url\|admin-address\)/#\1/'  \
        install -m 0755 privoxy $(DEBDIR)/usr/sbin/privoxy
 
        sed -e 's/^\(\(trust\|proxy\)-info-url\|admin-address\)/#\1/'  \

-           -e 's/^\(enable-\(edit-actions\|remote-toggle\)\)/#\1/' \
+           -e 's/^\(enable-\(edit-actions\|remote-toggle\)\)[  ]*1/\1 0/' \

            -e 's#^confdir \.#confdir /etc/privoxy#' \
            -e 's#^logdir \.#logdir /var/log/privoxy#' \
            -e 's#^confdir \.#confdir /etc/privoxy#' \
            -e 's#^logdir \.#logdir /var/log/privoxy#' \

+           -e 's%^#\(user-manual\).*%\1 /usr/share/doc/privoxy/user-manual%' \

            -e 's/\(Sample Configuration File for Privoxy\).*/\1/' \
            -e 's/Id: config,v.*/Id: config,v $$/' \
                < config > $(DEBDIR)/etc/privoxy/config
            -e 's/\(Sample Configuration File for Privoxy\).*/\1/' \
            -e 's/Id: config,v.*/Id: config,v $$/' \
                < config > $(DEBDIR)/etc/privoxy/config