[Privoxy-commits] [privoxy] 02/02: Merge debian changes from 3.0.34-4 and 3.0.34-5.
User Git
git at git.privoxy.org
Fri Oct 11 17:35:55 CEST 2024
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository privoxy.
commit e61ceba6b357a627aaa6c48471665dc2096d8da2
Author: Roland Rosenfeld <roland at debian.org>
AuthorDate: Fri Oct 11 16:33:18 2024 +0200
Merge debian changes from 3.0.34-4 and 3.0.34-5.
---
debian/apparmor/usr.sbin.privoxy | 1 +
debian/changelog | 23 +++++++-
debian/control | 2 +-
debian/copyright | 100 ++++++++++++++++++++++++++++-------
debian/tests/privoxy-regression-test | 18 +++++--
5 files changed, 116 insertions(+), 28 deletions(-)
diff --git a/debian/apparmor/usr.sbin.privoxy b/debian/apparmor/usr.sbin.privoxy
index 3f38a92a..e6810a58 100644
--- a/debian/apparmor/usr.sbin.privoxy
+++ b/debian/apparmor/usr.sbin.privoxy
@@ -7,6 +7,7 @@
capability setgid,
capability setuid,
+ /usr/sbin/privoxy mr,
/etc/privoxy/** r,
owner /etc/privoxy/match-all.action rw,
owner /etc/privoxy/user.action rw,
diff --git a/debian/changelog b/debian/changelog
index 3d95a933..3615aa7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,28 @@ privoxy (3.0.35~gitsnapshot-1) UNRELEASED; urgency=medium
* Unreleased GIT snapshot.
* The following patches are now incorporated upstream: 35_pcre2-support,
- 36_pcre2-patternfix.
+ 36_pcre2-patternfix, 37_socks-bufferoverflow.
- -- Roland Rosenfeld <roland at debian.org> Sun, 05 Feb 2023 10:58:57 +0100
+ -- Roland Rosenfeld <roland at debian.org> Fri, 11 Oct 2024 16:31:33 +0200
+
+privoxy (3.0.34-5) unstable; urgency=medium
+
+ * d/tests/privoxy-regression-test: wait for privoxy to start up.
+
+ -- Roland Rosenfeld <roland at debian.org> Wed, 15 May 2024 20:23:18 +0200
+
+privoxy (3.0.34-4) unstable; urgency=medium
+
+ * Update debian/copyright with help by lrc tool.
+ * d/apparmor/usr.sbin.privoxy: Fix running in container (LP: #2058866,
+ thanks to Łukasz 'sil2100' Zemczak for providing the patch).
+ * d/tests/privoxy-regression-test: place privoxy output into artifacts.
+ * d/tests/privoxy-regression-test: preserve privoxy logfile.
+ * 37_socks-bufferoverflow: Fix socks buffer overflow under source
+ fortification (LP: #2059344).
+ * Update to Standards-Version 4.7.0 (no changes).
+
+ -- Roland Rosenfeld <roland at debian.org> Tue, 14 May 2024 21:55:58 +0200
privoxy (3.0.34-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 0396f097..069d7c1e 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: autoconf,
sgmlspl <!nodoc>,
w3m <!nodoc>,
zlib1g-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Homepage: https://www.privoxy.org/
Vcs-Git: https://salsa.debian.org/debian/privoxy.git
Vcs-Browser: https://salsa.debian.org/debian/privoxy
diff --git a/debian/copyright b/debian/copyright
index 917e794b..010a9936 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,12 +28,12 @@ Comment:
license, or (at your option) any later version.
.
The same is true for Privoxy binaries unless they are linked with a
- mbed TLS version that is licensed under the Apache 2.0 license in
- which case you can redistribute and/or modify the Privoxy binaries
- under the terms of the GNU General Public License as published by the
- Free Software Foundation, either version 3 of the license, or (at
- your option) any later version.
-License: GPL-2+
+ mbed TLS or OpenSSL version that is licensed under the Apache 2.0
+ license in which case you can redistribute and/or modify the Privoxy
+ binaries under the terms of the GNU General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ license, or (at your option) any later version.
+License: GPL-2+ or GPL-3
Files: ./regression-tests.action ./tools/uagen.pl
./tools/privoxy-regression-test.pl ./tools/privoxy-log-parser.pl
@@ -42,6 +42,17 @@ Files: ./regression-tests.action ./tools/uagen.pl
Copyright:
Copyright (c) 2006-2021 Fabian Keil <fk at fabiankeil.de>
License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Files: ./strptime.h
Copyright:
@@ -49,16 +60,60 @@ Copyright:
Comment:
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper at cygnus.com>, 1996.
-License: GPL-2+
+License: LGPL-2+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+ .
+ The GNU C Library 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
+ Floor, Boston, MA 02110-1301, USA.
Files: ./config.guess ./config.sub
Copyright:
1992-2013, Free Software Foundation, Inc.
-License: GPL-2+
+License: GPL-2+ with Autoconf-data exception
+ This file 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
+ .
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that program.
+
+Files: ./install-sh
+Copyright: 1991 by the Massachusetts Institute of Technology
+License: HPND-sell-variant
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of M.I.T. not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission. M.I.T. makes no representations about the
+ suitability of this software for any purpose. It is provided "as is"
+ without express or implied warranty.
Files: debian/*
Copyright:
- 2002-2023 Roland Rosenfeld <roland at debian.org>
+ 2002-2024 Roland Rosenfeld <roland at debian.org>
License: GPL-2+
License: GPL-2+
@@ -84,15 +139,20 @@ License: GPL-2+
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
-License: ISC
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
+License: GPL-3
+ 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 3 of the License, or
+ (at your option) any later version.
.
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/tests/privoxy-regression-test b/debian/tests/privoxy-regression-test
index e8fdd9d9..f134b4fe 100755
--- a/debian/tests/privoxy-regression-test
+++ b/debian/tests/privoxy-regression-test
@@ -3,7 +3,7 @@
# Run privoxy-regression-test.pl on a configuration extended by
# regression-tests.action.
#
-# (c) 2018-2022 Roland Rosenfeld <roland at debian.org>
+# (c) 2018-2024 Roland Rosenfeld <roland at debian.org>
PORT=8119
@@ -22,20 +22,22 @@ cp /usr/sbin/privoxy "$PRIVOXY"
http_proxy=http://127.0.0.1:$PORT/
export http_proxy
-OUTFILE=$AUTOPKGTEST_TMP/output
-
+OUTFILE=$AUTOPKGTEST_TMP/test-output
+DAEMONOUT=$AUTOPKGTEST_TMP/daemon-output
echo "#### pass 1: some optiones disabled"
sed -e "s/^listen-address.*/listen-address 127.0.0.1:$PORT/" \
-e "s%^logdir.*%logdir $AUTOPKGTEST_TMP%" \
+ -e "s/^#debug 65536/debug 13551/" \
-e "s/^keep-alive-timeout.*/keep-alive-timeout 21/" \
-e "s/^#connection-sharing.*/connection-sharing 0/" \
< /usr/share/privoxy/config > "$CONFIG"
echo "actionsfile regression-tests.action" >> "$CONFIG"
echo "Starting privoxy on port $PORT"
-$PRIVOXY --pidfile "$PIDFILE" "$CONFIG"
+$PRIVOXY --pidfile "$PIDFILE" --no-daemon "$CONFIG" > "$DAEMONOUT" 2>&1 &
+sleep 1
/usr/bin/privoxy-regression-test --max-level 200 --show-skipped-tests \
| tee "$OUTFILE" 2>&1
@@ -45,6 +47,7 @@ echo "#### pass 2 with some more options enabled"
sed -e "s/^listen-address.*/listen-address 127.0.0.1:$PORT/" \
-e "s%^logdir.*%logdir $AUTOPKGTEST_TMP%" \
+ -e "s/^#debug 65536/debug 13551/" \
-e "s/^enable-remote-toggle.*/enable-remote-toggle 1/" \
-e "s/^enable-edit-actions.*/enable-edit-actions 1/" \
-e "s/^enable-proxy-authentication-forwarding.*/enable-proxy-authentication-forwarding 1/" \
@@ -60,6 +63,12 @@ echo "actionsfile regression-tests.action" >> "$CONFIG"
echo "Stopping privoxy on port $PORT"
kill "$(cat "$PIDFILE")"
+# Place privoxy output into artifacts:
+if [ -d "$AUTOPKGTEST_ARTIFACTS" ]
+then
+ cp -a "$OUTFILE" "$DAEMONOUT" "$AUTOPKGTEST_ARTIFACTS"/
+fi
+
# Check that 2 passes have both 0 failures:
if [ "$(grep -c 'Executed.*, 0 failures' "$OUTFILE")" = 2 ]
then
@@ -67,4 +76,3 @@ then
else
exit 1
fi
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Privoxy-commits
mailing list