[arch-commits] Commit in p7zip/repos (8 files)

2020-05-16 Thread Evangelos Foutras via arch-commits 
Date: Saturday, May 16, 2020 @ 19:56:08
  Author: foutrelis
Revision: 384801

archrelease: copy trunk to staging-x86_64

Added:
  p7zip/repos/staging-x86_64/
  p7zip/repos/staging-x86_64/CVE-2016-9296.patch
(from rev 384800, p7zip/trunk/CVE-2016-9296.patch)
  p7zip/repos/staging-x86_64/CVE-2017-17969.patch
(from rev 384800, p7zip/trunk/CVE-2017-17969.patch)
  p7zip/repos/staging-x86_64/CVE-2018-10115.patch
(from rev 384800, p7zip/trunk/CVE-2018-10115.patch)
  p7zip/repos/staging-x86_64/CVE-2018-5996.patch
(from rev 384800, p7zip/trunk/CVE-2018-5996.patch)
  p7zip/repos/staging-x86_64/PKGBUILD
(from rev 384800, p7zip/trunk/PKGBUILD)
  p7zip/repos/staging-x86_64/gcc10-conversion.patch
(from rev 384800, p7zip/trunk/gcc10-conversion.patch)
  p7zip/repos/staging-x86_64/p7zip.install
(from rev 384800, p7zip/trunk/p7zip.install)

+
 CVE-2016-9296.patch|   12 +
 CVE-2017-17969.patch   |   26 +++
 CVE-2018-10115.patch   |  311 +++
 CVE-2018-5996.patch|  221 +
 PKGBUILD   |   77 +++
 gcc10-conversion.patch |   26 +++
 p7zip.install  |9 +
 7 files changed, 682 insertions(+)

Copied: p7zip/repos/staging-x86_64/CVE-2016-9296.patch (from rev 384800, 
p7zip/trunk/CVE-2016-9296.patch)
===
--- staging-x86_64/CVE-2016-9296.patch  (rev 0)
+++ staging-x86_64/CVE-2016-9296.patch  2020-05-16 19:56:08 UTC (rev 384801)
@@ -0,0 +1,12 @@
+--- ./CPP/7zip/Archive/7z/7zIn.cpp.orig2016-11-21 01:42:29.460901230 
+
 ./CPP/7zip/Archive/7z/7zIn.cpp 2016-11-21 01:42:57.481197725 +
+@@ -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;
+ }
+ 

Copied: p7zip/repos/staging-x86_64/CVE-2017-17969.patch (from rev 384800, 
p7zip/trunk/CVE-2017-17969.patch)
===
--- staging-x86_64/CVE-2017-17969.patch (rev 0)
+++ staging-x86_64/CVE-2017-17969.patch 2020-05-16 19:56:08 UTC (rev 384801)
@@ -0,0 +1,26 @@
+From 79bca880ce7bcf07216c45f93afea545e0344418 Mon Sep 17 00:00:00 2001
+From: aone 
+Date: Mon, 5 Feb 2018 13:01:09 +0100
+Subject: [PATCH] Security fix CVE-2017-17969
+
+---
+ CPP/7zip/Compress/ShrinkDecoder.cpp | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp 
b/CPP/7zip/Compress/ShrinkDecoder.cpp
+index 80b7e67..5bb0559 100644
+--- a/CPP/7zip/Compress/ShrinkDecoder.cpp
 b/CPP/7zip/Compress/ShrinkDecoder.cpp
+@@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, 
ISequentialOutStream *
+ {
+   _stack[i++] = _suffixes[cur];
+   cur = _parents[cur];
++if (cur >= kNumItems || i >= kNumItems)
++  break;
+ }
++  
++  if (cur >= kNumItems || i >= kNumItems)
++  break;
+ 
+ _stack[i++] = (Byte)cur;
+ lastChar2 = (Byte)cur;

Copied: p7zip/repos/staging-x86_64/CVE-2018-10115.patch (from rev 384800, 
p7zip/trunk/CVE-2018-10115.patch)
===
--- staging-x86_64/CVE-2018-10115.patch (rev 0)
+++ staging-x86_64/CVE-2018-10115.patch 2020-05-16 19:56:08 UTC (rev 384801)
@@ -0,0 +1,311 @@
+From: Robert Luberda 
+Date: Tue, 29 May 2018 23:59:09 +0200
+Subject: Fix CVE-2018-10115
+
+Apply "patch" taken from https://landave.io/files/patch_7zip_CVE-2018-10115.txt
+
+
+Bugs-Debian: https://bugs.debian.org/897674
+---
+ CPP/7zip/Compress/Rar1Decoder.cpp | 16 +++-
+ CPP/7zip/Compress/Rar1Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar2Decoder.cpp | 17 +
+ CPP/7zip/Compress/Rar2Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar3Decoder.cpp | 19 +++
+ CPP/7zip/Compress/Rar3Decoder.h   |  3 ++-
+ CPP/7zip/Compress/Rar5Decoder.cpp |  8 
+ CPP/7zip/Compress/Rar5Decoder.h   |  1 +
+ 8 files changed, 54 insertions(+), 16 deletions(-)
+
+diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp 
b/CPP/7zip/Compress/Rar1Decoder.cpp
+index 68030c7..8c890c8 100644
+--- a/CPP/7zip/Compress/Rar1Decoder.cpp
 b/CPP/7zip/Compress/Rar1Decoder.cpp
+@@ -29,7 +29,7 @@ public:
+ };
+ */
+ 
+-CDecoder::CDecoder(): m_IsSolid(false), _errorMode(false) { }
++CDecoder::CDecoder(): _isSolid(false), _solidAllowed(false), 
_errorMode(false) { }
+ 
+ void CDecoder::InitStructures()
+ {
+@@ -345,7 +345,7 @@ void CDecoder::GetFlagsBuf()
+ 
+ void CDecoder::InitData()
+ {
+-  if (!m_IsSolid)
++  if (!_isSolid)
+   {
+ AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0;
+ AvrPlc

[arch-commits] Commit in p7zip/repos (8 files)

2016-08-07 Thread Evangelos Foutras 
Date: Sunday, August 7, 2016 @ 08:39:44
  Author: foutrelis
Revision: 273436

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  p7zip/repos/extra-i686/PKGBUILD
(from rev 273435, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-i686/p7zip.install
(from rev 273435, p7zip/trunk/p7zip.install)
  p7zip/repos/extra-x86_64/PKGBUILD
(from rev 273435, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-x86_64/p7zip.install
(from rev 273435, 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  |  110 +++
 /p7zip.install |   18 +++
 extra-i686/PKGBUILD|   52 
 extra-i686/p7zip.install   |9 ---
 extra-x86_64/PKGBUILD  |   52 
 extra-x86_64/p7zip.install |9 ---
 6 files changed, 128 insertions(+), 122 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-08-07 08:39:24 UTC (rev 273435)
+++ extra-i686/PKGBUILD 2016-08-07 08:39:44 UTC (rev 273436)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras 
-# Contributor: Gaetan Bisson 
-# Contributor: Thayer Williams 
-# Contributor: Hugo Doria 
-# Contributor: TuxSpirit  2007/11/17 21:22:36 UTC
-# Contributor: Daniel J Griffiths 
-
-pkgname=p7zip
-pkgver=16.02
-pkgrel=1
-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
-
-  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 273435, p7zip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-08-07 08:39:44 UTC (rev 273436)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Evangelos Foutras 
+# Contributor: Gaetan Bisson 
+# Contributor: Thayer Williams 
+# Contributor: Hugo Doria 
+# Contributor: TuxSpirit  2007/11/17 21:22:36 UTC
+# Contributor: Daniel J Griffiths 
+
+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:

Deleted: extra-i686/p7zip.install
===
--- extra-i686/p7zip.install2016-08-07 08:39:24 UTC (rev 273435)
+++ extra-i686/p7zip.install2016-08-07 08:39:44 UTC (rev 273436)
@@ -1,9 +0,0 @@
-post_upgrade() {
-  if

[arch-commits] Commit in p7zip/repos (8 files)

2016-05-11 Thread Evangelos Foutras 
Date: Wednesday, May 11, 2016 @ 12:17:53
  Author: foutrelis
Revision: 267790

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  p7zip/repos/extra-i686/PKGBUILD
(from rev 267789, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-i686/p7zip.install
(from rev 267789, p7zip/trunk/p7zip.install)
  p7zip/repos/extra-x86_64/PKGBUILD
(from rev 267789, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-x86_64/p7zip.install
(from rev 267789, 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  |  104 +++
 /p7zip.install |   18 +++
 extra-i686/PKGBUILD|   54 --
 extra-i686/p7zip.install   |9 ---
 extra-x86_64/PKGBUILD  |   54 --
 extra-x86_64/p7zip.install |9 ---
 6 files changed, 122 insertions(+), 126 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-05-11 10:17:43 UTC (rev 267789)
+++ extra-i686/PKGBUILD 2016-05-11 10:17:53 UTC (rev 267790)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras 
-# Contributor: Gaetan Bisson 
-# Contributor: Thayer Williams 
-# Contributor: Hugo Doria 
-# Contributor: TuxSpirit  2007/11/17 21:22:36 UTC
-# Contributor: Daniel J Griffiths 
-
-pkgname=p7zip
-pkgver=9.38.1
-pkgrel=4
-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=('fd5019109c9a1bf34ad3257d37a6853eae8151ff50345f0a3ffba7d8c5fdb995')
-
-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
-
-  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
-
-  chmod -R a+r,u+w,a+X "$pkgdir/usr"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: p7zip/repos/extra-i686/PKGBUILD (from rev 267789, p7zip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-11 10:17:53 UTC (rev 267790)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Evangelos Foutras 
+# Contributor: Gaetan Bisson 
+# Contributor: Thayer Williams 
+# Contributor: Hugo Doria 
+# Contributor: TuxSpirit  2007/11/17 21:22:36 UTC
+# Contributor: Daniel J Griffiths 
+
+pkgname=p7zip
+pkgver=15.14.1
+pkgrel=1
+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=('699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4')
+
+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
+
+  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.install2016-05-11 10:17:43 UTC (rev 267789)
+++ extra-i686/p7zip.install2016-05-11 10:17:53 UTC (rev 267790)
@@ -1,9 +0,0 @@
-post_upgrade() {
-  if (($(vercmp $2 9.38.1-3) < 0)); then
-echo ':: The 7zFM

[arch-commits] Commit in p7zip/repos (8 files)

2014-01-06 Thread Bartłomiej Piotrowski 
Date: Monday, January 6, 2014 @ 20:32:39
  Author: bpiotrowski
Revision: 203247

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  p7zip/repos/staging-i686/
  p7zip/repos/staging-i686/7zFM.desktop
(from rev 203246, p7zip/trunk/7zFM.desktop)
  p7zip/repos/staging-i686/PKGBUILD
(from rev 203246, p7zip/trunk/PKGBUILD)
  p7zip/repos/staging-i686/install
(from rev 203246, p7zip/trunk/install)
  p7zip/repos/staging-x86_64/
  p7zip/repos/staging-x86_64/7zFM.desktop
(from rev 203246, p7zip/trunk/7zFM.desktop)
  p7zip/repos/staging-x86_64/PKGBUILD
(from rev 203246, p7zip/trunk/PKGBUILD)
  p7zip/repos/staging-x86_64/install
(from rev 203246, p7zip/trunk/install)

-+
 staging-i686/7zFM.desktop   |9 +
 staging-i686/PKGBUILD   |   67 ++
 staging-i686/install|   13 
 staging-x86_64/7zFM.desktop |9 +
 staging-x86_64/PKGBUILD |   67 ++
 staging-x86_64/install  |   13 
 6 files changed, 178 insertions(+)

Copied: p7zip/repos/staging-i686/7zFM.desktop (from rev 203246, 
p7zip/trunk/7zFM.desktop)
===
--- staging-i686/7zFM.desktop   (rev 0)
+++ staging-i686/7zFM.desktop   2014-01-06 19:32:39 UTC (rev 203247)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=7-Zip FM
+GenericName=7-Zip File Manager
+Type=Application
+Categories=GTK;Utility;Archiving;Compression;
+Terminal=false
+Icon=p7zip
+Exec=7zFM

Copied: p7zip/repos/staging-i686/PKGBUILD (from rev 203246, 
p7zip/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2014-01-06 19:32:39 UTC (rev 203247)
@@ -0,0 +1,67 @@
+# $Id$
+# Contributor: Thayer Williams tha...@archlinux.org
+# Contributor: Hugo Doria h...@archlinux.org
+# Contributor: TuxSpirittuxspi...@archlinux.fr  2007/11/17 21:22:36 UTC
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=p7zip
+pkgver=9.20.1
+pkgrel=9
+pkgdesc='Command-line version of the 7zip compressed file archiver'
+url='http://p7zip.sourceforge.net/'
+license=('GPL' 'custom')
+arch=('i686' 'x86_64')
+depends=('gcc-libs' 'bash')
+optdepends=('wxgtk2.8: GUI'
+'desktop-file-utils: desktop entries')
+makedepends=('yasm' 'nasm' 'wxgtk2.8')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2;
+'7zFM.desktop')
+sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
+  'f2c370d6f1b286b7ce9a2804e22541b755616a40')
+
+options=('!makeflags')
+install=install
+
+prepare() {
+   cd ${srcdir}/${pkgname}_${pkgver}
+   rm GUI/kde4/p7zip_compress.desktop
+   [[ $CARCH = x86_64 ]] \
+cp makefile.linux_amd64_asm makefile.machine \
+   || cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+
+   sed -i 's/wx-config/wx-config-2.8/g' CPP/7zip/TEST/TestUI/makefile \
+   CPP/7zip/UI/{FileManager,GUI,P7ZIP}/makefile
+}
+
+build() {
+   cd ${srcdir}/${pkgname}_${pkgver}
+   make all4 OPTFLAGS=${CXXFLAGS}
+}
+
+package() {
+   cd ${srcdir}/${pkgname}_${pkgver}
+   make install \
+   DEST_DIR=${pkgdir} \
+   DEST_HOME=/usr \
+   DEST_MAN=/usr/share/man
+
+   # Licenses
+   install -d ${pkgdir}/usr/share/licenses/p7zip
+   ln -s -t ${pkgdir}/usr/share/licenses/p7zip \
+   /usr/share/doc/p7zip/DOCS/License.txt \
+   /usr/share/doc/p7zip/DOCS/unRarLicense.txt
+
+   # Integration with stuff...
+   install -Dm644 GUI/p7zip_32.png 
${pkgdir}/usr/share/icons/hicolor/32x32/apps/p7zip.png
+   install -d 
${pkgdir}/usr/share/{applications,kde4/services/ServiceMenus}
+   cp GUI/kde4/* ${pkgdir}/usr/share/kde4/services/ServiceMenus/
+   cp ../7zFM.desktop ${pkgdir}/usr/share/applications/
+   ln -s 7zCon.sfx ${pkgdir}/usr/lib/p7zip/7z.sfx
+
+   find GUI/help -type d -exec chmod 755 {} \;
+   cp -r GUI/help ${pkgdir}/usr/lib/p7zip/
+
+   chmod -R u+w ${pkgdir}/usr
+}

Copied: p7zip/repos/staging-i686/install (from rev 203246, p7zip/trunk/install)
===
--- staging-i686/install(rev 0)
+++ staging-i686/install2014-01-06 19:32:39 UTC (rev 203247)
@@ -0,0 +1,13 @@
+post_install() {
+   [[ -x usr/bin/update-desktop-database ]]  update-desktop-database -q 
|| true
+   [[ -x usr/bin/gtk-update-icon-cache ]]  gtk-update-icon-cache -q -t 
-f usr/share/icons/hicolor || true
+}
+
+post_upgrade() {
+   post_install
+}
+
+
+post_remove() {
+   post_install
+}

Copied: p7zip/repos/staging-x86_64/7zFM.desktop (from rev 203246,

[arch-commits] Commit in p7zip/repos (8 files)

2011-10-29 Thread Gaetan Bisson 
Date: Saturday, October 29, 2011 @ 22:04:19
  Author: bisson
Revision: 141362

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  p7zip/repos/testing-i686/
  p7zip/repos/testing-i686/7zFM.desktop
(from rev 141361, p7zip/trunk/7zFM.desktop)
  p7zip/repos/testing-i686/PKGBUILD
(from rev 141361, p7zip/trunk/PKGBUILD)
  p7zip/repos/testing-i686/install
(from rev 141361, p7zip/trunk/install)
  p7zip/repos/testing-x86_64/
  p7zip/repos/testing-x86_64/7zFM.desktop
(from rev 141361, p7zip/trunk/7zFM.desktop)
  p7zip/repos/testing-x86_64/PKGBUILD
(from rev 141361, p7zip/trunk/PKGBUILD)
  p7zip/repos/testing-x86_64/install
(from rev 141361, p7zip/trunk/install)

-+
 testing-i686/7zFM.desktop   |9 ++
 testing-i686/PKGBUILD   |   61 ++
 testing-i686/install|   13 
 testing-x86_64/7zFM.desktop |9 ++
 testing-x86_64/PKGBUILD |   61 ++
 testing-x86_64/install  |   13 
 6 files changed, 166 insertions(+)

Copied: p7zip/repos/testing-i686/7zFM.desktop (from rev 141361, 
p7zip/trunk/7zFM.desktop)
===
--- testing-i686/7zFM.desktop   (rev 0)
+++ testing-i686/7zFM.desktop   2011-10-30 02:04:19 UTC (rev 141362)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=7-Zip FM
+GenericName=7-Zip File Manager
+Type=Application
+Categories=GTK;Utility;Archiving;Compression;
+Terminal=false
+Icon=p7zip
+Exec=7zFM

Copied: p7zip/repos/testing-i686/PKGBUILD (from rev 141361, 
p7zip/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2011-10-30 02:04:19 UTC (rev 141362)
@@ -0,0 +1,61 @@
+# $Id$
+# Contributor: Thayer Williams tha...@archlinux.org
+# Contributor: Hugo Doria h...@archlinux.org
+# Contributor: TuxSpirittuxspi...@archlinux.fr  2007/11/17 21:22:36 UTC
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+
+pkgname=p7zip
+pkgver=9.20.1
+pkgrel=6
+pkgdesc='Command-line version of the 7zip compressed file archiver'
+url='http://p7zip.sourceforge.net/'
+license=('GPL' 'custom')
+arch=('i686' 'x86_64')
+depends=('gcc-libs' 'bash')
+optdepends=('wxgtk: GUI'
+'desktop-file-utils: desktop entries')
+makedepends=('yasm' 'nasm' 'wxgtk')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2;
+'7zFM.desktop')
+sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
+  'f2c370d6f1b286b7ce9a2804e22541b755616a40')
+
+install=install
+
+build() {
+   cd ${srcdir}/${pkgname}_${pkgver}
+
+   [[ $CARCH = x86_64 ]] \
+cp makefile.linux_amd64_asm makefile.machine \
+   || cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+
+   make all4 OPTFLAGS=${CXXFLAGS}
+}
+
+package() {
+   cd ${srcdir}/${pkgname}_${pkgver}
+
+   make install \
+   DEST_DIR=${pkgdir} \
+   DEST_HOME=/usr \
+   DEST_MAN=/usr/share/man
+
+   # Licenses
+   install -d ${pkgdir}/usr/share/licenses/p7zip
+   ln -s -t ${pkgdir}/usr/share/licenses/p7zip \
+   /usr/share/doc/p7zip/DOCS/License.txt \
+   /usr/share/doc/p7zip/DOCS/unRarLicense.txt
+
+   # Integration with stuff...
+   install -D GUI/p7zip_32.png 
${pkgdir}/usr/share/icons/hicolor/32x32/apps/p7zip.png
+   install -d 
${pkgdir}/usr/share/{applications,kde4/services/ServiceMenus}
+   cp GUI/kde4/* ${pkgdir}/usr/share/kde4/services/ServiceMenus/
+   cp ../7zFM.desktop ${pkgdir}/usr/share/applications/
+   ln -s 7zCon.sfx ${pkgdir}/usr/lib/p7zip/7z.sfx
+
+   find GUI/help -type d -exec chmod 755 {} \;
+   cp -r GUI/help ${pkgdir}/usr/lib/p7zip/
+
+   chmod -R u+w ${pkgdir}/usr
+}

Copied: p7zip/repos/testing-i686/install (from rev 141361, p7zip/trunk/install)
===
--- testing-i686/install(rev 0)
+++ testing-i686/install2011-10-30 02:04:19 UTC (rev 141362)
@@ -0,0 +1,13 @@
+post_install() {
+   [[ -x usr/bin/update-desktop-database ]]  update-desktop-database -q 
|| true
+   [[ -x usr/bin/gtk-update-icon-cache ]]  gtk-update-icon-cache -q -t 
-f usr/share/icons/hicolor || true
+}
+
+post_upgrade() {
+   post_install
+}
+
+
+post_remove() {
+   post_install
+}

Copied: p7zip/repos/testing-x86_64/7zFM.desktop (from rev 141361, 
p7zip/trunk/7zFM.desktop)
===
--- testing-x86_64/7zFM.desktop (rev 0)
+++ testing-x86_64/7zFM.desktop 2011-10-30 02:04:19 UTC (rev 141362)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=7-Zip FM