OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Nov-2007 20:30:54
Branch: HEAD Handle: 2007110119305300
Added files:
openpkg-src/pcre pcre.patch
Modified files:
openpkg-src/pcre pcre.spec
Log:
apply a preventive link-time symbol namespace conflict workaround (we
got caught by a symbol conflict and resulting segfault in the RPM 5
camp and this change prevents such sitations already in advance)
Summary:
Revision Changes Path
1.5 +16 -0 openpkg-src/pcre/pcre.patch
1.62 +3 -1 openpkg-src/pcre/pcre.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pcre/pcre.patch
============================================================================
$ cvs diff -u -r0 -r1.5 pcre.patch
--- /dev/null 2007-11-01 20:30:46 +0100
+++ pcre.patch 2007-11-01 20:30:54 +0100
@@ -0,0 +1,16 @@
+Index: pcreposix.h
+--- pcreposix.h.orig 2007-08-01 11:06:39 +0200
++++ pcreposix.h 2007-11-01 20:28:15 +0100
+@@ -129,6 +129,12 @@
+
+ /* The functions */
+
++/* link-time symbol namespace conflict prevention */
++#define regcomp pcreposix_regcomp
++#define regexec pcreposix_regexec
++#define regerror pcreposix_regerror
++#define regfree pcreposix_regfree
++
+ PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int);
+ PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t,
+ regmatch_t *, int);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pcre/pcre.spec
============================================================================
$ cvs diff -u -r1.61 -r1.62 pcre.spec
--- openpkg-src/pcre/pcre.spec 21 Sep 2007 11:59:15 -0000 1.61
+++ openpkg-src/pcre/pcre.spec 1 Nov 2007 19:30:53 -0000 1.62
@@ -33,13 +33,14 @@
Group: Libraries
License: LGPL
Version: 7.4
-Release: 20070921
+Release: 20071101
# package options
%option with_utf8 yes
# list of sources
Source0:
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-%{version}.tar.gz
+Patch0: pcre.patch
# build information
Prefix: %{l_prefix}
@@ -61,6 +62,7 @@
%prep
%setup -q
+ %patch -p0
%{l_shtool} subst \
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
