diff options
21 files changed, 67 insertions, 1224 deletions
diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD index 0e3ced5cc..0aeb839c0 100644 --- a/community/doublecmd/PKGBUILD +++ b/community/doublecmd/PKGBUILD @@ -1,11 +1,11 @@ # vim:set ft=sh: -# $Id: PKGBUILD 103165 2013-12-28 11:02:28Z idevolder $ +# $Id: PKGBUILD 108143 2014-03-23 19:45:43Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: (sirocco AT ngs.ru) pkgbase=doublecmd pkgname=('doublecmd-gtk2' 'doublecmd-qt') -pkgver=0.5.8 +pkgver=0.5.9 _helpver=0.5.5 pkgrel=1 url="http://doublecmd.sourceforge.net/" @@ -22,26 +22,29 @@ optdepends=( source=( "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz" "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz" + "http://www.herecura.be/files/lazarus-20140321-2.tar.gz" ) build() { cp -a $pkgbase-$pkgver $pkgbase-gtk cp -a $pkgbase-$pkgver $pkgbase-qt - cd "$srcdir/$pkgbase-gtk" - if [ "$CARCH" = "i686" ]; then - sed -e '/fPIC/d' -i "$srcdir/$pkgbase-gtk/components/doublecmd/doublecmd_common.lpk" - fi - sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh + msg2 'build gtk' + gtkdir="$srcdir/$pkgbase-gtk" + cd "$gtkdir" + bsdtar -zxf "$srcdir/lazarus-20140321-2.tar.gz" + sed -e "s/\\(export\\ lazbuild=\\).*/\\1\"\$(which lazbuild) --primary-config-path=${gtkdir//\//\\\/}\/lazarus\/lazarus-$CARCH\"/" -i build.sh + sed -e "s/%%SRCDIR%%/${gtkdir//\//\\\/}/g" -i lazarus/packagefiles.xml ./build.sh beta gtk2 - cd "$srcdir/$pkgbase-qt" - # dont use fPIC on i686 - if [ "$CARCH" = "i686" ]; then - sed -e '/fPIC/d' -i "$srcdir/$pkgbase-qt/components/doublecmd/doublecmd_common.lpk" - fi - sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh + msg2 'build qt' + qtdir="$srcdir/$pkgbase-qt" + cd "$qtdir" + bsdtar -zxf "$srcdir/lazarus-20140321-2.tar.gz" + sed -e "s/\\(export\\ lazbuild=\\).*/\\1\"\$(which lazbuild) --primary-config-path=${qtdir//\//\\\/}\/lazarus\/lazarus-$CARCH\"/" -i build.sh + sed -e "s/%%SRCDIR%%/${qtdir//\//\\\/}/g" -i lazarus/packagefiles.xml ./build.sh beta qt + } package_doublecmd-gtk2() { @@ -49,7 +52,6 @@ package_doublecmd-gtk2() { depends=('gtk2') conflicts=('doublecmd-qt') cd "$srcdir/$pkgbase-gtk" - sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" # install doc @@ -62,7 +64,6 @@ package_doublecmd-qt() { depends=('qt4pas') conflicts=('doublecmd-gtk2') cd "$srcdir/$pkgbase-qt" - sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh ./install/linux/install.sh --install-prefix="$pkgdir" # install doc @@ -70,5 +71,6 @@ package_doublecmd-qt() { cp -a * "$pkgdir/usr/share/$pkgbase/doc/" } -sha256sums=('bfa85693b6cc06b7fd28ec8bd443ad9fb9d79d27a541e4f4d54bb9da2fb052ea' - '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf') +sha256sums=('d5b3c93b3029f4b0a45b7c9912d34f753445e031c93bc0268d4cb4c313d06ba4' + '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf' + '16560ad7403ffbee1800384768828e1fad924d03068c6248b68a78c393fc4e20') diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index f3168f4a4..3e43338c2 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102201 2013-12-06 13:22:28Z arodseth $ +# $Id: PKGBUILD 108126 2014-03-23 13:40:11Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=gendesk -pkgver=0.6 +pkgver=0.6.1 pkgrel=1 pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686') @@ -12,7 +12,7 @@ makedepends=('go') depends=('glibc') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" 'http://roboticoverlords.org/images/default.png') -sha256sums=('ccfe024a2258beb81a82217598b432cb98006af5d7b6cc8e6012d263d82f1b5d' +sha256sums=('d4d2bfb23ae1c401f3147ed20206e72015b338067ff40b86271106865774de55' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD index 06c9793c9..70f31e2e2 100644 --- a/community/haskell-regex-base/PKGBUILD +++ b/community/haskell-regex-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99318 2013-10-26 21:05:51Z jelle $ +# $Id: PKGBUILD 108122 2014-03-23 11:53:03Z arodseth $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> @@ -6,7 +6,7 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=15 +pkgrel=16 pkgdesc='Interface API for regex-posix,pcre,parsec,tdfa,dfa' url='http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base' license=('custom:BSD3') diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 1bde27e52..8c6750c5f 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 107728 2014-03-18 21:42:05Z stativ $ +# $Id: PKGBUILD 108116 2014-03-23 10:11:55Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=13.1 -_pkgver=135.475 +pkgver=13.1.1 +_pkgver=135.480 pkgrel=1 pkgdesc="Architecture dependent libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('Apache') depends=('glibc') options=(!strip) source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('b1ffe55b57afc2447b30e4bf82c3d277') +md5sums=('a20ade9bc4addbc341af8dcc1a0830ce') package() { [ $CARCH == "x86_64" ] && SUFFIX=64 diff --git a/community/keybinder2/PKGBUILD b/community/keybinder2/PKGBUILD index 8bfb560be..b117f0cb5 100644 --- a/community/keybinder2/PKGBUILD +++ b/community/keybinder2/PKGBUILD @@ -3,21 +3,20 @@ pkgname=('libkeybinder2' 'python2-keybinder2') pkgbase=keybinder2 _offname=keybinder pkgver=0.3.0 -pkgrel=1 +pkgrel=2 pkgdesc='Library for registering global keyboard shortcuts' arch=('i686' 'x86_64') -url='http://kaizer.se/wiki/keybinder/' +url='https://github.com/engla/keybinder' license=('GPL') -makedepends=('pygtk') -source=(http://kaizer.se/publicfiles/${_offname}/${_offname}-${pkgver}.tar.gz) -sha256sums=('42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb') +makedepends=('pygtk' 'gnome-common' 'gtk-doc') +source=(https://github.com/engla/${_offname}/archive/master.zip) +sha256sums=('30e46747a76b38395b669079edd0532d3ed8c818d13dd6cbd32da9ffc012919b') build() { - cd "${srcdir}/${_offname}-${pkgver}" + cd "${srcdir}/${_offname}-master" export PYTHON=/usr/bin/python2 - ./configure \ - --prefix=/usr \ - --disable-lua + ./autogen.sh \ + --prefix=/usr make } @@ -25,9 +24,9 @@ package_libkeybinder2() { pkgdesc='Library for registering global keyboard shortcuts' depends=('gtk2') - cd "${srcdir}/${_offname}-${pkgver}" + cd "${srcdir}/${_offname}-master" make DESTDIR="${pkgdir}/" install - rm -rf ${pkgdir}/usr/lib/python2.7 + rm -rf "${pkgdir}/usr/lib/python2.7" } package_python2-keybinder2() { @@ -35,8 +34,8 @@ package_python2-keybinder2() { depends=('libkeybinder2' 'pygtk') provides=('python-keybinder') - cd "${srcdir}/${_offname}-${pkgver}" + cd "${srcdir}/${_offname}-master" make DESTDIR="${pkgdir}/" install - rm -rf ${pkgdir}/usr/lib/{girepository-1.0,libkeybinder*,pkgconfig} - rm -rf ${pkgdir}/usr/{include,share} + rm -rf "${pkgdir}"/usr/lib/{girepository-1.0,libkeybinder*,pkgconfig} + rm -rf "${pkgdir}"/usr/{include,share} } diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD index 0324d43e3..82487db06 100644 --- a/community/libnfs/PKGBUILD +++ b/community/libnfs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 105190 2014-02-02 16:31:36Z idevolder $ +# $Id: PKGBUILD 108142 2014-03-23 19:44:44Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgname=libnfs -pkgver=1.9.2 +pkgver=1.9.3 pkgrel=1 pkgdesc="client library for accessing NFS shares" arch=('i686' 'x86_64') @@ -23,4 +23,4 @@ package() { cd "$pkgname-$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -sha256sums=('77d9d543eb1ae3e36497e5a3d4f37c8dd3d66def8d11817d4ed84368bbbb225b') +sha256sums=('9d1c988065b373ea25e195aedff4c33ca949fee41c61bdb38a26908bb618315a') diff --git a/community/tipp10/PKGBUILD b/community/tipp10/PKGBUILD index 725ccb9e2..9d4233c2a 100644 --- a/community/tipp10/PKGBUILD +++ b/community/tipp10/PKGBUILD @@ -1,37 +1,36 @@ -# $Id: PKGBUILD 85418 2013-03-01 10:41:22Z andrea $ +# $Id: PKGBUILD 108120 2014-03-23 11:08:36Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: toliman <altergan@hs-albsig.de> pkgname=tipp10 pkgver=2.1.0 -pkgrel=5 +pkgrel=6 pkgdesc="intelligent typing tutor" arch=('i686' 'x86_64') url="http://www.tipp10.com/" license=('GPL2') depends=('qt4') -source=(defines.h.patch gcc-4.5.patch \ - "http://www.tipp10.com/de/download/tipp10_source_v"${pkgver//./-}".zip") +source=(defines.h.patch + gcc-4.5.patch \ + "http://www.tipp10.com/de/download/tipp10_source_v"${pkgver//./-}".zip") md5sums=('73a987123ca842026b7bde5e89370b86' 'a9d388ddb17ae93f13acb915bc8eba57' '38c1e1fc9c5ba183279efdd22b318b7a') -_srcdir="$srcdir/tipp10_source_v${pkgver//./-}" - build() { - cd "$_srcdir" + cd "$srcdir/tipp10_source_v${pkgver//./-}" sed -i 's#tipp10v2.template#../share/tipp10/tipp10v2.template#' def/defines.h patch -p0 < "$srcdir/defines.h.patch" patch -p0 < "$srcdir/gcc-4.5.patch" - qmake + qmake-qt4 make } package() { - cd "$_srcdir" + cd "$srcdir/tipp10_source_v${pkgver//./-}" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install install -Dm755 tipp10 "$pkgdir/usr/bin/tipp10" install -Dm644 release/tipp10v2.template "$pkgdir/usr/share/tipp10/tipp10v2.template" diff --git a/community/vor/PKGBUILD b/community/vor/PKGBUILD index 16f0651f0..bd9c09ae0 100644 --- a/community/vor/PKGBUILD +++ b/community/vor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101359 2013-11-23 12:39:11Z arodseth $ +# $Id: PKGBUILD 108130 2014-03-23 13:52:23Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: tdy <tdy@gmx.com> # Contributor: nut543 <kfs1@online.no> pkgname=vor pkgver=0.5.5 -pkgrel=2 +pkgrel=3 pkgdesc='Classic spaceship versus asteroid field arcade game' arch=('x86_64' 'i686') url='http://jasonwoof.org/vor' @@ -20,8 +20,11 @@ source=("http://qualdan.com/$pkgname/$pkgname-$pkgver.tar.bz2" sha256sums=('ead1b9786741e26d37ff7c5185b7fe1e91f90f76ebed3785225312e323b7c7da' '07a805928f5cf2b3351e2b9ff820ea69352ad80faad43311889ffbd5f62da872') -build() { +prepare() { gendesk -f --pkgname "$pkgname" --pkgdesc "$pkgdesc" +} + +build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr make LDFLAGS=-lm diff --git a/extra/libkeybinder3/PKGBUILD b/extra/libkeybinder3/PKGBUILD index 501c66c61..ec9da817b 100644 --- a/extra/libkeybinder3/PKGBUILD +++ b/extra/libkeybinder3/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 198192 2013-10-30 13:21:58Z allan $ +# $Id: PKGBUILD 208524 2014-03-23 21:26:50Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: speps <speps at aur dot archlinux dot org> pkgname=libkeybinder3 pkgver=0.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="A library for registering global keyboard shortcuts" arch=('i686' 'x86_64') -url="http://kaizer.se/wiki/keybinder/" +url="https://github.com/engla/keybinder/tree/keybinder-3.0" license=('MIT') depends=('gtk3') makedepends=('gtk-doc' 'gobject-introspection') diff --git a/extra/libmodplug/PKGBUILD b/extra/libmodplug/PKGBUILD index f45c8d68f..862bca8df 100644 --- a/extra/libmodplug/PKGBUILD +++ b/extra/libmodplug/PKGBUILD @@ -1,25 +1,16 @@ -# $Id: PKGBUILD 198199 2013-10-30 13:24:33Z allan $ +# $Id: PKGBUILD 208526 2014-03-23 21:51:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libmodplug -pkgver=0.8.8.4 -pkgrel=2 +pkgver=0.8.8.5 +pkgrel=1 pkgdesc="A MOD playing library" arch=('i686' 'x86_64') url="http://modplug-xmms.sourceforge.net/" license=('custom') depends=('gcc-libs') -source=(http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz - libmodplug-CVE-2013-4233-Fix.patch libmodplug-CVE-2013-4234-Fix.patch) -sha1sums=('df4deffe542b501070ccb0aee37d875ebb0c9e22' - 'daee7fba80f633236a3d09ad19225c57013140e9' - '2e870747261a86dce5056cbf077c5914e9e8b287') - -prepare() { - cd ${pkgname}-${pkgver} - patch -p2 -i "${srcdir}/libmodplug-CVE-2013-4233-Fix.patch" - patch -p2 -i "${srcdir}/libmodplug-CVE-2013-4234-Fix.patch" -} +source=(http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz) +sha1sums=('771ee75bb8bfcfe95eae434ed1f3b2c5b63b2cb3') build() { cd ${pkgname}-${pkgver} diff --git a/extra/libmodplug/libmodplug-CVE-2013-4233-Fix.patch b/extra/libmodplug/libmodplug-CVE-2013-4233-Fix.patch deleted file mode 100644 index 288b44d13..000000000 --- a/extra/libmodplug/libmodplug-CVE-2013-4233-Fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c4d4e047862649a75f6dba905c613aff0df81309 Mon Sep 17 00:00:00 2001 -From: Konstanty Bialkowski <konstanty@ieee.org> -Date: Wed, 14 Aug 2013 14:15:27 +1000 -Subject: [PATCH] CVE-2013-4233 Fix - -Integer overflow in j variable - --- reported by Florian "Agix" Gaultier ---- - libmodplug/src/load_abc.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/libmodplug/src/load_abc.cpp b/libmodplug/src/load_abc.cpp -index 9f4b328..ecb7b62 100644 ---- a/libmodplug/src/load_abc.cpp -+++ b/libmodplug/src/load_abc.cpp -@@ -1814,7 +1814,7 @@ static int abc_extract_tempo(const char *p, int invoice) - - static void abc_set_parts(char **d, char *p) - { -- int i,j,k,m,n; -+ int i,j,k,m,n,size; - char *q; - #ifdef NEWMIKMOD - static MM_ALLOC *h; -@@ -1852,10 +1852,11 @@ static void abc_set_parts(char **d, char *p) - i += n-1; - } - } -- q = (char *)_mm_calloc(h, j+1, sizeof(char)); // enough storage for the worst case -+ size = (j + 1) > 0 ? j+1 : j; -+ q = (char *)_mm_calloc(h, size, sizeof(char)); // enough storage for the worst case - // now copy bytes from p to *d, taking parens and digits in account - j = 0; -- for( i=0; p[i] && p[i] != '%'; i++ ) { -+ for( i=0; p[i] && p[i] != '%' && j < size; i++ ) { - if( isdigit(p[i]) || isupper(p[i]) || p[i] == '(' || p[i] == ')' ) { - if( p[i] == ')' ) { - for( n=j; n > 0 && q[n-1] != '('; n-- ) ; // find open paren in q --- -1.8.4 - diff --git a/extra/libmodplug/libmodplug-CVE-2013-4234-Fix.patch b/extra/libmodplug/libmodplug-CVE-2013-4234-Fix.patch deleted file mode 100644 index c4b105d19..000000000 --- a/extra/libmodplug/libmodplug-CVE-2013-4234-Fix.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 5de53a46283e7c463115444a9339978011dab961 Mon Sep 17 00:00:00 2001 -From: Konstanty Bialkowski <konstanty@ieee.org> -Date: Wed, 14 Aug 2013 15:15:09 +1000 -Subject: [PATCH] CVE-2013-4234 Fix - -Heap overflow in abc_MIDI_drum + abc_MIDI_gchord - --- reported by Florian "Agix" Gaultier ---- - libmodplug/src/load_abc.cpp | 34 +++++++++++++++++++++++----------- - 1 file changed, 23 insertions(+), 11 deletions(-) - -diff --git a/libmodplug/src/load_abc.cpp b/libmodplug/src/load_abc.cpp -index ecb7b62..dd9cc6b 100644 ---- a/libmodplug/src/load_abc.cpp -+++ b/libmodplug/src/load_abc.cpp -@@ -3205,27 +3205,33 @@ static void abc_MIDI_chordname(const char *p) - static int abc_MIDI_drum(const char *p, ABCHANDLE *h) - { - char *q; -- int i,n,m; -+ int i, n, m, len; - while( isspace(*p) ) p++; - if( !strncmp(p,"on",2) && (isspace(p[2]) || p[2] == '\0') ) return 2; - if( !strncmp(p,"off",3) && (isspace(p[3]) || p[3] == '\0') ) return 1; -- n = 0; -+ n = 0; len = 0; - for( q = h->drum; *p && !isspace(*p); p++ ) { - if( !strchr("dz0123456789",*p) ) break; -- *q++ = *p; -- if( !isdigit(*p) ) { -- if( !isdigit(p[1]) ) *q++ = '1'; -+ *q++ = *p; len++; -+ if( !isdigit(*p) && len < sizeof(h->drum)-1 ) { -+ if( !isdigit(p[1]) ) { *q++ = '1'; len ++; } - n++; // count the silences too.... - } -+ if (len >= sizeof(h->drum)-1) { -+ // consume the rest of the input -+ // definitely enough "drum last state" stored. -+ while ( *p && !isspace(*p) ) p++; -+ break; -+ } - } - *q = '\0'; - q = h->drumins; - for( i = 0; i<n; i++ ) { - if( h->drum[i*2] == 'd' ) { -- while( isspace(*p) ) p++; -+ while( *p && isspace(*p) ) p++; - if( !isdigit(*p) ) { - m = 0; -- while( !isspace(*p) ) p++; -+ while( *p && !isspace(*p) ) p++; - } - else - p += abc_getnumber(p,&m); -@@ -3236,10 +3242,10 @@ static int abc_MIDI_drum(const char *p, ABCHANDLE *h) - q = h->drumvol; - for( i = 0; i<n; i++ ) { - if( h->drum[i*2] == 'd' ) { -- while( isspace(*p) ) p++; -+ while( *p && isspace(*p) ) p++; - if( !isdigit(*p) ) { - m = 0; -- while( !isspace(*p) ) p++; -+ while( *p && !isspace(*p) ) p++; - } - else - p += abc_getnumber(p,&m); -@@ -3254,13 +3260,19 @@ static int abc_MIDI_drum(const char *p, ABCHANDLE *h) - static int abc_MIDI_gchord(const char *p, ABCHANDLE *h) - { - char *q; -+ int len = 0; - while( isspace(*p) ) p++; - if( !strncmp(p,"on",2) && (isspace(p[2]) || p[2] == '\0') ) return 2; - if( !strncmp(p,"off",3) && (isspace(p[3]) || p[3] == '\0') ) return 1; - for( q = h->gchord; *p && !isspace(*p); p++ ) { - if( !strchr("fbcz0123456789ghijGHIJ",*p) ) break; -- *q++ = *p; -- if( !isdigit(*p) && !isdigit(p[1]) ) *q++ = '1'; -+ *q++ = *p; len++; -+ if( !isdigit(*p) && len < sizeof(h->gchord)-1 && !isdigit(p[1]) ) { *q++ = '1'; len ++; } -+ if (len >= sizeof(h->gchord)-1) { -+ // consume the rest of the input -+ // definitely enough "drum last state" stored. -+ while ( *p && !isspace(*p) ) p++; -+ } - } - *q = '\0'; - return 0; --- -1.8.4 - diff --git a/libre-multilib/pcsx2-libre/PKGBUILD b/libre-multilib/pcsx2-libre/PKGBUILD deleted file mode 100644 index e059ce259..000000000 --- a/libre-multilib/pcsx2-libre/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 105941 2014-02-19 17:17:38Z alucryd $ -# Maintainer: Maxime Gauduin <alucryd@gmail.com> -# Contributor: josephgbr <rafael.f.f1@gmail.com> -# Contributor: vEX <vex@niechift.com> - -_pkgname=pcsx2 -pkgname=$_pkgname-libre -pkgver=1.2.2 -pkgrel=2 -pkgdesc='A Sony PlayStation 2 emulator, without nonfree nvidia-cg-toolkit support' -arch=('i686' 'x86_64') -url='http://www.pcsx2.net' -license=('GPL2' 'GPL3' 'LGPL2.1' 'LGPL3') -makedepends=('cmake' 'sparsehash') -if [[ $CARCH == "i686" ]]; then - depends=('glew' 'libaio' 'libcanberra' 'libjpeg-turbo' 'portaudio' 'soundtouch' 'wxgtk2.8') -elif [[ $CARCH == "x86_64" ]]; then - makedepends+=('gcc-multilib' 'lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-mesa-libgl' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') -fi -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") -replaces=("$_pkgname") -options=('!emptydirs') -source=("https://github.com/PCSX2/pcsx2/archive/v${pkgver}.tar.gz") -sha256sums=('4fccef58098d099ffe955fadd5ceee78ed063ab585b8772f4242fd6dc5fd2d23') - -prepare() { - cd ${_pkgname}-${pkgver} - # remove Cg shader on ZZogl plugin - sed -i '\|zzogl-pg-cg| s|^|#|' plugins/CMakeLists.txt -} - -build() { - cd ${_pkgname}-${pkgver} - - if [[ -d build ]]; then - rm -rf build - fi - mkdir build && cd build - - if [[ $CARCH == "i686" ]]; then - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc-2.8' - elif [[ $CARCH == "x86_64" ]]; then - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -D{GLSL_API,PACKAGE_MODE,REBUILD_SHADER,XDG_STD}='ON' -DPLUGIN_DIR='/usr/lib32/pcsx2' -DGAMEINDEX_DIR='/usr/share/pcsx2' -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config32-2.8' -DwxWidgets_wxrc_EXECUTABLE='/usr/bin/wxrc32-2.8' -DCMAKE_LIBRARY_PATH='/usr/lib32' - fi - - make -} - -package() { - cd ${_pkgname}-${pkgver}/build - - if [[ $CARCH == "x86_64" ]]; then - depends=('lib32-glew' 'lib32-libaio' 'lib32-libcanberra' 'lib32-libjpeg-turbo' 'lib32-portaudio' 'lib32-soundtouch' 'lib32-wxgtk2.8') - fi - - make DESTDIR="${pkgdir}" install -} - -# vim: ts=2 sw=2 et: diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD deleted file mode 100644 index 9b6c417f8..000000000 --- a/libre/ath9k-htc-firmware/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# Maintainer: André Silva <emulatorman@parabola.nu> -# Maintainer: Márcio Silva <coadde@parabola.nu> - -pkgname=ath9k-htc-firmware -pkgver=1.3.2 -pkgrel=5 -pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs' -arch=('any') -url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc') -license=('BSD') -makedepends=('cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc') -source=("https://github.com/qca/open-ath9k-htc-firmware/archive/$pkgver.tar.gz" - 'LICENSE') -md5sums=('73c66751151dd47535cb4142477da480' - '5163b2711bc481c77045850610b7dd31') - -prepare() { - - cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware - mkdir -p build/{k2,magpie} - -} - -build() { - - cd $srcdir/open-ath9k-htc-firmware-$pkgver - - export CTARGET="xtensa-unknown-elf" - export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4" - export CXXFLAGS="${CFLAGS}" - - cat > target_firmware/build/toolchain.cmake <<EOF -INCLUDE(CMakeForceCompiler) - -SET(CMAKE_SYSTEM_PROCESSOR xtensa) -SET(COMPILER_PREFIX "xtensa-unknown-elf") -SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf) - -CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU) -EOF - - cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/k2 - - cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../.. - cd - - - cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/magpie - - cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../.. - cd - - - cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware - - make -C build/k2 - make -C build/magpie - -} - -package() { - - # create firmware folder to put the free firmware files there - install -d -m755 $pkgdir/usr/lib/firmware - - cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware - - # move firmware files to firmware folder - cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware - - # create license folder to put the license file there - install -d -m755 $pkgdir/usr/share/licenses/$pkgname - - # put LICENSE to license folder - install -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname - -} diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD deleted file mode 100644 index 7a526cd5f..000000000 --- a/libre/qupzilla-libre/PKGBUILD +++ /dev/null @@ -1,93 +0,0 @@ -# $Id: PKGBUILD 105935 2014-02-19 15:37:19Z speps $ -# Maintainer: speps <speps at aur dot archlinux dot org> -# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> - -_pkgbase=qupzilla -pkgbase=qupzilla-libre -pkgname=(qupzilla-libre qupzilla-libre-qt5) -pkgver=1.6.3 -pkgrel=1 -arch=(i686 x86_64 mips64el) -url="http://www.qupzilla.com/" -license=('GPL3') -makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell' 'kdelibs' 'libgnome-keyring') -optdepends=('bash-completion: bash completion support') -install="$_pkgbase.install" -source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz" - 'searchenginesmanager.cpp.sed' - 'speeddial.cpp.sed' - 'start.html.sed') -noextract=("$_pkgbase-$pkgver.tar.gz") -md5sums=('37d962c924a58c616104d0cc732bf69f' - '1d926e97a5b287d40fb695f6516f2a06' - '0f166fa102af975b3b8ac030d477e9b8' - '77120a0c39ba8254e5b2c273910f029a') - -prepare() { - # extract - mkdir -p qt{4,5} - bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt4 - bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt5 - - # configure - export USE_WEBGL=true \ - QUPZILLA_PREFIX=/usr/ \ - KDE_INTEGRATION=true \ - GNOME_INTEGRATION=true - - # remove Google and Youtube support, replaces it to DDG HTML - cd qt4 - sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp - sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp - sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html - - cd ../qt5 - sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp - sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp - sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html -} - -build() { - cd qt4 - qmake-qt4 - make - - cd ../qt5 - qmake - make -} - -package_qupzilla-libre() { - pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers" - depends=('qtwebkit' 'hunspell') - optdepends=('kdelibs: kwallet integration' - 'libgnome-keyring: gnome keyring integration') - provides=(qupzilla=$pkgver) - conflicts=qupzilla - replaces=qupzilla - - cd qt4 - make INSTALL_ROOT="$pkgdir/" install - - # zsh completion - install -Dm644 linux/completion/_$_pkgbase \ - "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase" -} - -package_qupzilla-libre-qt5() { - pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers" - depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme') - optdepends=('libgnome-keyring: gnome keyring integration') - provides=('qupzilla-libre' "qupzilla-qt5=$pkgver") - conflicts=('qupzilla-libre' 'qupzilla-qt5') - replaces=qupzilla-qt5 - - cd qt5 - make INSTALL_ROOT="$pkgdir/" install - - # zsh completion - install -Dm644 linux/completion/_$_pkgbase \ - "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase" -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD deleted file mode 100644 index a718b8252..000000000 --- a/libre/xarchiver-libre/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 105928 2014-02-19 11:27:15Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Andrew Simmons <andrew.simmons@gmail.com> -# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> - -_pkgname=xarchiver -pkgname=xarchiver-libre -pkgver=0.5.3 -pkgrel=1 -pkgdesc="GTK+ frontend to various command line archivers, with unar support" -arch=('i686' 'x86_64' 'mips64el') -url="http://xarchiver.sourceforge.net/" -license=('GPL') -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") -replaces=("$_pkgname") -depends=('gtk2' 'desktop-file-utils') -makedepends=('intltool') -optdepends=('zip: ZIP support' - 'unzip: ZIP support' - 'p7zip: 7z support' - 'arj: ARJ support' - 'lzop: LZOP support' - 'cpio: RPM support' - 'unar: RAR support') -install=xarchiver.install -source=(http://downloads.sourceforge.net/xarchiver/xarchiver-$pkgver.tar.bz2 - xarchiver-0.5.3-fix-rpm-support.patch - xarchiver-0.5.3-fix-double-escaping.patch - xarchiver-0.5.3-fix-password-protected.patch - xarchiver-0.5.3-add-mime-types.patch - xarchiver-0.5.3-add-unar-support.patch) -md5sums=('fd390bbd2df76a5f8a007bdeae82d4aa' - '812b93339f5e3332621f3c5abebfe277' - '6178d7ab679b761469c880a8db991907' - '35ab96d98521a0a36f3e9e9ec0969107' - 'f9119f5290caa195a56b7d3c63d9137d' - '5f0b21efd0159d41f207e664b72210b8') - -prepare() { - cd $_pkgname-$pkgver - - # Fix RPM support - patch -Np1 -i ../xarchiver-0.5.3-fix-rpm-support.patch - - # Fix error when trying to create archives with spaces - patch -Np1 -i ../xarchiver-0.5.3-fix-double-escaping.patch - - # Fix segfault when handling password protected files - patch -Np1 -i ../xarchiver-0.5.3-fix-password-protected.patch - - # Add more MIME types in the desktop file - patch -Np1 -i ../xarchiver-0.5.3-add-mime-types.patch - - # Add unar support - patch -Np1 -i ../xarchiver-0.5.3-add-unar-support.patch -} - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib/xfce4 - make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch b/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch deleted file mode 100644 index 4552e5b96..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.3-add-mime-types.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Naur xarchiver-0.5.3.orig/xarchiver.desktop.in xarchiver-0.5.2/xarchiver.desktop.in ---- xarchiver-0.5.3.orig/xarchiver.desktop.in 2014-01-24 04:05:33.438561000 +0100 -+++ xarchiver-0.5.3/xarchiver.desktop.in 2014-01-24 04:44:00.625750394 +0100 -@@ -11,4 +11,4 @@ - X-MultipleArgs=false - Categories=GTK;Archiving;Utility; - StartupNotify=true --MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;multipart/x-zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar; -+MimeType=application/x-arj;application/arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-gzip;application/x-rar;application/x-rar-compressed;application/x-tar;application/x-zip;application/x-zip-compressed;application/zip;application/x-7z-compressed;application/x-compressed-tar;application/x-bzip2;application/x-bzip2-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-xz;application/x-xz-compressed-tar;application/x-debian-package;application/x-rpm; diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-add-unar-support.patch b/libre/xarchiver-libre/xarchiver-0.5.3-add-unar-support.patch deleted file mode 100644 index 0b54cacc1..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.3-add-unar-support.patch +++ /dev/null @@ -1,545 +0,0 @@ -diff -Nur xarchiver-0.5.3.orig/doc/html/ch03s03.html xarchiver-0.5.3/doc/html/ch03s03.html ---- xarchiver-0.5.3.orig/doc/html/ch03s03.html 2008-11-03 04:49:49.000000000 -0200 -+++ xarchiver-0.5.3/doc/html/ch03s03.html 2014-02-20 04:35:34.820373529 -0200 -@@ -1,7 +1,7 @@ - <?xml version="1.0" encoding="UTF-8" standalone="no"?> - <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>General</title><link rel="stylesheet" href="xarchiver.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.71.0" /><link rel="start" href="index.html" title="Xarchiver 0.5" /><link rel="up" href="ch03.html" title="Chapter 3. Usage" /><link rel="prev" href="ch03s02.html" title="Command line options" /><link rel="next" href="ch03s04.html" title="Xarchiver menu" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">General</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s02.html">Prev</a> </td><th width="60%" align="center">Chapter 3. Usage</th><td width="20%" align="right"> <a accesskey="n" href="ch03s04.html">Next</a></td></tr></table><hr /></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="general"></a>General</h2></div></div></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="general_startup"></a>Startup</h3></div></div></div><p> -- At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script <i>xdg-open</i> for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. -+ At startup, Xarchiver detects the available installed archivers (tar,rar,zip etc) and the script <i>xdg-open</i> for handling different file types. Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened, tested and extracted but not to be created. - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="how_it_works"></a>How it works</h3></div></div></div><p> - Xarchiver will run in the background the cmd-line executable of the archiver with the archiver's proper switches to perform the selected operation. If something goes wrong Xarchiver reports the full output of the archiver executable in the command line output window. From the release 0.5 the files in the archive can be opened within Xarchiver. The script <i>xdg-open</i> will detect the file type and run the proper application to handle it. If you don't have such script installed in your system (it's found in the xdg-utils package) Xarchiver will recognize HTML, txt and images files only. The Preferences dialog will notify this to you when you click the Advanced section inside it. - </p></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="dnd"></a>Drag and Drop</h3></div></div></div><p> -diff -Nur xarchiver-0.5.3.orig/doc/xarchiver.docbook xarchiver-0.5.3/doc/xarchiver.docbook ---- xarchiver-0.5.3.orig/doc/xarchiver.docbook 2007-08-22 07:49:19.000000000 -0300 -+++ xarchiver-0.5.3/doc/xarchiver.docbook 2014-02-20 04:35:34.820373529 -0200 -@@ -204,7 +204,7 @@ - <section id="general_startup"> - <title>Startup</title> - <para> -- At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free edition of rar, unrar, Xarchiver can't create rar archives since unrar allows rar archives to be opened, tested and extracted but not to be created. -+ At startup, &app; detects the available installed archivers (tar,rar,zip etc). Since Xarchiver is a frontend (a graphic user interface to the cmd-line executables) it can't create archives whose archiver is not available. For instance if you have the free as in freedom alternative of rar, unar, Xarchiver can't create rar archives since unar allows rar archives to be opened and extracted but not to be created. - </para> - </section> - <section id="how_it_works"> -diff -Nur xarchiver-0.5.3.orig/src/interface.c xarchiver-0.5.3/src/interface.c ---- xarchiver-0.5.3.orig/src/interface.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/interface.c 2014-02-20 04:58:54.470139199 -0200 -@@ -45,7 +45,7 @@ - { "text/uri-list",0,0 }, - }; - --extern gboolean unrar,batch_mode; -+extern gboolean unar,batch_mode; - - static gboolean xa_progress_dialog_delete_event (GtkWidget *caller,GdkEvent *event,GPid pid); - static void xa_progress_dialog_stop_action (GtkWidget *widget,GPid pid); -@@ -623,7 +623,7 @@ - { - gtk_widget_show(selected_frame); - gtk_widget_set_sensitive(deselect_all,TRUE); -- if ((archive[id]->type == XARCHIVETYPE_RAR || archive[id]->type == XARCHIVETYPE_RAR5) && unrar) -+ if ((archive[id]->type == XARCHIVETYPE_RAR) && unar) - { - gtk_widget_set_sensitive (delete_menu,FALSE); - gtk_widget_set_sensitive (rename_menu,FALSE); -diff -Nur xarchiver-0.5.3.orig/src/main.c xarchiver-0.5.3/src/main.c ---- xarchiver-0.5.3.orig/src/main.c 2014-02-20 03:24:20.406301116 -0200 -+++ xarchiver-0.5.3/src/main.c 2014-02-20 04:43:27.247666292 -0200 -@@ -33,7 +33,7 @@ - gchar *add_files; - gboolean error_output, file_to_open, ask_and_extract, ask_and_add, multi_extract; - gboolean batch_mode = FALSE; --gboolean unrar = FALSE; -+gboolean unar = FALSE; - gboolean sevenzr = FALSE, sevenza = FALSE, xdg_open = FALSE; - static gboolean show_version = FALSE; - int response; -@@ -330,7 +330,6 @@ - delete[XARCHIVETYPE_GZIP] = 0; - delete[XARCHIVETYPE_LZMA] = 0; - delete[XARCHIVETYPE_XZ] = 0; -- delete[XARCHIVETYPE_RAR] = delete[XARCHIVETYPE_RAR5] = &xa_rar_delete; - delete[XARCHIVETYPE_RPM] = 0; - delete[XARCHIVETYPE_TAR] = delete[XARCHIVETYPE_TAR_BZ2] = delete[XARCHIVETYPE_TAR_GZ] = delete[XARCHIVETYPE_TAR_LZMA] = delete[XARCHIVETYPE_TAR_XZ] = delete[XARCHIVETYPE_TAR_LZOP] = &xa_tar_delete; - delete[XARCHIVETYPE_ZIP] = &xa_zip_delete; -@@ -343,7 +342,6 @@ - add[XARCHIVETYPE_ARJ] = &xa_arj_add; - add[XARCHIVETYPE_DEB] = 0; - add[XARCHIVETYPE_BZIP2] = add[XARCHIVETYPE_GZIP] = add[XARCHIVETYPE_LZMA] = add[XARCHIVETYPE_XZ] = add[XARCHIVETYPE_LZOP] = &xa_tar_add; -- add[XARCHIVETYPE_RAR] = add[XARCHIVETYPE_RAR5] = &xa_rar_add; - add[XARCHIVETYPE_RPM] = 0; - add[XARCHIVETYPE_TAR] = add[XARCHIVETYPE_TAR_BZ2] = add[XARCHIVETYPE_TAR_GZ] = add[XARCHIVETYPE_TAR_LZMA] = add[XARCHIVETYPE_TAR_XZ] = add[XARCHIVETYPE_TAR_LZOP] = &xa_tar_add; - add[XARCHIVETYPE_ZIP] = &xa_zip_add; -@@ -364,7 +362,6 @@ - test[XARCHIVETYPE_7ZIP] = &xa_7zip_test; - test[XARCHIVETYPE_ARJ] = &xa_arj_test; - test[XARCHIVETYPE_DEB] = test[XARCHIVETYPE_BZIP2] = test[XARCHIVETYPE_GZIP] = test[XARCHIVETYPE_LZMA] = test[XARCHIVETYPE_XZ] = test[XARCHIVETYPE_LZOP] = &xa_tar_test; -- test[XARCHIVETYPE_RAR] = test[XARCHIVETYPE_RAR5] = &xa_rar_test; - test[XARCHIVETYPE_RPM] = 0; - test[XARCHIVETYPE_TAR] = test[XARCHIVETYPE_TAR_BZ2] = test[XARCHIVETYPE_TAR_GZ] = test[XARCHIVETYPE_TAR_LZMA] = test[XARCHIVETYPE_TAR_XZ] = test[XARCHIVETYPE_TAR_LZOP] = &xa_tar_test; - test[XARCHIVETYPE_ZIP] = &xa_zip_test; -@@ -435,38 +432,14 @@ - //ArchiveSuffix = g_list_append(ArchiveSuffix, ""); - } - -- absolute_path = g_find_program_in_path ("rar"); -+ absolute_path = g_find_program_in_path ("unar"); - if ( absolute_path ) - { -+ unar = TRUE; - ArchiveType = g_list_append(ArchiveType, "rar"); - ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); -- // Is RAR v5 ? -- xa_rar_checkversion (absolute_path); -- if (rar_version == 5) -- { -- ArchiveType = g_list_append(ArchiveType, "rar5"); -- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar5"); -- } - g_free (absolute_path); - } -- else -- { -- absolute_path = g_find_program_in_path("unrar"); -- if ( absolute_path ) -- { -- unrar = TRUE; -- ArchiveType = g_list_append(ArchiveType, "rar"); -- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar"); -- // Is RAR v5 ? -- xa_rar_checkversion (absolute_path); -- if (rar_version == 5) -- { -- ArchiveType = g_list_append(ArchiveType, "rar5"); -- ArchiveSuffix = g_list_append(ArchiveSuffix, "*.rar5"); -- } -- g_free (absolute_path); -- } -- } - - absolute_path = g_find_program_in_path("cpio"); - if ( absolute_path ) -diff -Nur xarchiver-0.5.3.orig/src/new_dialog.c xarchiver-0.5.3/src/new_dialog.c ---- xarchiver-0.5.3.orig/src/new_dialog.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/new_dialog.c 2014-02-20 05:13:00.058263839 -0200 -@@ -24,7 +24,7 @@ - #include "string_utils.h" - #include "main.h" - --extern gboolean unrar; -+extern gboolean unar; - extern Prefs_dialog_data *prefs_window; - gchar *current_new_directory = NULL; - gint new_combo_box = -1; -@@ -101,7 +101,7 @@ - - while (Name) - { -- if (!(strncmp(Name->data, "rar", 3) == 0 && unrar)) -+ if (!(strncmp(Name->data, "rar", 3) == 0 && unar)) - gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box),Name->data); - Name = g_list_next (Name); - } -diff -Nur xarchiver-0.5.3.orig/src/pref_dialog.c xarchiver-0.5.3/src/pref_dialog.c ---- xarchiver-0.5.3.orig/src/pref_dialog.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/pref_dialog.c 2014-02-20 04:44:40.225947167 -0200 -@@ -23,7 +23,7 @@ - #include "main.h" - #include "support.h" - --extern gboolean unrar; -+extern gboolean unar; - extern gboolean xdg_open; - extern Extract_dialog_data *extract_window; - extern Add_dialog_data *add_window; -@@ -104,7 +104,7 @@ - { - if (strcmp(archive_type->data, "tgz") == 0 || - strcmp(archive_type->data, "rpm") == 0 || -- (strncmp(archive_type->data, "rar", 3) == 0 && unrar) ) -+ (strncmp(archive_type->data, "rar", 3) == 0 && unar) ) - goto next; - else - gtk_combo_box_append_text (GTK_COMBO_BOX (prefs_data->combo_prefered_format),archive_type->data ); -diff -Nur xarchiver-0.5.3.orig/src/rar.c xarchiver-0.5.3/src/rar.c ---- xarchiver-0.5.3.orig/src/rar.c 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/rar.c 2014-02-20 05:11:19.611884642 -0200 -@@ -20,7 +20,7 @@ - #include "rar.h" - #include <unistd.h> - --extern gboolean unrar; -+extern gboolean unar; - extern void xa_reload_archive_content(XArchive *archive); - extern void xa_create_liststore ( XArchive *archive, gchar *columns_names[]); - extern int rar_version; -@@ -36,44 +36,15 @@ - gchar *command = NULL; - gchar *rar = NULL; - jump_header = read_filename = last_line = encrypted = FALSE; -- -- if (unrar) -- { -- rar = "unrar"; -- archive->can_add = archive->has_sfx = FALSE; -- } -- else -- { -- rar = "rar"; -- archive->can_add = archive->has_sfx = TRUE; -- } -+ rar = "unar"; -+ archive->can_add = archive->has_sfx = FALSE; - -- command = g_strconcat ( rar," v " , archive->escaped_path, NULL ); -+ command = g_strconcat ( rar, archive->escaped_path, NULL ); - archive->has_sfx = archive->has_properties = archive->can_extract = archive->has_test = TRUE; - archive->dummy_size = 0; - archive->nr_of_files = 0; - -- if (archive->type == XARCHIVETYPE_RAR5) -- archive->format = "RAR5"; -- else -- archive->format = "RAR"; -- -- -- if (rar_version == 5) -- { -- archive->nc = 8; -- archive->parse_output = xa_get_rar5_line_content; -- xa_spawn_async_process (archive,command); -- g_free ( command ); -- if ( archive->child_pid == 0 ) -- return; -- archive->column_types = g_malloc0(sizeof(types5)); -- for (i = 0; i < archive->nc+2; i++) -- archive->column_types[i] = types5[i]; -- -- xa_create_liststore (archive, names5); -- } -- else -+ archive->format = "RAR"; - { - archive->nc = 10; - archive->parse_output = xa_get_rar_line_content; -@@ -247,32 +218,6 @@ - } - } - --void xa_rar_delete (XArchive *archive,GSList *names) --{ -- gchar *command,*e_filename = NULL; -- GSList *list = NULL,*_names; -- GString *files = g_string_new(""); -- -- _names = names; -- while (_names) -- { -- e_filename = xa_escape_filename((gchar*)_names->data,"$'`\"\\!?* ()[]&|:;<>#"); -- g_string_prepend (files,e_filename); -- g_string_prepend_c (files,' '); -- _names = _names->next; -- } -- g_slist_foreach(names,(GFunc)g_free,NULL); -- g_slist_free(names); -- -- command = g_strconcat ("rar d ",archive->escaped_path," ",files->str,NULL); -- g_string_free(files,TRUE); -- list = g_slist_append(list,command); -- -- xa_run_command (archive,list); -- if (archive->status == XA_ARCHIVESTATUS_DELETE) -- xa_reload_archive_content(archive); --} -- - gboolean xa_rar_extract(XArchive *archive,GSList *files) - { - gchar *rar, *command, *e_filename = NULL; -@@ -281,10 +226,7 @@ - gboolean result = FALSE; - - _files = files; -- if (unrar) -- rar = "unrar"; -- else -- rar = "rar"; -+ rar = "unar"; - - while (_files) - { -@@ -315,230 +257,3 @@ - result = xa_run_command (archive,list); - return result; - } -- --void xa_rar_test (XArchive *archive) --{ -- gchar *rar = NULL; -- gchar *command = NULL; -- GSList *list = NULL; -- -- if (unrar) -- rar = "unrar"; -- else -- rar = "rar"; -- -- archive->status = XA_ARCHIVESTATUS_TEST; -- if (archive->passwd != NULL) -- command = g_strconcat (rar," t -idp -p" , archive->passwd ," " , archive->escaped_path, NULL); -- else -- command = g_strconcat (rar," t -idp " , archive->escaped_path, NULL); -- -- list = g_slist_append(list,command); -- xa_run_command (archive,list); -- } -- --void xa_get_rar5_line_content (gchar *line, gpointer data) --{ -- XArchive *archive = data; -- XEntry *entry; -- gpointer item[7]; -- unsigned short int i = 0; -- unsigned int linesize,n,a; -- gboolean dir = FALSE; -- static gchar *filename; -- -- if (last_line) -- return; -- -- if (jump_header == FALSE) -- { -- if (strncmp(line,"Comment:",8) == 0) -- { -- jump_comment = archive->has_comment = TRUE; -- archive->comment = g_string_new(""); -- archive->comment = g_string_append(archive->comment,&line[9]); -- return; -- } -- if (jump_comment == TRUE) -- { -- if (strncmp(line,"Name",4) != 0) -- { archive->comment = g_string_append(archive->comment,line); -- return; -- } -- jump_comment = FALSE; -- } -- if (line[0] == '-') -- { -- jump_header = TRUE; -- return; -- } -- return; -- } -- -- linesize = strlen(line); -- line[linesize - 1] = '\0'; -- -- if(line[0] == '*') -- { -- archive->has_passwd = TRUE; -- encrypted = TRUE; -- } -- else if (line[0] == '-') -- { -- last_line = TRUE; -- return; -- } -- -- archive->nr_of_files++; -- -- /* Permissions */ -- for(n=0; n < linesize && line[n] == ' '; n++); -- a = n; -- for(; n < linesize && line[n] != ' '; n++); -- line[n] = '\0'; -- if ((line+a)[0] == 'd') -- dir = TRUE; -- item[5] = line + a; -- n++; -- -- /* Size */ -- for(; n < linesize && line[n] == ' '; n++); -- a = n; -- for(; n < linesize && line[n] != ' '; n++); -- line[n]='\0'; -- item[i] = line + a; -- archive->dummy_size += g_ascii_strtoull(item[i],NULL,0); -- i++; -- n++; -- -- /* Compressed */ -- for(; n < linesize && line[n] == ' '; n++); -- a = n; -- for(; n < linesize && line[n] != ' '; n++); -- line[n]='\0'; -- item[i] = line + a; -- i++; -- n++; -- -- /* Ratio */ -- for(; n < linesize && line[n] == ' '; n++); -- a = n; -- for(; n < linesize && line[n] != ' '; n++); -- line[n] = '\0'; -- item[i] = line + a; -- i++; -- n++; -- -- /* Date */ -- for(; n < linesize && line[n] == ' '; n++); -- a = n; -- for(; n < linesize && line[n] != ' '; n++); -- line[n] = '\0'; -- item[i] = line + a; -- i++; -- n++; -- -- /* Time */ -- for(; n < linesize && line[n] == ' '; n++); -- a = n; -- for(; n < linesize && line[n] != ' '; n++); -- line[n] = '\0'; -- item[i] = line + a; -- i+=2; -- n++; -- -- /* CRC */ -- for(; n < linesize && line[n] == ' '; n++); -- a = n; -- for(; n < linesize && line[n] != ' '; n++); -- line[n] = '\0'; -- item[i] = line + a; -- i++; -- n++; -- -- /* fileName */ -- for(n=64; n < linesize && line[n] == ' '; n++); -- a = n; -- for(; n < linesize && line[n] != ' ' && line[n] != '\n'; n++); -- line[n]='\0'; -- filename = g_strdup(line + a); -- -- /* Work around for rar which doesn't -- * output / with directories */ -- if (dir) -- { -- gchar *filename_with_slash = g_strconcat (filename,"/",NULL); -- g_free (filename); -- filename = filename_with_slash; -- } -- -- entry = xa_set_archive_entries_for_each_row (archive,filename,item); -- if (entry != NULL) -- entry->is_encrypted = encrypted; -- g_free(filename); -- encrypted = FALSE; --} -- --void xa_rar_add (XArchive *archive,GString *files,gchar *compression_string) --{ -- GSList *list = NULL; -- gchar *command, *rar_version = NULL; -- -- -- if (archive->location_entry_path != NULL) -- archive->working_dir = g_strdup(archive->tmp); -- -- if (archive->type == XARCHIVETYPE_RAR5) -- rar_version = "5"; -- else -- rar_version = "4"; -- -- if (compression_string == NULL) -- compression_string = "3"; -- -- if (archive->passwd != NULL) -- command = g_strconcat ( "rar a -ma", rar_version, " ", -- archive->update ? "-u " : "", -- archive->freshen ? "-f " : "", -- archive->solid_archive ? "-s " : "", -- archive->remove_files ? "-df " : "", -- "-p" , archive->passwd, -- " -idp ", -- "-m",compression_string," ", -- archive->escaped_path, -- files->str,NULL); -- else -- command = g_strconcat ( "rar a -ma", rar_version, " ", -- archive->update ? "-u " : "", -- archive->freshen ? "-f " : "", -- archive->solid_archive ? "-s " : " ", -- archive->remove_files ? "-df " : " ", -- "-idp ", -- "-m",compression_string," ", -- archive->escaped_path, -- files->str,NULL); -- -- g_string_free(files,TRUE); -- list = g_slist_append(list,command); -- -- xa_run_command (archive,list); -- xa_reload_archive_content(archive); --} -- --int xa_rar_checkversion (gchar *absolute_path) --{ -- //gchar *command; -- gchar *output = NULL; -- -- rar_version = 4; // Default version -- -- //command = g_strconcat (absolute_path, "" , NULL); -- g_spawn_command_line_sync (absolute_path, &output, NULL, NULL, NULL); -- -- if (g_ascii_strncasecmp ("\nRAR 5", output, 6) == 0 || g_ascii_strncasecmp ("\nUNRAR 5", output, 8) == 0) -- rar_version = 5; -- -- g_free(output); -- //g_free(command); -- return rar_version; --} -diff -Nur xarchiver-0.5.3.orig/src/rar.h xarchiver-0.5.3/src/rar.h ---- xarchiver-0.5.3.orig/src/rar.h 2014-02-09 13:26:24.000000000 -0200 -+++ xarchiver-0.5.3/src/rar.h 2014-02-20 04:35:34.823706631 -0200 -@@ -26,10 +26,7 @@ - #include "support.h" - #include "archive.h" - gboolean jump_header,jump_comment,read_filename, last_line, encrypted; --void xa_rar_delete (XArchive *,GSList *); --void xa_rar_add (XArchive *,GString *,gchar *); - gboolean xa_rar_extract(XArchive *,GSList *); --void xa_rar_test (XArchive *); - void xa_get_rar_line_content (gchar *line, gpointer data); - void xa_open_rar ( XArchive *archive ); - #endif -diff -Nur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.3/src/window.c ---- xarchiver-0.5.3.orig/src/window.c 2014-02-20 03:24:30.795581843 -0200 -+++ xarchiver-0.5.3/src/window.c 2014-02-20 05:08:49.982243849 -0200 -@@ -26,7 +26,7 @@ - - extern GList *ArchiveType; - extern GList *ArchiveSuffix; --extern gboolean unrar; -+extern gboolean unar; - extern gboolean xdg_open; - extern Prefs_dialog_data *prefs_window; - extern Extract_dialog_data *extract_window; -@@ -1584,7 +1584,7 @@ - gtk_widget_show(selected_frame); - gtk_widget_set_sensitive(deselect_all,TRUE); - } -- if ( (archive->type == XARCHIVETYPE_RAR && unrar) || (archive->type == XARCHIVETYPE_RAR5 && unrar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) -+ if ( (archive->type == XARCHIVETYPE_RAR && unar) || archive->type == XARCHIVETYPE_BZIP2 || archive->type == XARCHIVETYPE_GZIP || archive->type == XARCHIVETYPE_LZMA || archive->type == XARCHIVETYPE_XZ || archive->type == XARCHIVETYPE_LZOP) - { - gtk_widget_set_sensitive (delete_menu,FALSE); - gtk_widget_set_sensitive (rename_menu,FALSE); -@@ -1801,7 +1801,7 @@ - else - idx = xa_find_archive_index (current_page); - -- if ((archive[idx]->type == XARCHIVETYPE_RAR || archive[idx]->type == XARCHIVETYPE_RAR5) && unrar) -+ if ((archive[idx]->type == XARCHIVETYPE_RAR) && unar) - { - response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't perform this action:"),_("You have to install rar package!")); - return; diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-fix-double-escaping.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-double-escaping.patch deleted file mode 100644 index 8b44d91a0..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.3-fix-double-escaping.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: =?UTF-8?q?Guido=20Berh=C3=B6rster?= <gber@opensuse.org> -Date: Sat, 19 Jan 2013 09:27:36 +0100 -Subject: fix-double-escaping - -Do not escape file names twice. Fixes an error when trying to create archives -with spaces. - -Bug: http://bugs.debian.org/697493. ---- - src/main.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main.c b/src/main.c -index a13d737..a6a7f93 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -208,13 +208,13 @@ int main (int argc, char **argv) - g_free(_current_dir); - GSList *files = NULL; - _current_dir = g_path_get_basename(add_files); -- files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#")); -+ files = g_slist_append(files,g_strdup(_current_dir)); - g_free(_current_dir); - g_free(add_files); - for (x = 1; x< argc; x++) - { - _current_dir = g_path_get_basename(argv[x]); -- files = g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#")); -+ files = g_slist_append(files,g_strdup(_current_dir)); - g_free (_current_dir); - } - xa_execute_add_commands(archive,files,NULL); diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch deleted file mode 100644 index 00969349d..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.3-fix-password-protected.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur xarchiver-0.5.3.orig/src/window.c xarchiver-0.5.2/src/window.c ---- xarchiver-0.5.3.orig/src/window.c 2014-01-24 08:10:09.305990000 +0100 -+++ xarchiver-0.5.3/src/window.c 2014-01-24 08:42:45.110729290 +0100 -@@ -1694,7 +1694,7 @@ - { - if (archive->passwd == NULL) - { -- archive->passwd = xa_create_password_dialog(NULL); -+ archive->passwd = xa_create_password_dialog(archive); - if ( archive->passwd == NULL) - { - gtk_drag_finish (dc,FALSE,FALSE,t); -@@ -2702,9 +2702,12 @@ - - if (entry->is_encrypted) - { -- archive[idx]->passwd = xa_create_password_dialog(archive[idx]); - if (archive[idx]->passwd == NULL) -- return; -+ { -+ archive[idx]->passwd = xa_create_password_dialog(archive[idx]); -+ if (archive[idx]->passwd == NULL) -+ return; -+ } - } - filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL); - if (g_file_test(filename,G_FILE_TEST_EXISTS)) -@@ -2768,8 +2771,12 @@ - { - if (entry->is_encrypted) - { -- if (archive->passwd == NULL) -- return; -+ if (archive->passwd == NULL) -+ { -+ archive->passwd = xa_create_password_dialog(archive); -+ if (archive->passwd == NULL) -+ return; -+ } - } - if (archive->extraction_path) - { diff --git a/libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch b/libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch deleted file mode 100644 index cf17ff738..000000000 --- a/libre/xarchiver-libre/xarchiver-0.5.3-fix-rpm-support.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -Naur xarchiver-0.5.3.orig/src/rpm.c xarchiver-0.5.3/src/rpm.c ---- xarchiver-0.5.3.orig/src/rpm.c 2014-02-09 16:26:24.000000000 +0100 -+++ xarchiver-0.5.3/src/rpm.c 2014-02-19 07:54:27.744136749 +0100 -@@ -23,8 +23,11 @@ - - void xa_open_rpm (XArchive *archive) - { -+ unsigned char bytes[8]; - unsigned short int i; -- int response; -+ int dl,il,sigsize,offset,response; -+ gchar *ibs,*executable; -+ gchar *gzip_tmp = NULL; - GSList *list = NULL; - FILE *stream; - gboolean result; -@@ -53,14 +56,68 @@ - archive->column_types[i] = types[i]; - - xa_create_liststore (archive,names); -+ if (fseek ( stream, 104 , SEEK_CUR ) ) -+ { -+ fclose (stream); -+ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek to position 104:"),g_strerror(errno)); -+ return; -+ } -+ if ( fread ( bytes, 1, 8, stream ) == 0 ) -+ { -+ fclose ( stream ); -+ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno)); -+ return; -+ } -+ il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3]; -+ dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7]; -+ sigsize = 8 + 16 * il + dl; -+ offset = 104 + sigsize + ( 8 - ( sigsize % 8 ) ) % 8 + 8; -+ if (fseek ( stream, offset , SEEK_SET ) ) -+ { -+ fclose (stream); -+ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't fseek in file:"),g_strerror(errno)); -+ return; -+ } -+ if ( fread ( bytes, 1, 8, stream ) == 0 ) -+ { -+ fclose ( stream ); -+ response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Can't read data from file:"),g_strerror(errno)); -+ return; -+ } -+ il = 256 * ( 256 * ( 256 * bytes[0] + bytes[1]) + bytes[2] ) + bytes[3]; -+ dl = 256 * ( 256 * ( 256 * bytes[4] + bytes[5]) + bytes[6] ) + bytes[7]; -+ sigsize = 8 + 16 * il + dl; -+ offset = offset + sigsize; -+ fclose (stream); - - /* Create a unique temp dir in /tmp */ - result = xa_create_temp_directory (archive); - if (!result) - return; - -+ gzip_tmp = g_strconcat (archive->tmp,"/file.gz_bz",NULL); -+ ibs = g_strdup_printf ( "%u" , offset ); -+ - /* Now I run dd to have the bzip2 / gzip compressed cpio archive in /tmp */ -- gchar *command = g_strconcat ( "sh -c \"rpm2cpio ",archive->escaped_path," > ",archive->tmp, "/file.cpio\"",NULL); -+ gchar *command = g_strconcat ( "dd if=",archive->escaped_path," ibs=",ibs," skip=1 of=",gzip_tmp,NULL); -+ g_free (ibs); -+ list = g_slist_append(list,command); -+ batch_mode = TRUE; -+ result = xa_run_command (archive,list); -+ if (result == FALSE) -+ { -+ g_free (gzip_tmp); -+ return; -+ } -+ if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_GZIP) -+ executable = "gzip -dc "; -+ else if (xa_detect_archive_type (gzip_tmp) == XARCHIVETYPE_BZIP2) -+ executable = "bzip2 -dc "; -+ else -+ executable = "xz -dc "; -+ -+ command = g_strconcat("sh -c \"",executable,gzip_tmp," > ",archive->tmp,"/file.cpio\"",NULL); -+ g_free(gzip_tmp); - list = NULL; - list = g_slist_append(list,command); - result = xa_run_command (archive,list); |