[arch-commits] Commit in zip/repos (6 files)
Gaetan Bisson
bisson at archlinux.org
Wed Jan 13 07:14:36 UTC 2016
Date: Wednesday, January 13, 2016 @ 08:14:36
Author: bisson
Revision: 258154
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
zip/repos/extra-i686/PKGBUILD
(from rev 258153, zip/trunk/PKGBUILD)
zip/repos/extra-i686/zipnote.patch
(from rev 258153, zip/trunk/zipnote.patch)
zip/repos/extra-x86_64/PKGBUILD
(from rev 258153, zip/trunk/PKGBUILD)
zip/repos/extra-x86_64/zipnote.patch
(from rev 258153, zip/trunk/zipnote.patch)
Deleted:
zip/repos/extra-i686/PKGBUILD
zip/repos/extra-x86_64/PKGBUILD
----------------------------+
/PKGBUILD | 78 +++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 36 -------------------
extra-i686/zipnote.patch | 13 +++++++
extra-x86_64/PKGBUILD | 36 -------------------
extra-x86_64/zipnote.patch | 13 +++++++
5 files changed, 104 insertions(+), 72 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-01-13 07:13:54 UTC (rev 258153)
+++ extra-i686/PKGBUILD 2016-01-13 07:14:36 UTC (rev 258154)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=zip
-pkgver=3.0
-_pkgver=${pkgver/./}
-pkgrel=6
-pkgdesc='Compressor/archiver for creating and modifying zipfiles'
-url='http://www.info-zip.org/Zip.html'
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('bzip2')
-source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz")
-sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182')
-
-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
-}
-
-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-i686/PKGBUILD (from rev 258153, zip/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-01-13 07:14:36 UTC (rev 258154)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=zip
+pkgver=3.0
+_pkgver=${pkgver/./}
+pkgrel=7
+pkgdesc='Compressor/archiver for creating and modifying zipfiles'
+url='http://www.info-zip.org/Zip.html'
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('bzip2')
+source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
+ 'zipnote.patch')
+sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182'
+ 'bb7301ba3339af9b9837dfc323777393f5c53a65')
+
+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-i686/zipnote.patch (from rev 258153, zip/trunk/zipnote.patch)
===================================================================
--- extra-i686/zipnote.patch (rev 0)
+++ extra-i686/zipnote.patch 2016-01-13 07:14:36 UTC (rev 258154)
@@ -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 */
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-01-13 07:13:54 UTC (rev 258153)
+++ extra-x86_64/PKGBUILD 2016-01-13 07:14:36 UTC (rev 258154)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=zip
-pkgver=3.0
-_pkgver=${pkgver/./}
-pkgrel=6
-pkgdesc='Compressor/archiver for creating and modifying zipfiles'
-url='http://www.info-zip.org/Zip.html'
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('bzip2')
-source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz")
-sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182')
-
-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
-}
-
-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 258153, zip/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-01-13 07:14:36 UTC (rev 258154)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=zip
+pkgver=3.0
+_pkgver=${pkgver/./}
+pkgrel=7
+pkgdesc='Compressor/archiver for creating and modifying zipfiles'
+url='http://www.info-zip.org/Zip.html'
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('bzip2')
+source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
+ 'zipnote.patch')
+sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182'
+ 'bb7301ba3339af9b9837dfc323777393f5c53a65')
+
+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/zipnote.patch (from rev 258153, zip/trunk/zipnote.patch)
===================================================================
--- extra-x86_64/zipnote.patch (rev 0)
+++ extra-x86_64/zipnote.patch 2016-01-13 07:14:36 UTC (rev 258154)
@@ -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 */
More information about the arch-commits
mailing list