[arch-commits] Commit in pcre/repos (8 files)
Sébastien Luttringer
seblu at archlinux.org
Thu Jun 23 21:00:01 UTC 2016
Date: Thursday, June 23, 2016 @ 21:00:01
Author: seblu
Revision: 270542
db-move: moved pcre from [testing] to [core] (i686, x86_64)
Added:
pcre/repos/core-i686/PKGBUILD
(from rev 270541, pcre/repos/testing-i686/PKGBUILD)
pcre/repos/core-x86_64/PKGBUILD
(from rev 270541, pcre/repos/testing-x86_64/PKGBUILD)
Deleted:
pcre/repos/core-i686/01-CVE-2016-1283.patch
pcre/repos/core-i686/PKGBUILD
pcre/repos/core-x86_64/01-CVE-2016-1283.patch
pcre/repos/core-x86_64/PKGBUILD
pcre/repos/testing-i686/
pcre/repos/testing-x86_64/
------------------------------------+
/PKGBUILD | 118 +++++++++++++++++++++++++++++++++++
core-i686/01-CVE-2016-1283.patch | 18 -----
core-i686/PKGBUILD | 55 ----------------
core-x86_64/01-CVE-2016-1283.patch | 18 -----
core-x86_64/PKGBUILD | 55 ----------------
5 files changed, 118 insertions(+), 146 deletions(-)
Deleted: core-i686/01-CVE-2016-1283.patch
===================================================================
--- core-i686/01-CVE-2016-1283.patch 2016-06-23 21:00:00 UTC (rev 270541)
+++ core-i686/01-CVE-2016-1283.patch 2016-06-23 21:00:01 UTC (rev 270542)
@@ -1,18 +0,0 @@
-Index: pcre_compile.c
-===================================================================
---- a/pcre_compile.c (revision 1635)
-+++ b/pcre_compile.c (revision 1636)
-@@ -7311,7 +7311,12 @@
- so far in order to get the number. If the name is not found, leave
- the value of recno as 0 for a forward reference. */
-
-- else
-+ /* This patch (removing "else") fixes a problem when a reference is
-+ to multiple identically named nested groups from within the nest.
-+ Once again, it is not the "proper" fix, and it results in an
-+ over-allocation of memory. */
-+
-+ /* else */
- {
- ng = cd->named_groups;
- for (i = 0; i < cd->names_found; i++, ng++)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2016-06-23 21:00:00 UTC (rev 270541)
+++ core-i686/PKGBUILD 2016-06-23 21:00:01 UTC (rev 270542)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=pcre
-pkgver=8.38
-pkgrel=3
-pkgdesc='A library that implements Perl 5-style regular expressions'
-arch=('i686' 'x86_64')
-url='http://www.pcre.org/'
-license=('BSD')
-depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
-validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel
-source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig}
- '01-CVE-2016-1283.patch')
-md5sums=('00aabbfe56d5a48b270f999b508c5ad2'
- 'SKIP'
- '722aba6455a3f0240eaa22289f0176a0')
-
-prepare() {
- for _f in "${source[@]}"; do
- [[ "$_f" =~ \.patch$ ]] && { msg2 "$_f"; patch -p1 -d $pkgname-$pkgver < "$_f"; }
- done
- :
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure \
- --prefix=/usr \
- --enable-unicode-properties \
- --enable-pcre16 \
- --enable-pcre32 \
- --enable-jit \
- --enable-pcregrep-libz \
- --enable-pcregrep-libbz2 \
- --enable-pcretest-libreadline
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make -j1 check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: pcre/repos/core-i686/PKGBUILD (from rev 270541, pcre/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2016-06-23 21:00:01 UTC (rev 270542)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=pcre
+pkgver=8.39
+pkgrel=1
+pkgdesc='A library that implements Perl 5-style regular expressions'
+arch=('i686' 'x86_64')
+url='http://www.pcre.org/'
+license=('BSD')
+depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
+validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel
+source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig})
+md5sums=('e3fca7650a0556a2647821679d81f585'
+ 'SKIP')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -N -i "$srcdir/$filename"
+ fi
+ done
+ :
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --enable-unicode-properties \
+ --enable-pcre16 \
+ --enable-pcre32 \
+ --enable-jit \
+ --enable-pcregrep-libz \
+ --enable-pcregrep-libbz2 \
+ --enable-pcretest-libreadline
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -j1 check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: core-x86_64/01-CVE-2016-1283.patch
===================================================================
--- core-x86_64/01-CVE-2016-1283.patch 2016-06-23 21:00:00 UTC (rev 270541)
+++ core-x86_64/01-CVE-2016-1283.patch 2016-06-23 21:00:01 UTC (rev 270542)
@@ -1,18 +0,0 @@
-Index: pcre_compile.c
-===================================================================
---- a/pcre_compile.c (revision 1635)
-+++ b/pcre_compile.c (revision 1636)
-@@ -7311,7 +7311,12 @@
- so far in order to get the number. If the name is not found, leave
- the value of recno as 0 for a forward reference. */
-
-- else
-+ /* This patch (removing "else") fixes a problem when a reference is
-+ to multiple identically named nested groups from within the nest.
-+ Once again, it is not the "proper" fix, and it results in an
-+ over-allocation of memory. */
-+
-+ /* else */
- {
- ng = cd->named_groups;
- for (i = 0; i < cd->names_found; i++, ng++)
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2016-06-23 21:00:00 UTC (rev 270541)
+++ core-x86_64/PKGBUILD 2016-06-23 21:00:01 UTC (rev 270542)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Sébastien "Seblu" Luttringer
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=pcre
-pkgver=8.38
-pkgrel=3
-pkgdesc='A library that implements Perl 5-style regular expressions'
-arch=('i686' 'x86_64')
-url='http://www.pcre.org/'
-license=('BSD')
-depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
-validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel
-source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig}
- '01-CVE-2016-1283.patch')
-md5sums=('00aabbfe56d5a48b270f999b508c5ad2'
- 'SKIP'
- '722aba6455a3f0240eaa22289f0176a0')
-
-prepare() {
- for _f in "${source[@]}"; do
- [[ "$_f" =~ \.patch$ ]] && { msg2 "$_f"; patch -p1 -d $pkgname-$pkgver < "$_f"; }
- done
- :
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure \
- --prefix=/usr \
- --enable-unicode-properties \
- --enable-pcre16 \
- --enable-pcre32 \
- --enable-jit \
- --enable-pcregrep-libz \
- --enable-pcregrep-libbz2 \
- --enable-pcretest-libreadline
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make -j1 check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: pcre/repos/core-x86_64/PKGBUILD (from rev 270541, pcre/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2016-06-23 21:00:01 UTC (rev 270542)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Sébastien "Seblu" Luttringer
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=pcre
+pkgver=8.39
+pkgrel=1
+pkgdesc='A library that implements Perl 5-style regular expressions'
+arch=('i686' 'x86_64')
+url='http://www.pcre.org/'
+license=('BSD')
+depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
+validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel
+source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig})
+md5sums=('e3fca7650a0556a2647821679d81f585'
+ 'SKIP')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -N -i "$srcdir/$filename"
+ fi
+ done
+ :
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure \
+ --prefix=/usr \
+ --enable-unicode-properties \
+ --enable-pcre16 \
+ --enable-pcre32 \
+ --enable-jit \
+ --enable-pcregrep-libz \
+ --enable-pcregrep-libbz2 \
+ --enable-pcretest-libreadline
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make -j1 check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list