[arch-commits] Commit in p7zip/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun Feb 5 19:09:35 UTC 2017
Date: Sunday, February 5, 2017 @ 19:09:34
Author: foutrelis
Revision: 288092
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
p7zip/repos/extra-i686/CVE-2016-9296.patch
(from rev 288091, p7zip/trunk/CVE-2016-9296.patch)
p7zip/repos/extra-i686/PKGBUILD
(from rev 288091, p7zip/trunk/PKGBUILD)
p7zip/repos/extra-i686/p7zip.install
(from rev 288091, p7zip/trunk/p7zip.install)
p7zip/repos/extra-x86_64/CVE-2016-9296.patch
(from rev 288091, p7zip/trunk/CVE-2016-9296.patch)
p7zip/repos/extra-x86_64/PKGBUILD
(from rev 288091, p7zip/trunk/PKGBUILD)
p7zip/repos/extra-x86_64/p7zip.install
(from rev 288091, p7zip/trunk/p7zip.install)
Deleted:
p7zip/repos/extra-i686/PKGBUILD
p7zip/repos/extra-i686/p7zip.install
p7zip/repos/extra-x86_64/PKGBUILD
p7zip/repos/extra-x86_64/p7zip.install
----------------------------------+
/PKGBUILD | 120 +++++++++++++++++++++++++++++++++++++
/p7zip.install | 18 +++++
extra-i686/CVE-2016-9296.patch | 12 +++
extra-i686/PKGBUILD | 55 ----------------
extra-i686/p7zip.install | 9 --
extra-x86_64/CVE-2016-9296.patch | 12 +++
extra-x86_64/PKGBUILD | 55 ----------------
extra-x86_64/p7zip.install | 9 --
8 files changed, 162 insertions(+), 128 deletions(-)
Copied: p7zip/repos/extra-i686/CVE-2016-9296.patch (from rev 288091, p7zip/trunk/CVE-2016-9296.patch)
===================================================================
--- extra-i686/CVE-2016-9296.patch (rev 0)
+++ extra-i686/CVE-2016-9296.patch 2017-02-05 19:09:34 UTC (rev 288092)
@@ -0,0 +1,12 @@
+--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig 2016-11-21 01:42:29.460901230 +0000
++++ ./CPP/7zip/Archive/7z/7zIn.cpp 2016-11-21 01:42:57.481197725 +0000
+@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
+ if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
+ ThrowIncorrect();
+ }
+- HeadersSize += folders.PackPositions[folders.NumPackStreams];
++ if (folders.PackPositions)
++ HeadersSize += folders.PackPositions[folders.NumPackStreams];
+ return S_OK;
+ }
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-02-05 19:09:19 UTC (rev 288091)
+++ extra-i686/PKGBUILD 2017-02-05 19:09:34 UTC (rev 288092)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Thayer Williams <thayer at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-# Contributor: TuxSpirit<tuxspirit at archlinux.fr> 2007/11/17 21:22:36 UTC
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=p7zip
-pkgver=16.02
-pkgrel=2
-pkgdesc="Command-line file archiver with high compression ratio"
-arch=('i686' 'x86_64')
-url="http://p7zip.sourceforge.net/"
-license=('LGPL' 'custom:unRAR')
-depends=('gcc-libs' 'sh')
-makedepends_i686=('nasm')
-makedepends_x86_64=('yasm')
-install=$pkgname.install
-source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_${pkgver}_src_all.tar.bz2)
-sha256sums=('5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f')
-
-prepare() {
- cd "$srcdir/${pkgname}_$pkgver"
-
- if [[ $CARCH = x86_64 ]]; then
- cp makefile.linux_amd64_asm makefile.machine
- else
- cp makefile.linux_x86_asm_gcc_4.X makefile.machine
- fi
-}
-
-build() {
- cd "$srcdir/${pkgname}_$pkgver"
- make all3 OPTFLAGS="$CFLAGS"
-}
-
-package() {
- cd "$srcdir/${pkgname}_$pkgver"
-
- make install \
- DEST_DIR="$pkgdir" \
- DEST_HOME=/usr \
- DEST_MAN=/usr/share/man
-
- # Remove documentation for the GUI file manager
- rm -r "$pkgdir/usr/share/doc/p7zip/DOC/MANUAL/fm"
-
- install -d "${pkgdir}"/usr/share/licenses/p7zip
- ln -s -t "$pkgdir/usr/share/licenses/p7zip/" \
- /usr/share/doc/p7zip/DOC/License.txt \
- /usr/share/doc/p7zip/DOC/unRarLicense.txt
-}
-
-# vim:set ts=2 sw=2 et:
Copied: p7zip/repos/extra-i686/PKGBUILD (from rev 288091, p7zip/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-02-05 19:09:34 UTC (rev 288092)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Thayer Williams <thayer at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+# Contributor: TuxSpirit<tuxspirit at archlinux.fr> 2007/11/17 21:22:36 UTC
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=p7zip
+pkgver=16.02
+pkgrel=3
+pkgdesc="Command-line file archiver with high compression ratio"
+arch=('i686' 'x86_64')
+url="http://p7zip.sourceforge.net/"
+license=('LGPL' 'custom:unRAR')
+depends=('gcc-libs' 'sh')
+makedepends_i686=('nasm')
+makedepends_x86_64=('yasm')
+install=$pkgname.install
+source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_${pkgver}_src_all.tar.bz2
+ CVE-2016-9296.patch)
+sha256sums=('5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f'
+ 'f9bcbf21d4aa8938861a6cba992df13dec19538286e9ed747ccec6d9a4e8f983')
+
+prepare() {
+ cd "$srcdir/${pkgname}_$pkgver"
+
+ # https://sourceforge.net/p/p7zip/bugs/185/
+ patch -Np1 -i ../CVE-2016-9296.patch
+
+ if [[ $CARCH = x86_64 ]]; then
+ cp makefile.linux_amd64_asm makefile.machine
+ else
+ cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+ fi
+}
+
+build() {
+ cd "$srcdir/${pkgname}_$pkgver"
+ make all3 OPTFLAGS="$CFLAGS"
+}
+
+package() {
+ cd "$srcdir/${pkgname}_$pkgver"
+
+ make install \
+ DEST_DIR="$pkgdir" \
+ DEST_HOME=/usr \
+ DEST_MAN=/usr/share/man
+
+ # Remove documentation for the GUI file manager
+ rm -r "$pkgdir/usr/share/doc/p7zip/DOC/MANUAL/fm"
+
+ install -d "${pkgdir}"/usr/share/licenses/p7zip
+ ln -s -t "$pkgdir/usr/share/licenses/p7zip/" \
+ /usr/share/doc/p7zip/DOC/License.txt \
+ /usr/share/doc/p7zip/DOC/unRarLicense.txt
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/p7zip.install
===================================================================
--- extra-i686/p7zip.install 2017-02-05 19:09:19 UTC (rev 288091)
+++ extra-i686/p7zip.install 2017-02-05 19:09:34 UTC (rev 288092)
@@ -1,9 +0,0 @@
-post_upgrade() {
- if (($(vercmp $2 9.38.1-3) < 0)); then
- echo ':: The 7zFM graphical frontend is no longer included in this package.'
- echo ' If you used it, consider installing one of the following packages:'
- echo ' 1) file-roller, 2) engrampa, 3) kdeutils-ark.'
- fi
-}
-
-# vim:set ts=2 sw=2 et:
Copied: p7zip/repos/extra-i686/p7zip.install (from rev 288091, p7zip/trunk/p7zip.install)
===================================================================
--- extra-i686/p7zip.install (rev 0)
+++ extra-i686/p7zip.install 2017-02-05 19:09:34 UTC (rev 288092)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ if (($(vercmp $2 9.38.1-3) < 0)); then
+ echo ':: The 7zFM graphical frontend is no longer included in this package.'
+ echo ' If you used it, consider installing one of the following packages:'
+ echo ' 1) file-roller, 2) engrampa, 3) kdeutils-ark.'
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Copied: p7zip/repos/extra-x86_64/CVE-2016-9296.patch (from rev 288091, p7zip/trunk/CVE-2016-9296.patch)
===================================================================
--- extra-x86_64/CVE-2016-9296.patch (rev 0)
+++ extra-x86_64/CVE-2016-9296.patch 2017-02-05 19:09:34 UTC (rev 288092)
@@ -0,0 +1,12 @@
+--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig 2016-11-21 01:42:29.460901230 +0000
++++ ./CPP/7zip/Archive/7z/7zIn.cpp 2016-11-21 01:42:57.481197725 +0000
+@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
+ if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
+ ThrowIncorrect();
+ }
+- HeadersSize += folders.PackPositions[folders.NumPackStreams];
++ if (folders.PackPositions)
++ HeadersSize += folders.PackPositions[folders.NumPackStreams];
+ return S_OK;
+ }
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-02-05 19:09:19 UTC (rev 288091)
+++ extra-x86_64/PKGBUILD 2017-02-05 19:09:34 UTC (rev 288092)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Thayer Williams <thayer at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-# Contributor: TuxSpirit<tuxspirit at archlinux.fr> 2007/11/17 21:22:36 UTC
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=p7zip
-pkgver=16.02
-pkgrel=2
-pkgdesc="Command-line file archiver with high compression ratio"
-arch=('i686' 'x86_64')
-url="http://p7zip.sourceforge.net/"
-license=('LGPL' 'custom:unRAR')
-depends=('gcc-libs' 'sh')
-makedepends_i686=('nasm')
-makedepends_x86_64=('yasm')
-install=$pkgname.install
-source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_${pkgver}_src_all.tar.bz2)
-sha256sums=('5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f')
-
-prepare() {
- cd "$srcdir/${pkgname}_$pkgver"
-
- if [[ $CARCH = x86_64 ]]; then
- cp makefile.linux_amd64_asm makefile.machine
- else
- cp makefile.linux_x86_asm_gcc_4.X makefile.machine
- fi
-}
-
-build() {
- cd "$srcdir/${pkgname}_$pkgver"
- make all3 OPTFLAGS="$CFLAGS"
-}
-
-package() {
- cd "$srcdir/${pkgname}_$pkgver"
-
- make install \
- DEST_DIR="$pkgdir" \
- DEST_HOME=/usr \
- DEST_MAN=/usr/share/man
-
- # Remove documentation for the GUI file manager
- rm -r "$pkgdir/usr/share/doc/p7zip/DOC/MANUAL/fm"
-
- install -d "${pkgdir}"/usr/share/licenses/p7zip
- ln -s -t "$pkgdir/usr/share/licenses/p7zip/" \
- /usr/share/doc/p7zip/DOC/License.txt \
- /usr/share/doc/p7zip/DOC/unRarLicense.txt
-}
-
-# vim:set ts=2 sw=2 et:
Copied: p7zip/repos/extra-x86_64/PKGBUILD (from rev 288091, p7zip/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-02-05 19:09:34 UTC (rev 288092)
@@ -0,0 +1,60 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Thayer Williams <thayer at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+# Contributor: TuxSpirit<tuxspirit at archlinux.fr> 2007/11/17 21:22:36 UTC
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=p7zip
+pkgver=16.02
+pkgrel=3
+pkgdesc="Command-line file archiver with high compression ratio"
+arch=('i686' 'x86_64')
+url="http://p7zip.sourceforge.net/"
+license=('LGPL' 'custom:unRAR')
+depends=('gcc-libs' 'sh')
+makedepends_i686=('nasm')
+makedepends_x86_64=('yasm')
+install=$pkgname.install
+source=(https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/${pkgname}_${pkgver}_src_all.tar.bz2
+ CVE-2016-9296.patch)
+sha256sums=('5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f'
+ 'f9bcbf21d4aa8938861a6cba992df13dec19538286e9ed747ccec6d9a4e8f983')
+
+prepare() {
+ cd "$srcdir/${pkgname}_$pkgver"
+
+ # https://sourceforge.net/p/p7zip/bugs/185/
+ patch -Np1 -i ../CVE-2016-9296.patch
+
+ if [[ $CARCH = x86_64 ]]; then
+ cp makefile.linux_amd64_asm makefile.machine
+ else
+ cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+ fi
+}
+
+build() {
+ cd "$srcdir/${pkgname}_$pkgver"
+ make all3 OPTFLAGS="$CFLAGS"
+}
+
+package() {
+ cd "$srcdir/${pkgname}_$pkgver"
+
+ make install \
+ DEST_DIR="$pkgdir" \
+ DEST_HOME=/usr \
+ DEST_MAN=/usr/share/man
+
+ # Remove documentation for the GUI file manager
+ rm -r "$pkgdir/usr/share/doc/p7zip/DOC/MANUAL/fm"
+
+ install -d "${pkgdir}"/usr/share/licenses/p7zip
+ ln -s -t "$pkgdir/usr/share/licenses/p7zip/" \
+ /usr/share/doc/p7zip/DOC/License.txt \
+ /usr/share/doc/p7zip/DOC/unRarLicense.txt
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/p7zip.install
===================================================================
--- extra-x86_64/p7zip.install 2017-02-05 19:09:19 UTC (rev 288091)
+++ extra-x86_64/p7zip.install 2017-02-05 19:09:34 UTC (rev 288092)
@@ -1,9 +0,0 @@
-post_upgrade() {
- if (($(vercmp $2 9.38.1-3) < 0)); then
- echo ':: The 7zFM graphical frontend is no longer included in this package.'
- echo ' If you used it, consider installing one of the following packages:'
- echo ' 1) file-roller, 2) engrampa, 3) kdeutils-ark.'
- fi
-}
-
-# vim:set ts=2 sw=2 et:
Copied: p7zip/repos/extra-x86_64/p7zip.install (from rev 288091, p7zip/trunk/p7zip.install)
===================================================================
--- extra-x86_64/p7zip.install (rev 0)
+++ extra-x86_64/p7zip.install 2017-02-05 19:09:34 UTC (rev 288092)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ if (($(vercmp $2 9.38.1-3) < 0)); then
+ echo ':: The 7zFM graphical frontend is no longer included in this package.'
+ echo ' If you used it, consider installing one of the following packages:'
+ echo ' 1) file-roller, 2) engrampa, 3) kdeutils-ark.'
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list