|
|
current/debian watch, NONE, 1.1.2.1 README.Debian, 1.1.2.2, 1.1.2.3 changel: msg#00002web.privoxy.cvs
Update of /cvsroot/ijbswa/current/debian In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13016 Modified Files: Tag: v_3_0_branch README.Debian changelog compat control copyright init.d logrotate postinst postrm rules Added Files: Tag: v_3_0_branch watch Log Message: All Debian packaging changes from Debian version 3.0.3-2-1. This includes a migration to the dpatch mechanism. --- NEW FILE: watch --- # See uscan(1) for format # Compulsory line, this is a version 3 file version=3 #http://sourceforge.net/project/showfiles.php?group_id=11118 http://prdownloads.sourceforge.net/ijbswa/privoxy-(.*)-stable-src.tar.gz\?download http://prdownloads.sourceforge.net/ijbswa/privoxy-(.*)-stable-src.tar.gz Index: README.Debian =================================================================== RCS file: /cvsroot/ijbswa/current/debian/README.Debian,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- README.Debian 6 Dec 2003 22:22:43 -0000 1.1.2.2 +++ README.Debian 2 Jul 2006 11:06:24 -0000 1.1.2.3 @@ -13,5 +13,10 @@ in /etc/privoxy/config this is activated and the manual can be accessed as http://config.privoxy.org/user-manual +- A patch was applied to use multiple filter files. So you can leave + /etc/privoxy/default.filter untouched and use a local file like + /etc/privoxy/user.filter for your local changes (you have to enable + this file using a second filterfile directive in /etc/privoxy/config). + Roland Rosenfeld <roland@xxxxxxxxxx> $Id$ Index: changelog =================================================================== RCS file: /cvsroot/ijbswa/current/debian/changelog,v retrieving revision 1.6.2.11 retrieving revision 1.6.2.12 diff -u -d -r1.6.2.11 -r1.6.2.12 --- changelog 6 Dec 2003 22:28:39 -0000 1.6.2.11 +++ changelog 2 Jul 2006 11:06:24 -0000 1.6.2.12 @@ -1,3 +1,105 @@ +privoxy (3.0.3-2-1) unstable; urgency=low + + * New upstream version 3.0.3-2. + * Add debian/watch file. + * Remove parts of 13_memory.dpatch, which seem to be free too much + memory (Closes: #353110, #354611). + + -- Roland Rosenfeld <roland@xxxxxxxxxx> Mon, 27 Feb 2006 23:28:52 +0100 + +privoxy (3.0.3-6) unstable; urgency=low + + * Now hopefully really redirect all output of logrotate to /dev/null + (Closes: #314868). + * Migrate all patches to dpatch mechanism. + * Upgrade to debhelper 5. + * Call htmldoc with parameter --no-embedfonts to keep PDF files small. + * Build-Depends on htmldoc (>= 1.8.25-1), because older versions caused + broken PDF documentation on 64bit systems. + * Fix some typos in user-manual. + * Add multiple filter file support (from CVS) (Closes: #201177). + * Fix some memory leaks, mallocs, double frees (from CVS). + * Remove CVS $-tags from config files to make it easier for users to + keep the configuration in a VCS (Closes: #350799). + * Remove trailing spaces from all config files now. + * Build man page (and HTML version of it) at build time. + + -- Roland Rosenfeld <roland@xxxxxxxxxx> Sat, 11 Feb 2006 21:27:14 +0100 + +privoxy (3.0.3-5) unstable; urgency=low + + * Redirect output of restart script in logrotate to /dev/null + (Closes: #314868). + * Upgrade to Standards-Version 3.6.2: + - Recommends: doc-base + * Build-Depends on autotools-dev and copy config.guess and config.sub + from there on every build (Closes: #332767). + * After dechunking remove the "chunked"-header instead of replacing it + by an d"identity" header. Thanks to Michael Shields for reporting this + (Closes: #318683). + * Update address of FSF in copyright file. + + -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 9 Oct 2005 13:44:55 +0200 + +privoxy (3.0.3-4) unstable; urgency=low + + * Stop converting entities to 8bit chars in the documentation + (Closes: #203697). + * Fix typos ('persistant' and 'Januar') in man page and man page sources + (Closes: #302145). + * Restart privoxy in logrotate script instead of sendig a kill -HUP, to + triggering reopen of log files (Closes: #285059). + * Apply patch by Jindrich Makovicka to fix race conditions in log + writing functions (Closes: #299662). + * Stop hiding referrer for www.petitiononline.com/mod_perl/signed.cgi, + because this site does not work otherwise (Closes: #250407). + + -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 15 May 2005 15:28:56 +0200 + +privoxy (3.0.3-3) unstable; urgency=low + + * Now really remove multiproxy.org from all documentation, not only from + the config file (Closes: #198953). + + -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 15 Feb 2004 23:11:29 +0100 + +privoxy (3.0.3-2) unstable; urgency=low + + * no banners-by-side on "/valid-" images, because that's usually from + validator.w3.org (Closes: #221009). + * Upgrade to Standards-Version 3.6.1 (no changes). + * Add Homepage URL to the package description. + * If the privoxy user is already existing as a non-system user in + postinst, this no longer fails, but deletes the non-system user before + adding it again as a system user (Closes: #232724). + * Use deluser instead of userdel in postrm. + * Redirect stderr of privoxy to /var/log/privoxy/errfile to avoid + problems with kept open file descriptors (Closes: #200712). + * Remove comment from config file, which points to list of open proxies + at multiproxy.org (Closes: #198953). + + -- Roland Rosenfeld <roland@xxxxxxxxxx> Sun, 15 Feb 2004 15:13:27 +0100 + +privoxy (3.0.3-1) unstable; urgency=low + + * New upstream version 3.0.3. + - This introduces workarounds for server (PHP <4.2.3) bugs including + the "blank page" problem (Closes: #215231). + - Avoid the conversion of "open" in scripts to "PrivoxyWindowOpen" + (Closes: #197995). + - "advocancy" is no longer blocked (Closes: #202042). + - Fixed yet another two memory leaks (Closes: #215911). + * Stop backup of pdf directory, because it is no longer contained in the + upstream package. + * Create doc/pdf, which is missing upstream. + * disable filter{unsolicited-popups} for www.perl.com/language/newdocs/pod/ + to avoid problems with "PrivoxyWindowOpen" in Perl manuals + (Closes: #195311). + * Apply patch make privoxy compilable on woody where htmldoc --version + doesn't exist (Closes: #216524). + + -- Roland Rosenfeld <roland@xxxxxxxxxx> Sat, 31 Jan 2004 11:25:53 +0100 + privoxy (3.0.2-5) unstable; urgency=low * Merge corrections from upstream default.action 1.7. Index: compat =================================================================== RCS file: /cvsroot/ijbswa/current/debian/compat,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- compat 28 Feb 2003 17:42:31 -0000 1.1.2.1 +++ compat 2 Jul 2006 11:06:24 -0000 1.1.2.2 @@ -1 +1 @@ -4 +5 Index: control =================================================================== RCS file: /cvsroot/ijbswa/current/debian/control,v retrieving revision 1.5.2.5 retrieving revision 1.5.2.6 diff -u -d -r1.5.2.5 -r1.5.2.6 --- control 6 Dec 2003 22:28:09 -0000 1.5.2.5 +++ control 2 Jul 2006 11:06:24 -0000 1.5.2.6 @@ -2,12 +2,13 @@ Section: web Priority: optional Maintainer: Roland Rosenfeld <roland@xxxxxxxxxx> -Build-Depends: debhelper (>= 4.0.0), autoconf, libpcre3-dev, jade, docbook-dsssl, w3m, sp, sgmlspl, groff, htmldoc (>= 1.8.20) -Standards-Version: 3.5.9 +Build-Depends: debhelper (>= 5.0.0), autoconf, autotools-dev, libpcre3-dev, jade, docbook-dsssl, w3m, sp, sgmlspl, groff, htmldoc (>= 1.8.25-1), man2html, dpatch +Standards-Version: 3.6.2 Package: privoxy Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate, adduser +Recommends: doc-base Description: Privacy enhancing HTTP Proxy Privoxy is a web proxy with advanced filtering capabilities for protecting privacy, filtering web page content, managing cookies, @@ -17,3 +18,5 @@ has application for both stand-alone systems and multi-user networks. . Privoxy is based on Internet Junkbuster (tm). + . + Homepage: http://www.privoxy.org/ Index: copyright =================================================================== RCS file: /cvsroot/ijbswa/current/debian/copyright,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- copyright 29 Mar 2003 16:36:48 -0000 1.1.2.1 +++ copyright 2 Jul 2006 11:06:24 -0000 1.1.2.2 @@ -1,3 +1,4 @@ + This package was debianized by Roland Rosenfeld <roland@xxxxxxxxxx> on Fri, 29 Mar 2002 11:52:03 +0100. @@ -40,8 +41,8 @@ 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., 59 - Temple Place - Suite 330, Boston, MA 02111-1307, USA. + 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 Index: init.d =================================================================== RCS file: /cvsroot/ijbswa/current/debian/init.d,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- init.d 6 Dec 2003 22:24:40 -0000 1.1.2.2 +++ init.d 2 Jul 2006 11:06:24 -0000 1.1.2.3 @@ -17,7 +17,7 @@ echo -n "Starting $DESC: " start-stop-daemon --oknodo --start --quiet --pidfile $PIDFILE \ --exec $DAEMON -- --pidfile $PIDFILE --user $OWNER $CONFIGFILE \ - 2>/dev/null + 2>> /var/log/privoxy/errorfile echo "$NAME." ;; stop) @@ -45,12 +45,14 @@ # option to the "reload" entry above. If not, "force-reload" is # just the same as "restart". # - echo "Restarting $DESC: " + echo -n "Restarting $DESC: " start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \ --exec $DAEMON sleep 1 start-stop-daemon --oknodo --start --quiet --pidfile $PIDFILE \ - --exec $DAEMON -- --pidfile $PIDFILE --user $OWNER $CONFIGFILE + --exec $DAEMON -- --pidfile $PIDFILE --user $OWNER $CONFIGFILE \ + 2>> /var/log/privoxy/errorfile + echo "$NAME." ;; *) N=/etc/init.d/$NAME Index: logrotate =================================================================== RCS file: /cvsroot/ijbswa/current/debian/logrotate,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- logrotate 6 Dec 2003 22:25:27 -0000 1.1.2.1 +++ logrotate 2 Jul 2006 11:06:25 -0000 1.1.2.2 @@ -1,4 +1,4 @@ -/var/log/privoxy/logfile /var/log/privoxy/jarfile { +/var/log/privoxy/logfile /var/log/privoxy/jarfile /var/log/privoxy/errorfile { create 0640 privoxy adm missingok weekly @@ -6,9 +6,12 @@ compress sharedscripts postrotate - if [ -f /var/run/privoxy.pid ] - then - kill -HUP `cat /var/run/privoxy.pid` > /dev/null - fi + 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 endscript } Index: postinst =================================================================== RCS file: /cvsroot/ijbswa/current/debian/postinst,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -d -r1.3.2.1 -r1.3.2.2 --- postinst 28 Feb 2003 17:42:31 -0000 1.3.2.1 +++ postinst 2 Jul 2006 11:06:25 -0000 1.3.2.2 @@ -25,8 +25,15 @@ case "$1" in configure) - adduser --quiet --system --home /etc/privoxy --ingroup nogroup \ - --disabled-password privoxy + if ! adduser --quiet --system --home /etc/privoxy --no-create-home \ + --ingroup nogroup --disabled-password privoxy + then + # user privoxy seems to exist + # -> remove him before newly adding him. + deluser --quiet privoxy + adduser --quiet --system --home /etc/privoxy --no-create-home \ + --ingroup nogroup --disabled-password privoxy + fi chown -R privoxy.adm /var/log/privoxy chmod 750 /var/log/privoxy chown privoxy /etc/privoxy/*.action /etc/privoxy/trust Index: postrm =================================================================== RCS file: /cvsroot/ijbswa/current/debian/postrm,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- postrm 28 Feb 2003 17:42:31 -0000 1.1.2.1 +++ postrm 2 Jul 2006 11:06:25 -0000 1.1.2.2 @@ -20,7 +20,7 @@ case "$1" in purge) - userdel privoxy || echo "WARNING: Problem removing user privoxy." + deluser --quiet privoxy rm -rf /var/log/privoxy /etc/privoxy ;; Index: rules =================================================================== RCS file: /cvsroot/ijbswa/current/debian/rules,v retrieving revision 1.3.2.8 retrieving revision 1.3.2.9 diff -u -d -r1.3.2.8 -r1.3.2.9 --- rules 6 Dec 2003 22:27:23 -0000 1.3.2.8 +++ rules 2 Jul 2006 11:06:25 -0000 1.3.2.9 @@ -1,6 +1,6 @@ #!/usr/bin/make -f # -# (C) 2002-2003 Roland Rosenfeld <roland@xxxxxxxxxx>, based on +# (C) 2002-2006 Roland Rosenfeld <roland@xxxxxxxxxx>, based on # Sample debian/rules that uses debhelper. # This file is public domain software, originally written by Joey Hess. @@ -21,8 +21,8 @@ OPTIMIZE=-O2 endif -configure: configure-stamp -configure-stamp: +build: build-stamp +build-stamp: patch-stamp dh_testdir autoheader @@ -31,28 +31,13 @@ ./configure --prefix=/usr --sysconfdir=/etc \ --mandir=/usr/share/man $(WITHDEBUG) \ --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular - - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - -# backup formatted upstream documentation: - for x in source text webserver pdf; do \ - if [ ! -d doc/$$x.dist ]; then \ - cp -a doc/$$x doc/$$x.dist; \ - fi; \ - done - for x in INSTALL README AUTHORS privoxy.1; do \ - if [ ! -f $$x.dist ]; then \ - cp -a $$x $$x.dist; \ - fi; \ - done - $(MAKE) +# create missing doc/pdf directory if necessary: + [ -d doc/pdf ] || mkdir doc/pdf $(MAKE) dok-pdf $(MAKE) dok + env -u LANG $(MAKE) man + $(MAKE) man2html # remove trailing whitespaces: for x in developer-manual user-manual faq; do \ @@ -62,39 +47,28 @@ touch build-stamp -clean: +clean: clean1 unpatch +clean1: dh_testdir dh_testroot rm -f build-stamp configure-stamp -$(MAKE) clean -$(MAKE) distclean - rm -f privoxy privoxy.8 - rm -f configure config.h GNUmakefile + 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 -# restore formatted upstream documentation: - for x in source text webserver pdf; do \ - if [ -d doc/$$x.dist ]; then \ - rm -rf doc/$$x; \ - mv doc/$$x.dist doc/$$x; \ - fi; \ - done - for x in INSTALL README AUTHORS privoxy.1; do \ - if [ -f $$x.dist ]; then \ - rm -f $$x; \ - mv $$x.dist $$x; \ - fi; \ - done - rm -f doc/source/ldp.dsl + rm -rf doc/source/temp + rm -rf doc/pdf dh_clean -install: build +install: build-stamp dh_testdir dh_testroot dh_clean -k @@ -102,34 +76,34 @@ 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/\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 $$/' \ - -e 's/ *$$//' \ - < config > $(DEBDIR)/etc/privoxy/config + install -m 644 config $(DEBDIR)/etc/privoxy/config install -m 0644 default.action $(DEBDIR)/etc/privoxy/default.action install -m 0644 standard.action $(DEBDIR)/etc/privoxy/standard.action install -m 0644 user.action $(DEBDIR)/etc/privoxy/user.action install -m 0644 default.filter $(DEBDIR)/etc/privoxy/default.filter install -m 0644 trust $(DEBDIR)/etc/privoxy/trust - sed -e 's/"1"/"8"/' < privoxy.1 > privoxy.8 - cp -r templates $(DEBDIR)/etc/privoxy/ rm -f $(DEBDIR)/etc/privoxy/templates/*~ rm -rf $(DEBDIR)/etc/privoxy/templates/CVS +# Remove CVS tags and trailing spaces from config files: + find $(DEBDIR)/etc/privoxy -type f \ + | xargs grep -l '\$$[A-Z][^$$]*:[^$$]*\$$' \ + | while read f; do \ + sed -e 's/\$$\(Id: [^$$]*,v\)[^$$]*\$$/\1/' \ + -e 's/\$$\(Source: [^$$]*\)\$$/\1/' \ + -e 's/\$$\(Log: [^$$]*\)\$$/\1/' \ + -e 's/ *$$//' < $$f > $$f.new; \ + mv -f $$f.new $$f; \ + done # Build architecture-independent files here. -binary-indep: build install +binary-indep: build-stamp install # We have nothing to do by default. # Build architecture-dependent files here. -binary-arch: build install +binary-arch: build-stamp install dh_testdir dh_testroot # dh_installdebconf @@ -160,5 +134,17 @@ dh_md5sums dh_builddeb +patch: patch-stamp +patch-stamp: + dpatch apply-all + touch patch-stamp + #dpatch call-all -a=pkg-info >patch-stamp + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure + +.PHONY: build clean binary-indep binary-arch binary install patch unpatch \ + clean1 Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 |
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| News | FAQ | advertise |