From 3b457a9a7fbd7d31b7113163ee81c577f6a58490 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Feb 01 2021 17:30:14 +0000 Subject: Merge branch 'master' into epel8 --- diff --git a/.gitignore b/.gitignore index 4023a15..dac5527 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ privoxy-3.0.16-stable-src.tar.gz /privoxy-3.0.25-beta-src.tar.gz /privoxy-3.0.26-stable-src.tar.gz /privoxy-3.0.28-stable-src.tar.gz +/privoxy-3.0.29-stable-src.tar.gz +/privoxy-3.0.31-stable-src.tar.gz diff --git a/privoxy-3.0.16-chkconfig.patch b/privoxy-3.0.16-chkconfig.patch deleted file mode 100644 index a76affb..0000000 --- a/privoxy-3.0.16-chkconfig.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4ec811a3770425417528031954e309267a23b859 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Tue, 14 Feb 2012 15:46:14 +0100 -Subject: [PATCH] Add LSB header to init script - ---- - privoxy-generic.init | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/privoxy-generic.init b/privoxy-generic.init -index ac51234..507b669 100755 ---- a/privoxy-generic.init -+++ b/privoxy-generic.init -@@ -1,5 +1,15 @@ - #!/bin/sh - # -+# -+# This is file /etc/rc.d/init.d/privoxy and was put here -+# by the privoxy rpm -+# -+# chkconfig: - 84 09 -+# -+# description: Web proxy with advanced filtering capabilities \ -+# such as filtering web page content, managing \ -+# cookies and removing ads -+# - # ******************************************************************** - # - # File : $Source: /cvsroot/ijbswa/current/privoxy-generic.init,v $ --- -1.7.7.6 - diff --git a/privoxy-3.0.16-configdir.patch b/privoxy-3.0.16-configdir.patch deleted file mode 100644 index 790b4ba..0000000 --- a/privoxy-3.0.16-configdir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up privoxy-3.0.16-stable/privoxy-generic.init.configdir privoxy-3.0.16-stable/privoxy-generic.init ---- privoxy-3.0.16-stable/privoxy-generic.init.configdir 2010-03-25 14:41:09.000000000 +0100 -+++ privoxy-3.0.16-stable/privoxy-generic.init 2010-03-25 14:42:47.000000000 +0100 -@@ -56,12 +56,12 @@ - # logfile is writable by $P_USER (logfile is defined in config), and that - # there is suitable write access for $P_PIDFILE. - --PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/xpg4/bin:/usr/bin:/sbin:/bin -+PATH=/usr/bin:/bin:/sbin:/usr/sbin - P_NAME=Privoxy - # Path to executable. - P_DAEMON=privoxy - # Full path to location of Privoxy config file. --P_CONF_FILE=/usr/local/etc/privoxy/config -+P_CONF_FILE=/etc/privoxy/config - # Full path to PID file location. Location must be writable by - # whoever runs this script and by Privoxy itself. - P_PIDFILE=/var/run/privoxy.pid diff --git a/privoxy-3.0.23-CVE-2016-1982.patch b/privoxy-3.0.23-CVE-2016-1982.patch deleted file mode 100644 index 5dbda92..0000000 --- a/privoxy-3.0.23-CVE-2016-1982.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- filters.c 2015/12/27 12:53:39 1.196 -+++ filters.c 2016/01/16 12:29:17 1.197 -@@ -2053,6 +2053,7 @@ - size_t newsize = 0; - unsigned int chunksize = 0; - char *from_p, *to_p; -+ const char *end_of_buffer = buffer + *size; - - assert(buffer); - from_p = to_p = buffer; -@@ -2065,27 +2066,62 @@ - - while (chunksize > 0U) - { -+ /* -+ * If the chunk-size is valid, we should have at least -+ * chunk-size bytes of chunk-data and five bytes of -+ * meta data (chunk-size, CRLF, CRLF) left in the buffer. -+ */ -+ if (chunksize + 5 >= *size - newsize) -+ { -+ log_error(LOG_LEVEL_ERROR, -+ "Chunk size %u exceeds buffered data left. " -+ "Already digested %u of %u buffered bytes.", -+ chunksize, (unsigned int)newsize, (unsigned int)*size); -+ return JB_ERR_PARSE; -+ } -+ -+ /* -+ * Skip the chunk-size, the optional chunk-ext and the CRLF -+ * that is supposed to be located directly before the start -+ * of chunk-data. -+ */ - if (NULL == (from_p = strstr(from_p, "\r\n"))) - { - log_error(LOG_LEVEL_ERROR, "Parse error while stripping \"chunked\" transfer coding"); - return JB_ERR_PARSE; - } -+ from_p += 2; - -- if (chunksize >= *size - newsize) -+ /* -+ * The previous strstr() does not enforce chunk-validity -+ * and is sattisfied as long a CRLF is left in the buffer. -+ * -+ * Make sure the bytes we consider chunk-data are within -+ * the valid range. -+ */ -+ if (from_p + chunksize >= end_of_buffer) - { - log_error(LOG_LEVEL_ERROR, -- "Chunk size %u exceeds buffered data left. " -- "Already digested %u of %u buffered bytes.", -- chunksize, (unsigned int)newsize, (unsigned int)*size); -+ "End of chunk is beyond the end of the buffer."); - return JB_ERR_PARSE; - } -- newsize += chunksize; -- from_p += 2; - - memmove(to_p, from_p, (size_t) chunksize); -+ newsize += chunksize; - to_p = buffer + newsize; -- from_p += chunksize + 2; -+ from_p += chunksize; - -+ /* -+ * Not merging this check with the previous one allows us -+ * to keep chunks without trailing CRLF. It's not clear -+ * if we actually have to care about those, though. -+ */ -+ if (from_p + 2 >= end_of_buffer) -+ { -+ log_error(LOG_LEVEL_ERROR, "Not enough room for trailing CRLF."); -+ return JB_ERR_PARSE; -+ } -+ from_p += 2; - if (sscanf(from_p, "%x", &chunksize) != 1) - { - log_error(LOG_LEVEL_INFO, "Invalid \"chunked\" transfer encoding detected and ignored."); diff --git a/privoxy-3.0.23-CVE-2016-1983.patch b/privoxy-3.0.23-CVE-2016-1983.patch deleted file mode 100644 index 2b06b54..0000000 --- a/privoxy-3.0.23-CVE-2016-1983.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- parsers.c 2015/12/27 12:54:12 1.302 -+++ parsers.c 2016/01/16 12:29:00 1.303 -@@ -3287,6 +3287,13 @@ - { - char *p, *q; - -+ if (strlen(*header) < 7) -+ { -+ log_error(LOG_LEVEL_HEADER, "Removing empty Host header"); -+ freez(*header); -+ return JB_ERR_OK; -+ } -+ - if (!csp->http->hostport || (*csp->http->hostport == '*') || - *csp->http->hostport == ' ' || *csp->http->hostport == '\0') - { diff --git a/privoxy.spec b/privoxy.spec index 88daf14..b9e3f7e 100644 --- a/privoxy.spec +++ b/privoxy.spec @@ -6,8 +6,8 @@ #define beta_or_stable beta Name: privoxy -Version: 3.0.28 -Release: 2%{?dist} +Version: 3.0.31 +Release: 1%{?dist} Summary: Privacy enhancing proxy License: GPLv2+ Source0: http://downloads.sourceforge.net/ijbswa/%{name}-%{version}-%{beta_or_stable}-src.tar.gz @@ -15,6 +15,7 @@ Source1: privoxy.service Source2: privoxy.logrotate URL: http://www.privoxy.org/ Requires(pre): shadow-utils +BuildRequires: make BuildRequires: libtool autoconf pcre-devel zlib-devel systemd %description @@ -41,7 +42,7 @@ make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_sbindir} \ - %{buildroot}%{_mandir}/man1 \ + %{buildroot}%{_mandir}/man8 \ %{buildroot}%{_localstatedir}/log/%{name} \ %{buildroot}%{privoxyconf}/templates \ %{buildroot}%{_unitdir} @@ -49,7 +50,7 @@ mkdir -p %{buildroot}%{_sbindir} \ install -p -m 755 %{name} %{buildroot}%{_sbindir}/%{name} install -p -m 644 {config,*.action,default.filter,trust} %{buildroot}%{privoxyconf}/ install -p -m 644 templates/* %{buildroot}%{privoxyconf}/templates -install -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +install -p -m 644 %{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8 install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service install -p -m 711 -d %{buildroot}%{_localstatedir}/log/%{name} @@ -96,12 +97,27 @@ fi %attr(0755,root,root)%{_sbindir}/%{name} %config(noreplace) %{privoxyconf} %attr(0644,root,root) %{_unitdir}/%{name}.service -%{_mandir}/man1/%{name}.* +%{_mandir}/man8/%{name}.* %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %doc README AUTHORS ChangeLog LICENSE %doc doc %changelog +* Mon Feb 01 2021 Gwyn Ciesla - 3.0.31-1 +- 3.0.31 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Nov 30 2020 Gwyn Ciesla - 3.0.29-1 +- 3.0.29 + +* Tue Jul 28 2020 Fedora Release Engineering - 3.0.28-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 3.0.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 3.0.28-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 6a30512..24c6d85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (privoxy-3.0.28-stable-src.tar.gz) = 5d58024ae73d623a2b8fb2ac49e18f047dfe252c9441388f025cf888c0e4b11546b8796cfa559759ee137002b1b31b30ad28b356ae226836454f32591eb835fc +SHA512 (privoxy-3.0.31-stable-src.tar.gz) = 0bea9973ac22e594a959452390c8612605dbf1fd55151632d35ecc7fe0ef9ca87cc1694a8bcb0511467445ec414b721b9d33651d917b2a8083768d8905ec68ed