[arch-commits] Commit in patch/repos (8 files)
Sébastien Luttringer
seblu at archlinux.org
Tue Jan 27 20:51:06 UTC 2015
Date: Tuesday, January 27, 2015 @ 21:51:06
Author: seblu
Revision: 230145
db-move: moved patch from [testing] to [core] (i686, x86_64)
Added:
patch/repos/core-i686/PKGBUILD
(from rev 230144, patch/repos/testing-i686/PKGBUILD)
patch/repos/core-x86_64/PKGBUILD
(from rev 230144, patch/repos/testing-x86_64/PKGBUILD)
Deleted:
patch/repos/core-i686/PKGBUILD
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.7.1-initialize-data-structures-early-enough.patch
patch/repos/testing-i686/
patch/repos/testing-x86_64/
-----------------------------------------------------------------------+
/PKGBUILD | 90 ++++++++++
core-i686/PKGBUILD | 46 -----
core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch | 81 ---------
core-x86_64/PKGBUILD | 46 -----
core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch | 81 ---------
5 files changed, 90 insertions(+), 254 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2015-01-27 20:49:12 UTC (rev 230144)
+++ core-i686/PKGBUILD 2015-01-27 20:51:06 UTC (rev 230145)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: judd <jvinet at 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:
Copied: patch/repos/core-i686/PKGBUILD (from rev 230144, patch/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2015-01-27 20:51:06 UTC (rev 230145)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=patch
+pkgver=2.7.3
+pkgrel=1
+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')
+validpgpkeys=('7768CE4B75E5236F1A374CEEC4C927CD5D1B36D7') # Andreas Gruenbacher
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('29b87be845e4662ab0ca0d48a805ecc6'
+ 'SKIP')
+
+#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.7.1-initialize-data-structures-early-enough.patch
===================================================================
--- core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch 2015-01-27 20:49:12 UTC (rev 230144)
+++ core-i686/patch-2.7.1-initialize-data-structures-early-enough.patch 2015-01-27 20:51:06 UTC (rev 230145)
@@ -1,81 +0,0 @@
-From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen at 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 2015-01-27 20:49:12 UTC (rev 230144)
+++ core-x86_64/PKGBUILD 2015-01-27 20:51:06 UTC (rev 230145)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: judd <jvinet at 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:
Copied: patch/repos/core-x86_64/PKGBUILD (from rev 230144, patch/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2015-01-27 20:51:06 UTC (rev 230145)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=patch
+pkgver=2.7.3
+pkgrel=1
+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')
+validpgpkeys=('7768CE4B75E5236F1A374CEEC4C927CD5D1B36D7') # Andreas Gruenbacher
+source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('29b87be845e4662ab0ca0d48a805ecc6'
+ 'SKIP')
+
+#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.7.1-initialize-data-structures-early-enough.patch
===================================================================
--- core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch 2015-01-27 20:49:12 UTC (rev 230144)
+++ core-x86_64/patch-2.7.1-initialize-data-structures-early-enough.patch 2015-01-27 20:51:06 UTC (rev 230145)
@@ -1,81 +0,0 @@
-From 291ec175812b7ba291d124e4cf2fbf9efec590c8 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen at 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
-
More information about the arch-commits
mailing list