Date: Wednesday, July 16, 2014 @ 19:04:51 Author: seblu Revision: 216931
db-move: moved patch from [testing] to [core] (i686, x86_64) Added: patch/repos/core-i686/PKGBUILD (from rev 216929, patch/repos/testing-i686/PKGBUILD) patch/repos/core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch (from rev 216929, patch/repos/testing-i686/patch-2.7.1-initialize-data-structures-early-enough.patch) patch/repos/core-x86_64/PKGBUILD (from rev 216929, patch/repos/testing-x86_64/PKGBUILD) patch/repos/core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch (from rev 216929, patch/repos/testing-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch) Deleted: patch/repos/core-i686/PKGBUILD patch/repos/core-i686/patch-2.6.1-get-arg.patch patch/repos/core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch patch/repos/core-x86_64/PKGBUILD patch/repos/core-x86_64/patch-2.6.1-get-arg.patch patch/repos/core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch patch/repos/testing-i686/ patch/repos/testing-x86_64/ -----------------------------------------------------------------------+ /PKGBUILD | 92 +++++ /patch-2.7.1-initialize-data-structures-early-enough.patch | 162 ++++++++++ core-i686/PKGBUILD | 43 -- core-i686/patch-2.6.1-get-arg.patch | 12 core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch | 81 ----- core-x86_64/PKGBUILD | 43 -- core-x86_64/patch-2.6.1-get-arg.patch | 12 core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch | 81 ----- 8 files changed, 254 insertions(+), 272 deletions(-) Deleted: core-i686/PKGBUILD =================================================================== --- core-i686/PKGBUILD 2014-07-16 17:04:50 UTC (rev 216930) +++ core-i686/PKGBUILD 2014-07-16 17:04:51 UTC (rev 216931) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Allan McRae <al...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=patch -pkgver=2.7.1 -pkgrel=2 -pkgdesc="A utility to apply patch files to original sources" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/patch/patch.html" -license=('GPL') -groups=('base-devel') -depends=('glibc') -makedepends=('ed') -optdepends=('ed: for patch -e functionality') -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} - patch-2.7.1-initialize-data-structures-early-enough.patch) -md5sums=('e9ae5393426d3ad783a300a338c09b72' - 'b12189e0de3cb2af25268441647ec517' - 'dc6367a7cd49933d4006c246789e98da') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # Fix segfault on non-numeric strip-count - # (also segfaults on nonexistent directory passed to -d) - # http://savannah.gnu.org/bugs/?37500 - patch -Np1 -i \ - $srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch - - ./configure --prefix=/usr - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install -} Copied: patch/repos/core-i686/PKGBUILD (from rev 216929, patch/repos/testing-i686/PKGBUILD) =================================================================== --- core-i686/PKGBUILD (rev 0) +++ core-i686/PKGBUILD 2014-07-16 17:04:51 UTC (rev 216931) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=patch +pkgver=2.7.1 +pkgrel=3 +pkgdesc='A utility to apply patch files to original sources' +arch=('i686' 'x86_64') +url='http://www.gnu.org/software/patch/patch.html' +license=('GPL') +groups=('base-devel') +depends=('glibc' 'attr') +makedepends=('ed') +optdepends=('ed: for patch -e functionality') +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} + 'patch-2.7.1-initialize-data-structures-early-enough.patch') +md5sums=('e9ae5393426d3ad783a300a338c09b72' + 'SKIP' + 'dc6367a7cd49933d4006c246789e98da') + +prepare() { + # Fix segfault on non-numeric strip-count + # (also segfaults on nonexistent directory passed to -d) + # http://savannah.gnu.org/bugs/?37500 + patch -Np1 -d $pkgname-$pkgver < patch-2.7.1-initialize-data-structures-early-enough.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Deleted: core-i686/patch-2.6.1-get-arg.patch =================================================================== --- core-i686/patch-2.6.1-get-arg.patch 2014-07-16 17:04:50 UTC (rev 216930) +++ core-i686/patch-2.6.1-get-arg.patch 2014-07-16 17:04:51 UTC (rev 216931) @@ -1,12 +0,0 @@ -diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c ---- patch-2.6.1/src/patch.c.get-arg 2010-07-27 18:05:26.217150510 +0100 -+++ patch-2.6.1/src/patch.c 2010-07-27 18:05:47.464150892 +0100 -@@ -558,7 +558,7 @@ static struct option const longopts[] = - {"remove-empty-files", no_argument, NULL, 'E'}, - {"force", no_argument, NULL, 'f'}, - {"fuzz", required_argument, NULL, 'F'}, -- {"get", no_argument, NULL, 'g'}, -+ {"get", required_argument, NULL, 'g'}, - {"input", required_argument, NULL, 'i'}, - {"ignore-whitespace", no_argument, NULL, 'l'}, - #ifdef ENABLE_MERGE Deleted: core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch =================================================================== --- core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch 2014-07-16 17:04:50 UTC (rev 216930) +++ core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch 2014-07-16 17:04:51 UTC (rev 216931) @@ -1,81 +0,0 @@ -From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher <agr...@linbit.com> -Date: Thu, 4 Oct 2012 12:33:09 +0200 -Subject: [PATCH] Initialize data structures early enough - -* src/patch.c (main): Initialize data structures early enough, before error -paths can access them. -* tests/bad-usage: Test bad command line usage. -* tests/Makefile.am (TESTS): Add bad-usage here. ---- - src/patch.c | 8 ++++---- - tests/Makefile.am | 1 + - tests/bad-usage | 18 ++++++++++++++++++ - 3 files changed, 23 insertions(+), 4 deletions(-) - create mode 100644 tests/bad-usage - -diff --git a/src/patch.c b/src/patch.c -index 828943b..0255fbb 100644 ---- a/src/patch.c -+++ b/src/patch.c -@@ -150,6 +150,10 @@ main (int argc, char **argv) - else if ((version_control = getenv ("VERSION_CONTROL"))) - version_control_context = "$VERSION_CONTROL"; - -+ init_backup_hash_table (); -+ init_files_to_delete (); -+ init_files_to_output (); -+ - /* parse switches */ - Argc = argc; - Argv = argv; -@@ -162,10 +166,6 @@ main (int argc, char **argv) - if (make_backups | backup_if_mismatch) - backup_type = get_version (version_control_context, version_control); - -- init_backup_hash_table (); -- init_files_to_delete (); -- init_files_to_output (); -- - init_output (&outstate); - if (outfile) - outstate.ofp = open_outfile (outfile); -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 02fc6de..5cea52d 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -20,6 +20,7 @@ TESTS = \ - asymmetric-hunks \ - backup-prefix-suffix \ - bad-filenames \ -+ bad-usage \ - concat-git-diff \ - copy-rename \ - corrupt-reject-files \ -diff --git a/tests/bad-usage b/tests/bad-usage -new file mode 100644 -index 0000000..022eeda ---- /dev/null -+++ b/tests/bad-usage -@@ -0,0 +1,18 @@ -+# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. -+# -+# Copying and distribution of this file, with or without modification, -+# in any medium, are permitted without royalty provided the copyright -+# notice and this notice are preserved. -+ -+. $srcdir/test-lib.sh -+ -+require_cat -+use_local_patch -+use_tmpdir -+ -+# ============================================================== -+ -+check 'patch -px || echo "status: $?"' <<EOF -+$PATCH: **** strip count x is not a number -+status: 2 -+EOF --- -1.8.0.3 - Copied: patch/repos/core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch (from rev 216929, patch/repos/testing-i686/patch-2.7.1-initialize-data-structures-early-enough.patch) =================================================================== --- core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch (rev 0) +++ core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch 2014-07-16 17:04:51 UTC (rev 216931) @@ -0,0 +1,81 @@ +From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agr...@linbit.com> +Date: Thu, 4 Oct 2012 12:33:09 +0200 +Subject: [PATCH] Initialize data structures early enough + +* src/patch.c (main): Initialize data structures early enough, before error +paths can access them. +* tests/bad-usage: Test bad command line usage. +* tests/Makefile.am (TESTS): Add bad-usage here. +--- + src/patch.c | 8 ++++---- + tests/Makefile.am | 1 + + tests/bad-usage | 18 ++++++++++++++++++ + 3 files changed, 23 insertions(+), 4 deletions(-) + create mode 100644 tests/bad-usage + +diff --git a/src/patch.c b/src/patch.c +index 828943b..0255fbb 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -150,6 +150,10 @@ main (int argc, char **argv) + else if ((version_control = getenv ("VERSION_CONTROL"))) + version_control_context = "$VERSION_CONTROL"; + ++ init_backup_hash_table (); ++ init_files_to_delete (); ++ init_files_to_output (); ++ + /* parse switches */ + Argc = argc; + Argv = argv; +@@ -162,10 +166,6 @@ main (int argc, char **argv) + if (make_backups | backup_if_mismatch) + backup_type = get_version (version_control_context, version_control); + +- init_backup_hash_table (); +- init_files_to_delete (); +- init_files_to_output (); +- + init_output (&outstate); + if (outfile) + outstate.ofp = open_outfile (outfile); +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 02fc6de..5cea52d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -20,6 +20,7 @@ TESTS = \ + asymmetric-hunks \ + backup-prefix-suffix \ + bad-filenames \ ++ bad-usage \ + concat-git-diff \ + copy-rename \ + corrupt-reject-files \ +diff --git a/tests/bad-usage b/tests/bad-usage +new file mode 100644 +index 0000000..022eeda +--- /dev/null ++++ b/tests/bad-usage +@@ -0,0 +1,18 @@ ++# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. ++# ++# Copying and distribution of this file, with or without modification, ++# in any medium, are permitted without royalty provided the copyright ++# notice and this notice are preserved. ++ ++. $srcdir/test-lib.sh ++ ++require_cat ++use_local_patch ++use_tmpdir ++ ++# ============================================================== ++ ++check 'patch -px || echo "status: $?"' <<EOF ++$PATCH: **** strip count x is not a number ++status: 2 ++EOF +-- +1.8.0.3 + Deleted: core-x86_64/PKGBUILD =================================================================== --- core-x86_64/PKGBUILD 2014-07-16 17:04:50 UTC (rev 216930) +++ core-x86_64/PKGBUILD 2014-07-16 17:04:51 UTC (rev 216931) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Allan McRae <al...@archlinux.org> -# Contributor: judd <jvi...@zeroflux.org> - -pkgname=patch -pkgver=2.7.1 -pkgrel=2 -pkgdesc="A utility to apply patch files to original sources" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/patch/patch.html" -license=('GPL') -groups=('base-devel') -depends=('glibc') -makedepends=('ed') -optdepends=('ed: for patch -e functionality') -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} - patch-2.7.1-initialize-data-structures-early-enough.patch) -md5sums=('e9ae5393426d3ad783a300a338c09b72' - 'b12189e0de3cb2af25268441647ec517' - 'dc6367a7cd49933d4006c246789e98da') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # Fix segfault on non-numeric strip-count - # (also segfaults on nonexistent directory passed to -d) - # http://savannah.gnu.org/bugs/?37500 - patch -Np1 -i \ - $srcdir/patch-2.7.1-initialize-data-structures-early-enough.patch - - ./configure --prefix=/usr - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install -} Copied: patch/repos/core-x86_64/PKGBUILD (from rev 216929, patch/repos/testing-x86_64/PKGBUILD) =================================================================== --- core-x86_64/PKGBUILD (rev 0) +++ core-x86_64/PKGBUILD 2014-07-16 17:04:51 UTC (rev 216931) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Sébastien Luttringer <se...@archlinux.org> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: judd <jvi...@zeroflux.org> + +pkgname=patch +pkgver=2.7.1 +pkgrel=3 +pkgdesc='A utility to apply patch files to original sources' +arch=('i686' 'x86_64') +url='http://www.gnu.org/software/patch/patch.html' +license=('GPL') +groups=('base-devel') +depends=('glibc' 'attr') +makedepends=('ed') +optdepends=('ed: for patch -e functionality') +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} + 'patch-2.7.1-initialize-data-structures-early-enough.patch') +md5sums=('e9ae5393426d3ad783a300a338c09b72' + 'SKIP' + 'dc6367a7cd49933d4006c246789e98da') + +prepare() { + # Fix segfault on non-numeric strip-count + # (also segfaults on nonexistent directory passed to -d) + # http://savannah.gnu.org/bugs/?37500 + patch -Np1 -d $pkgname-$pkgver < patch-2.7.1-initialize-data-structures-early-enough.patch +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Deleted: core-x86_64/patch-2.6.1-get-arg.patch =================================================================== --- core-x86_64/patch-2.6.1-get-arg.patch 2014-07-16 17:04:50 UTC (rev 216930) +++ core-x86_64/patch-2.6.1-get-arg.patch 2014-07-16 17:04:51 UTC (rev 216931) @@ -1,12 +0,0 @@ -diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c ---- patch-2.6.1/src/patch.c.get-arg 2010-07-27 18:05:26.217150510 +0100 -+++ patch-2.6.1/src/patch.c 2010-07-27 18:05:47.464150892 +0100 -@@ -558,7 +558,7 @@ static struct option const longopts[] = - {"remove-empty-files", no_argument, NULL, 'E'}, - {"force", no_argument, NULL, 'f'}, - {"fuzz", required_argument, NULL, 'F'}, -- {"get", no_argument, NULL, 'g'}, -+ {"get", required_argument, NULL, 'g'}, - {"input", required_argument, NULL, 'i'}, - {"ignore-whitespace", no_argument, NULL, 'l'}, - #ifdef ENABLE_MERGE Deleted: core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch =================================================================== --- core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch 2014-07-16 17:04:50 UTC (rev 216930) +++ core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch 2014-07-16 17:04:51 UTC (rev 216931) @@ -1,81 +0,0 @@ -From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001 -From: Andreas Gruenbacher <agr...@linbit.com> -Date: Thu, 4 Oct 2012 12:33:09 +0200 -Subject: [PATCH] Initialize data structures early enough - -* src/patch.c (main): Initialize data structures early enough, before error -paths can access them. -* tests/bad-usage: Test bad command line usage. -* tests/Makefile.am (TESTS): Add bad-usage here. ---- - src/patch.c | 8 ++++---- - tests/Makefile.am | 1 + - tests/bad-usage | 18 ++++++++++++++++++ - 3 files changed, 23 insertions(+), 4 deletions(-) - create mode 100644 tests/bad-usage - -diff --git a/src/patch.c b/src/patch.c -index 828943b..0255fbb 100644 ---- a/src/patch.c -+++ b/src/patch.c -@@ -150,6 +150,10 @@ main (int argc, char **argv) - else if ((version_control = getenv ("VERSION_CONTROL"))) - version_control_context = "$VERSION_CONTROL"; - -+ init_backup_hash_table (); -+ init_files_to_delete (); -+ init_files_to_output (); -+ - /* parse switches */ - Argc = argc; - Argv = argv; -@@ -162,10 +166,6 @@ main (int argc, char **argv) - if (make_backups | backup_if_mismatch) - backup_type = get_version (version_control_context, version_control); - -- init_backup_hash_table (); -- init_files_to_delete (); -- init_files_to_output (); -- - init_output (&outstate); - if (outfile) - outstate.ofp = open_outfile (outfile); -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 02fc6de..5cea52d 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -20,6 +20,7 @@ TESTS = \ - asymmetric-hunks \ - backup-prefix-suffix \ - bad-filenames \ -+ bad-usage \ - concat-git-diff \ - copy-rename \ - corrupt-reject-files \ -diff --git a/tests/bad-usage b/tests/bad-usage -new file mode 100644 -index 0000000..022eeda ---- /dev/null -+++ b/tests/bad-usage -@@ -0,0 +1,18 @@ -+# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. -+# -+# Copying and distribution of this file, with or without modification, -+# in any medium, are permitted without royalty provided the copyright -+# notice and this notice are preserved. -+ -+. $srcdir/test-lib.sh -+ -+require_cat -+use_local_patch -+use_tmpdir -+ -+# ============================================================== -+ -+check 'patch -px || echo "status: $?"' <<EOF -+$PATCH: **** strip count x is not a number -+status: 2 -+EOF --- -1.8.0.3 - Copied: patch/repos/core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch (from rev 216929, patch/repos/testing-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch) =================================================================== --- core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch (rev 0) +++ core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch 2014-07-16 17:04:51 UTC (rev 216931) @@ -0,0 +1,81 @@ +From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher <agr...@linbit.com> +Date: Thu, 4 Oct 2012 12:33:09 +0200 +Subject: [PATCH] Initialize data structures early enough + +* src/patch.c (main): Initialize data structures early enough, before error +paths can access them. +* tests/bad-usage: Test bad command line usage. +* tests/Makefile.am (TESTS): Add bad-usage here. +--- + src/patch.c | 8 ++++---- + tests/Makefile.am | 1 + + tests/bad-usage | 18 ++++++++++++++++++ + 3 files changed, 23 insertions(+), 4 deletions(-) + create mode 100644 tests/bad-usage + +diff --git a/src/patch.c b/src/patch.c +index 828943b..0255fbb 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -150,6 +150,10 @@ main (int argc, char **argv) + else if ((version_control = getenv ("VERSION_CONTROL"))) + version_control_context = "$VERSION_CONTROL"; + ++ init_backup_hash_table (); ++ init_files_to_delete (); ++ init_files_to_output (); ++ + /* parse switches */ + Argc = argc; + Argv = argv; +@@ -162,10 +166,6 @@ main (int argc, char **argv) + if (make_backups | backup_if_mismatch) + backup_type = get_version (version_control_context, version_control); + +- init_backup_hash_table (); +- init_files_to_delete (); +- init_files_to_output (); +- + init_output (&outstate); + if (outfile) + outstate.ofp = open_outfile (outfile); +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 02fc6de..5cea52d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -20,6 +20,7 @@ TESTS = \ + asymmetric-hunks \ + backup-prefix-suffix \ + bad-filenames \ ++ bad-usage \ + concat-git-diff \ + copy-rename \ + corrupt-reject-files \ +diff --git a/tests/bad-usage b/tests/bad-usage +new file mode 100644 +index 0000000..022eeda +--- /dev/null ++++ b/tests/bad-usage +@@ -0,0 +1,18 @@ ++# Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc. ++# ++# Copying and distribution of this file, with or without modification, ++# in any medium, are permitted without royalty provided the copyright ++# notice and this notice are preserved. ++ ++. $srcdir/test-lib.sh ++ ++require_cat ++use_local_patch ++use_tmpdir ++ ++# ============================================================== ++ ++check 'patch -px || echo "status: $?"' <<EOF ++$PATCH: **** strip count x is not a number ++status: 2 ++EOF +-- +1.8.0.3 +