[arch-commits] Commit in zip/repos/extra-x86_64 (4 files)

[Jelle van der Waa]

    Date: Friday, April 24, 2020 @ 15:02:21
  Author: jelle
Revision: 381499

archrelease: copy trunk to extra-x86_64

Added:
  zip/repos/extra-x86_64/PKGBUILD
    (from rev 381498, zip/trunk/PKGBUILD)
  zip/repos/extra-x86_64/zipnote.patch
    (from rev 381498, zip/trunk/zipnote.patch)
Deleted:
  zip/repos/extra-x86_64/PKGBUILD
  zip/repos/extra-x86_64/zipnote.patch

---------------+
 PKGBUILD      |   77 +++++++++++++++++++++++++++-----------------------------
 zipnote.patch |   26 +++++++++---------
 2 files changed, 51 insertions(+), 52 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-24 15:02:13 UTC (rev 381498)
+++ PKGBUILD	2020-04-24 15:02:21 UTC (rev 381499)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=zip
-pkgver=3.0
-_pkgver=${pkgver/./}
-pkgrel=8
-pkgdesc='Compressor/archiver for creating and modifying zipfiles'
-url='http://www.info-zip.org/Zip.html'
-arch=('x86_64')
-license=('custom')
-depends=('bzip2')
-source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
-        'zipnote.patch')
-sha256sums=('f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369'
-            '89249a3f1fdf838b795ce432a2d763fdbe913d6a146541e41b7a2e2769291ba0')
-
-options=('!makeflags')
-
-prepare() {
-	cd "${srcdir}/${pkgname}${_pkgver}"
-	sed -e "/^CFLAGS_NOOPT =/s/\$/ $CPPFLAGS $CFLAGS/" -i unix/Makefile
-	sed -e "s/^LFLAGS1=''/LFLAGS1=$LDFLAGS/" -i unix/configure
-	patch -p1 -i ../zipnote.patch
-}
-
-build() {
-	cd "${srcdir}/${pkgname}${_pkgver}"
-	make -f unix/Makefile prefix=/usr generic_gcc
-}
-
-package() {
-	cd "${srcdir}/${pkgname}${_pkgver}"
-	make -f unix/Makefile prefix="${pkgdir}"/usr \
-		MANDIR=${pkgdir}/usr/share/man/man1 \
-		install
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: zip/repos/extra-x86_64/PKGBUILD (from rev 381498, zip/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-24 15:02:21 UTC (rev 381499)
@@ -0,0 +1,38 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=zip
+pkgver=3.0
+_pkgver=${pkgver/./}
+pkgrel=9
+pkgdesc='Compressor/archiver for creating and modifying zipfiles'
+url='http://www.info-zip.org/Zip.html'
+arch=('x86_64')
+license=('custom')
+depends=('bzip2')
+source=("https://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
+        'zipnote.patch')
+sha256sums=('f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369'
+            '89249a3f1fdf838b795ce432a2d763fdbe913d6a146541e41b7a2e2769291ba0')
+
+options=('!makeflags')
+
+prepare() {
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	sed -e "/^CFLAGS_NOOPT =/s/\$/ $CPPFLAGS $CFLAGS/" -i unix/Makefile
+	sed -e "s/^LFLAGS1=''/LFLAGS1=$LDFLAGS/" -i unix/configure
+	patch -p1 -i ../zipnote.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	make -f unix/Makefile prefix=/usr generic_gcc
+}
+
+package() {
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	make -f unix/Makefile prefix="${pkgdir}"/usr \
+		MANDIR="${pkgdir}"/usr/share/man/man1 \
+		install
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: zipnote.patch
===================================================================
--- zipnote.patch	2020-04-24 15:02:13 UTC (rev 381498)
+++ zipnote.patch	2020-04-24 15:02:21 UTC (rev 381499)
@@ -1,13 +0,0 @@
-diff --git a/zipnote.c b/zipnote.c
-index 5e02cb6..996f012 100644
---- a/zipnote.c
-+++ b/zipnote.c
-@@ -661,7 +661,7 @@ char **argv;            /* command line tokens */
-     if ((r = zipcopy(z)) != ZE_OK)
-       ziperr(r, "was copying an entry");
-   }
--  fclose(x);
-+  fclose(in_file);
- 
-   /* Write central directory and end of central directory with new comments */
-   if ((c = zftello(y)) == (zoff_t)-1)    /* get start of central */

Copied: zip/repos/extra-x86_64/zipnote.patch (from rev 381498, zip/trunk/zipnote.patch)
===================================================================
--- zipnote.patch	                        (rev 0)
+++ zipnote.patch	2020-04-24 15:02:21 UTC (rev 381499)
@@ -0,0 +1,13 @@
+diff --git a/zipnote.c b/zipnote.c
+index 5e02cb6..996f012 100644
+--- a/zipnote.c
++++ b/zipnote.c
+@@ -661,7 +661,7 @@ char **argv;            /* command line tokens */
+     if ((r = zipcopy(z)) != ZE_OK)
+       ziperr(r, "was copying an entry");
+   }
+-  fclose(x);
++  fclose(in_file);
+ 
+   /* Write central directory and end of central directory with new comments */
+   if ((c = zftello(y)) == (zoff_t)-1)    /* get start of central */