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

2016-07-16 Thread Evangelos Foutras
Date: Saturday, July 16, 2016 @ 13:06:14
  Author: foutrelis
Revision: 271944

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

Added:
  p7zip/repos/extra-i686/PKGBUILD
(from rev 271943, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-i686/p7zip.install
(from rev 271943, p7zip/trunk/p7zip.install)
  p7zip/repos/extra-x86_64/PKGBUILD
(from rev 271943, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-x86_64/p7zip.install
(from rev 271943, p7zip/trunk/p7zip.install)
Deleted:
  p7zip/repos/extra-i686/CVE-2016-2334.patch
  p7zip/repos/extra-i686/CVE-2016-2335.patch
  p7zip/repos/extra-i686/PKGBUILD
  p7zip/repos/extra-i686/p7zip.install
  p7zip/repos/extra-x86_64/CVE-2016-2334.patch
  p7zip/repos/extra-x86_64/CVE-2016-2335.patch
  p7zip/repos/extra-x86_64/PKGBUILD
  p7zip/repos/extra-x86_64/p7zip.install

--+
 /PKGBUILD|  104 +
 /p7zip.install   |   18 ++
 extra-i686/CVE-2016-2334.patch   |   24 
 extra-i686/CVE-2016-2335.patch   |   17 --
 extra-i686/PKGBUILD  |   60 -
 extra-i686/p7zip.install |9 ---
 extra-x86_64/CVE-2016-2334.patch |   24 
 extra-x86_64/CVE-2016-2335.patch |   17 --
 extra-x86_64/PKGBUILD|   60 -
 extra-x86_64/p7zip.install   |9 ---
 10 files changed, 122 insertions(+), 220 deletions(-)

Deleted: extra-i686/CVE-2016-2334.patch
===
--- extra-i686/CVE-2016-2334.patch  2016-07-16 13:04:22 UTC (rev 271943)
+++ extra-i686/CVE-2016-2334.patch  2016-07-16 13:06:14 UTC (rev 271944)
@@ -1,24 +0,0 @@
-Index: p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp
-===
 p7zip_15.14.1.orig/CPP/7zip/Archive/HfsHandler.cpp
-+++ p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp
-@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFo
-   item.GroupID = Get32(r + 0x24);
-   item.AdminFlags = r[0x28];
-   item.OwnerFlags = r[0x29];
-+  */
-   item.FileMode = Get16(r + 0x2A);
-+  /*
-   item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount
-   item.FileType = Get32(r + 0x30);
-   item.FileCreator = Get32(r + 0x34);
-@@ -1572,6 +1574,9 @@ HRESULT CHandler::ExtractZlibFile(
- 
- UInt32 size = GetUi32(tableBuf + i * 8 + 4);
- 
-+if (size > buf.Size() || size > kCompressionBlockSize + 1)
-+return S_FALSE;
-+
- RINOK(ReadStream_FALSE(inStream, buf, size));
- 
- if ((buf[0] & 0xF) == 0xF)

Deleted: extra-i686/CVE-2016-2335.patch
===
--- extra-i686/CVE-2016-2335.patch  2016-07-16 13:04:22 UTC (rev 271943)
+++ extra-i686/CVE-2016-2335.patch  2016-07-16 13:06:14 UTC (rev 271944)
@@ -1,17 +0,0 @@
-Index: p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp
-===
 p7zip_15.14.1.orig/CPP/7zip/Archive/Udf/UdfIn.cpp
-+++ p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp
-@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int vol
- return S_FALSE;
-   CFile  = Files.Back();
-   const CLogVol  = LogVols[volIndex];
--  CPartition  = 
Partitions[vol.PartitionMaps[lad.Location.PartitionRef].PartitionIndex];
-+  unsigned partitionRef = lad.Location.PartitionRef;
-+
-+  if (partitionRef >= vol.PartitionMaps.Size())
-+  return S_FALSE;
-+  CPartition  = 
Partitions[vol.PartitionMaps[partitionRef].PartitionIndex];
- 
-   UInt32 key = lad.Location.Pos;
-   UInt32 value;

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-07-16 13:04:22 UTC (rev 271943)
+++ extra-i686/PKGBUILD 2016-07-16 13:06:14 UTC (rev 271944)
@@ -1,60 +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=15.14.1
-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
-CVE-2016-2334.patch
-CVE-2016-2335.patch)
-sha256sums=('699db4da3621904113e040703220abb1148dfef477b55305e2f14a4f1f8f25d4'
-'632cae14095e065cb550b0f16faf39d8f822d0a8bb5b605e903f3bc7657a4ee5'
-'368870f92c658e8add261695923470855a969c0d7ecafd880ec7144ac245adbf')
-
-prepare() 

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

2016-05-17 Thread Evangelos Foutras
Date: Tuesday, May 17, 2016 @ 23:44:11
  Author: foutrelis
Revision: 268264

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

Added:
  p7zip/repos/extra-i686/CVE-2016-2334.patch
(from rev 268263, p7zip/trunk/CVE-2016-2334.patch)
  p7zip/repos/extra-i686/CVE-2016-2335.patch
(from rev 268263, p7zip/trunk/CVE-2016-2335.patch)
  p7zip/repos/extra-i686/PKGBUILD
(from rev 268263, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-i686/p7zip.install
(from rev 268263, p7zip/trunk/p7zip.install)
  p7zip/repos/extra-x86_64/CVE-2016-2334.patch
(from rev 268263, p7zip/trunk/CVE-2016-2334.patch)
  p7zip/repos/extra-x86_64/CVE-2016-2335.patch
(from rev 268263, p7zip/trunk/CVE-2016-2335.patch)
  p7zip/repos/extra-x86_64/PKGBUILD
(from rev 268263, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-x86_64/p7zip.install
(from rev 268263, 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-2334.patch   |   24 +++
 extra-i686/CVE-2016-2335.patch   |   17 +
 extra-i686/PKGBUILD  |   52 
 extra-i686/p7zip.install |9 --
 extra-x86_64/CVE-2016-2334.patch |   24 +++
 extra-x86_64/CVE-2016-2335.patch |   17 +
 extra-x86_64/PKGBUILD|   52 
 extra-x86_64/p7zip.install   |9 --
 10 files changed, 220 insertions(+), 122 deletions(-)

Copied: p7zip/repos/extra-i686/CVE-2016-2334.patch (from rev 268263, 
p7zip/trunk/CVE-2016-2334.patch)
===
--- extra-i686/CVE-2016-2334.patch  (rev 0)
+++ extra-i686/CVE-2016-2334.patch  2016-05-17 21:44:11 UTC (rev 268264)
@@ -0,0 +1,24 @@
+Index: p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp
+===
+--- p7zip_15.14.1.orig/CPP/7zip/Archive/HfsHandler.cpp
 p7zip_15.14.1/CPP/7zip/Archive/HfsHandler.cpp
+@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFo
+   item.GroupID = Get32(r + 0x24);
+   item.AdminFlags = r[0x28];
+   item.OwnerFlags = r[0x29];
++  */
+   item.FileMode = Get16(r + 0x2A);
++  /*
+   item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount
+   item.FileType = Get32(r + 0x30);
+   item.FileCreator = Get32(r + 0x34);
+@@ -1572,6 +1574,9 @@ HRESULT CHandler::ExtractZlibFile(
+ 
+ UInt32 size = GetUi32(tableBuf + i * 8 + 4);
+ 
++if (size > buf.Size() || size > kCompressionBlockSize + 1)
++return S_FALSE;
++
+ RINOK(ReadStream_FALSE(inStream, buf, size));
+ 
+ if ((buf[0] & 0xF) == 0xF)

Copied: p7zip/repos/extra-i686/CVE-2016-2335.patch (from rev 268263, 
p7zip/trunk/CVE-2016-2335.patch)
===
--- extra-i686/CVE-2016-2335.patch  (rev 0)
+++ extra-i686/CVE-2016-2335.patch  2016-05-17 21:44:11 UTC (rev 268264)
@@ -0,0 +1,17 @@
+Index: p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp
+===
+--- p7zip_15.14.1.orig/CPP/7zip/Archive/Udf/UdfIn.cpp
 p7zip_15.14.1/CPP/7zip/Archive/Udf/UdfIn.cpp
+@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int vol
+ return S_FALSE;
+   CFile  = Files.Back();
+   const CLogVol  = LogVols[volIndex];
+-  CPartition  = 
Partitions[vol.PartitionMaps[lad.Location.PartitionRef].PartitionIndex];
++  unsigned partitionRef = lad.Location.PartitionRef;
++
++  if (partitionRef >= vol.PartitionMaps.Size())
++  return S_FALSE;
++  CPartition  = 
Partitions[vol.PartitionMaps[partitionRef].PartitionIndex];
+ 
+   UInt32 key = lad.Location.Pos;
+   UInt32 value;

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2016-05-17 21:43:53 UTC (rev 268263)
+++ extra-i686/PKGBUILD 2016-05-17 21:44:11 UTC (rev 268264)
@@ -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=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

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

2015-04-15 Thread Evangelos Foutras
Date: Wednesday, April 15, 2015 @ 23:18:37
  Author: foutrelis
Revision: 237197

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

Added:
  p7zip/repos/extra-i686/PKGBUILD
(from rev 237196, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-i686/p7zip.install
(from rev 237196, p7zip/trunk/p7zip.install)
  p7zip/repos/extra-x86_64/PKGBUILD
(from rev 237196, p7zip/trunk/PKGBUILD)
  p7zip/repos/extra-x86_64/p7zip.install
(from rev 237196, p7zip/trunk/p7zip.install)
Deleted:
  p7zip/repos/extra-i686/7zFM.desktop
  p7zip/repos/extra-i686/PKGBUILD
  p7zip/repos/extra-i686/install
  p7zip/repos/extra-i686/osversion.patch
  p7zip/repos/extra-x86_64/7zFM.desktop
  p7zip/repos/extra-x86_64/PKGBUILD
  p7zip/repos/extra-x86_64/install
  p7zip/repos/extra-x86_64/osversion.patch

--+
 /PKGBUILD|  108 +
 extra-i686/7zFM.desktop  |   10 ---
 extra-i686/PKGBUILD  |   71 --
 extra-i686/install   |   13 
 extra-i686/osversion.patch   |   28 --
 extra-i686/p7zip.install |9 +++
 extra-x86_64/7zFM.desktop|   10 ---
 extra-x86_64/PKGBUILD|   71 --
 extra-x86_64/install |   13 
 extra-x86_64/osversion.patch |   28 --
 extra-x86_64/p7zip.install   |9 +++
 11 files changed, 126 insertions(+), 244 deletions(-)

Deleted: extra-i686/7zFM.desktop
===
--- extra-i686/7zFM.desktop 2015-04-15 21:18:25 UTC (rev 237196)
+++ extra-i686/7zFM.desktop 2015-04-15 21:18:37 UTC (rev 237197)
@@ -1,10 +0,0 @@
-[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
-MimeType=application/gzip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-lha;application/x-lhz;application/x-lzma;application/x-lzma-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-tar;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/zip;application/vnd.ms-cab-compressed;

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2015-04-15 21:18:25 UTC (rev 237196)
+++ extra-i686/PKGBUILD 2015-04-15 21:18:37 UTC (rev 237197)
@@ -1,71 +0,0 @@
-# $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.38.1
-pkgrel=2
-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;
-'osversion.patch'
-'7zFM.desktop')
-sha1sums=('6b1eccf272d8b141a94758f80727ae633568ba69'
-  '8c086db1c7be0d52d2ac971f44adbdccf6dd82de'
-  '441e8d89457f165c22015dedd0c1ee88504f333c')
-
-options=('!makeflags')
-install=install
-
-prepare() {
-   cd ${srcdir}/${pkgname}_${pkgver}
-   [[ $CARCH = x86_64 ]] 
-   cp makefile.linux_amd64_asm makefile.machine ||
-   cp makefile.linux_x86_asm_gcc_4.X makefile.machine
-
-   patch -p1 -i ../osversion.patch
-   sed -i 's/x86_64-linux-gnu//g' CPP/7zip/*/*/*.depend
-
-   rm GUI/kde4/p7zip_compress.desktop # FS#43766
-}
-
-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
-
-   # Doc and licenses
-   cp -a DOC/* ${pkgdir}/usr/share/doc/p7zip
-   install -d ${pkgdir}/usr/share/licenses/p7zip
-   ln -s -t ${pkgdir}/usr/share/licenses/p7zip \
-   /usr/share/doc/p7zip/License.txt \
-   /usr/share/doc/p7zip/unRarLicense.txt
-
-   # Integration with stuff...
-   install -Dm644 GUI/p7zip_32.png 
${pkgdir}/usr/share/icons/hicolor/32x32/apps/p7zip.png
-   install -d 

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

2013-09-30 Thread Gaetan Bisson
Date: Monday, September 30, 2013 @ 20:47:20
  Author: bisson
Revision: 195475

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

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

---+
 /7zFM.desktop |   18 ++
 /PKGBUILD |  128 
 /install  |   26 
 extra-i686/7zFM.desktop   |9 ---
 extra-i686/PKGBUILD   |   62 -
 extra-i686/install|   13 
 extra-x86_64/7zFM.desktop |9 ---
 extra-x86_64/PKGBUILD |   62 -
 extra-x86_64/install  |   13 
 9 files changed, 172 insertions(+), 168 deletions(-)

Deleted: extra-i686/7zFM.desktop
===
--- extra-i686/7zFM.desktop 2013-09-30 18:46:35 UTC (rev 195474)
+++ extra-i686/7zFM.desktop 2013-09-30 18:47:20 UTC (rev 195475)
@@ -1,9 +0,0 @@
-[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/extra-i686/7zFM.desktop (from rev 195474, 
p7zip/trunk/7zFM.desktop)
===
--- extra-i686/7zFM.desktop (rev 0)
+++ extra-i686/7zFM.desktop 2013-09-30 18:47:20 UTC (rev 195475)
@@ -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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-09-30 18:46:35 UTC (rev 195474)
+++ extra-i686/PKGBUILD 2013-09-30 18:47:20 UTC (rev 195475)
@@ -1,62 +0,0 @@
-# $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=7
-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')
-
-options=('!makeflags')
-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 -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/extra-i686/PKGBUILD (from rev 195474, p7zip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-09-30 18:47:20 UTC (rev 195475)
@@ -0,0 +1,64 @@
+# $Id$
+# 

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

2013-06-14 Thread Gaetan Bisson
Date: Saturday, June 15, 2013 @ 06:52:30
  Author: bisson
Revision: 188505

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

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

---+
 /7zFM.desktop |   18 ++
 /PKGBUILD |  124 
 /install  |   26 +
 extra-i686/7zFM.desktop   |9 ---
 extra-i686/PKGBUILD   |   62 --
 extra-i686/install|   13 
 extra-x86_64/7zFM.desktop |9 ---
 extra-x86_64/PKGBUILD |   62 --
 extra-x86_64/install  |   13 
 9 files changed, 168 insertions(+), 168 deletions(-)

Deleted: extra-i686/7zFM.desktop
===
--- extra-i686/7zFM.desktop 2013-06-15 04:51:48 UTC (rev 188504)
+++ extra-i686/7zFM.desktop 2013-06-15 04:52:30 UTC (rev 188505)
@@ -1,9 +0,0 @@
-[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/extra-i686/7zFM.desktop (from rev 188504, 
p7zip/trunk/7zFM.desktop)
===
--- extra-i686/7zFM.desktop (rev 0)
+++ extra-i686/7zFM.desktop 2013-06-15 04:52:30 UTC (rev 188505)
@@ -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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2013-06-15 04:51:48 UTC (rev 188504)
+++ extra-i686/PKGBUILD 2013-06-15 04:52:30 UTC (rev 188505)
@@ -1,62 +0,0 @@
-# $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')
-options=('!makeflags')
-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/extra-i686/PKGBUILD (from rev 188504, p7zip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-06-15 04:52:30 UTC (rev 188505)
@@ -0,0 +1,62 @@
+# $Id$
+# Contributor: 

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

2011-10-01 Thread Gaetan Bisson
Date: Saturday, October 1, 2011 @ 04:53:55
  Author: bisson
Revision: 139183

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

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

---+
 extra-i686/7zFM.desktop   |   18 +++---
 extra-i686/PKGBUILD   |  116 +++-
 extra-i686/install|   26 -
 extra-x86_64/7zFM.desktop |   18 +++---
 extra-x86_64/PKGBUILD |  116 +++-
 extra-x86_64/install  |   26 -
 6 files changed, 166 insertions(+), 154 deletions(-)

Deleted: extra-i686/7zFM.desktop
===
--- extra-i686/7zFM.desktop 2011-10-01 08:52:23 UTC (rev 139182)
+++ extra-i686/7zFM.desktop 2011-10-01 08:53:55 UTC (rev 139183)
@@ -1,9 +0,0 @@
-[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/extra-i686/7zFM.desktop (from rev 139182, 
p7zip/trunk/7zFM.desktop)
===
--- extra-i686/7zFM.desktop (rev 0)
+++ extra-i686/7zFM.desktop 2011-10-01 08:53:55 UTC (rev 139183)
@@ -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

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-10-01 08:52:23 UTC (rev 139182)
+++ extra-i686/PKGBUILD 2011-10-01 08:53:55 UTC (rev 139183)
@@ -1,55 +0,0 @@
-# $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=4
-pkgdesc='Command-line version of the 7zip compressed file archiver'
-url='http://p7zip.sourceforge.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-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
-
-   # Integration with stuff...
-   install -D contrib/VirtualFileSystemForMidnightCommander/u7z 
${pkgdir}/usr/lib/mc/extfs.d/u7z
-   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/extra-i686/PKGBUILD (from rev 139182, p7zip/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-01 08:53:55 UTC (rev 139183)
@@ -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=5