Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package privoxy for openSUSE:Factory checked in at 2021-04-17 00:01:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/privoxy (Old) and /work/SRC/openSUSE:Factory/.privoxy.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "privoxy" Sat Apr 17 00:01:23 2021 rev:52 rq:884924 version:3.0.32 Changes: -------- --- /work/SRC/openSUSE:Factory/privoxy/privoxy.changes 2021-03-10 08:58:22.834958674 +0100 +++ /work/SRC/openSUSE:Factory/.privoxy.new.12324/privoxy.changes 2021-04-17 00:01:26.045562742 +0200 @@ -1,0 +2,7 @@ +Fri Apr 9 19:47:02 UTC 2021 - Cristian Rodr??guez <[email protected]> + +- Using pcre is good, however using the pcreposix library is not and will + lead to undefined behaviour as symbol clashes with glibc. + (privoxy-nopcreposix.patch) + +------------------------------------------------------------------- New: ---- privoxy-nopcreposix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ privoxy.spec ++++++ --- /var/tmp/diff_new_pack.q0QOfE/_old 2021-04-17 00:01:27.093564394 +0200 +++ /var/tmp/diff_new_pack.q0QOfE/_new 2021-04-17 00:01:27.097564401 +0200 @@ -32,6 +32,7 @@ Patch1: %{name}-3.0.21-config.patch Patch2: %{name}-3.0.17-utf8.patch Patch3: %{name}-3.0.16-networkmanager.systemd.patch +Patch4: privoxy-nopcreposix.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: pkgconfig @@ -65,10 +66,7 @@ configuration files. %prep -%setup -q -n privoxy-%{version}-stable -%patch1 -p1 -%patch2 -%patch3 +%autosetup -p1 -n privoxy-%{version}-stable %build autoreconf -fiv @@ -77,7 +75,8 @@ --with-openssl\ --with-brotli \ --enable-extended-statistics \ - --enable-pcre-host-patterns + --enable-pcre-host-patterns \ + --enable-dynamic-pcre %make_build ++++++ privoxy-3.0.16-networkmanager.systemd.patch ++++++ --- /var/tmp/diff_new_pack.q0QOfE/_old 2021-04-17 00:01:27.125564445 +0200 +++ /var/tmp/diff_new_pack.q0QOfE/_new 2021-04-17 00:01:27.129564451 +0200 @@ -1,5 +1,5 @@ ---- privoxy_nm -+++ privoxy_nm +--- /dev/null ++++ b/privoxy_nm @@ -0,0 +1,18 @@ +#! /bin/sh +# @@ -19,4 +19,3 @@ + exit 0 + ;; +esac -+ ++++++ privoxy-3.0.17-utf8.patch ++++++ --- /var/tmp/diff_new_pack.q0QOfE/_old 2021-04-17 00:01:27.141564470 +0200 +++ /var/tmp/diff_new_pack.q0QOfE/_new 2021-04-17 00:01:27.145564476 +0200 @@ -1,6 +1,6 @@ ---- default.filter -+++ default.filter -@@ -375,7 +375,7 @@ +--- a/default.filter ++++ b/default.filter +@@ -376,7 +376,7 @@ s/\x84/,,/g s/\x85/.../g #s/\x88/^/g ++++++ privoxy-3.0.21-config.patch ++++++ --- /var/tmp/diff_new_pack.q0QOfE/_old 2021-04-17 00:01:27.157564495 +0200 +++ /var/tmp/diff_new_pack.q0QOfE/_new 2021-04-17 00:01:27.161564502 +0200 @@ -2,11 +2,9 @@ config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: privoxy-3.0.22-stable/config -=================================================================== ---- privoxy-3.0.22-stable.orig/config 2014-11-14 11:31:53.000000000 +0000 -+++ privoxy-3.0.22-stable/config 2014-11-28 22:59:49.000000000 +0000 -@@ -260,7 +260,7 @@ +--- a/config ++++ b/config +@@ -259,7 +259,7 @@ # # No trailing "/", please. # @@ -15,7 +13,7 @@ # # 2.2. templdir # ============== -@@ -345,7 +345,7 @@ confdir . +@@ -344,7 +344,7 @@ # # No trailing "/", please. # ++++++ privoxy-nopcreposix.patch ++++++ --- a/project.h +++ b/project.h @@ -110,15 +110,7 @@ # include <pcrs.h> #endif -#ifdef STATIC_PCRE -# include "pcreposix.h" -#else -# ifdef PCRE_H_IN_SUBDIR -# include <pcre/pcreposix.h> -# else -# include <pcreposix.h> -# endif -#endif +#include <regex.h> #ifdef _WIN32 /* --- a/configure.in +++ b/configure.in @@ -113,6 +113,8 @@ CFLAGS=" " fi +AC_SYS_LARGEFILE +AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL @@ -872,16 +874,6 @@ ]) ], [have_pcre=no]) -AC_CHECK_LIB(pcreposix, regcomp, [ - AC_CHECK_HEADER(pcreposix.h, [ - AC_EGREP_HEADER(pcreposix_regerror, pcreposix.h, [AC_MSG_WARN([[pcreposix old version installed]]); have_pcreposix=no], [have_pcreposix=yes]) - ], [ - AC_CHECK_HEADER(pcre/pcreposix.h, [ - AC_EGREP_HEADER(pcreposix_regerror, pcre/pcreposix.h, [AC_MSG_WARN([[pcreposix old version installed]]); have_pcreposix=no], [have_pcreposix=yes]; [AC_DEFINE(PCREPOSIX_H_IN_SUBDIR)]) - ], [have_pcreposix=no]) - ]) -], [have_pcreposix=no], -lpcre) - dnl ================================================================ dnl libpcrs is temporarily disabled. dnl @@ -1085,7 +1077,7 @@ if test $have_pcre = "yes"; then echo "using libpcre" STATIC_PCRE_ONLY=# - LIBS="$LIBS -lpcre -lpcreposix" + LIBS="$LIBS -lpcre" if test "$use_static_pcre" = "yes"; then pcre_dyn=no AC_DEFINE(PCRE_STATIC,1,[Define to statically link to pcre library on Windows.]) --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -287,8 +287,7 @@ # Add your flags here OTHER_CFLAGS = -CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ - @STATIC_PCRE_ONLY@ -Ipcre +CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall -fvisibility=hidden -include config.h \ LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) --- a/parsers.c +++ b/parsers.c @@ -48,7 +48,6 @@ /* * Convince GNU's libc to provide a strptime prototype. */ -#define __USE_XOPEN #endif /*__GLIBC__ */ #include <time.h>
