[arch-commits] Commit in cpio/trunk (PKGBUILD cpio-2.11-stdio.in.patch)

[Tobias Powalowski]

    Date: Friday, May 17, 2013 @ 13:26:12
  Author: tpowa
Revision: 185698

upgpkg: cpio 2.11-4

move /bin to /usr/bin, add build patch from fedora

Added:
  cpio/trunk/cpio-2.11-stdio.in.patch
Modified:
  cpio/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   14 ++++++++++----
 cpio-2.11-stdio.in.patch |   13 +++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-17 11:13:51 UTC (rev 185697)
+++ PKGBUILD	2013-05-17 11:26:12 UTC (rev 185698)
@@ -2,16 +2,21 @@
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=cpio
 pkgver=2.11
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool to copy files into or out of a cpio or tar archive"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.gnu.org/software/cpio"
 depends=('glibc')
-source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz)
+source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz
+        cpio-2.11-stdio.in.patch)
 install=cpio.install
-md5sums=('1112bb6c45863468b5496ba128792f6c')
 
+prepare() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/cpio-2.11-stdio.in.patch
+}
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man
@@ -22,10 +27,11 @@
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
   rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1
-  mv ${pkgdir}/usr/bin ${pkgdir}/bin
   rm -rf ${pkgdir}/usr/libexec
   # remove mt manpage it conflicts with mt-st from extra
   rm $pkgdir/usr/share/man/man1/mt.1 || return 1
   # remove infodir
   rm $pkgdir/usr/share/info/dir
 }
+md5sums=('1112bb6c45863468b5496ba128792f6c'
+         'd7e58f2a1ec286febd09ea75042cf96e')

Added: cpio-2.11-stdio.in.patch
===================================================================
--- cpio-2.11-stdio.in.patch	                        (rev 0)
+++ cpio-2.11-stdio.in.patch	2013-05-17 11:26:12 UTC (rev 185698)
@@ -0,0 +1,13 @@
+diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h
+--- cpio-2.11-orig/gnu/stdio.in.h	2010-03-10 10:27:03.000000000 +0100
++++ cpio-2.11/gnu/stdio.in.h	2012-06-04 10:23:23.804471185 +0200
+@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not 
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
++#endif
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@