git » cpio.git » commit 35792dd

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

author Tobias Powalowski
2013-05-17 11:26:12 UTC
committer Tobias Powalowski
2013-05-17 11:26:12 UTC
parent b01a17084e166c43e85b547d7806d71395876d61

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

PKGBUILD +10 -4
cpio-2.11-stdio.in.patch +13 -0

diff --git a/PKGBUILD b/PKGBUILD
index 2b39280..d50d8ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,20 @@
 # Maintainer: judd <jvinet@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}
@@ -21,10 +26,11 @@ package() {
   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')
diff --git a/cpio-2.11-stdio.in.patch b/cpio-2.11-stdio.in.patch
new file mode 100644
index 0000000..f7016ba
--- /dev/null
+++ b/cpio-2.11-stdio.in.patch
@@ -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@