[arch-commits] Commit in patch/trunk (PKGBUILD patch-2.6.1-get-arg.patch)

[Stéphane Gaudreault]

    Date: Friday, November 19, 2010 @ 10:36:41
  Author: stephane
Revision: 99945

upgpkg: patch 2.6.1-2
rebuild of old package, tidy up PKGBUILD, fix segfault

Added:
  patch/trunk/patch-2.6.1-get-arg.patch
Modified:
  patch/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   20 ++++++++++++++------
 patch-2.6.1-get-arg.patch |   12 ++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-19 15:21:29 UTC (rev 99944)
+++ PKGBUILD	2010-11-19 15:36:41 UTC (rev 99945)
@@ -4,7 +4,7 @@
 
 pkgname=patch
 pkgver=2.6.1
-pkgrel=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"
@@ -12,12 +12,20 @@
 groups=('base-devel')
 depends=('glibc')
 optdepends=('ed: Interpret the patch as an ed script; for patch -e functionality(deprecated)')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('d758eb96d3f75047efc004a720d33daf')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz patch-2.6.1-get-arg.patch)
+md5sums=('d758eb96d3f75047efc004a720d33daf' '45cd5709adbbcdcb3ab95dc43559c07c')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fixed argument type for --get
+  # see https://bugzilla.redhat.com/show_bug.cgi?id=553624
+  patch -Np1 -i ../patch-2.6.1-get-arg.patch
   ./configure --prefix=/usr --mandir=/usr/share/man
-  make || return 1
-  make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install || return 1
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
+}

Added: patch-2.6.1-get-arg.patch
===================================================================
--- patch-2.6.1-get-arg.patch	                        (rev 0)
+++ patch-2.6.1-get-arg.patch	2010-11-19 15:36:41 UTC (rev 99945)
@@ -0,0 +1,12 @@
+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