--- pcre3-8.12.orig/pcreposix.h +++ pcre3-8.12/pcreposix.h @@ -133,14 +133,19 @@ /* The functions */ -PCREPOSIX_EXP_DECL int regcomp(regex_t *, const char *, int); -PCREPOSIX_EXP_DECL int regexec(const regex_t *, const char *, size_t, +PCREPOSIX_EXP_DECL int pcreposix_regcomp(regex_t *, const char *, int); +PCREPOSIX_EXP_DECL int pcreposix_regexec(const regex_t *, const char *, size_t, regmatch_t *, int); -PCREPOSIX_EXP_DECL size_t regerror(int, const regex_t *, char *, size_t); -PCREPOSIX_EXP_DECL void regfree(regex_t *); +PCREPOSIX_EXP_DECL size_t pcreposix_regerror(int, const regex_t *, char *, size_t); +PCREPOSIX_EXP_DECL void pcreposix_regfree(regex_t *); #ifdef __cplusplus } /* extern "C" */ #endif +#define regcomp pcreposix_regcomp +#define regexec pcreposix_regexec +#define regerror pcreposix_regerror +#define regfree pcreposix_regfree + #endif /* End of pcreposix.h */ --- pcre3-8.12.orig/pcretest.c +++ pcre3-8.12/pcretest.c @@ -1175,7 +1175,7 @@ int main(int argc, char **argv) { FILE *infile = stdin; -int options = 0; +long int options = 0; int study_options = 0; int default_find_match_limit = FALSE; int op = 1; --- pcre3-8.12.orig/configure +++ pcre3-8.12/configure @@ -15819,10 +15819,10 @@ # (Note: The libpcre*_version bits are m4 variables, assigned above) EXTRA_LIBPCRE_LDFLAGS="$EXTRA_LIBPCRE_LDFLAGS \ - $NO_UNDEFINED -version-info 0:1:0" + $NO_UNDEFINED -version-info 15:1:12" EXTRA_LIBPCREPOSIX_LDFLAGS="$EXTRA_LIBPCREPOSIX_LDFLAGS \ - $NO_UNDEFINED -version-info 0:0:0" + $NO_UNDEFINED -version-info 15:1:12" EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS \ $NO_UNDEFINED -version-info 0:0:0 \ --- pcre3-8.12.orig/pcrecpp.cc +++ pcre3-8.12/pcrecpp.cc @@ -79,6 +79,12 @@ // If the user doesn't ask for any options, we just use this one static RE_Options default_options; +// PCRE6.x compatible API +void RE::Init(const char *c_pat, const RE_Options* options) { + const string cxx_pat(c_pat); + Init(cxx_pat, options); +} + void RE::Init(const string& pat, const RE_Options* options) { pattern_ = pat; if (options == NULL) { --- pcre3-8.12.orig/pcrecpp.h +++ pcre3-8.12/pcrecpp.h @@ -658,6 +658,8 @@ private: void Init(const string& pattern, const RE_Options* options); + // Old version from PCRE 6.x, for compatibility + void Init(const char *pattern, const RE_Options* options); void Cleanup(); // Match against "text", filling in "vec" (up to "vecsize" * 2/3) with --- pcre3-8.12.orig/doc/pcreapi.3 +++ pcre3-8.12/doc/pcreapi.3 @@ -96,7 +96,7 @@ .PP .B int pcre_config(int \fIwhat\fP, void *\fIwhere\fP); .PP -.B char *pcre_version(void); +.B const char *pcre_version(void); .PP .B void *(*pcre_malloc)(size_t); .PP --- pcre3-8.12.orig/doc/pcregrep.1 +++ pcre3-8.12/doc/pcregrep.1 @@ -3,6 +3,7 @@ pcregrep - a grep with Perl-compatible regular expressions. .SH SYNOPSIS .B pcregrep [options] [long options] [pattern] [path1 path2 ...] +.B zpcregrep [options] [long options] [pattern] [file1 file2 ...] . .SH DESCRIPTION .rs @@ -75,6 +76,9 @@ If the \fBLC_ALL\fP or \fBLC_CTYPE\fP environment variable is set, \fBpcregrep\fP uses the value to set a locale when calling the PCRE library. The \fB--locale\fP option can be used to override this. +.P +\fBzpcregrep\fR is a wrapper script that allows pcregrep to work on +gzip compressed files. . .SH "SUPPORT FOR COMPRESSED FILES" .rs @@ -530,7 +534,7 @@ .rs .sp Exit status is 0 if any matches were found, 1 if no matches were found, and 2 -for syntax errors and non-existent or inacessible files (even if matches were +for syntax errors and non-existent or inaccessible files (even if matches were found in other files) or too many matching errors. Using the \fB-s\fP option to suppress error messages about inaccessble files does not affect the return code. --- pcre3-8.12.orig/doc/pcre_version.3 +++ pcre3-8.12/doc/pcre_version.3 @@ -7,7 +7,7 @@ .B #include .PP .SM -.B char *pcre_version(void); +.B const char *pcre_version(void); . .SH DESCRIPTION .rs --- pcre3-8.12.orig/debian/libpcrecpp0.docs +++ pcre3-8.12/debian/libpcrecpp0.docs @@ -0,0 +1,2 @@ +README AUTHORS NEWS + --- pcre3-8.12.orig/debian/libpcre3-dev.manpages +++ pcre3-8.12/debian/libpcre3-dev.manpages @@ -0,0 +1,2 @@ +debian/pcre-config.1 + --- pcre3-8.12.orig/debian/README.Versioning.libtool +++ pcre3-8.12/debian/README.Versioning.libtool @@ -0,0 +1,29 @@ +Debian release of PCRE 4.5 had + +PCRE_LIB_VERSION=13:0:10 +PCRE_POSIXLIB_VERSION=13:0:10 + +which corresponds to latest debian-revision (soname libpcre.so.3, +installed as libpcre.so.3.9.0) and followed the instructions about version +numbering in the libtool manual: +| 3. If the library source code has changed at all since the last +| update, then increment REVISION (`C:R:A' becomes `C:r+1:A'). + +13:1:10 + + 4. If any interfaces have been added, removed, or changed since the + last update, increment CURRENT, and set REVISION to 0. + +14:0:10 + + 5. If any interfaces have been added since the last public release, + then increment AGE. + +14:0:11 + + 6. If any interfaces have been removed since the last public release, + then set AGE to 0. + +n/a + +Therefore I'm using 14:0:11 for this release of PCRE 5.0 --- pcre3-8.12.orig/debian/zpcregrep +++ pcre3-8.12/debian/zpcregrep @@ -0,0 +1,2 @@ +#!/bin/sh +GREP=pcregrep zgrep "$@" --- pcre3-8.12.orig/debian/libpcre3-udeb.install +++ pcre3-8.12/debian/libpcre3-udeb.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libpcre.so.* +debian/tmp/usr/lib/libpcreposix.so.* --- pcre3-8.12.orig/debian/libpcrecpp0.install +++ pcre3-8.12/debian/libpcrecpp0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpcrecpp.so.* --- pcre3-8.12.orig/debian/dirs +++ pcre3-8.12/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin --- pcre3-8.12.orig/debian/libpcre3-dev.examples +++ pcre3-8.12/debian/libpcre3-dev.examples @@ -0,0 +1 @@ +pcredemo.c --- pcre3-8.12.orig/debian/compat +++ pcre3-8.12/debian/compat @@ -0,0 +1 @@ +5 --- pcre3-8.12.orig/debian/pcre-config.1 +++ pcre3-8.12/debian/pcre-config.1 @@ -0,0 +1,57 @@ +.TH PCRE-CONFIG 1 +.SH NAME +pcre-config \- program to return PCRE configuration +.SH SYNOPSIS +.B pcre-config +.RB [ --prefix ] +.RB [ --exec-prefix ] +.RB [ --version ] +.RB [ --libs ] +.RB [ --libs-posix ] +.RB [ --cflags ] +.RB [ --cflags-posix ] + +.SH DESCRIPTION +\fBpcre-config\fR returns the configuration of the installed PCRE +libraries: the options required to compile a program to use them. + +.SH OPTIONS +.TP 10 +\fB--prefix\fR +Writes the directory prefix used in the PCRE installation for +architecture independent files (e.g. \fI/usr\fR) to standard output. +.TP +\fB--exec-prefix\fR +Writes the directory prefix used in the PCRE installation for +architecture dependent files (normally the same as \fB--prefix\fR) +to standard output. +.TP +\fB--version\fR +Writes the version of PCRE installed to standard output. +.TP +\fB--libs\fR +Writes to standard output the command line options required to link +with PCRE (e.g. \fI-lpcre\fR). +.TP +\fB--libs-posix\fR +Writes to standard output the command line options required to link +with the PCRE POSIX emulation library (e.g. \fI-lpcreposix -lpcre\fR). +.TP +\fB--cflags\fR +Writes to standard output the command line options required to compile +files that use PCRE (this often includes some \fI-I\fR options, but is blank +on debian systems). +.TP +\fB--cflags-posix\fR +Writes to standard output the command line options required to compile +files that use the PCRE POSIX emulation library (this often includes +some -I options, but is blank on debian systems). Suppress printing of +filenames when searching multiple files. +.TP + +.SH AUTHOR +This manual page was written by Mark Baker , +for the Debian GNU/Linux system (but may be used by others). + +.SH SEE ALSO +\fBpcre(3) --- pcre3-8.12.orig/debian/libpcre3.docs +++ pcre3-8.12/debian/libpcre3.docs @@ -0,0 +1,2 @@ +README AUTHORS NEWS + --- pcre3-8.12.orig/debian/libpcre3-dev.install +++ pcre3-8.12/debian/libpcre3-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/lib*.a +debian/tmp/usr/lib/lib*.so +debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/bin/*-config +debian/tmp/usr/share/man/man3/* --- pcre3-8.12.orig/debian/control +++ pcre3-8.12/debian/control @@ -0,0 +1,79 @@ +Source: pcre3 +Section: libs +Priority: optional +Maintainer: Mark Baker +Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 5.0.22) + +Package: libpcre3 +Section: libs +Architecture: any +Priority: important +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libpcre3-dev (<= 4.3-3) +Description: Perl 5 Compatible Regular Expression Library - runtime files + This is a library of functions to support regular expressions whose syntax + and semantics are as close as possible to those of the Perl 5 language. + . + This package contains the runtime libraries. + +Package: libpcre3-udeb +Section: debian-installer +XC-Package-Type: udeb +Architecture: any +Priority: important +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libpcre3-dev (<= 4.3-3) +Description: Perl 5 Compatible Regular Expression Library - runtime files (udeb) + This is a library of functions to support regular expressions whose syntax + and semantics are as close as possible to those of the Perl 5 language. + . + This package contains the runtime libraries for the Debian Installer (udeb). + +Package: libpcrecpp0 +Section: libs +Architecture: any +Priority: optional +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libpcre3 (<< 6.4-1.1) +Replaces: libpcre3 (<< 6.4-1.1) +Description: Perl 5 Compatible Regular Expression Library - C++ runtime files + This is a C++ library of functions to support regular expressions whose syntax + and semantics are as close as possible to those of the Perl 5 language. + . + This package contains the C++ runtime library. + +Package: libpcre3-dev +Section: libdevel +Architecture: any +Depends: libc6-dev, libpcre3 (= ${binary:Version}), libpcrecpp0 (= ${binary:Version}), ${misc:Depends} +Conflicts: libpcre1-dev, libpcre2-dev +Description: Perl 5 Compatible Regular Expression Library - development files + This is a library of functions to support regular expressions whose syntax + and semantics are as close as possible to those of the Perl 5 language. + . + This package contains the development files, including headers, static + libraries, and documentation. + +Package: libpcre3-dbg +Section: libdevel +Architecture: any +Depends: libpcre3 (= ${binary:Version}), libpcrecpp0 (= ${binary:Version}), ${misc:Depends} +Description: Perl 5 Compatible Regular Expression Library - debug symbols + This is a library of functions to support regular expressions whose syntax + and semantics are as close as possible to those of the Perl 5 language. + . + This package contains the debug symbols, + +Package: pcregrep +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: pgrep (<<4.5) +Description: grep utility that uses perl 5 compatible regexes. + Perl-style regexps have many useful features that the standard POSIX ones + don't; this is basically the same as grep but with the different + regexp syntax. + . + The other reason for the existence of pcregrep is that its source code is an + example of programming with libpcre. --- pcre3-8.12.orig/debian/changelog +++ pcre3-8.12/debian/changelog @@ -0,0 +1,495 @@ +pcre3 (8.12-1yavdr1) lucid; urgency=low + + * reb. yavdr-repo + + -- Holger Schvestka Sat, 19 Feb 2011 19:40:00 +0100 + +pcre3 (8.12-1) unstable; urgency=low + + * New upstream release (Closes: #554242) + + -- Mark Baker Mon, 07 Feb 2011 23:53:42 +0000 + +pcre3 (8.02-1) unstable; urgency=low + + * New upstream release + + -- Mark Baker Fri, 07 May 2010 21:18:05 +0100 + +pcre3 (7.8-3) unstable; urgency=low + + * debian/rules: Install main library in /lib (Closes: 350468, #549608) + * debian/pcre-config.1: Minor formatting changes (thanks Alexander + Peslyak) (Closes: 338658) + * Makefile.am,Makefile.in: Added libpcre.la to LDADD for various things; + apparently this will make it cross-build successfully (Closes: 492565) + * debian/control: Added ${misc:Depends} to dependencies for all the + binary packages + * debian/rules: Don't ignore errors from make distclean + + -- Mark Baker Wed, 07 Oct 2009 00:05:25 +0100 + +pcre3 (7.8-2) unstable; urgency=low + + * debian/rules: Bumped shlib version to 7.7 because of new feature in + that version (Closes: #500987) + + -- Mark Baker Sun, 05 Oct 2008 17:06:46 +0100 + +pcre3 (7.8-1) unstable; urgency=low + + * New upstream release + + -- Mark Baker Sun, 21 Sep 2008 21:23:00 +0100 + +pcre3 (7.6-2.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix heap overflow in the pcre compiler triggered by + patterns which contain options and multiple branches + (CVE-2008-2371; Closes: #488919). + * debian/rules (patch by Bryan Donlan): Update shlibdeps invocation for + libpcrecpp0 due to new symbols (Closes: #476925). + * debian/copyright: replace license information with the current license + information shipped with upstream sources (Closes: #489318). + + -- Nico Golde Mon, 14 Jul 2008 19:13:11 +0200 + +pcre3 (7.6-2) unstable; urgency=low + + * pcrecpp.cc: Applied patch from PCRE bugzilla (bug 664) to fix ABI + breakage (Closes: #463170, #463266, #463413, #464974) + + -- Mark Baker Wed, 13 Feb 2008 22:19:35 +0000 + +pcre3 (7.6-1) unstable; urgency=low + + * New upstream release + * Ship pcredemo.c in examples directory (Closes: #377587) + + -- Mark Baker Mon, 28 Jan 2008 23:01:05 +0000 + +pcre3 (7.4-1) unstable; urgency=low + + * Build a -dbg package with debug symbols + + Thanks to Sebastian Dröge ,for all of the following: + + * New upstream release (Closes: #453372). + * debian/control, + debian/rules: + + Provide udeb (Closes: #443114). Build depend on debhelper (>= 5.0.22) + for this. + * debian/rules: + + Bump shlibs to >= 7.4 (Closes: #449289). + * debian/compat: + + Update debhelper compat level to 5. + * debian/control: + + Update Standards-Version to 3.7.3, no additional changes needed. + + Use ${binary:Version} instead of ${Source-Version} to make package + binNMU safe. + * debian/*.files, + debian/*.install, + debian/rules: + + Convert from dh_movefiles to dh_install. + * debian/*.dirs: + + Removed, not necessary. + + -- Mark Baker Mon, 7 Jan 2008 21:03:34 +0000 + +pcre3 (7.3-2) unstable; urgency=low + + * Overloaded RE::Init(), for compatibility with PCRE 6.x API (Closes + #436210). Thanks to Matthias Klose for the patch. + * Increased shlibdeps from 4.5 to 6.0. 6.0 introduced a new function + (pcre_compile2) to the API, so anything using that requires at least + 6.0. (Closes #441345) + + -- Mark Baker Mon, 7 Jan 2008 21:02:52 +0000 + +pcre3 (7.3-1) unstable; urgency=low + + * New upstream release + + -- Mark Baker Tue, 28 Aug 2007 20:53:39 +0100 + +pcre3 (7.2-1) unstable; urgency=low + + * New upstream release (Closes: #420280) + * debian/rules: dummy binary-indep target (Closes: #395730) + + -- Mark Baker Fri, 3 Aug 2007 23:06:28 +0100 + +pcre3 (6.7-1) unstable; urgency=low + + * New upstream release (Closes: #389305) + + -- Mark Baker Mon, 25 Sep 2006 23:24:55 +0100 + +pcre3 (6.4-2) unstable; urgency=low + + * Makefile.in: Install pcrepartial.3 (Closes: #362011) + * doc/pcreapi.3, doc/pcre_version.3: document pcre_version() as + returning a const char * not a char * (Closes: #278619) + * debian/libpcre3-dev.files: install libpcre.pc (Closes: #359662) + * doc/pcregrep.1: fixed typo (Closes: #310338) + * debian/control: drop dummy pgrep package (Closes: #247550) + + -- Mark Baker Thu, 27 Apr 2006 22:32:06 +0100 + +pcre3 (6.4-1.1) unstable; urgency=low + + * Split out the C++ library into it's own package libpcrecpp0, as + discussed in #339250. The C++ library was recently added, no + package references the C++ library yet. + Closes: #339250. + * debian/rules: Remove testsavedregex in clean target. + + -- Matthias Klose Fri, 25 Nov 2005 07:59:14 +0100 + +pcre3 (6.4-1) unstable; urgency=low + + * New upstream release (Closes: 333191) + + -- Mark Baker Mon, 10 Oct 2005 23:14:53 +0100 + +pcre3 (6.3-1) unstable; urgency=low + + * New upstream release (Closes: 323761). + * This includes fix to security issue CAN-2005-2491 (Closes: 324531) + + -- Mark Baker Sat, 27 Aug 2005 18:12:22 +0100 + +pcre3 (5.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Correct an alignment error in the pcretest.c test case, which was + causing build failures on ia64 (closes: #309606). + + -- Steve Langasek Thu, 26 May 2005 05:15:34 +0000 + +pcre3 (5.0-1) unstable; urgency=low + + * New upstream release (Closes: #295287) + - compatible, so same soname and package name can be used. + * Compile with --enable-unicode-properties, a new feature of PCRE 5.0 + * Removed . from description in control file + * Included patch from Niibe Yutaka for cross building (Closes: #285407) + + Thanks Andreas for the NMU, which this is based on (Closes: #237644, #237265) + + -- Mark Baker Wed, 16 Feb 2005 21:47:14 +0000 + +pcre3 (4.5-1.1) unstable; urgency=low + + * NMU to fix rc-bugs. + * Update libtool related files to fix build-error on mips, keep original + config.in, as it is no generated file. (Closes: #237265) + * pcregrep replaces pgrep. (Closes: #237564) + * Bump shlibs, pcre 4.5 includes two new functions. + * Let pgrep's /usr/share/doc symlink point to the package it depends on, + pcregrep. + + -- Andreas Metzler Fri, 12 Mar 2004 13:23:02 +0100 + +pcre3 (4.5-1) unstable; urgency=low + + * New upstream release + + Thanks to Andreas Metzler for patches for all the following: + + * doc/pcregrep.1: added newline between synopsis for pcregrep and that + for zpcregrp (Closes: #197899) + * debian/control: Change package descriptions (Closes: #209904) + * debian/rules and others: Renamed pgrep package to pcregrep, to match + name of binary and avoid confusion with pgrep (which greps for + processes, and is in the procps package; a dummy pgrep package will + ease upgrades (Closes: #217076) + + -- Mark Baker Wed, 25 Feb 2004 20:49:33 +0000 + +pcre3 (4.3-4) unstable; urgency=low + + * debian/libpcre3.files: include pcrepattern(3) manpage in libpcre3 + package instead of libpcre3-dev package. This means that anyone using + a PCRE based application will have the man page available. + + -- Mark Baker Thu, 8 Jan 2004 21:19:51 +0000 + +pcre3 (4.3-3) unstable; urgency=low + + * ltmain.sh: Replaced with standard version from debian libtool package, + but with Phil Hazel's patch applied (although I suspect his patch + isn't necessary on debian systems). (Closes: #198147, #198668) I hope. + + -- Mark Baker Wed, 25 Jun 2003 21:09:22 +0100 + +pcre3 (4.3-2) unstable; urgency=low + + * pcretest.c: Cheat at test! Always print 40 instead of the size, + because the size varies on different architectures, and we don't + really want to fail the test because of this. + + -- Mark Baker Thu, 19 Jun 2003 21:00:39 +0100 + +pcre3 (4.3-1) unstable; urgency=low + + This release is entirely the work of Andreas Metzler . + Thanks Andreas. + + * new upstream version (Closes: 182570) + * this version apparently fixes infinite loop bug (Closes: 161184) + * repacked using debhelper and upstream's Makefile. Switch to libtool's + versioning scheme, see debian/README.Versioning.libtool for details. + (Closes: #187371) + * (however, don't ship .la files, they only give libtool strange ideas, see + http://lists.debian.org/debian-devel/2003/debian-devel-200304/msg00827.html + for an example.) + * changed compile-options to really follow policy 3.5.7 + * debian/control: changed description to say "Perl 5" as Perl 6, when it + eventually appears, will have yet another different regex syntax + (Closes: #166939) + + -- Mark Baker Mon, 16 Jun 2003 22:11:08 +0100 + +pcre3 (3.9-1) unstable; urgency=low + + * New upstream version (Closes: #119429, #161424) + * Added zpcregrep script by Samuel Tardieu (Closes: #36897) + * doc/pcregrep.1: mention zpcregrep + * debian/rules: use && in test rule rather than -a option to test, for + better POSIX compatibility (Closes: #158775) + * debian/Makefile: build pcretest once with -rpath for doing tests, and + once without, so that: + * debian/rules: install pcretest program (Closes: #162998) + * Don't create or remove /usr/doc/foo symlinks. This means that none of + the packages have prerms and only libpcre3 has a postinst + * debian/copyright: corrected to "Debian GNU/Linux" + * debian/control: standards version updated to 3.5.7.0 + * debian/rules: strip comment and note sections from libraries + * The result of the last four changes is that it should now be + lintian-clean apart from one caused by a known bug in lintian (see + lintian bug #117260) (Closes: #162999) + + -- Mark Baker Sat, 26 Oct 2002 18:12:13 +0100 + +pcre3 (3.4-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Rebuild with a version of libc6 without a broken atexit() symbol + (closes: #108597, critical). + * Add to LD_LIBRARY_PATH rather than clobbering it, to avoid fakeroot + dying (closes: #108661, #108891). + + -- Colin Watson Sun, 19 Aug 2001 20:43:28 +0100 + +pcre3 (3.4-1) unstable; urgency=low + + * new upstream version (Closes: #93876) + + -- Mark Baker Sat, 28 Apr 2001 00:05:22 +0100 + +pcre3 (3.3-5) unstable; urgency=low + + * debian/rules: install pcregrep as that name (only) rather than as + pgrep with a symlink called pcregrep. This avoids a name clash with + the process table grepper also called pgrep. + * doc/pcregrep.1: change name of program being documented (back) to + pcregrep. + + -- Mark Baker Tue, 23 Jan 2001 23:54:08 +0000 + +pcre3 (3.3-4) unstable; urgency=low + + * debian/rules: only install config files that are meant to be installed + in libpcre3-dev package (Closes: #78354) + * debian/Makefile: distclean target clears up configure output + + -- Mark Baker Wed, 29 Nov 2000 23:59:19 +0000 + +pcre3 (3.3-3) unstable; urgency=low + + * debian/rules: make debian/Makefile executable before trying to run it + (Closes: #74316) + + -- Mark Baker Sun, 8 Oct 2000 21:18:15 +0100 + +pcre3 (3.3-2) unstable; urgency=low + + * debian/rules: pgrep should symlink to docs in /usr/doc/libpcre3, not + /usr/doc/libpcre2 + * debian/rules: manpage pgrep.1.gz should not be installed as executable! + * debian/rules: pcregrep.1.gz is symlink to pgrep.1.gz + * doc/pcre-config.1: basic manpage for pcre-config written + * debian/rules: install pcre-config.1 + * debian/rules: use -isp option to dpkg-gencontrol + + -- Mark Baker Tue, 22 Aug 2000 00:11:54 +0100 + +pcre3 (3.3-1) unstable; urgency=low + + * new package for pcre 3.x + + -- Mark Baker Sat, 19 Aug 2000 13:44:00 +0000 + +What follows is the changelog from pcre 3, up to the point where the pcre3 +package was made. + +pcre2 (2.08-1) unstable; urgency=low + + * new upstream version (#50386) + * put -lc after -lpcre when linking libpcreposix (#50046) + + -- Mark Baker Thu, 18 Nov 1999 21:45:14 +0000 + +pcre2 (2.07-2) unstable; urgency=low + + * debian/rules: use /usr/share/doc and /usr/share/man, as mandated by + policy 3.1.0 + * debian/postinst: create /usr/doc symlink; don't install library + * debian/postinst-lib (new file): create /usr/doc symlink and install library + * debian/prerm: remove /usr/doc symlink + * debian/rules: install postinst and prerm for all packages; but + postinst-lib for library package + + -- Mark Baker Sat, 13 Nov 1999 18:57:59 +0000 + +pcre2 (2.07-1) unstable; urgency=low + + * new upstream version + * pcre.c, pcre.h: new upstream version is incompatible with old one! I've + done a nasty hack so that old binaries will still work. Old source won't, + but at least it won't fail silently so this shouldn't be a major problem. + * debian/rules: /usr/doc/pgrep should be a link to libpcre2, not libpcre1 + (#42450) + + -- Mark Baker Tue, 3 Aug 1999 23:58:35 +0100 + +pcre2 (2.05-1) unstable; urgency=low + + * new upstream version (#36776) + + -- Mark Baker Tue, 27 Apr 1999 23:00:25 +0100 + +pcre2 (2.02-3) unstable; urgency=low + + * pcre.3: removed description of regular expression syntax and semantics + * pcre.7: new file, containing material removed from above + (this is so it can be put in the libpcre2 package (#34087) + + -- Mark Baker Fri, 5 Mar 1999 01:08:47 +0000 + +pcre2 (2.02-2) unstable; urgency=low + + * debian/rules: install copyright in correct location in libpcre2-dev; + a typo before meant the package wouldn't install + * debian/shlibs: update to refer to libpcre2 instead of libpcre1 + + -- Mark Baker Fri, 29 Jan 1999 00:12:00 +0000 + +pcre2 (2.02-1) unstable; urgency=low + + * first release of pcre2 + * install source of pgrep (it's small) in /usr/doc/libpcre2-dev/examples + + -- Mark Baker Thu, 28 Jan 1999 00:45:00 +0000 + +What follows is the changelog from pcre 1, up to the point where the pcre2 +package was made. + +The changes are not that large but the API, and therefore the ABI, are +changed so version 2 is not compatible. + +pcre (1.09-2) unstable; urgency=low + + * pcreposix.c,pcreposix.h: prefixed function names with pcreposix_ + * pcreposix.h: #defines so un-prefixed names can be used + * These mean pcre routines will be used instead of the regex library + built into libc (#22525) + * debian/shlibs: pcreposix needs libpcre1 >=1.09-2 now + * debian/rules: it's not pcre 1.01 any more. + + -- Mark Baker Sat, 30 May 1998 16:54:31 +0100 + +pcre (1.09-1) unstable; urgency=low + + * New upstream version + + -- Mark Baker Sat, 28 Feb 1998 21:29:07 +0000 + +pcre (1.08-1) unstable; urgency=low + + * New upstream version (new features, so in unstable only) + + -- Mark Baker Sat, 28 Feb 1998 21:29:07 +0000 + +pcre (1.06-3) unstable; urgency=low + + * Strip pgrep + + -- Mark Baker Sat, 28 Feb 1998 21:29:07 +0000 + +pcre (1.06-2) unstable; urgency=low + + * Extended description for pgrep + * Compress manpage + * Updated standards-version to 2.4.0.0 + + -- Mark Baker Mon, 9 Feb 1998 23:56:15 +0000 + +pcre (1.06-1) unstable; urgency=low + + * New upstream version (bug fixes) + + -- Mark Baker Sun, 25 Jan 1998 22:37:37 +0000 + +pcre (1.05-2) unstable; urgency=low + + * Remove debian/*~ in clean target + * Only run ldconfig on "configure" + + -- Mark Baker Wed, 7 Jan 1998 21:14:51 +0000 + +pcre (1.05-1) unstable; urgency=low + + * New upstream version (bug fixes) + + -- Mark Baker Sat, 27 Dec 1997 11:26:32 +0000 + +pcre (1.02-1) unstable; urgency=low + + * New upstream version + + -- Mark Baker Sat, 13 Dec 1997 22:01:48 +0000 + +pcre (1.01-4) unstable; urgency=low + + * Use -fPIC instead of -fpic (identical on i386, but different on other + architectures like m68k) + * Nasty trick so pgrep gets the right dependencies whether or not + libpcre1 is installed + + -- Mark Baker Tue, 2 Dec 1997 17:57:07 +0000 + +pcre (1.01-3) unstable; urgency=low + + * Apply patch to manpage from Karl Hegbloom + * Rewritten makefile (copy sent upstream) + + -- Mark Baker Tue, 25 Nov 1997 12:12:05 +0000 + +pcre (1.01-2) unstable; urgency=low + + * Correct typo (libprce) in debian/rules + * Use gcc instead of ld in makefile + * Build static libraries + * Use shlibdeps instead of hard-coding libc6 + * Use --strip-unneeded when stripping + + -- Mark Baker Fri, 21 Nov 1997 23:52:06 +0000 + +pcre (1.01-1) unstable; urgency=low + + * Initial debian release + + -- Mark Baker Fri, 21 Nov 1997 20:36:13 +0000 --- pcre3-8.12.orig/debian/README.Debian +++ pcre3-8.12/debian/README.Debian @@ -0,0 +1,11 @@ +libpcre for debian +------------------ + +Upstream's library version is much lower than Debian's - PCRE_LIB_VERSION=0:1:0 +instead of 13:0:10 (soname libpcre.so.0 instead of libpcre.so.3) + +The other change I made is to prefix the names of the functions in libpcreposix +with "pcreposix_". This is required so they don't clash with the ones in +libc. Suitable #defines have been added to pcreposix.h so that the +unprefixed names can be used. + --- pcre3-8.12.orig/debian/pcregrep.links +++ pcre3-8.12/debian/pcregrep.links @@ -0,0 +1,2 @@ +usr/share/doc/libpcre3 usr/share/doc/pcregrep +usr/share/man/man1/pcregrep.1.gz usr/share/man/man1/zpcregrep.1.gz --- pcre3-8.12.orig/debian/rules +++ pcre3-8.12/debian/rules @@ -0,0 +1,120 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +CFLAGS = -Wall -g +INSTALL = install +INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 +INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +INSTALL_PROGRAM += -s +endif + + +config.status: configure + dh_testdir + # Add here commands to configure the package. + CC_FOR_BUILD=cc CFLAGS="$(CFLAGS)" ./configure \ + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --enable-utf8 --enable-unicode-properties + + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + $(MAKE) check +endif + + touch build-stamp + +clean: config.status + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean +### -test -r /usr/share/misc/config.sub && \ +### cp -f /usr/share/misc/config.sub config.sub +### -test -r /usr/share/misc/config.guess && \ +### cp -f /usr/share/misc/config.guess config.guess + + + rm -f dftables testsavedregex + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/tmp + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_install -a + # This man page is in the main package, don't want it in -dev + rm debian/libpcre3-dev/usr/share/man/man3/pcrepattern.3 + # Move actual library to /lib + mkdir -p debian/libpcre3/lib + mv debian/libpcre3/usr/lib/libpcre.so.* debian/libpcre3/lib + ln -sf /lib/libpcre.so.3 debian/libpcre3-dev/usr/lib/libpcre.so + + dh_link -a + +# dh_installdebconf -a + dh_installdocs -a + dh_installexamples -a +# dh_installmenu -a +# dh_installlogrotate -a +# dh_installemacsen -a +# dh_installpam -a +# dh_installmime -a +# dh_installinit -a +# dh_installcron -a + dh_installman -a + dh_installinfo -a +# dh_undocumented -a + dh_installchangelogs -a ChangeLog + dh_strip -a --dbg-package=libpcre3-dbg + dh_compress -a + dh_fixperms -a + dh_makeshlibs -plibpcre3 --add-udeb="libpcre3-udeb" -V 'libpcre3 (>= 7.7)' + dh_makeshlibs -plibpcrecpp0 -V 'libpcrecpp0 (>= 7.7)' + dh_installdeb -a +# dh_perl -a + dh_shlibdeps -a -ldebian/libpcre3/usr/lib + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary-indep: + +binary: binary-arch binary-indep +.PHONY: build clean binary-arch binary install --- pcre3-8.12.orig/debian/pcregrep.install +++ pcre3-8.12/debian/pcregrep.install @@ -0,0 +1,4 @@ +debian/tmp/usr/bin/pcregrep +debian/tmp/usr/share/man/man1/pcregrep.1 +debian/zpcregrep /usr/bin/ + --- pcre3-8.12.orig/debian/pcregrep.files +++ pcre3-8.12/debian/pcregrep.files @@ -0,0 +1,3 @@ +usr/bin/pcregrep +usr/share/man/man1/pcregrep.1 + --- pcre3-8.12.orig/debian/libpcre3.install +++ pcre3-8.12/debian/libpcre3.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/libpcre.so.* +debian/tmp/usr/lib/libpcreposix.so.* +debian/tmp/usr/bin/pcretest +debian/tmp/usr/share/man/man1/pcretest.1 +debian/tmp/usr/share/man/man3/pcrepattern.3 --- pcre3-8.12.orig/debian/copyright +++ pcre3-8.12/debian/copyright @@ -0,0 +1,74 @@ +This is Debian GNU/Linux's prepackaged version of the PCRE regular +expression library and associated pgrep utility. + +This package was put together by me, Mark Baker from the +original sources obtained from ftp.csx.cam.ac.uk:/pub/software/programming/pcre. + +PCRE LICENCE +------------ + +PCRE is a library of functions to support regular expressions whose syntax +and semantics are as close as possible to those of the Perl 5 language. + +Release 7 of PCRE is distributed under the terms of the "BSD" licence, as +specified below. The documentation for PCRE, supplied in the "doc" +directory, is distributed under the same terms as the software itself. + +The basic library functions are written in C and are freestanding. Also +included in the distribution is a set of C++ wrapper functions. + + +THE BASIC LIBRARY FUNCTIONS +--------------------------- + +Written by: Philip Hazel +Email local part: ph10 +Email domain: cam.ac.uk + +University of Cambridge Computing Service, +Cambridge, England. + +Copyright (c) 1997-2007 University of Cambridge +All rights reserved. + + +THE C++ WRAPPER FUNCTIONS +------------------------- + +Contributed by: Google Inc. + +Copyright (c) 2007, Google Inc. +All rights reserved. + + +THE "BSD" LICENCE +----------------- + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + * Neither the name of the University of Cambridge nor the name of Google + Inc. nor the names of their contributors may be used to endorse or + promote products derived from this software without specific prior + written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +End