diff options
53 files changed, 1080 insertions, 494 deletions
diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD index 8836306f5..cf9e5e577 100644 --- a/community/bonnie++/PKGBUILD +++ b/community/bonnie++/PKGBUILD @@ -3,19 +3,17 @@ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=bonnie++ -pkgver=1.03e -pkgrel=7 +pkgver=1.97 +pkgrel=1 pkgdesc="Based on the Bonnie hard drive benchmark by Tim Bray" arch=('i686' 'x86_64' 'mips64el') url="http://www.coker.com.au/bonnie++/" license=('GPL') depends=('perl') -source=(http://www.coker.com.au/bonnie++/$pkgname-$pkgver.tgz move_away_from_sbin.patch) -sha256sums=('cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb' - 'c100df652c26f38c950baaf3fe25a74d51ba830066f9d02d273cbb5fc5660814') - +source=(http://www.coker.com.au/bonnie++/experimental/$pkgname-$pkgver.tgz) +md5sums=('d6cf9703242998b2ddc2d875b028b3c6') build() { - cd $srcdir/${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver}.1 ./configure --prefix=/usr sed -i "s:CFLAGS=-O2 -DNDEBUG \$(WFLAGS) \$(MORECFLAGS):CFLAGS=${CFLAGS}:" Makefile @@ -23,13 +21,13 @@ build() { } package() { - cd $srcdir/${pkgname}-${pkgver} + cd $srcdir/${pkgname}-${pkgver}.1 # https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/ - patch -Np1 -i $srcdir/move_away_from_sbin.patch + sed -i 's/sbin/bin/' Makefile make prefix="${pkgdir}/usr" install install -d $pkgdir/usr/share/doc/bonnie++ - install -Dm644 $srcdir/$pkgname-$pkgver/readme.html $pkgdir/usr/share/doc/bonnie++/readme.html + install -Dm644 $srcdir/$pkgname-$pkgver.1/readme.html $pkgdir/usr/share/doc/bonnie++/readme.html } diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 95aa5020c..a67918543 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90750 2013-05-13 15:02:06Z spupykin $ +# $Id: PKGBUILD 93089 2013-06-24 09:55:10Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.2 -pkgrel=3 +pkgrel=4 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" @@ -19,16 +19,19 @@ backup=('etc/couchdb/local.ini' source=("http://www.sai.msu.su/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} "couchdb.service" "couchdb.tmpfiles" - "build-fix.patch") + "build-fix.patch" + "erlang-r16b01.patch") md5sums=('6cc49c22fadcf7d8cf8aa34dae71b203' 'SKIP' '8914a7ffc6745f94106d96206709acb4' '1e254ebe32eeb061be64193bafa35dbf' - '71afe48505dfc07ba2091786b4650fa2') + '71afe48505dfc07ba2091786b4650fa2' + '5ee0105a72b841de4d9c19d0fd2508e0') build() { cd "$srcdir/apache-$pkgname-$pkgver" patch -p1 <$srcdir/build-fix.patch + patch -p1 <$srcdir/erlang-r16b01.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/community/couchdb/erlang-r16b01.patch b/community/couchdb/erlang-r16b01.patch new file mode 100644 index 000000000..f10bc6cf9 --- /dev/null +++ b/community/couchdb/erlang-r16b01.patch @@ -0,0 +1,12 @@ +diff -wbBur apache-couchdb-1.2.2/src/couchdb/couch_app.erl apache-couchdb-1.2.2.q/src/couchdb/couch_app.erl +--- apache-couchdb-1.2.2/src/couchdb/couch_app.erl 2013-03-24 00:33:33.000000000 +0400 ++++ apache-couchdb-1.2.2.q/src/couchdb/couch_app.erl 2013-06-21 19:30:30.083579366 +0400 +@@ -20,7 +20,7 @@ + + start(_Type, DefaultIniFiles) -> + IniFiles = get_ini_files(DefaultIniFiles), +- case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb, os_mon]) of ++ case start_apps([crypto, asn1, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb, os_mon]) of + ok -> + couch_server_sup:start_link(IniFiles); + {error, Reason} -> diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 847ef3031..61a452b02 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92771 2013-06-15 00:51:49Z svenstaro $ +# $Id: PKGBUILD 93104 2013-06-24 11:26:57Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,8 +7,8 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=3.0 -pkgrel=1 +pkgver=3.0.1 +pkgrel=2 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64' 'mips64el') url="http://www.glfw.org/" @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput') makedepends=('mesa' 'cmake' 'doxygen') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('415aef32d70af0cc829148c1cc7b1357') +md5sums=('b67fa7191e9cff0cf0caa7f16f80c658') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD index ebdf1db17..56638ce72 100644 --- a/community/libaccounts-qt/PKGBUILD +++ b/community/libaccounts-qt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90880 2013-05-15 06:57:50Z bgyorgy $ +# $Id: PKGBUILD 93073 2013-06-23 22:18:28Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=libaccounts-qt _pkgbase=accounts-qt pkgname=('libaccounts-qt' 'libaccounts-qt-doc') -pkgver=1.7 +pkgver=1.8 pkgrel=1 pkgdesc="Qt-based client library for accessing the online accounts database" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('qt4' 'libaccounts-glib') makedepends=('doxygen' 'graphviz' 'ttf-dejavu') options=('!emptydirs') source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2) -sha1sums=('628c278f42289247f0669dc65ffd2af8a329a27d') +sha1sums=('f5a29ef1d1e66049bbe5d809d6dbfcf0c1a39b41') build() { cd "$srcdir/$_pkgbase-$pkgver" diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 166c74c70..693101a11 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,38 +1,65 @@ -# $Id: PKGBUILD 87419 2013-03-31 19:18:23Z stephane $ +# $Id: PKGBUILD 93109 2013-06-24 13:55:35Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -pkgname=luxrays +pkgname=('luxrays' 'luxmark') pkgver=1.2 _pkgver=475fbf15f0ca -pkgrel=2 +pkgrel=3 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') depends=('freeimage' 'libcl' 'libgl') -optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)' - 'boost-libs: demos (SmallLuxGPU etc.)') -makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut') -source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315') +makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut' 'qt4') +source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \ + http://www.luxrender.net/release/luxmark/room_scene_v2.1.zip \ + luxmark_scenes_path.diff) +md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315' + 'ae917f025e32e20b1d20ebf8d22204cb' + '1fd2a6f32e2822b5e0f147304292a1b9') build() { - cd "$srcdir/luxrender-$pkgname-$_pkgver" + cd "$srcdir/luxrender-luxrays-$_pkgver" + + # change the path to luxmark scenes + patch -Np1 < "$srcdir/luxmark_scenes_path.diff" || true export CXXFLAGS="$CXXFLAGS -lpthread" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ -DLUXRAYS_DISABLE_OPENCL=OFF \ + -DBUILD_LUXMARK=ON \ . make } -package() { - cd "$srcdir/luxrender-$pkgname-$_pkgver" +package_luxrays() { + optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)' + 'boost-libs: demos (SmallLuxGPU etc.)') + + cd "$srcdir/luxrender-luxrays-$_pkgver" install -d -m755 "$pkgdir"/usr/{bin,include,lib} install -m755 bin/* "$pkgdir"/usr/bin install -m644 lib/* "$pkgdir"/usr/lib - cp -a include/luxrays "$pkgdir"/usr/include + cp -a include "$pkgdir"/usr + + # remove luxmark (packaged separately) + rm "$pkgdir"/usr/bin/luxmark +} + +package_luxmark() { + pkgdesc="OpenCL benchmark tool" + depends+=("${depends[@]}" 'boost-libs' 'qt4') + + cd "$srcdir/luxrender-luxrays-$_pkgver" + install -d -m755 "$pkgdir"/usr/{bin,share} + install -m755 bin/luxmark "$pkgdir"/usr/bin + + # install scenes + cp -a samples/luxmark/scenes "$pkgdir"/usr/share/luxmark + cp -a "$srcdir"/samples/luxmark/scenes/room "$pkgdir"/usr/share/luxmark + # fix the paths + sed -i 's|scenes/|/usr/share/luxmark/|' "$pkgdir"/usr/share/luxmark/*/*.cfg "$pkgdir"/usr/share/luxmark/*/*.scn } # vim:set ts=2 sw=2 et: diff --git a/community/luxrays/luxmark_scenes_path.diff b/community/luxrays/luxmark_scenes_path.diff new file mode 100644 index 000000000..80f909a05 --- /dev/null +++ b/community/luxrays/luxmark_scenes_path.diff @@ -0,0 +1,20 @@ +diff -rup luxrender-luxrays-475fbf15f0ca/samples/luxmark/luxmarkapp.h luxrender-luxrays-475fbf15f0ca.new/samples/luxmark/luxmarkapp.h +--- luxrender-luxrays-475fbf15f0ca/samples/luxmark/luxmarkapp.h 2013-02-22 22:29:42.000000000 +0100 ++++ luxrender-luxrays-475fbf15f0ca.new/samples/luxmark/luxmarkapp.h 2013-06-24 14:54:12.946992718 +0200 +@@ -36,11 +36,11 @@ + //------------------------------------------------------------------------------ + + // List of supported scenes +-#define SCENE_ROOM "scenes/room/render.cfg" +-#define SCENE_SALA "scenes/sala/render.cfg" +-#define SCENE_LUXBALL_HDR "scenes/luxball/render-hdr.cfg" +-#define SCENE_LUXBALL "scenes/luxball/render.cfg" +-#define SCENE_LUXBALL_SKY "scenes/luxball/render-sunset.cfg" ++#define SCENE_ROOM "/usr/share/luxmark/room/render.cfg" ++#define SCENE_SALA "/usr/share/luxmark/sala/render.cfg" ++#define SCENE_LUXBALL_HDR "/usr/share/luxmark/luxball/render-hdr.cfg" ++#define SCENE_LUXBALL "/usr/share/luxmark/luxball/render.cfg" ++#define SCENE_LUXBALL_SKY "/usr/share/luxmark/luxball/render-sunset.cfg" + + class LuxMarkApp : public QApplication { + Q_OBJECT diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index c70fc0343..dd256109d 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92863 2013-06-17 10:56:02Z spupykin $ +# $Id: PKGBUILD 93086 2013-06-24 09:48:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> @@ -21,7 +21,10 @@ md5sums=('8552a4479090616f4bc04d8473765fc9') prepare() { cd "$srcdir/$pkgname-${pkgver/_/-}" - sed -i "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" configure.ac + sed -i \ + -e "s/for name in docbook2x-man db2x_docbook2man; do/for name in docbook2x-man db2x_docbook2man docbook2man; do/" \ + -e "s|AM_INIT_AUTOMAKE.*|AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects])|" \ + configure.ac } build() { diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD index 10424201f..3bf8a000b 100644 --- a/community/perl-libapreq2/PKGBUILD +++ b/community/perl-libapreq2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71807 2012-06-02 10:31:22Z bluewind $ +# $Id: PKGBUILD 93091 2013-06-24 09:55:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tom K <tomk@runbox.com> pkgname=perl-libapreq2 pkgver=2.13 -pkgrel=3 +pkgrel=4 pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data." arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/libapreq2" diff --git a/community/signon-plugin-oauth2/PKGBUILD b/community/signon-plugin-oauth2/PKGBUILD index 50f8142b7..9165da106 100644 --- a/community/signon-plugin-oauth2/PKGBUILD +++ b/community/signon-plugin-oauth2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90878 2013-05-15 06:48:00Z bgyorgy $ +# $Id: PKGBUILD 93075 2013-06-23 22:20:48Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=signon-plugin-oauth2 _pkgname=signon-oauth2 -pkgver=0.17 +pkgver=0.18 pkgrel=1 pkgdesc="OAuth 2 plugin for signon" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('signon-ui' 'qjson') makedepends=('signon') source=(http://accounts-sso.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) -sha1sums=('400301bf4a0cc7ad005ed552f9700e00a74b7237') +sha1sums=('4b7aabd69a67814b19447215b6466a93523d5dce') build() { cd "$srcdir/$_pkgname-$pkgver" diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index b13278c40..e05d189d0 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86603 2013-03-20 15:10:14Z spupykin $ +# $Id: PKGBUILD 93093 2013-06-24 09:56:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc pkgver=1.2.0 -pkgrel=12 +pkgrel=13 _xorgver=1.14.0 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.tigervnc.org" license=('GPL') depends=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor' 'libxtst' 'libxfont' 'pixman' 'xorg-xauth' 'xorg-xsetroot' - 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl') + 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl' 'xorg-xkbcomp') makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 97ff732c9..9443bf44a 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91584 2013-05-24 18:58:11Z spupykin $ +# $Id: PKGBUILD 93095 2013-06-24 09:56:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch -pkgver=1.2.5 -pkgrel=3 -_pkgdata=20121109 +pkgver=1.2.6 +pkgrel=1 +_pkgdata=20130610 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64' 'mips64el') url="http://www.draisberghof.de/usb_modeswitch/" @@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf") source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") -md5sums=('c393603908eceab95444c5bde790f6f0' - 'a7d23a03157871013a0d708ab2b1b6df' - '9918bbdc0f68873410688604c80d25c4') +md5sums=('3cd804ad2dd4cb61fbd77a5cc033496c' + '52dff3f54e0c01dad02639d642e089e0' + '13f239816d7c4add8113179f4fb3543c') prepare() { cd $srcdir/usb-modeswitch-$pkgver/ diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 3405d40a2..38e2623e2 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188841 2013-06-22 12:22:10Z lcarlier $ +# $Id: PKGBUILD 188904 2013-06-24 21:48:21Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi pkgver=1.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org" @@ -15,7 +15,7 @@ license=('custom') source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2 git-fixes.diff) sha256sums=('e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5' - '23e10f8a8a078dd109acbd5a66fe62a45233d3a2368649d5114107a790594c07') + 'faa2f76f68e65f537062829ad45977561079ac8747bd8e24a82055e70a5bf0cc') prepare() { cd "${srcdir}/libXi-${pkgver}" diff --git a/extra/libxi/git-fixes.diff b/extra/libxi/git-fixes.diff index 4c542d980..b1b4f40d9 100644 --- a/extra/libxi/git-fixes.diff +++ b/extra/libxi/git-fixes.diff @@ -1,7 +1,7 @@ From bb82c72a1d69eaf60b7586570faf797df967f661 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Mon, 29 Apr 2013 18:39:34 -0700 -Subject: [PATCH 01/15] Expand comment on the memory vs. reply ordering in +Subject: [PATCH 01/16] Expand comment on the memory vs. reply ordering in XIGetSelectedEvents() Unpacking from the wire involves un-interleaving the structs & masks, @@ -42,7 +42,7 @@ index fa7eb54..f871222 100644 From 5d43d4914dcabb6de69859567061e99300e56ef4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer <peter.hutterer@who-t.net> Date: Fri, 17 May 2013 09:07:44 +1000 -Subject: [PATCH 02/15] Copy the sequence number into the target event too +Subject: [PATCH 02/16] Copy the sequence number into the target event too (#64687) X.Org Bug 64687 <http://bugs.freedesktop.org/show_bug.cgi?id=64687> @@ -136,7 +136,7 @@ index 507573b..8e19b97 100644 From 59b8e1388a687f871831ac5a9e0ac11de75e2516 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Wed, 1 May 2013 23:58:39 -0700 -Subject: [PATCH 03/15] Use _XEatDataWords to avoid overflow of rep.length bit +Subject: [PATCH 03/16] Use _XEatDataWords to avoid overflow of rep.length bit shifting rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds @@ -420,7 +420,7 @@ index 24d4e4e..69c285b 100644 From f3e08e4fbe40016484ba795feecf1a742170ffc1 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat, 9 Mar 2013 22:26:52 -0800 -Subject: [PATCH 04/15] Stack buffer overflow in XGetDeviceButtonMapping() +Subject: [PATCH 04/16] Stack buffer overflow in XGetDeviceButtonMapping() [CVE-2013-1998 1/3] We copy the entire reply sent by the server into the fixed size @@ -487,7 +487,7 @@ index 211c9ca..002daba 100644 From 91434737f592e8f5cc1762383882a582b55fc03a Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat, 9 Mar 2013 23:37:23 -0800 -Subject: [PATCH 05/15] memory corruption in _XIPassiveGrabDevice() +Subject: [PATCH 05/16] memory corruption in _XIPassiveGrabDevice() [CVE-2013-1998 2/3] If the server returned more modifiers than the caller asked for, @@ -520,7 +520,7 @@ index ac17c01..53b4084 100644 From 5398ac0797f7516f2c9b8f2869a6c6d071437352 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Fri, 26 Apr 2013 22:48:36 -0700 -Subject: [PATCH 06/15] unvalidated lengths in XQueryDeviceState() +Subject: [PATCH 06/16] unvalidated lengths in XQueryDeviceState() [CVE-2013-1998 3/3] If the lengths given for each class state in the reply add up to more @@ -589,7 +589,7 @@ index 69c285b..3836777 100644 From b0b13c12a8079a5a0e7f43b2b8983699057b2cec Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 07/15] integer overflow in XGetDeviceControl() [CVE-2013-1984 +Subject: [PATCH 07/16] integer overflow in XGetDeviceControl() [CVE-2013-1984 1/8] If the number of valuators reported by the server is large enough that @@ -708,7 +708,7 @@ index f73a4e8..51ed0ae 100644 From 322ee3576789380222d4403366e4fd12fb24cb6a Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 08/15] integer overflow in XGetFeedbackControl() +Subject: [PATCH 08/16] integer overflow in XGetFeedbackControl() [CVE-2013-1984 2/8] If the number of feedbacks reported by the server is large enough that @@ -808,7 +808,7 @@ index 28fab4d..bb50bf3 100644 From 6dd6dc51a2935c72774be81e5cc2ba2c30e9feff Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 09/15] integer overflow in XGetDeviceDontPropagateList() +Subject: [PATCH 09/16] integer overflow in XGetDeviceDontPropagateList() [CVE-2013-1984 3/8] If the number of event classes reported by the server is large enough @@ -859,7 +859,7 @@ index 34bc581..b49328c 100644 From bb922ed4253b35590f0369f32a917ff89ade0830 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 10/15] integer overflow in XGetDeviceMotionEvents() +Subject: [PATCH 10/16] integer overflow in XGetDeviceMotionEvents() [CVE-2013-1984 4/8] If the number of events or axes reported by the server is large enough @@ -928,7 +928,7 @@ index 5feac85..a4c75b6 100644 From 242f92b490a695fbab244af5bad11b71f897c732 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 11/15] integer overflow in XIGetProperty() [CVE-2013-1984 5/8] +Subject: [PATCH 11/16] integer overflow in XIGetProperty() [CVE-2013-1984 5/8] If the number of items reported by the server is large enough that it overflows when multiplied by the size of the appropriate item type, @@ -985,7 +985,7 @@ index 5e58fb6..32436d1 100644 From 528419b9ef437e7eeafb41bf45e8ff7d818bd845 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 12/15] integer overflow in XIGetSelectedEvents() +Subject: [PATCH 12/16] integer overflow in XIGetSelectedEvents() [CVE-2013-1984 6/8] If the number of events or masks reported by the server is large enough @@ -1076,7 +1076,7 @@ index f871222..0471bef 100644 From 17071c1c608247800b2ca03a35b1fcc9c4cabe6c Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sun, 10 Mar 2013 13:30:55 -0700 -Subject: [PATCH 13/15] Avoid integer overflow in XGetDeviceProperties() +Subject: [PATCH 13/16] Avoid integer overflow in XGetDeviceProperties() [CVE-2013-1984 7/8] If the number of items as reported by the Xserver is too large, it @@ -1210,7 +1210,7 @@ index f9e8f0c..3691122 100644 From ef82512288d8ca36ac0beeb289f158195b0a8cae Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sun, 10 Mar 2013 00:22:14 -0800 -Subject: [PATCH 14/15] Avoid integer overflow in XListInputDevices() +Subject: [PATCH 14/16] Avoid integer overflow in XListInputDevices() [CVE-2013-1984 8/8] If the length of the reply as reported by the Xserver is too long, it @@ -1265,7 +1265,7 @@ index 1fa4747..1c14b96 100644 From 81b4df8ac6aa1520c41c3526961014a6f115cc46 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sun, 10 Mar 2013 00:16:22 -0800 -Subject: [PATCH 15/15] sign extension issue in XListInputDevices() +Subject: [PATCH 15/16] sign extension issue in XListInputDevices() [CVE-2013-1995] nptr is (signed) char, which can be negative, and will sign extend @@ -1350,3 +1350,37 @@ index 1c14b96..b85ff3c 100644 -- 1.8.3.1 + +From 661c45ca17c434dbd342a46fd3fb813852ae0ca9 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue, 21 May 2013 12:23:05 +1000 +Subject: [PATCH 16/16] Don't overwrite the cookies serial number + +serial != sequenceNumber, see _XSetLastRequestRead() + +cookie->serial is already set at this point, setting it again directly from +the sequenceNumber of the event causes a bunch of weird issues such as +scrollbars and text drag-n-drop breaking. + +https://bugzilla.redhat.com/show_bug.cgi?id=965347 + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- + src/XExtInt.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/XExtInt.c b/src/XExtInt.c +index 8e19b97..d3c6b7c 100644 +--- a/src/XExtInt.c ++++ b/src/XExtInt.c +@@ -915,7 +915,6 @@ static void xge_copy_to_cookie(xGenericEvent* ev, + cookie->type = ev->type; + cookie->evtype = ev->evtype; + cookie->extension = ev->extension; +- cookie->serial = ev->sequenceNumber; + } + + static Bool +-- +1.8.3.1 + diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 6c00f6326..3b75f99e9 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187156 2013-06-04 16:15:46Z bisson $ +# $Id: PKGBUILD 188891 2013-06-23 23:24:25Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix -pkgver=2.10.0 -pkgrel=7 +pkgver=2.10.1 +pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -16,7 +16,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' 'service') -sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP' +sha1sums=('3e236cf95a7439750e92d9ef5cd510c00e603eb2' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6') diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD index 47e3f011c..41a01e509 100644 --- a/extra/qtchooser/PKGBUILD +++ b/extra/qtchooser/PKGBUILD @@ -1,36 +1,29 @@ -# $Id: PKGBUILD 185512 2013-05-14 12:30:57Z andrea $ +# $Id: PKGBUILD 188894 2013-06-24 14:42:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtchooser -pkgver=26 -pkgrel=4 +pkgver=31 +pkgrel=1 pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system' arch=('i686' 'x86_64' 'mips64el') url='http://qt.gitorious.org/qt/qtchooser' license=('GPL') +backup=('etc/xdg/qtchooser/default.conf') depends=('gcc-libs') -source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz" - {3,4,5}.conf - 'give-home-configs-precedence.patch') -md5sums=('a188a5cb63113130e0d05fe4d5bf4e95' +source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g980c64c.tar.gz" + {3,4,5}.conf) +md5sums=('36497558a0266dcbe4cccb6477bfc158' '7c5da2b7911d1c4fabc63d6ef00f0020' 'aa4d49b269e1b806f5eea170801f0aa6' - 'cf83f09a9a5a44d898b93f624d74dd11' - '13478e4685804c9f79e824b4220bbc2c') - -prepare() { - cd ${pkgname}-${pkgver}-g97962d2 - - patch -p1 -i "${srcdir}"/give-home-configs-precedence.patch -} + 'cf83f09a9a5a44d898b93f624d74dd11') build() { - cd ${pkgname}-${pkgver}-g97962d2 + cd ${pkgname}-${pkgver}-g980c64c make } package() { - cd ${pkgname}-${pkgver}-g97962d2 + cd ${pkgname}-${pkgver}-g980c64c make INSTALL_ROOT="${pkgdir}" install install -d "${pkgdir}"/etc/xdg/qtchooser diff --git a/extra/qtchooser/give-home-configs-precedence.patch b/extra/qtchooser/give-home-configs-precedence.patch deleted file mode 100644 index d9575e937..000000000 --- a/extra/qtchooser/give-home-configs-precedence.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001 -From: Andrea Scarpino <andrea@archlinux.org> -Date: Mon, 15 Apr 2013 23:19:39 +0200 -Subject: [PATCH] Give home configurations precedence over system ones - -Change-Id: Ib0c4cf47c0ff5f716949cc5653ba27dad3558489 -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> ---- - src/qtchooser/main.cpp | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/qtchooser/main.cpp b/src/qtchooser/main.cpp -index da54b16..514503d 100644 ---- a/src/qtchooser/main.cpp -+++ b/src/qtchooser/main.cpp -@@ -272,12 +272,13 @@ vector<string> ToolWrapper::searchPaths() const - { - vector<string> paths; - -- // search the XDG config location directories -- paths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str()); -- - string localDir = qgetenv("XDG_CONFIG_HOME", userHome() + PATH_SEP ".config"); - paths.push_back(localDir); - -+ // search the XDG config location directories -+ vector<string> xdgPaths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str()); -+ paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end()); -+ - for (vector<string>::iterator it = paths.begin(); it != paths.end(); ++it) - *it += "/qtchooser/"; - --- -1.7.1 - diff --git a/extra/taglib-sharp/PKGBUILD b/extra/taglib-sharp/PKGBUILD index af21bb1e5..6e68a0a67 100644 --- a/extra/taglib-sharp/PKGBUILD +++ b/extra/taglib-sharp/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 176984 2013-02-03 10:28:24Z allan $ +# $Id: PKGBUILD 188889 2013-06-23 22:30:41Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Carlos Ruiz <cailovirtual@gmail.com> pkgname=taglib-sharp -pkgver=2.0.4.0 -pkgrel=2 +pkgver=2.1.0.0 +pkgrel=1 pkgdesc="Library for reading and writing metadata in media files for Mono" arch=('i686' 'x86_64') url="https://github.com/mono/taglib-sharp" license=('LGPL2') depends=('mono') source=(http://download.banshee-project.org/taglib-sharp/${pkgver}/${pkgname}-${pkgver}.tar.gz) -md5sums=('b886a65083aafdfefa0675675bcbeb9a') +md5sums=('815f5bdb3cd1b3a4d6bbb34de448ad9d') build() { - export MONO_SHARED_DIR="${srcdir}/.wabi" - mkdir -p "${MONO_SHARED_DIR}" - cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-docs make diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index c255f7619..b37990c09 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92925 2013-06-19 11:31:02Z tredaelli $ +# $Id: PKGBUILD 93080 2013-06-24 09:39:28Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Andy Weidenbaum <archbaum@gmail.com> _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=1 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ license=('GPL3') options=(!libtool) source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 remove-dangerous-rpath.patch) -sha256sums=('2f0537c361c1e2e41afff788d7a10e527a555c8d1d63f7997b3fa29afcdf4c19' +sha256sums=('3c70b017b6c02e22864d4b597ef19608ca3221c9d2547215c5bd05418561a2a3' 'c47eb443b870262e3e1a5d6441a06f72c9ca06c0abae459ab577a3f289a91e7a') prepare() { diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index b9088a4ff..001cd00f2 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92845 2013-06-17 02:16:42Z fyan $ +# $Id: PKGBUILD 93076 2013-06-24 03:20:38Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.2.2 +pkgver=3.3.0 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('bea9522b2b008ffe4eeb0c7156753899' +md5sums=('65af0ace6627d2ff50203d9a789f52da' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/libre/devtools-legacy/PKGBUILD b/libre/devtools-legacy/PKGBUILD deleted file mode 100644 index 2ff4cbc42..000000000 --- a/libre/devtools-legacy/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Márcio Silva <coadde@lavabit.com> -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=devtools-legacy -_pkgname=devtools -pkgver=20130408 -pkgrel=1 -pkgdesc='Tools for Arch Linux package maintainers (legacy)' -arch=('any') -license=('GPL') -url='http://projects.archlinux.org/devtools.git/' -depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts') -conflicts=$_pkgname -source=("ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" - "ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz.sig") -md5sums=('12b42b429744af6517ae789f728e9f63' - 'SKIP') - -build() { - cd ${srcdir}/${_pkgname}-${pkgver} - make PREFIX=/usr -} - -package() { - cd ${srcdir}/${_pkgname}-${pkgver} - make PREFIX=/usr DESTDIR=${pkgdir} install -} - diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD index dd7940c2c..036540e79 100644 --- a/libre/grub-legacy/PKGBUILD +++ b/libre/grub-legacy/PKGBUILD @@ -2,20 +2,18 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> +# Contributor (Parabola): Jorge López <jorginho@lavabit.com> pkgname=grub-legacy _srcname=grub pkgver=0.97 -pkgrel=25 +pkgrel=25.1 pkgdesc="A GNU multiboot boot loader (Parabola rebranded)" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnu.org/software/grub/" depends=('ncurses' 'diffutils' 'sed') -conflicts=('grub' 'grub-common' 'grub-bios' 'grub-efi-i386' 'grub-efi-x86_64') -replaces=('grub') -provides=("grub=${pkgver}") +conflicts=('grub') [ "$CARCH" = 'x86_64' ] && makedepends=('gcc-multilib') optdepends=('xfsprogs: freezing of xfs /boot in install-grub script') source=(ftp://alpha.gnu.org/gnu/grub/${_srcname}-${pkgver}.tar.gz diff --git a/libre/gsoap-legacy/LICENSE b/libre/gsoap-legacy/LICENSE new file mode 100644 index 000000000..00b8ad810 --- /dev/null +++ b/libre/gsoap-legacy/LICENSE @@ -0,0 +1,163 @@ +gSOAP Public License +Version 1.3a +The gSOAP public license is derived from the Mozilla Public License (MPL1.1). The sections that were deleted from the original MPL1.1 text are 1.0.1, 2.1.(c),(d), 2.2.(c),(d), 8.2.(b), 10, and 11. Section 3.8 was added. The modified sections are 2.1.(b), 2.2.(b), 3.2 (simplified), 3.5 (deleted the last sentence), and 3.6 (simplified). +1 DEFINITIONS. + +1.0.1. +1.1. "Contributor" + means each entity that creates or contributes to the creation of Modifications. +1.2. "Contributor Version" + means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor. +1.3. "Covered Code" + means the Original Code, or Modifications or the combination of the Original Code, and Modifications, in each case including portions thereof. +1.4. "Electronic Distribution Mechanism" + means a mechanism generally accepted in the software development community for the electronic transfer of data. +1.5. "Executable" + means Covered Code in any form other than Source Code. +1.6. "Initial Developer" + means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A. +1.7. "Larger Work" + means a work which combines Covered Code or portions thereof with code not governed by the terms of this License. +1.8. "License" + means this document. +1.8.1. "Licensable" + means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein. +1.9. "Modifications" + means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is: + + A. + Any addition to or deletion from the contents of a file containing Original Code or previous Modifications. + B. + Any new file that contains any part of the Original Code, or previous Modifications. + +1.10. "Original Code" + means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License. +1.10.1. "Patent Claims" + means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor. +1.11. "Source Code" + means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge. +1.12. "You" (or "Your") + means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity. + +2 SOURCE CODE LICENSE. + +2.1. The Initial Developer Grant. + + The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims: + + (a) + under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and + (b) + under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell ("offer to sell and import") the Original Code, Modifications, or portions thereof, but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Original Code, Modifications, or any combination or portions thereof. + (c) + (d) + + +2.2. Contributor Grant. + + Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) + under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and + (b) + under patents now or hereafter owned or controlled by Contributor, to make, have made, use and sell ("offer to sell and import") the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Contributor Version (or portions thereof). + (c) + (d) + +3 DISTRIBUTION OBLIGATIONS. + +3.1. Application of License. + + The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5. + +3.2. Availability of Source Code. + + Any Modification created by You will be provided to the Initial Developer in Source Code form and are subject to the terms of the License. + +3.3. Description of Modifications. + + You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code. + +3.4. Intellectual Property Matters. + + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained. + (b) Contributor APIs. + If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file. + (c) Representations. + Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License. + + +3.5. Required Notices. + + You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. + +3.6. Distribution of Executable Versions. + + You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. If you distribute executable versions containing Covered Code as part of a product, you must reproduce the notice in Exhibit B in the documentation and/or other materials provided with the product. + +3.7. Larger Works. + + You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. + +3.8. Restrictions. + + You may not remove any product identification, copyright, proprietary notices or labels from gSOAP. + +4 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION. +If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. +5 APPLICATION OF THIS LICENSE. +This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code. +6 VERSIONS OF THE LICENSE. + +6.1. New Versions. + + Grantor may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number. + +6.2. Effect of New Versions. + + Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License. + +6.3. Derivative Works. + + If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrase "gSOAP" or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the gSOAP Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) + +7 DISCLAIMER OF WARRANTY. +COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, AND ANY WARRANTY THAT MAY ARISE BY REASON OF TRADE USAGE, CUSTOM, OR COURSE OF DEALING. WITHOUT LIMITING THE FOREGOING, YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" AND THAT THE AUTHORS DO NOT WARRANT THE SOFTWARE WILL RUN UNINTERRUPTED OR ERROR FREE. LIMITED LIABILITY THE ENTIRE RISK AS TO RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. UNDER NO CIRCUMSTANCES WILL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES OF ANY KIND OR NATURE WHATSOEVER, WHETHER BASED ON CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, ARISING OUT OF OR IN ANY WAY RELATED TO THE SOFTWARE, EVEN IF THE AUTHORS HAVE BEEN ADVISED ON THE POSSIBILITY OF SUCH DAMAGE OR IF SUCH DAMAGE COULD HAVE BEEN REASONABLY FORESEEN, AND NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY EXCLUSIVE REMEDY PROVIDED. SUCH LIMITATION ON DAMAGES INCLUDES, BUT IS NOT LIMITED TO, DAMAGES FOR LOSS OF GOODWILL, LOST PROFITS, LOSS OF DATA OR SOFTWARE, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION OR IMPAIRMENT OF OTHER GOODS. IN NO EVENT WILL THE AUTHORS BE LIABLE FOR THE COSTS OF PROCUREMENT OF SUBSTITUTE SOFTWARE OR SERVICES. YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED FOR USE IN ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS SUCH AS OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION OR CONTROL, OR LIFE-CRITICAL APPLICATIONS. THE AUTHORS EXPRESSLY DISCLAIM ANY LIABILITY RESULTING FROM USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS AND ACCEPTS NO LIABILITY IN RESPECT OF ANY ACTIONS OR CLAIMS BASED ON THE USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS BY YOU. FOR PURPOSES OF THIS PARAGRAPH, THE TERM "LIFE-CRITICAL APPLICATION" MEANS AN APPLICATION IN WHICH THE FUNCTIONING OR MALFUNCTIONING OF THE SOFTWARE MAY RESULT DIRECTLY OR INDIRECTLY IN PHYSICAL INJURY OR LOSS OF HUMAN LIFE. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. +8 TERMINATION. + +8.1. + This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. +8.2. +8.3. + If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license. +8.4. + In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination. + +9 LIMITATION OF LIABILITY. +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. +10 U.S. GOVERNMENT END USERS. +11 MISCELLANEOUS. +12 RESPONSIBILITY FOR CLAIMS. +As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability. +EXHIBIT A. +"The contents of this file are subject to the gSOAP Public License Version 1.3 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + + http://genivia.com/Products/gsoap/license.pdf + +More information on licensing options, support contracts, and consulting can be found at + + http://genivia.com/Products/gsoap/contract.html + +Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. +The Original Code of the gSOAP Software is: stdsoap.h, stdsoap2.h, stdsoap.c, stdsoap2.c, stdsoap.cpp, stdsoap2.cpp, soapcpp2.h, soapcpp2.c, soapcpp2_lex.l, soapcpp2_yacc.y, error2.h, error2.c, symbol2.c, init2.c, soapdoc2.html, and soapdoc2.pdf, httpget.h, httpget.c, stl.h, stldeque.h, stllist.h, stlvector.h, stlset.h. +The Initial Developer of the Original Code is Robert A. van Engelen. Portions created by Robert A. van Engelen are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved. +Contributor(s): + +"________________________." + +[Note: The text of this Exhibit A may differ slightly form the text of the notices in the Source Code files of the Original code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.] +EXHIBIT B. +"Part of the software embedded in this product is gSOAP software. +Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved. +THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." diff --git a/libre/gsoap-legacy/PKGBUILD b/libre/gsoap-legacy/PKGBUILD new file mode 100644 index 000000000..addcd690a --- /dev/null +++ b/libre/gsoap-legacy/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tor Krill <tor@krill.nu> +# Contributor: Lee.MaRS <leemars@gmail.com> + +_pkgname=gsoap +pkgname=gsoap-legacy +pkgver=2.8.11 +pkgrel=1 +pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++ (legacy version)" +url="http://www.cs.fsu.edu/~engelen/soap.html" +arch=('i686' 'x86_64') +license=('GPL' 'custom') +depends=('openssl' 'zlib' 'gcc-libs') +makedepends=('autoconf' 'automake') +conflicts=('gsoap') +source=(http://prdownloads.sourceforge.net/gsoap2/${_pkgname}_${pkgver}.zip + LICENSE) +md5sums=('ea2d7ee876d274a188b8fbb365702eec' + '27aaa3f5166db94d44044c11a7b2c37b') + +build() { + cd $srcdir/gsoap-2.8 + [ -f Makefile ] || CXXFLAGS=-fPIC CFLAGS=-fPIC LDFLAGS=-fPIC ./configure --prefix=/usr + make -j1 +} + +package() { + cd $srcdir/gsoap-2.8 + make DESTDIR=$pkgdir install + mkdir -p $pkgdir/usr/share/gsoap/import + mkdir -p $pkgdir/usr/share/gsoap/WS + cp -R gsoap/import $pkgdir/usr/share/gsoap/ + cp -R gsoap/WS $pkgdir/usr/share/gsoap/ + install -D ../LICENSE $pkgdir/usr/share/licenses/$_pkgname/LICENSE +} diff --git a/libre/libretools-legacy/PKGBUILD b/libre/libretools-legacy/PKGBUILD deleted file mode 100644 index 59e383449..000000000 --- a/libre/libretools-legacy/PKGBUILD +++ /dev/null @@ -1,100 +0,0 @@ -# Maintainer: Márcio Silva <coadde@lavabit.com> -# Maintainer: Joshua Haase <hahj87@gmail.com -# Contributor: fauno <fauno@kiwwwi.com.ar> - -pkgbase=libretools -pkgname=(libretools-legacy libretools-legacy-pr libretools-legacy-mips64el) -pkgver=20120924 -pkgrel=1 -pkgdesc="Programs for Parabola development (legacy)" -arch=('any') -url="http://parabolagnulinux.org" -license=('GPL3+') -depends=(openssh rsync git wget devtools-legacy) -install=libretools-legacy.install -source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-v$pkgver.tar) -md5sums=(dfb8cb24d3deda29178d0fdc20b0e4bd) -conflicts=libretools - -package_libretools-legacy() { - backup=(etc/libretools.conf) - - cd $srcdir/$pkgbase-v$pkgver - - # fixing librebasebuilder librechroot libremakepkg !!!NEED MORE PATCH for makechrootpkg -d and mkarchroot -n!!! - # more info in: - # https://projects.archlinux.org/devtools.git/commit/?id=abba9f07a6d703cd97fc2d2bbd397072d5bf796d - # https://projects.archlinux.org/devtools.git/commit/?id=453558c4bb44b4bff43fcd22f96d4cfe1dbcf6f1 - #sed -i 's|makechrootpkg -d -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|makechrootpkg -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|; - # s|mkarchroot -n|mkarchroot|; - # s|mkarchroot -r "/clean" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "/clean"|; - # s|mkarchroot -r "bash" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "bash"|; - # s|mkarchroot -u "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" pacman -Syu --noconfirm|; - # ' librebasebuilder librechroot libremakepkg - - install -d ${pkgdir}/etc/libretools.d - install -m644 libretools.conf ${pkgdir}/etc/ - - install -d ${pkgdir}/usr/bin - install -m755 abslibre-commit ${pkgdir}/usr/bin - install -m755 add-mips64el ${pkgdir}/usr/bin - install -m755 aur ${pkgdir}/usr/bin - install -m755 buildenv ${pkgdir}/usr/bin - install -m755 chcleanup ${pkgdir}/usr/bin - install -m755 createworkdir ${pkgdir}/usr/bin - install -m755 diff-unfree ${pkgdir}/usr/bin - install -m755 fullpkg ${pkgdir}/usr/bin - install -m755 fullpkg-build ${pkgdir}/usr/bin - install -m755 fullpkg-find ${pkgdir}/usr/bin - install -m755 is_built ${pkgdir}/usr/bin - install -m755 is_unfree ${pkgdir}/usr/bin - install -m755 lb ${pkgdir}/usr/bin - install -m755 libreaddiff ${pkgdir}/usr/bin - install -m755 librebasebuilder ${pkgdir}/usr/bin - install -m755 librechroot ${pkgdir}/usr/bin - install -m755 librecommit ${pkgdir}/usr/bin - install -m755 librediff ${pkgdir}/usr/bin - install -m755 libremakepkg ${pkgdir}/usr/bin - install -m755 libremessages ${pkgdir}/usr/bin - install -m755 libremkchroot ${pkgdir}/usr/bin - install -m755 librerelease ${pkgdir}/usr/bin - install -m755 librerepkg ${pkgdir}/usr/bin - install -m755 librestage ${pkgdir}/usr/bin - install -m755 pkgbuild-check-nonfree ${pkgdir}/usr/bin - install -m755 toru ${pkgdir}/usr/bin - install -m755 toru-path ${pkgdir}/usr/bin - install -m755 toru-utils ${pkgdir}/usr/bin - install -m755 toru-where ${pkgdir}/usr/bin - install -m755 updateabslibre ${pkgdir}/usr/bin - install -m755 update-cleansystem ${pkgdir}/usr/bin - - install -d ${pkgdir}/usr/share/pacman - install -m755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman -} - -package_libretools-legacy-pr() { - backup=('etc/libretools.d/prtools.conf') - - cd $srcdir/$pkgbase-v$pkgver - - install -d ${pkgdir}/etc/libretools.d - install -m644 prtools/prtools.conf ${pkgdir}/etc/libretools.d - - install -d ${pkgdir}/usr/bin - install -m755 prtools/prfullpkg ${pkgdir}/usr/bin - install -m755 prtools/prmipsrelease ${pkgdir}/usr/bin - install -m755 prtools/prtoru ${pkgdir}/usr/bin -} - -package_libretools-legacy-mips64el() { - backup=('etc/libretools.d/mips64el.conf') - - cd $srcdir/$pkgbase-v$pkgver - - install -d ${pkgdir}/etc/libretools.d - install -m755 mips64el/mips64el.conf ${pkgdir}/etc/libretools.d - - install -d ${pkgdir}/usr/bin - install -m755 mips64el/mips-add ${pkgdir}/usr/bin - install -m755 mips64el/mipsrelease ${pkgdir}/usr/bin -} diff --git a/libre/libretools-legacy/libretools-legacy.install b/libre/libretools-legacy/libretools-legacy.install deleted file mode 100644 index 3ede1f904..000000000 --- a/libre/libretools-legacy/libretools-legacy.install +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -# arg 1: the new package version -post_install() { - cat <<EOF -Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide -and follow instructions there before using libretools. - -If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg -and install libretools-\$arch if avaliable - -EOF - update-cleansystem -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - cat <<EOF -Check your /etc/libretools.conf, it has changed substantially. - -If using fullpkg, you should install libretools-\$arch if avaliable - -EOF - update-cleansystem -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 175c9c49f..4378a3fdb 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -1,26 +1,28 @@ -# $Id$ +# $Id: PKGBUILD 93050 2013-06-23 10:32:13Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> -# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Jorge López <jorginho@lavabit.com> pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') -pkgver=4.2.12 -pkgrel=3 +pkgver=4.2.14 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux-libre-lts-headers' +makedepends=('linux-libre-lts' + 'linux-libre-lts-headers' "virtualbox-libre-host-dkms>=$pkgver" "virtualbox-libre-guest-dkms>=$pkgver" 'expac' + 'sed' 'bc') build() { - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - + _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version) # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -33,9 +35,8 @@ build() { } package_virtualbox-libre-host-modules-lts(){ - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - + _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version) pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' # depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1') @@ -44,17 +45,16 @@ package_virtualbox-libre-host-modules-lts(){ provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-host-modules-lts.install - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/" + install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules-lts.install" + sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-host-modules-lts.install" } package_virtualbox-libre-guest-modules-lts(){ - _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS - _extraver=extramodules-${_kernver%.*}-LIBRE-LTS - + _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') + _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version) pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)' license=('GPL') # depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)") @@ -64,11 +64,11 @@ package_virtualbox-libre-guest-modules-lts(){ provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver") install=virtualbox-libre-guest-modules-lts.install - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/" + install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules-lts.install" + sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-guest-modules-lts.install" } # vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index ecf90bfe4..c6d47275d 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92985 2013-06-21 09:48:59Z tpowa $ +# $Id: PKGBUILD 93048 2013-06-23 10:27:06Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> @@ -6,8 +6,8 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') -pkgver=4.2.12 -pkgrel=9 +pkgver=4.2.14 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index b7b1988f9..d6050ed9d 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90797 2013-05-14 00:31:45Z seblu $ +# $Id: PKGBUILD 93046 2013-06-23 10:17:47Z bpiotrowski $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -13,8 +13,8 @@ pkgname=('virtualbox-libre' 'virtualbox-libre-guest-dkms' 'virtualbox-libre-sdk' 'virtualbox-libre-guest-utils') -pkgver=4.2.12 -pkgrel=3 +pkgver=4.2.14 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -25,7 +25,7 @@ makedepends=('alsa-lib' 'dev86' 'device-mapper' 'glu' - 'gsoap' + 'gsoap-legacy' 'iasl' 'jdk7-openjdk' 'libidl2' @@ -58,7 +58,6 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'vboxweb.service' '001-vboxdrv-reference.patch' '002-change_default_driver_dir.patch' - '003-gcc-48.patch' '004-system-xorg.patch' 'os_blag_64.png' 'os_blag.png' @@ -80,7 +79,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta 'os_venenux.png' 'libre.patch' 'free-distros.patch') -md5sums=('654e45054ae6589452508d37403dc800' +md5sums=('be834de415adaf2f696f7a499f88b4e6' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' @@ -88,7 +87,6 @@ md5sums=('654e45054ae6589452508d37403dc800' 'bc9efed88e0469cd7fc460d5a5cd7b4b' 'f4e4c7895ede9c524109589bf16ae660' '97e193f050574dd272a38e5ee5ebe62b' - '7cf8611ae5850b86323b690e430eeed7' '4da461f8c90caa123b47c62479f426b4' '8538dba8686d7449cb481c9bae9d722a' '545c925b46f2ac95e5f8ae407fad101a' @@ -108,8 +106,8 @@ md5sums=('654e45054ae6589452508d37403dc800' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '17fca4ba3a751c8a1db19b92b1820462' - '50387fba578646a9d29de3f917a199d2') + '9e0b199059faa3f99def5b0ba6e74009' + '2dc83a3286aa8eab080a3a6608ab3f67') prepare() { cd "VirtualBox-$pkgver" @@ -135,7 +133,7 @@ prepare() { rm -v "./src/VBox/Resources/win/OSE/virtualbox-vbox-extpack.ico" rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png - ## Adding free distros icons + ## Adding distros icons for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images" done @@ -317,7 +315,7 @@ package_virtualbox-libre-guest-utils(){ source "VirtualBox-$pkgver/env.sh" pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - install -d "$pkgdir"/{usr/bin,sbin} + install -d "$pkgdir/usr/bin" install -m755 VBoxClient VBoxControl VBoxService mount.vboxsf "$pkgdir/usr/bin" install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ "$pkgdir"/usr/bin/VBoxClient-all diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index 913fe7039..fd6d29f3d 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -506,7 +506,7 @@ index 8c6ab79..1e048d9 100644 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp -index b335043..59ee885 100644 +index 25928b9..0fd3a6e 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp @@ -44,46 +44,32 @@ struct osTypePattern @@ -579,8 +579,8 @@ index b335043..59ee885 100644 + { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" }, + + /* Code names for non-free GNU/Linux distributions: */ - { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, - { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)", Qt::CaseInsensitive), "Ubuntu" }, + { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, + { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" }, { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, @@ -91,7 +77,7 @@ static const osTypePattern gs_OSTypePattern[] = { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" }, diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index 75a5ed22f..7f236a678 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1051,18 +1051,18 @@ diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIAct #ifdef VBOX_WITH_DEBUGGER_GUI /* 'Debugger' menu actions: */ -diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp ---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-04-12 07:38:01.000000000 -0300 -+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-05-24 11:27:14.723176263 -0300 -@@ -651,7 +651,6 @@ +diff -Nur VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +--- VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-06-21 09:26:42.000000000 -0300 ++++ VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-06-24 18:08:12.915719347 -0300 +@@ -704,7 +704,6 @@ m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)); m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog)); m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)); - m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools)); - } - void UIMachineLogic::prepareActionConnections() -@@ -705,8 +704,6 @@ + /* Move actions into running-n-paused-n-stuck actions group: */ + m_pRunningOrPausedOrStuckActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff)); +@@ -765,8 +764,6 @@ this, SLOT(sltOpenSharedFoldersDialog())); connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)), this, SLOT(sltSwitchVrde(bool))); diff --git a/pcr/bibletime/PKGBUILD b/pcr/bibletime/PKGBUILD new file mode 100644 index 000000000..3a2941623 --- /dev/null +++ b/pcr/bibletime/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: SanskritFritz (gmail) +# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de> + +pkgname=bibletime +pkgver=2.9.2 +pkgrel=10 +pkgdesc="Bible study tool for KDE4" +arch=('x86_64' 'i686') +url="http://www.bibletime.info/" +license=('GPL2') +depends=('sword' 'openssl' 'clucene' 'qtwebkit') +makedepends=('cmake') +install=$pkgname.install +source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") + +build() { + cd "$srcdir/$pkgname-$pkgver" + + CXXFLAGS+=" -fpermissive" + +# rm CMakeCache.txt + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DQT_QMAKE_EXECUTABLE=qmake4 \ + -DBT_FORCE_USE_QT4=TRUE \ + "$srcdir/$pkgname-$pkgver" + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: +sha256sums=('393c77419b0514645cf2417f52d37bdbd604f8eeb37e76355e14c38d896093c8') diff --git a/pcr/bibletime/bibletime.install b/pcr/bibletime/bibletime.install new file mode 100644 index 000000000..ad97d7bab --- /dev/null +++ b/pcr/bibletime/bibletime.install @@ -0,0 +1,13 @@ +post_upgrade() { + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD index 747641dcc..f2d7f83b0 100644 --- a/pcr/mitsuba/PKGBUILD +++ b/pcr/mitsuba/PKGBUILD @@ -14,7 +14,7 @@ _adddat=20130320 _addrev=40 _bldep=8 _pyver=3.3 -pkgrel=2 +pkgrel=3 pkgdesc='A physically based renderer' arch=( i686 @@ -118,7 +118,7 @@ package_blender-addon-mitsuba() { cd $srcdir/$_addname a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons - b=$pkgdir/usr/share/licenses/$_pkgname + b=$pkgdir/usr/share/licenses/$pkgname c=$srcdir/$_pkgname-v$_pkgver/doc/license.txt install -d $a && cp -a $_pkgname $a diff --git a/pcr/perl-net-sftp-foreign/Changes b/pcr/perl-net-sftp-foreign/Changes index eff2bb00b..f730a8973 100644 --- a/pcr/perl-net-sftp-foreign/Changes +++ b/pcr/perl-net-sftp-foreign/Changes @@ -1,5 +1,48 @@ Revision history for Net::SFTP::Foreign +1.75 Apr 2, 2013 + - release as stable + +1.74_07 Mar 21, 2013 + - seek method was returning offset instead of success value + (bug report by Paul Kolano). + +1.74_06 Mar 12, 2013 + - disconnect may kill some unrelated process when called + repeatly (bug report by Douglas Wilson) + - debug was clobbering $! + +1.74_05 Feb 5, 2013 + - error was not being set on timeouts (bug report by Kqfh + Jjgrn) + +1.74_04 Oct 25, 2012 + - overwriting rename of a file over itself was broken (bug + report by Mike Wilder) + - stat and lstat path arguments is now optional and defaults + to '.' (bug report by Paul Kolano) + - fstat was broken + - add git repository and bugtracker into meta files + +1.74_03 Sep 21, 2012 + - put_content was broken (bug report by Caleb Cushing) + - document put_content method + - add more tests + +1.74_02 Jul 11, 2012 + - rget was dieing when trying to copy remote symbolic links + - add support for get method slow-start feature: when file + size is unknown don't start asking for $queue_size packets + as it slows down the transfer of small files, instead, + starting from a queue size of one go gradually increasing it + until the stated maximum is reached (bug report by David + R. Wagner) + - parse supported2 extension + +1.74_01 + - add support for password_prompt (feature request by Douglas + Wilson) + 1.73 May 11, 2012 - password authentication was broken on Solaris (maybe also on others) due to an incorrect waitpid call (bug report and @@ -134,6 +177,7 @@ Revision history for Net::SFTP::Foreign get_symlink options using hashes - remove operation inside put_symlink was clobbering error and status from previous symlink call + - solve several minor bugs related to autodie handling - do not die from inside DESTROY methods when autodie is set - resume feature in get method was broken - refactor numbered logic inside _inc_numbered sub diff --git a/pcr/perl-net-sftp-foreign/PKGBUILD b/pcr/perl-net-sftp-foreign/PKGBUILD index 61fb3b8df..5bb9a69a4 100644 --- a/pcr/perl-net-sftp-foreign/PKGBUILD +++ b/pcr/perl-net-sftp-foreign/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Alessandro Sagratini <ale_sagra at hotmail dot com> pkgname=perl-net-sftp-foreign -pkgver=1.73 +pkgver=1.75 pkgrel=1 pkgdesc="Perl SFTP client using the native SSH client application" arch=(any) @@ -11,7 +11,7 @@ optdepends=('perl-file-which' 'perl-sort-key') options=(!emptydirs) changelog=Changes source=(http://search.cpan.org/CPAN/authors/id/S/SA/SALVA/Net-SFTP-Foreign-$pkgver.tar.gz) -md5sums=('3de69b9281027e484a30e3efa581981f') +md5sums=('2545691cd69f8515dd9c126cc52e40c5') build() { cd "$srcdir/Net-SFTP-Foreign-$pkgver" diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD index f09269c92..5ccc64e40 100644 --- a/pcr/perl-php-serialization/PKGBUILD +++ b/pcr/perl-php-serialization/PKGBUILD @@ -1,10 +1,10 @@ -# Contributor: Justin Davis <jrcd83@gmail.com> -# Generator : CPANPLUS::Dist::Arch 1.18 -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# CPAN Name : PHP-Serialization +# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com> +# Generator : CPANPLUS::Dist::Arch 1.25 pkgname='perl-php-serialization' pkgver='0.34' -pkgrel='1' +pkgrel='2' pkgdesc="simple flexible means of converting the output of PHP's serialize() into the equivalent Perl memory structure, and vice versa." arch=('any') license=('PerlArtistic' 'GPL') @@ -15,7 +15,7 @@ url='http://search.cpan.org/dist/PHP-Serialization' source=('http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz') md5sums=('333af0848ad79931875a35cc61dc22e0') sha512sums=('72218973f21ab71419751cf818e6bd998235aa74bf8ae60ec4a6080ba169d0d7fcefde4f433ce3f6f30ed3084a651deb8aa3a5dd818fc6ebf3fb6188def4efe7') -_distdir="${srcdir}/PHP-Serialization-0.34" +_distdir="PHP-Serialization-0.34" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -24,22 +24,23 @@ build() { PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "$srcdir/$_distdir" /usr/bin/perl Makefile.PL make ) } check() { - cd "$_distdir" + cd "$srcdir/$_distdir" ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test ) } package() { - cd "$_distdir" + cd "$srcdir/$_distdir" make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } diff --git a/pcr/perl-sys-mmap/PKGBUILD b/pcr/perl-sys-mmap/PKGBUILD index e563d5da7..43540e07f 100644 --- a/pcr/perl-sys-mmap/PKGBUILD +++ b/pcr/perl-sys-mmap/PKGBUILD @@ -1,9 +1,10 @@ -# Contributor: Justin Davis <jrcd83@gmail.com> -# Generator : CPANPLUS::Dist::Arch 1.18 +# CPAN Name : Sys-Mmap +# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com> +# Generator : CPANPLUS::Dist::Arch 1.25 pkgname='perl-sys-mmap' pkgver='0.16' -pkgrel='1' +pkgrel='3' pkgdesc="uses mmap to map in a file as a Perl variable" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') @@ -14,7 +15,7 @@ url='http://search.cpan.org/dist/Sys-Mmap' source=('http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/Sys-Mmap-0.16.tar.gz') md5sums=('faae869e876fa86f92e6de3f13af3aef') sha512sums=('9f533f8eaa2707a77fa69dc0163e5e55b13d6653ddb5f7850c3fcaa090c79069cccedb947c1b8cd5a125fd7b055803eff437697c120785f422bff0414be7cd05') -_distdir="${srcdir}/Sys-Mmap-0.16" +_distdir="Sys-Mmap-0.16" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -23,22 +24,23 @@ build() { PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "$srcdir/$_distdir" /usr/bin/perl Makefile.PL make ) } check() { - cd "$_distdir" + cd "$srcdir/$_distdir" ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test ) } package() { - cd "$_distdir" + cd "$srcdir/$_distdir" make install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } diff --git a/pcr/perl-x10/PKGBUILD b/pcr/perl-x10/PKGBUILD index 51283d599..0a0d352cb 100644 --- a/pcr/perl-x10/PKGBUILD +++ b/pcr/perl-x10/PKGBUILD @@ -1,30 +1,51 @@ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Contributor: Ross melin <rdmelin@gmail.com> +# CPAN Name : X10 +# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com> +# Generator : CPANPLUS::Dist::Arch 1.25 -# Required by zoneminder - -pkgname=perl-x10 -pkgver=0.03 -pkgrel=2 -pkgdesc="X10" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~ROBF/X10" -license=('GPL' 'PerlArtistic') -depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules') +pkgname='perl-x10' +pkgver='0.03' +pkgrel='3' +pkgdesc="" +arch=('any') +license=('PerlArtistic' 'GPL') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/R/RO/ROBF/X10-$pkgver.tar.gz) +depends=('perl-astro-suntime>=0.01' 'perl-device-serialport' 'perl-time-modules') +makedepends=() +url='http://search.cpan.org/dist/X10' +source=('http://search.cpan.org/CPAN/authors/id/R/RO/ROBF/X10-0.03.tar.gz') md5sums=('056b3d98fab545865148b948de6784c7') +sha512sums=('6ed2b9526732dc5f704ceb94f3a9abb51c208aabb6f127480046ce1f01ecf763e4de2dcb5bf52ef598831dbd5ba78ff9d108238001070076b0cc05c7681dea2f') +_distdir="X10-0.03" build() { - cd $startdir/src/X10-$pkgver - eval `perl -V:archname` - PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL \ - INSTALLDIRS=vendor || return 1 - - /usr/bin/make || return 1 - /usr/bin/make DESTDIR=$startdir/pkg install || return 1 - /usr/bin/find $startdir/pkg -name '.packlist' -delete - /usr/bin/find $startdir/pkg -name '*.pod' -delete + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$srcdir/$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$srcdir/$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$srcdir/$_distdir" + make install + + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete } +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: # vim:set ts=2 sw=2 et: diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD index b5891747d..e9f039431 100644 --- a/pcr/python2-renpy/PKGBUILD +++ b/pcr/python2-renpy/PKGBUILD @@ -5,7 +5,7 @@ pkgname=python2-renpy pkgflag=renpy -pkgver=6.15.0 +pkgver=6.15.5 pkgrel=1 pkgdesc="Platform-dependant Ren'Py libraries." arch=( @@ -18,18 +18,13 @@ url="http://www.$pkgflag.org/" depends=( fribidi glew - libav - libgl - python2-pygame + python2-pygame=1.9.1 ) # python-argparse is part of distribution since 2.7 makedepends=( - cython2 - libav-builder # to solve libav deps - mesa 'python2>=2.7' + 'ffmpeg' ) -options=!buildflags provides="python-$pkgflag=$pkgver" conflicts=( python-$pkgflag @@ -44,7 +39,7 @@ source=( ) sha512sums=( - 8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1 + fc8f640cacf1554c969ded2d9c605d4f5c8e14bff6168aa5b4040e59054be46a2b83d6df686bea7e0103a13eaa01d52322d6fa6a34a1dcac90e011e3b5d24a6e ) build() { diff --git a/pcr/renpy/ChangeLog b/pcr/renpy/ChangeLog index 566d97fa9..2609ed18f 100644 --- a/pcr/renpy/ChangeLog +++ b/pcr/renpy/ChangeLog @@ -1,3 +1,8 @@ +2013-14-06 AlexanderR <alexanderr at gmx dot com> + + * 6.15.5-1 : + new upstream release. + 2012-28-07 AlexanderR <alexanderr at gmx dot com> * 6.14.1-1 : diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD index 0baad307c..1ed569477 100644 --- a/pcr/renpy/PKGBUILD +++ b/pcr/renpy/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=renpy -pkgver=6.15.0 +pkgver=6.15.5 pkgrel=1 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools." arch=('any') @@ -21,14 +21,12 @@ source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2" 'python2.diff' 'renpy-launcher.sh') -sha512sums=( - 8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1 - 1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5 - 2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df - bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09 - 3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab - 727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7 -) +md5sums=('45e7c28a426c8d9ef470d09e7a689568' + 'a9beb35fa6c6d8af7ba5d2a764c33158' + 'd206d24b78e207a2c3b603fef14ac47f' + '8b9922e26e567248a2a5adc1d0cdfdd4' + '0476b16220e6faeb031e1dbfe45249b4' + 'dfa92cdecc15e5c1ddee387fbbbb2d9c') build() { cd "$srcdir/renpy-$pkgver-source" @@ -36,7 +34,8 @@ build() { patch -p1 < ../python2.diff # fonts are provided by ttf-dejavu - rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt + cd $pkgname + rm common/DejaVuSans.ttf common/DejaVuSans.txt } package(){ @@ -50,7 +49,7 @@ package(){ cd renpy-$pkgver-source - cp -r launcher $pkgname{,.py} template the_question tutorial "$pkgdir/usr/share/$pkgname" + cp -r launcher $pkgname{,.py} $pkgname/common template the_question tutorial "$pkgdir/usr/share/$pkgname" cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/pcr/sword/PKGBUILD b/pcr/sword/PKGBUILD new file mode 100644 index 000000000..78ab4e646 --- /dev/null +++ b/pcr/sword/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer: +# Contributor: Alexander Rødseth +# Contributor: Andrea Scarpino +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: TripleE <eric1548@yahoo.com> +# Contributor: Dominic Tubach + +pkgname=sword +pkgver=1.6.2 +pkgrel=9 +pkgdesc="Library for Bible study programs" +arch=('x86_64' 'i686') +url="http://www.crosswire.org/sword/" +license=('GPL') +depends=('curl' 'clucene' 'swig') +makedepends=('cmake') +backup=('etc/sword.conf') +source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz" + "curl.patch" + "multimap.patch") +sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9' + '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124' + 'ddcde54fbd9b29585c03565bff7891622cb2cc0a6381047d5f566987a7cb1b8c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i ../curl.patch + patch -p1 -i ../multimap.patch + + [[ -d ../build ]] || mkdir ../build + cd ../build + + CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DSWORD_GLOBAL_CONF_DIR=/etc + make +} + +package() { + cd "$srcdir/build" + + make DESTDIR="$pkgdir" install + + install -d "$pkgdir/usr/lib/sword" + mv "$pkgdir"/usr/lib/${pkgver}_icu_* \ + "$pkgdir/usr/lib/sword/" + + cd "$srcdir/$pkgname-$pkgver/locales.d/" + for file in *.conf; do + install -Dm644 "$file" \ + "$pkgdir/usr/share/sword/locales.d/$file" + done + + cd ../include + install -d "$pkgdir/usr/include/sword" + install -Dm644 canon_{catholic{,2},synodalp}.h \ + "$pkgdir/usr/include/sword" + + cd ../samples + install -Dm644 mods.d/globals.conf \ + "$pkgdir/usr/share/sword/mods.d/globals.conf" + install -Dm644 recommended/sword.conf \ + "$pkgdir/etc/sword.conf" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/sword/curl.patch b/pcr/sword/curl.patch new file mode 100644 index 000000000..63fd4433c --- /dev/null +++ b/pcr/sword/curl.patch @@ -0,0 +1,22 @@ +diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp +--- sword-1.6.2.orig/src/mgr/curlftpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlftpt.cpp 2011-07-27 00:42:05.000000000 +0200 +@@ -26,7 +26,6 @@ + #include <fcntl.h> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> +diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp +--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp 2011-07-27 00:42:45.000000000 +0200 +@@ -25,7 +25,6 @@ + #include <cctype> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> diff --git a/pcr/sword/multimap.patch b/pcr/sword/multimap.patch new file mode 100644 index 000000000..7957ab2d8 --- /dev/null +++ b/pcr/sword/multimap.patch @@ -0,0 +1,39 @@ +--- sword-1.6.2/include/multimapwdef.h 2004-05-04 23:01:39.000000000 +0200 ++++ /usr/include/sword/multimapwdef.h 2012-06-02 13:37:47.816457345 +0200 +@@ -7,26 +7,26 @@ + + // multmap that still lets you use [] to reference FIRST + // entry of a key if multiples exist +-template <class Key, class T, class Compare> +-class multimapwithdefault : public std::multimap<Key, T, Compare> { ++template < class Key, class T, class Compare > ++class multimapwithdefault : public std::multimap< Key, T, Compare > { + public: +- typedef std::pair<const Key, T> value_type; ++ typedef std::pair< const Key, T > value_type; + T& getWithDefault(const Key& k, const T& defaultValue) { +- if (find(k) == this->end()) { +- insert(value_type(k, defaultValue)); ++ if (this->find(k) == this->end()) { ++ this->insert(value_type(k, defaultValue)); + } + return (*(find(k))).second; + } + + T& operator[](const Key& k) { +- if (find(k) == this->end()) { +- insert(value_type(k, T())); ++ if (this->find(k) == this->end()) { ++ this->insert(value_type(k, T())); + } +- return (*(find(k))).second; ++ return (*(this->find(k))).second; + } + bool has(const Key& k, const T &val) const { +- typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k); +- typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k); ++ typename std::multimap< Key, T, Compare >::const_iterator start = this->lower_bound(k); ++ typename std::multimap< Key, T, Compare >::const_iterator end = this->upper_bound(k); + for (; start!=end; start++) { + if (start->second == val) + return true; diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index 236ceca01..bf03b4133 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer: Jacek Burghardt <jacek@hebe.us> # Maintainer: Vojtech Aschenbrenner <v@asch.cz> # Contributor: Jason Gardner <buhrietoe@gmail.com> # Contributor: Ross melin <rdmelin@gmail.com> @@ -9,12 +10,13 @@ pkgbase=zoneminder pkgname=zoneminder pkgver=1.25.0 -pkgrel=24 +pkgrel=27 pkgdesc='Capture, analyse, record and monitor video security cameras' arch=( i686 x86_64 mips64el + arm ) backup=( etc/zm.conf @@ -26,7 +28,6 @@ license=( depends=( apache cambozola - libav-static gnutls mariadb perl-archive-zip @@ -59,110 +60,67 @@ source=( httpd-$pkgbase.conf $pkgbase $pkgbase.service + zoneminder-1.25.0-kernel35.patch + zoneminder-1.25.0-gcc47.patch + zoneminder-1.25.0-ffmpeg.patch + zoneminder-1.25-text.patch + zoneminder-1.25-fixwarning.patch + zoneminder-1.25.0-gcrypt.patch ) sha512sums=( 3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375 4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08 ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0 cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf + 4fa79e49a3c04e9fdc9823792c6a28012002479c77ed41637bd2d21f089e4c15592bfcd5c24028f356c9f80d774a5080a6841e8e70a435d607e3089d0b121775 + 3da7d4d21dea166ea12b49e88a05a9f7a75790881a1f2d7588fa9e0e6ce592b4b5ee71994fa8b05236efeeb57890157a622c752c12a9059c2ee915adf3b4660d + 7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4 + 17b85051543c34a41c6b94ec8f46a10927aa4bc9554562650788c8257ffba8e362500cf3641708f2f9dabebc663a2d012fa9feacd7f9b33c637fbc965d405adf + 8eab0a922968465fee8537dc035ce781e51dc84cc05259a32acb5bf59c618bc1700dbf4eec90717ed5959841def119357974d109df8d7450c12ca4ea8576e55c + 8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675 ) build() { cd $srcdir/ZoneMinder-$pkgver - - # ZM_RUNDIR need change to run dir - export CPPFLAGS=-D__STDC_CONSTANT_MACROS\ - OPT_FFMPEG=yes\ - PATH_FFMPEG=/usr/bin/avconv-static\ - ZM_LOGDIR=/var/log/$pkgbase\ - ZM_RUNDIR=/tmp/$pkgbase\ - ZM_SSL_LIB=gnutls\ - ZM_TMPDIR=/tmp/$pkgbase - - # Patch for GCC 4.7.x - sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\ - src/zm_logger.cpp || read - sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/'\ - src/zm_thread.h || read - - # Patch for automake 1.12 - sed -i -e '/am__api_version=/ s/1.11/1.12/'\ - configure || read - - # Patch for disable ZM_CHECK_FOR_UPDATES - sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - - # Patch for support html5 video and flv - sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/; - /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - - # Patch for enable video export - #sed -i -e '/ZM_OPT_FFMPEG/,+1 s/@OPT_FFMPEG@/yes/; - # /ZM_PATH_FFMPEG/,+1 s/@PATH_FFMPEG@/\/usr\/bin\/avconv-static/'\ - # scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - - # Patch for change path run dir - sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\ - scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - # Patch for change ZM name to ZoneMinder sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - - # Patch for v4l2 convert support - sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l2convert.so\' ;/"\ - scripts/zmdc.pl.in || read - - # Patch for add more socket tries + sed -i -e '/am__api_version=/ s/1.11/1.13.1/'\ + configure || read + # Patch for add more socket tries sed -i -e '/$max_socket_tries/ s/3/15/'\ - web/ajax/stream.php || read - - # Patch for wrong "suppported" + web/ajax/stream.php || read + # Patch for support html5 video and flv + sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/; + /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\ + scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read + # Patch for wrong "suppported" sed -i -e 's/suppported/supported/'\ src/zm_local_camera.cpp || read + - # Patch for type cast in linux-libre kernel 3.5 - sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\ - src/zm_local_camera.cpp || read - - # Patch for drop custom perl install paths - sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d; - s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\ - configure.ac - - # Patch for support ffmpeg with <libavutil/mathematics.h> and C library - sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/ - s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\ - src/zm_ffmpeg.h - sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/; - s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/; - s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\ - configure.ac + patch -Np1 -F99 -i ../zoneminder-1.25.0-kernel35.patch + patch -Np1 -F99 -i ../zoneminder-1.25.0-gcc47.patch + patch -Np1 -F99 -i ../zoneminder-1.25.0-ffmpeg.patch + patch -Np1 -F99 -i ../zoneminder-1.25-text.patch + patch -Np1 -F99 -i ../zoneminder-1.25-fixwarning.patch + patch -Np1 -F99 -i ../zoneminder-1.25.0-gcrypt.patch - # Patch for wrong install run, tmp and log dir - sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d; - / ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d; - / ( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d; - / ( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d; - / ( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d'\ - Makefile.{am,in} - - ./configure --prefix=/usr\ +export CXXFLAGS=-D__STDC_CONSTANT_MACROS +./configure --prefix=/usr\ --enable-crashtrace=no\ --enable-debug=no\ --enable-mmap=yes\ --sysconfdir=/etc\ --with-cgidir=/srv/http/cgi-bin\ --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\ - --with-ffmpeg=/opt/libav-static\ --with-libarch=lib\ + --with-ffmpeg=/usr \ --with-mysql=/usr\ --with-webdir=/srv/http/$pkgbase\ --with-webgroup=http\ --with-webhost=localhost\ - --with-webuser=http + --with-webuser=http \ make V=0 } @@ -173,8 +131,9 @@ package() { make DESTDIR=$pkgdir install mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}} - + mkdir -p $pkgdir/srv/zoneminder/socks chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}} + chown -R http.http $pkgdir/srv/zoneminder/socks chmod 0700 $pkgdir/etc/zm.conf for i in events images temp; do diff --git a/pcr/zoneminder/zoneminder-1.25-fixwarning.patch b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch new file mode 100644 index 000000000..0d151d139 --- /dev/null +++ b/pcr/zoneminder/zoneminder-1.25-fixwarning.patch @@ -0,0 +1,14 @@ +diff -U 3 -H -d -r -N -- ZoneMinder-1.24.2/src/zm_image.cpp ZoneMinder-1.24.2-patch/src/zm_image.cpp +--- ZoneMinder-1.24.2/src/zm_image.cpp 2009-05-25 20:04:00.000000000 +0200 ++++ ZoneMinder-1.24.2-patch/src/zm_image.cpp 2009-07-04 16:31:45.000000000 +0200 +@@ -776,7 +776,8 @@ + + while( pdest < (buffer+size) ) + { +- *pdest++ = (*blend_ptr)[*pdest][*psrc++]; ++ *pdest = (*blend_ptr)[*pdest][*psrc++]; ++ pdest++; + } + } + else + diff --git a/pcr/zoneminder/zoneminder-1.25-text.patch b/pcr/zoneminder/zoneminder-1.25-text.patch new file mode 100644 index 000000000..90885f1b5 --- /dev/null +++ b/pcr/zoneminder/zoneminder-1.25-text.patch @@ -0,0 +1,12 @@ +--- ZoneMinder-1.25.0/src/zm_stream.cpp 2009-05-08 09:47:27.000000000 -0400 ++++ ZoneMinder-1.25.0.ajs/src/zm_stream.cpp 2013-01-14 16:52:18.000000000 -0500 +@@ -262,7 +262,7 @@ bool StreamBase::sendTextFrame( const ch + fprintf( stdout, "--ZoneMinderFrame\r\n" ); + fprintf( stdout, "Content-Length: %d\r\n", n_bytes ); + fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" ); +- if ( fwrite( buffer, n_bytes, 1, stdout ) ) ++ if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 ) + { + Error( "Unable to send stream text frame: %s", strerror(errno) ); + return( false ); + diff --git a/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch new file mode 100644 index 000000000..99d41ee33 --- /dev/null +++ b/pcr/zoneminder/zoneminder-1.25.0-ffmpeg.patch @@ -0,0 +1,130 @@ +diff -Naur ZoneMinder-1.25.0-a/configure.ac ZoneMinder-1.25.0-b/configure.ac +--- ZoneMinder-1.25.0-a/configure.ac 2011-08-23 09:10:32.000000000 -0600 ++++ ZoneMinder-1.25.0-b/configure.ac 2013-05-06 11:17:33.860608307 -0600 +@@ -95,7 +95,7 @@ + + LDFLAGS="${FFMPEG_LIBS} $LDFLAGS" + CFLAGS="${FFMPEG_CFLAGS} $CFLAGS" +-CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS" ++CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS -D__STDC_CONSTANT_MACROS" + + EXTRA_LIBS= + AC_ARG_WITH(extralibs, +@@ -275,8 +275,7 @@ + AC_CHECK_LIB(x264,x264_predict_16x16_init) + AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming)) + # Don't bother to warn about this one +-AC_CHECK_LIB(avcore,av_image_copy,,) +-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming)) ++AC_CHECK_LIB(avcodec,avcodec_register_all,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming)) + AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming)) + AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming)) + AC_CHECK_LIB(swscale,sws_scale,,,-lswscale) +diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg.h ZoneMinder-1.25.0-b/src/zm_ffmpeg.h +--- ZoneMinder-1.25.0-a/src/zm_ffmpeg.h 2011-06-24 10:05:07.000000000 -0600 ++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg.h 2013-05-06 18:11:49.327274977 -0600 +@@ -43,6 +43,11 @@ + } + #endif + ++#include <libavutil/avutil.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> ++#include <libswscale/swscale.h> ++ + #if FFMPEG_VERSION_INT == 0x000408 + #define ZM_FFMPEG_048 1 + #elif FFMPEG_VERSION_INT == 0x000409 +diff -Naur ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp +--- ZoneMinder-1.25.0-a/src/zm_ffmpeg_camera.cpp 2011-06-21 01:40:13.000000000 -0600 ++++ ZoneMinder-1.25.0-b/src/zm_ffmpeg_camera.cpp 2013-05-06 19:57:08.453941643 -0600 +@@ -91,7 +91,7 @@ + Info( "Priming capture from %s", mPath.c_str() ); + + // Open the input, not necessarily a file +- if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 ) ++ if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, NULL ) !=0 ) + Fatal( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) ); + + // Locate stream info from input +@@ -122,7 +122,7 @@ + Fatal( "Can't find codec for video stream from %s", mPath.c_str() ); + + // Open the codec +- if ( avcodec_open( mCodecContext, mCodec ) < 0 ) ++ if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 ) + Fatal( "Unable to open codec for video stream from %s", mPath.c_str() ); + + // Allocate space for the native video frame +diff -Naur ZoneMinder-1.25.0-a/src/zm_mpeg.cpp ZoneMinder-1.25.0-b/src/zm_mpeg.cpp +--- ZoneMinder-1.25.0-a/src/zm_mpeg.cpp 2011-05-15 14:39:06.000000000 -0600 ++++ ZoneMinder-1.25.0-b/src/zm_mpeg.cpp 2013-05-06 20:00:08.923941640 -0600 +@@ -130,7 +130,7 @@ + { + /* set the output parameters (must be done even if no + parameters). */ +- if ( av_set_parameters(ofc, NULL) < 0 ) ++ if ( avformat_write_header(ofc, NULL) < 0 ) + { + Panic( "Invalid output format parameters" ); + } +@@ -176,7 +176,7 @@ + } + + /* open the codec */ +- if ( avcodec_open(c, codec) < 0 ) ++ if ( avcodec_open2(c, codec, NULL) < 0 ) + { + Panic( "Could not open codec" ); + } +@@ -222,7 +222,7 @@ + if ( !(of->flags & AVFMT_NOFILE) ) + { + #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,2,1) +- if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 ) ++ if ( avio_open(&ofc->pb, filename, AVIO_FLAG_WRITE) < 0 ) + #else + if ( url_fopen(&ofc->pb, filename, URL_WRONLY) < 0 ) + #endif +@@ -241,7 +241,7 @@ + } + + /* write the stream header, if any */ +- av_write_header(ofc); ++ avformat_write_header(ofc, NULL); + } + + VideoStream::VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int width, int height ) +diff -Naur ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp +--- ZoneMinder-1.25.0-a/src/zm_remote_camera_rtsp.cpp 2011-06-21 03:19:10.000000000 -0600 ++++ ZoneMinder-1.25.0-b/src/zm_remote_camera_rtsp.cpp 2013-05-06 20:07:40.797274975 -0600 +@@ -145,7 +145,7 @@ + Panic( "Unable to locate codec %d decoder", codecContext->codec_id ); + + // Open codec +- if ( avcodec_open( codecContext, codec ) < 0 ) ++ if ( avcodec_open2( codecContext, codec, NULL ) < 0 ) + Panic( "Can't open codec" ); + + picture = avcodec_alloc_frame(); +diff -Naur ZoneMinder-1.25.0-a/src/zm_sdp.h ZoneMinder-1.25.0-b/src/zm_sdp.h +--- ZoneMinder-1.25.0-a/src/zm_sdp.h 2011-05-15 14:39:06.000000000 -0600 ++++ ZoneMinder-1.25.0-b/src/zm_sdp.h 2013-05-06 20:23:28.237274974 -0600 +@@ -41,7 +41,7 @@ + int payloadType; + const char payloadName[6]; + enum AVMediaType codecType; +- enum CodecID codecId; ++ enum AVCodecID codecId; + int clockRate; + int autoChannels; + }; +@@ -50,7 +50,7 @@ + { + const char payloadName[32]; + enum AVMediaType codecType; +- enum CodecID codecId; ++ enum AVCodecID codecId; + //int clockRate; + //int autoChannels; + }; diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch new file mode 100644 index 000000000..a083c6dbc --- /dev/null +++ b/pcr/zoneminder/zoneminder-1.25.0-gcc47.patch @@ -0,0 +1,33 @@ +diff -up ./src/zm_local_camera.cpp.gcc47 ./src/zm_local_camera.cpp +--- ./src/zm_local_camera.cpp.gcc47 2011-06-21 04:19:10.000000000 -0500 ++++ ./src/zm_local_camera.cpp 2012-01-19 13:43:49.142440717 -0600 +@@ -26,6 +26,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <limits.h> + #include <unistd.h> + #include <sys/mman.h> + #include <errno.h> +diff -up ./src/zm_logger.cpp.gcc47 ./src/zm_logger.cpp +--- ./src/zm_logger.cpp.gcc47 2011-06-28 06:07:35.000000000 -0500 ++++ ./src/zm_logger.cpp 2012-01-19 13:43:49.142440717 -0600 +@@ -33,6 +33,7 @@ + #include <signal.h> + #include <stdarg.h> + #include <errno.h> ++#include <unistd.h> + + bool Logger::smInitialised = false; + Logger *Logger::smInstance = 0; +diff -up ./src/zm_thread.h.gcc47 ./src/zm_thread.h +--- ./src/zm_thread.h.gcc47 2012-01-19 13:44:43.082766722 -0600 ++++ ./src/zm_thread.h 2012-01-19 13:44:56.966335869 -0600 +@@ -21,6 +21,7 @@ + #define ZM_THREAD_H + + #include <pthread.h> ++#include <unistd.h> + #include "zm_exception.h" + #include "zm_utils.h" + diff --git a/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch new file mode 100644 index 000000000..21f197ec6 --- /dev/null +++ b/pcr/zoneminder/zoneminder-1.25.0-gcrypt.patch @@ -0,0 +1,86 @@ +diff -up ./configure.ac.gcrypt ./configure.ac +--- ./configure.ac.gcrypt 2012-01-19 12:58:20.647123209 -0600 ++++ ./configure.ac 2012-01-19 13:12:34.186669577 -0600 +@@ -13,7 +13,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo + AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm]) + AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser]) + AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass]) +-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls]) ++AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt]) + AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM]) + AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm]) + AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm]) +@@ -32,7 +32,7 @@ if test "$ZM_DB_PASS" == ""; then + AC_SUBST(ZM_DB_PASS,[zmpass]) + fi + if test "$ZM_SSL_LIB" == ""; then +- AC_SUBST(ZM_SSL_LIB,gnutls) ++ AC_SUBST(ZM_SSL_LIB,libgcrypt) + fi + if test "$ZM_MYSQL_ENGINE" == ""; then + AC_SUBST(ZM_MYSQL_ENGINE,MyISAM) +@@ -264,11 +264,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A + AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a)) + AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a)) + if test "$ZM_SSL_LIB" == "openssl"; then +-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead])) ++AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead])) + else +-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),) ++AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),) + AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead])) +-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead])) + fi + AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support)) + AC_CHECK_LIB(z,zlibVersion) +@@ -320,9 +319,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h + if test "$ZM_SSL_LIB" == "openssl"; then + AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h> + #include <openssl/md5.h>]) +-else +-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h> +-#include <gnutls/openssl.h>]) + fi + AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>]) + +diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp +--- ./src/zm_user.cpp.gcrypt 2011-08-03 06:31:06.000000000 -0500 ++++ ./src/zm_user.cpp 2012-01-19 12:58:20.654122992 -0600 +@@ -140,6 +140,18 @@ User *zmLoadUser( const char *username, + return( user ); + } + ++#ifdef HAVE_GCRYPT_H ++#define HAVE_DECL_MD5 1 ++#define MD5_DIGEST_LENGTH 16 ++static unsigned char *MD5(const unsigned char *data, unsigned long len, ++ unsigned char *md) ++{ ++ gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len); ++ ++ return md; ++} ++#endif ++ + // Function to validate an authentication string + User *zmLoadAuthUser( const char *auth, bool use_remote_addr ) + { +diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h +--- ./src/zm_user.h.gcrypt 2010-11-11 06:11:07.000000000 -0600 ++++ ./src/zm_user.h 2012-01-19 13:14:11.200654694 -0600 +@@ -23,14 +23,11 @@ + #ifndef ZM_USER_H
+ #define ZM_USER_H
+
+-#if HAVE_LIBGNUTLS_OPENSSL
+-#include <gnutls/openssl.h>
+ #if HAVE_GCRYPT_H
+ #include <gcrypt.h>
+-#endif // HAVE_GCRYPT_H
+ #elif HAVE_LIBCRYPTO
+ #include <openssl/md5.h>
+-#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO
++#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
+
+ class User
+ {
diff --git a/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch new file mode 100644 index 000000000..51bc1288d --- /dev/null +++ b/pcr/zoneminder/zoneminder-1.25.0-kernel35.patch @@ -0,0 +1,21 @@ +diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp +--- ./src/zm_local_camera.cpp.kernel35 2012-07-16 15:01:22.182614878 -0500 ++++ ./src/zm_local_camera.cpp 2012-07-16 15:02:16.491941730 -0500 +@@ -740,7 +740,7 @@ void LocalCamera::Terminate() + { + Debug( 3, "Terminating video stream" ); + //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; +- enum v4l2_buf_type type = v4l2_data.fmt.type; ++ enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type; + if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 ) + Error( "Failed to stop capture stream: %s", strerror(errno) ); + +@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture() + + Debug( 3, "Starting video stream" ); + //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE; +- enum v4l2_buf_type type = v4l2_data.fmt.type; ++ enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type; + if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 ) + Fatal( "Failed to start capture stream: %s", strerror(errno) ); + } diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install index ecacf6437..899e2a5d1 100644 --- a/pcr/zoneminder/zoneminder.install +++ b/pcr/zoneminder/zoneminder.install @@ -69,9 +69,6 @@ post_install() { /^open_basedir/ s/:\/srv\/http\/zoneminder//; /^open_basedir/ s/:\/srv\/http\/zoneminder\///; /^open_basedir/ s/$/:\/srv\/http\/zoneminder/; - /^open_basedir/ s/:\/var\/cache\/zoneminder//; - /^open_basedir/ s/:\/var\/cache\/zoneminder\///; - /^open_basedir/ s/$/:\/var\/cache\/zoneminder/; ' /etc/php/php.ini || read sed -i -e ' /^LoadModule php5_module modules\/libphp5.so/d; @@ -82,7 +79,6 @@ post_install() { /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d; /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/; ' /etc/httpd/conf/httpd.conf || read - gpasswd -a http video cat << EOF Note for mysql: ==> To run Zoneminder, you must install the database running mysql service (as root): @@ -109,11 +105,11 @@ Note for php: ==> "extension=openssl.so" ==> "extension=ftp.so" ==> "extension=zip.so" -==> check and add to open_basedir "/etc", -==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so -==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder" +==> check and add to open_basedir "/etc" and +==> "/srv/http/zoneminder" like so +==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder" ==> and set your timezone in php.ini: -==> "date.timezone = <your_zone>/<your_city>" +==> "date.timezone = <your_country>/<your_city>" Note for apache: ==> You must edit /etc/httpd/conf/httpd.conf and add the line: @@ -136,7 +132,6 @@ post_remove() { sed -i -e ' /^open_basedir/ s/:\/srv\/http\/zoneminder//; /^open_basedir/ s/:\/srv\/http\/zoneminder\///; - /^open_basedir/ s/:\/var\/cache\/zoneminder\/// ' /etc/php/php.ini || read sed -i -e ' /^# ZoneMinder/d; @@ -170,12 +165,9 @@ Note: ==> "extension=mysqli.so" ==> "extension=session.so" ==> "extension=sockets.so" -==> "date.timezone = <my_zone>/<my_city>" +==> "date.timezone = <my_country>/<my_city>" -==> Drop http user on video group if it isn't needed with others servers: -==> gpasswd -d http video - -==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder" +==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder" ==> in the "open_basedir". ==> Remove log files and "zonemider" directory in "/var/log/zoneminder". |