From: Roland Rosenfeld Date: Sat, 1 Mar 2003 10:47:25 +0000 (+0000) Subject: Merge in changes from Debian packages 3.0.0-3 to 3.0.0-5 X-Git-Tag: v_3_1_archive_branchpoint~28 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=7080a82ad34bd1f81efb7219df775ccb18468303 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 index 00000000..1e13c06f --- /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 +$Id$ diff --git a/debian/changelog b/debian/changelog index 310b525e..fa2b6463 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,44 @@ privoxy (3.1.1-0) unstable; urgency=low -- Devin Bayer 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 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 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 Sun, 8 Sep 2002 11:43:38 +0200 + 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 index 00000000..b8626c4c --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control index 9ee2ba3a..85ff2b30 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: privoxy Section: web Priority: optional Maintainer: Roland Rosenfeld -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 diff --git a/debian/postinst b/debian/postinst index 8f1028de..1c1f1264 100644 --- a/debian/postinst +++ b/debian/postinst @@ -25,11 +25,8 @@ set -e 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 diff --git a/debian/postrm b/debian/postrm index 2c9e371a..b3cb9f7e 100644 --- a/debian/postrm +++ b/debian/postrm @@ -20,11 +20,8 @@ set -e case "$1" in purge) - echo "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) diff --git a/debian/rules b/debian/rules index 63e41118..ad7116ae 100755 --- a/debian/rules +++ b/debian/rules @@ -5,9 +5,6 @@ # 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) @@ -15,17 +12,11 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) 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 @@ -34,9 +25,9 @@ configure-stamp: autoheader autoconf - env CFLAGS=$(CFLAGS) \ + env CFLAGS="$(OPTIMIZE) -g" \ ./configure --prefix=/usr --sysconfdir=/etc \ - --mandir=/usr/share/man $(WITHDEBUG) $(WITHOUTPTHREAD) \ + --mandir=/usr/share/man $(WITHDEBUG) \ --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/' \ - -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%^#\(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