[arch-commits] Commit in pcre/trunk (3 files)

[Eric Belanger]

    Date: Friday, September 5, 2008 @ 23:23:26
  Author: eric
Revision: 11888

upgpkg: pcre 7.8-1
    Upstream update, Fixed license

Modified:
  pcre/trunk/ChangeLog
  pcre/trunk/PKGBUILD
Deleted:
  pcre/trunk/libpcre-7.7-buffer-overflow.patch

-----------------------------------+
 ChangeLog                         |    6 ++++++
 PKGBUILD                          |   16 +++++++---------
 libpcre-7.7-buffer-overflow.patch |   16 ----------------
 3 files changed, 13 insertions(+), 25 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2008-09-06 03:23:04 UTC (rev 11887)
+++ ChangeLog	2008-09-06 03:23:26 UTC (rev 11888)
@@ -1,3 +1,9 @@
+2008-09-05  Eric Belanger  <eric at archlinux.org>
+
+	* pcre 7.8-1
+	* Upstream update
+	* Fixed license
+
 2008-07-07  Eric Belanger  <eric at archlinux.org>
 
 	* pcre 7.7-2

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-06 03:23:04 UTC (rev 11887)
+++ PKGBUILD	2008-09-06 03:23:26 UTC (rev 11888)
@@ -3,24 +3,22 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=pcre
-pkgver=7.7
-pkgrel=2
+pkgver=7.8
+pkgrel=1
 pkgdesc="A library that implements Perl 5-style regular expressions"
 arch=('i686' 'x86_64') 
 url="http://pcre.sourceforge.net"
-license=('custom')
+license=('BSD')
 groups=('base')
 depends=('gcc-libs')
 options=('!libtool' '!makeflags')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2 \
-        libpcre-7.7-buffer-overflow.patch)
-md5sums=('4b2e9cde1f7227448dddba59843efa0b' 'ea2204b6a0cbc83b3ca925ace06459a1')
-sha1sums=('f1f54d3e13e6cb427de962e62eaaee32c74cba38' '5a69fb97f1fa547f9012082221a6b98d77b65277')
+source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('141132d6af14dccc7b08fa797e4fd441')
+sha1sums=('552909f9d18e1954eec639f926957a4cb2de1ec3')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
-  patch -p1 < ../libpcre-7.7-buffer-overflow.patch || return 1
   ./configure --prefix=/usr --enable-utf8 --enable-unicode-properties || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
@@ -28,5 +26,5 @@
   mkdir -p ${pkgdir}/lib
   mv ${pkgdir}/usr/lib/libpcre.so.* ${pkgdir}/lib/ || return 1
   ln -sf ../../lib/libpcre.so.0 ${pkgdir}/usr/lib/libpcre.so || return 1
-  install -D -m644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/license.txt || return 1
+  install -D -m644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
 }

Deleted: libpcre-7.7-buffer-overflow.patch
===================================================================
--- libpcre-7.7-buffer-overflow.patch	2008-09-06 03:23:04 UTC (rev 11887)
+++ libpcre-7.7-buffer-overflow.patch	2008-09-06 03:23:26 UTC (rev 11888)
@@ -1,16 +0,0 @@
-diff -NrU5 pcre-7.7.orig/pcre_compile.c pcre-7.7/pcre_compile.c
---- pcre-7.7.orig/pcre_compile.c	2008-06-18 17:08:49.000000000 +0200
-+++ pcre-7.7/pcre_compile.c	2008-06-18 17:11:04.000000000 +0200
-@@ -4929,11 +4929,11 @@
-           {
-           if (code == cd->start_code + 1 + LINK_SIZE &&
-                (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
-             {
-             cd->external_options = newoptions;
--            options = newoptions;
-+            options = *optionsptr = newoptions;
-             }
-          else
-             {
-             if ((options & PCRE_IMS) != (newoptions & PCRE_IMS))
-               {