[arch-commits] Commit in gen-init-cpio/trunk (PKGBUILD gen_init_cpio.c)

[Allan McRae]

    Date: Monday, December 6, 2010 @ 04:37:46
  Author: allan
Revision: 102143

upgpkg: gen-init-cpio 2.6.36-1
bump to latest release, fix license (FS#20062)

Modified:
  gen-init-cpio/trunk/PKGBUILD
  gen-init-cpio/trunk/gen_init_cpio.c

-----------------+
 PKGBUILD        |   19 ++++++++++++-------
 gen_init_cpio.c |    5 ++++-
 2 files changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-12-06 07:48:07 UTC (rev 102142)
+++ PKGBUILD    2010-12-06 09:37:46 UTC (rev 102143)
@@ -2,20 +2,25 @@
 # Maintainer : Tobias Powalowski <tp...@archlinux.org>
 
 pkgname=gen-init-cpio
-pkgver=2.6.32
+pkgver=2.6.36
 pkgrel=1
 pkgdesc="Program to compress initramfs images"
-arch=(i686 x86_64)
-license=('custom:none')
+arch=('i686' 'x86_64')
+license=('GPL2')
 url="http://www.kernel.org/";
 depends=('glibc')
-source=(Makefile gen_init_cpio.c)
+source=(Makefile
+        gen_init_cpio.c)
 md5sums=('8e3a142a522d65121c3bead41013be98'
-         '1e930eb3d6255aca3b91a73e31bf9da6')
+         'c0c0844d9e2e2c1bfb948201dc7b4c97')
 
 build()
 {
-  cd $srcdir/
-  make || return 1
+  cd $srcdir
+  make
+}
+
+package() {
+  cd $srcdir
   make DESTDIR=$pkgdir install
 }

Modified: gen_init_cpio.c
===================================================================
--- gen_init_cpio.c     2010-12-06 07:48:07 UTC (rev 102142)
+++ gen_init_cpio.c     2010-12-06 09:37:46 UTC (rev 102143)
@@ -354,7 +354,10 @@
                push_pad();
 
                if (size) {
-                       fwrite(filebuf, size, 1, stdout);
+                       if (fwrite(filebuf, size, 1, stdout) != 1) {
+                               fprintf(stderr, "writing filebuf failed\n");
+                               goto error;
+                       }
                        offset += size;
                        push_pad();
                }