diff options
31 files changed, 458 insertions, 210 deletions
diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD index e4a898185..d0334dd68 100644 --- a/community/activity-log-manager/PKGBUILD +++ b/community/activity-log-manager/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 92682 2013-06-12 04:38:43Z bgyorgy $ +# $Id: PKGBUILD 94510 2013-07-25 21:57:24Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Ner0 pkgname=activity-log-manager -pkgver=0.9.5 +pkgver=0.9.7 pkgrel=1 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist" arch=('i686' 'x86_64') url="https://launchpad.net/activity-log-manager" license=('GPL2') -depends=('gtk3' 'libgee06' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') +depends=('gtk3' 'libgee06' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') makedepends=('vala' 'intltool') install=$pkgname.install source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz) -md5sums=('460b4439798badbf4ba4b76b31cc1d03' - '6167df74ce44659aa94a89f31ff4d351') + http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20130725.tar.gz) +md5sums=('d886be32db0fa351aaf0eb59912ee377' + 'f7a284bca152011500cb845aebad8d14') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,6 +25,8 @@ build() { mv -f -t po ../po/* printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS + rm src/activity_log_manager_vala.stamp + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } diff --git a/community/banner/PKGBUILD b/community/banner/PKGBUILD new file mode 100644 index 000000000..8720cb681 --- /dev/null +++ b/community/banner/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: jsteel <jsteel@aur.archlinux.org> +# Contributor: Peter Simons <simons@cryp.to> + +pkgname=banner +pkgver=1.3.2 +pkgrel=4 +pkgdesc="Print large banners to ASCII terminals" +arch=('i686' 'x86_64') +url="http://shh.thathost.com/pub-unix" +license=('GPL') +depends=('glibc') +makedepends=('shhmsg' 'shhopt') +source=($url/files/$pkgname-$pkgver.tar.gz) +md5sums=('9bd1dc58d3bced525a19194b92d20217') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" dep + make OPTIM="$CFLAGS" +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make INSTBASEDIR="$pkgdir"/usr/ INSTMANDIR="$pkgdir"/usr/share/man/man1/ install +} diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index fc653a61e..f32125942 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94428 2013-07-24 17:40:58Z spupykin $ +# $Id: PKGBUILD 94475 2013-07-25 13:27:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=1 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver/_/-}.tar.gz dbmail-lmtpd.xinetd dbmail-pop3d.xinetd dbmail-timsieved.xinetd) -md5sums=('5dbf91cd8f562708fef904878a72e2fc' +md5sums=('8951dd9e055476fdf491c2dca013ede7' 'c4b5793c5422b62a675d4c66ff7e9300' '5a6297cb03c8d0b424f978ea1d7402de' '070db88538af9833f003f4cb516d337b' @@ -44,7 +44,8 @@ md5sums=('5dbf91cd8f562708fef904878a72e2fc' build() { cd $srcdir/dbmail-${pkgver/_/-}/ - [ -f Makefile ] || ./configure --prefix=/usr --sbindir=/usr/bin \ + [ -f Makefile ] || ./configure \ + --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \ --with-ldap --with-sieve make } diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD index 5cd15184b..61709421f 100644 --- a/community/flightgear/PKGBUILD +++ b/community/flightgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92437 2013-06-05 11:05:37Z spupykin $ +# $Id: PKGBUILD 94473 2013-07-25 13:17:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=flightgear pkgver=2.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="An open-source, multi-platform flight simulator" arch=(i686 x86_64) depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') diff --git a/community/gnubg/PKGBUILD b/community/gnubg/PKGBUILD new file mode 100644 index 000000000..5ad5b0c0b --- /dev/null +++ b/community/gnubg/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: jsteel <jsteel@aur.archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Stefan Clarke <fm0nk3y@yahoo.co.uk> + +pkgname=gnubg +pkgver=1.01.003 +pkgrel=1 +pkgdesc="A world class backgammon application" +arch=('i686' 'x86_64') +url="http://www.gnubg.org" +license=('GPL') +depends=('python2' 'gtkglext' 'hicolor-icon-theme') +conflicts=('gnubg-cli' 'gnubg-cvs') +install=$pkgname.install +source=($url/media/sources/$pkgname-release-$pkgver-sources.tar.gz + $pkgname.desktop) +md5sums=('5b03cf8634abe2822eee4db1317f0754' + '965f5c7c25f60b27d06cc6fef7befd30') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + ./autogen.sh + + ./configure --prefix=/usr --bindir=/usr/bin --sysconfdir=/etc \ + --mandir=/usr/share/man + + make +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make DESTDIR="$pkgdir"/ install + + install -Dm644 "$srcdir"/$pkgname.desktop \ + "$pkgdir"/usr/share/applications/$pkgname.desktop +} diff --git a/community/gnubg/gnubg.desktop b/community/gnubg/gnubg.desktop new file mode 100644 index 000000000..a0d3ba75d --- /dev/null +++ b/community/gnubg/gnubg.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Name=GNU Backgammon +Name[hr]=GNU Tavla +Name[ru]=GNU Нарды +Name[sr]=ГНУ Тавла +GenericName=Backgammon +GenericName[hr]=Tavla +GenericName[ru]=Нарды +GenericName[sr]=Тавла +Comment=GNU Backgammon +Comment[hr]=GNU Tavla +Comment[ru]=GNU Короткие нарды +Comment[sr]=GNU Тавла +Exec=gnubg +Icon=gnubg +StartupNotify=true +Terminal=false +Type=Application +Categories=GTK;Game;StrategyGame; diff --git a/community/gnubg/gnubg.install b/community/gnubg/gnubg.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/community/gnubg/gnubg.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index 337e08c62..c2741f62f 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92251 2013-06-03 11:15:23Z allan $ +# $Id: PKGBUILD 94436 2013-07-25 05:59:37Z ttoepper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh -pkgver=R46 -pkgrel=3 +pkgver=R47 +pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' license=('custom') @@ -13,7 +13,7 @@ depends=('gcc-libs') install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') -md5sums=('77c108d8143a6e7670954d77517d216d' +md5sums=('71c7cbcd78306897801b8b6691091e66' 'a231b325d5f2155a6c667a9323986718') build() { diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 3ef92191b..35d9de6fd 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90073 2013-05-06 19:38:55Z foutrelis $ +# $Id: PKGBUILD 94454 2013-07-25 10:41:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=openscenegraph -pkgver=3.0.1 -pkgrel=10 +pkgver=3.2.0 +pkgrel=1 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') @@ -16,11 +16,9 @@ makedepends=('cmake' 'libvncserver' 'qt4' 'ffmpeg-compat' 'mesa') optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt4') conflicts=('openthreads') provides=('openthreads') -source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip - osg-xine-1.2.patch) -#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip") -md5sums=('c43a25d023e635c3566b2083d8e6d956' - 'b05a486fdc2aaf06b29efb5e0714672e') +#source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip +source=(http://www.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-$pkgver.zip) +md5sums=('4980f8692712a24d4c99f363f80c6814') build() { cd OpenSceneGraph-$pkgver @@ -42,8 +40,7 @@ build() { -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \ -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so - sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp - patch -p1 <$srcdir/osg-xine-1.2.patch +# sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp make } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index e40de4723..68fd24c76 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9840 +pkgver=9893 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64') @@ -19,9 +19,9 @@ build() { ./mkfiles.pl - sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile + sed -i 's|\$(gamesdir)|\$(bindir)|' Makefile.gtk - make prefix=/usr + make -f Makefile.gtk prefix=/usr } package() { @@ -30,7 +30,7 @@ package() { install -d ${pkgdir}/usr/{bin,share/licenses/${pkgname}} install -Dm644 LICENCE ${pkgdir}/usr/share/licenses/${pkgname}/ - make prefix=/usr DESTDIR=${pkgdir} install + make -f Makefile.gtk prefix=/usr DESTDIR=${pkgdir} install #fix FS#14600 mv ${pkgdir}/usr/bin/net ${pkgdir}/usr/bin/puzzles-net diff --git a/community/shhmsg/PKGBUILD b/community/shhmsg/PKGBUILD new file mode 100644 index 000000000..f1ef76668 --- /dev/null +++ b/community/shhmsg/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: jsteel <jsteel@aur.archlinux.org> +# Contributor: Peter Simons <simons@cryp.to> + +pkgname=shhmsg +pkgver=1.4.1 +pkgrel=1 +pkgdesc="Library for displaying messages" +arch=('i686' 'x86_64') +url="http://shh.thathost.com/pub-unix" +license=('GPL') +source=($url/files/$pkgname-$pkgver.tar.gz) +md5sums=('de300150851786eb19cb9b9ad234d7a2') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" dep + make OPTIM="$CFLAGS" +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" INSTBASEDIR="$pkgdir"/usr/ install +} diff --git a/community/shhopt/PKGBUILD b/community/shhopt/PKGBUILD new file mode 100644 index 000000000..701b32fdb --- /dev/null +++ b/community/shhopt/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: jsteel <jsteel@aur.archlinux.org> +# Contributor: Peter Simons <simons@cryp.to> + +pkgname=shhopt +pkgver=1.1.7 +pkgrel=1 +pkgdesc="Library for parsing command line options" +arch=('i686' 'x86_64') +url="http://shh.thathost.com/pub-unix" +license=('GPL') +source=($url/files/$pkgname-$pkgver.tar.gz) +md5sums=('caf24206354296e8a48771aea1f47fbd') + +build() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" dep + make OPTIM="$CFLAGS" +} + +package() { + cd "$srcdir"/$pkgname-$pkgver + + make OPTIM="$CFLAGS" INSTBASEDIR="$pkgdir"/usr/ install +} diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index 1e2c8dfc2..af8420930 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84416 2013-02-18 20:14:11Z spupykin $ +# $Id: PKGBUILD 94470 2013-07-25 12:34:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> pkgname=simgear pkgver=2.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications." arch=(i686 x86_64) depends=('glut' 'freealut' 'plib' 'openscenegraph') @@ -15,8 +15,15 @@ license=("GPL") url="https://gitorious.org/fg" options=('!makeflags') #source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") -source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2") -md5sums=('0ec974d3778f777d5c99c89db671fcc7') +source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2" + "osg-3.2.patch") +md5sums=('0ec974d3778f777d5c99c89db671fcc7' + 'd7f35f02d88c6ef9c58e07b8431811e6') + +prepare() { + cd $srcdir/simgear-$pkgver + patch -p1 <$srcdir/osg-3.2.patch +} build() { cd $srcdir/simgear-$pkgver diff --git a/community/simgear/osg-3.2.patch b/community/simgear/osg-3.2.patch new file mode 100644 index 000000000..30d732ad6 --- /dev/null +++ b/community/simgear/osg-3.2.patch @@ -0,0 +1,22 @@ +diff -wbBur simgear-2.10.0/simgear/scene/material/EffectGeode.cxx simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx +--- simgear-2.10.0/simgear/scene/material/EffectGeode.cxx 2011-06-29 18:58:56.000000000 +0400 ++++ simgear-2.10.0.q/simgear/scene/material/EffectGeode.cxx 2013-07-25 16:14:24.268934729 +0400 +@@ -80,15 +80,15 @@ + int n = _effect->getGenerator(Effect::TANGENT); + tsg->generate(geometry, 0); // 0 is normal_unit, but I have no idea what that is! + if (n != -1 && !geometry->getVertexAttribArray(n)) +- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getTangentArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); ++ geometry->setVertexAttribArray(n, tsg->getTangentArray(), osg::Array::BIND_PER_VERTEX); + + n = _effect->getGenerator(Effect::BINORMAL); + if (n != -1 && !geometry->getVertexAttribArray(n)) +- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getBinormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); ++ geometry->setVertexAttribArray(n, tsg->getBinormalArray(), osg::Array::BIND_PER_VERTEX); + + n = _effect->getGenerator(Effect::NORMAL); + if (n != -1 && !geometry->getVertexAttribArray(n)) +- geometry->setVertexAttribData(n, osg::Geometry::ArrayData(tsg->getNormalArray(), osg::Geometry::BIND_PER_VERTEX,GL_FALSE)); ++ geometry->setVertexAttribArray(n, tsg->getNormalArray(), osg::Array::BIND_PER_VERTEX); + } + } + diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 4d220f40b..51b0f410c 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 93524 2013-07-05 00:43:46Z seblu $ +# $Id: PKGBUILD 94462 2013-07-25 11:22:57Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.16 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux>=3.9' 'linux<3.10' - 'linux-headers>=3.9' 'linux-headers<3.10' +makedepends=('linux>=3.10' 'linux<3.11' + 'linux-headers>=3.10' 'linux-headers<3.11' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver" 'expac' @@ -18,7 +18,7 @@ makedepends=('linux>=3.9' 'linux<3.10' 'bc') # remember to also adjust the .install files and the package deps below -_extramodules=extramodules-3.9-ARCH +_extramodules=extramodules-3.10-ARCH build() { _kernver="$(cat /usr/lib/modules/$_extramodules/version)" @@ -36,7 +36,7 @@ build() { package_virtualbox-host-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.9' 'linux<3.10') + depends=('linux>=3.10' 'linux<3.11') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install @@ -51,7 +51,7 @@ package_virtualbox-guest-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.9' 'linux<3.10') + depends=('linux>=3.10' 'linux<3.11') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 169dd9a35..ed1762c21 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.9-ARCH' + EXTRAMODULES='extramodules-3.10-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index b1c7a68c6..2f7f00d9e 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES='extramodules-3.9-ARCH' + EXTRAMODULES='extramodules-3.10-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 7822b0465..df05a0fac 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188861 2013-06-23 11:12:05Z tpowa $ +# $Id: PKGBUILD 191387 2013-07-25 11:24:46Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -7,7 +7,7 @@ pkgname=nfs-utils pkgver=1.2.8 -pkgrel=8 +pkgrel=9 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' diff --git a/core/nfs-utils/nfs-utils.install b/core/nfs-utils/nfs-utils.install index 7dcdf9575..f6c72d915 100644 --- a/core/nfs-utils/nfs-utils.install +++ b/core/nfs-utils/nfs-utils.install @@ -5,9 +5,9 @@ cat << 'EOM' ==> Extended configuration options for NFS (clients & server) are available in ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf ==> - ==> Please refer to http://wiki.archlinux.org/index.php/Nfs - ==> for further information on NFS; for NFSv4, refer to - ==> http://wiki.archlinux.org/index.php/NFSv4 + ==> Please refer to http://wiki.archlinux.org/index.php/NFS + ==> for further information on NFS4; for NFSv3, refer to + ==> http://wiki.archlinux.org/index.php/NFSv3 EOM } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index de0896e8b..dd226717f 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190122 2013-07-15 22:43:53Z dan $ +# $Id: PKGBUILD 191563 2013-07-25 14:47:59Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.3.3 +pkgver=1.8.3.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -111,7 +111,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('63f5355259bae32858dac07326fe4e07' - '99625bedd599c5970e2e3d2d05e8cbc3' +md5sums=('80eec3201a5d012913d287b85adaee8e' + '86fd812754d25201fd72c7476045dfec' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 4b2129bb6..1770b3cad 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187908 2013-06-07 23:36:32Z heftig $ +# $Id: PKGBUILD 191381 2013-07-25 09:28:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.3 +pkgver=3.8.4.1 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -23,7 +23,7 @@ url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('e78a5b01692ccfe825e079d795d9e9610fcb94853c0e6d747b2d8d36dead9d84') +sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55') build() { cd $pkgname-$pkgver diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 6b535049b..370827844 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187876 2013-06-07 17:10:53Z heftig $ +# $Id: PKGBUILD 191565 2013-07-25 16:28:52Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=(harfbuzz) pkgname=(harfbuzz harfbuzz-icu) -pkgver=0.9.18 +pkgver=0.9.19 pkgrel=1 pkgdesc="OpenType text shaping engine" arch=(i686 x86_64) @@ -12,7 +12,7 @@ license=(MIT) makedepends=(glib2 freetype2 graphite cairo icu) options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908') +sha256sums=('d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35') build() { cd $pkgbase-$pkgver diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index c7a3a5a8e..b913e9959 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 186584 2013-05-29 15:44:45Z eric $ +# $Id: PKGBUILD 191377 2013-07-24 22:05:06Z eric $ # Maintainer: pkgname=perl-dbi -pkgver=1.627 +pkgver=1.628 pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64') license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/DBI/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz) -md5sums=('aab49be51b0f4867a1894145b023d2c5') +md5sums=('4273f8cc6ee3979ce448c7eb3f8a6a5a') build() { cd DBI-${pkgver} diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD index 9063e3a4d..6a851a494 100644 --- a/extra/xorg-iceauth/PKGBUILD +++ b/extra/xorg-iceauth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $ +# $Id: PKGBUILD 191580 2013-07-25 21:13:50Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-iceauth -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="ICE authority file utility" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('libice') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2) -sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e') +sha256sums=('bd990837353b439e6f45d478a87b8dbfa3f67d72d903e7a9ed4eb8de52f2e2f4') build() { cd "${srcdir}/iceauth-${pkgver}" diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 37ec6585b..90b6a45c5 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ _basekernel=3.10 _sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -39,7 +39,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '223606d6db3504732aab7711833a30fb') + 'dd620e4cb68341f847686c000d8038e8') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 443f45485..0c109a5d1 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -1,54 +1,61 @@ -# $Id: PKGBUILD 93800 2013-07-10 11:24:05Z stativ $ +# $Id$ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> -pkgname=luxrender-libre -_pkgflag=libre +_pkgname=luxrender +pkgname=$_pkgname-libre pkgver=1.2.1 _pkgver=3066b2161439 pkgrel=5 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') -url="http://www.${pkgname%-$_pkgflag}.net/" +url="http://www.$_pkgname.net/" license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl') +depends=('boost-libs' 'freeimage' 'openexr' 'libcl-libre' 'mesa-libgl') optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') -makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers') -provides=(${pkgname%-$_pkgflag}=$pkgver) -conflicts=${pkgname%-$_pkgflag} -replaces=${pkgname%-$_pkgflag} -source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2 +makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') +makedepends+=('gcc-lts') +provides=($_pkgname=$pkgver) +conflicts=$_pkgname +replaces=$_pkgname +source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 boost-1.53-shared_array_constructor.diff) md5sums=( '87958798c164ad14f92fb4af2595d332' 'dd19c7ac2ba8c9b703018a176ef77f98') -build() { - cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver +prepare() { + cd "$srcdir"/$_pkgname-lux-$_pkgver # fix the installation - sed -i '/.*wxgui.*/ d' CMakeLists.txt + sed -i '/.*wxgui.*/ d + s|-ftree-vectorize || + ' CMakeLists.txt # fix for boost 1.53 patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true export CXXFLAGS="$CXXFLAGS -lpthread" - setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr \ +} + +build() { + cd "$srcdir"/$_pkgname-lux-$_pkgver + + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \ - . - setarch $CARCH make + -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m + make } package() { - cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver + cd "$srcdir"/$_pkgname-lux-$_pkgver setarch $CARCH make DESTDIR="$pkgdir" install - # fix library path on x86_64 - [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib + # fix library path on 64bit + [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib #install pylux install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so diff --git a/pcr/gcc-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD index c3ab693d3..b1280fad9 100644 --- a/pcr/gcc-lts/PKGBUILD +++ b/pcr/gcc-lts/PKGBUILD @@ -8,7 +8,7 @@ #pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-ada' 'gcc-lts-go') pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-go') pkgver=4.7.3 -pkgrel=1 +pkgrel=3 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -96,9 +96,9 @@ check() { package_gcc-lts-libs() { pkgdesc="Runtime libraries shipped by GCC" - groups=('base') + groups=('lts') depends=('glibc>=2.17') - provides=('gcc-libs') + provides=("gcc-libs=$pkgver") conflicts=('gcc-libs') install=gcc-libs.install @@ -134,10 +134,10 @@ package_gcc-lts-libs() package_gcc-lts() { pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl') - provides=('gcc') + depends=("gcc-lts-libs=$pkgver" 'binutils>=2.23' 'libmpc' 'cloog' 'ppl') + provides=("gcc=$pkgver") conflicts=('gcc') - groups=('base-devel') + groups=('lts-devel') install=gcc.install cd ${srcdir}/gcc-build @@ -212,8 +212,8 @@ EOF package_gcc-lts-fortran() { pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - provides=('gcc-fortran') + depends=("gcc-lts=$pkgver") + provides=("gcc-fortran=$pkgver") conflicts=('gcc-fortran') install=gcc-fortran.install @@ -241,8 +241,8 @@ package_gcc-lts-fortran() package_gcc-lts-objc() { pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - provides=('gcc-objc') + depends=("gcc-lts=$pkgver") + provides=("gcc-objc=$pkgver") conflicts=('gcc-objc') cd ${srcdir}/gcc-build @@ -264,8 +264,8 @@ package_gcc-lts-objc() package_gcc-lts-ada() { pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - provides=('gcc-ada') + depends=("gcc-lts=$pkgver") + provides=("gcc-ada=$pkgver") conflicts=('gcc-ada') install=gcc-ada.install @@ -283,8 +283,8 @@ package_gcc-lts-ada() package_gcc-lts-go() { pkgdesc="Go front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - provides=('gcc-go') + depends=("gcc-lts=$pkgver") + provides=("gcc-go=$pkgver") conflicts=('gcc-go') install=gcc-go.install diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 84845960e..a2d174304 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.07.24.2 +pkgver=2013.07.25.2 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -14,7 +14,7 @@ license=('custom') depends=('python') makedepends=('python-distribute') source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('7ffcae6db1e5387a5f002e195da23cf4' +md5sums=('db09e5672c674ccadd3c9afed77189d9' 'SKIP') prepare() { diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index bf03b4133..ede03dd77 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -7,27 +7,24 @@ # based of debian squeeze package -pkgbase=zoneminder +_automake=1.14 + pkgname=zoneminder pkgver=1.25.0 -pkgrel=27 +pkgrel=28 pkgdesc='Capture, analyse, record and monitor video security cameras' arch=( - i686 - x86_64 mips64el - arm -) -backup=( - etc/zm.conf -) -url="http://www.$pkgbase.com" -license=( - GPL + x86_64 + i686 ) +backup=etc/zm.conf +url=http://www.$pkgname.com +license=GPL2 depends=( apache cambozola + ffmpeg gnutls mariadb perl-archive-zip @@ -48,108 +45,158 @@ depends=( php-gd php-mcrypt ) -makedepends=( - netpbm -) -optdepends=( - netpbm -) -install=$pkgbase.install +makedepends=netpbm +optdepends=netpbm +options=(!libtool) +install=$pkgname.install source=( - http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz - 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 + http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz + httpd-$pkgname.conf + $pkgname.service + sysctl-$pkgname.conf + $pkgname-$pkgver-ffmpeg.patch + $pkgname-$pkgver-gcrypt.patch ) sha512sums=( 3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375 4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08 - ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0 cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf - 4fa79e49a3c04e9fdc9823792c6a28012002479c77ed41637bd2d21f089e4c15592bfcd5c24028f356c9f80d774a5080a6841e8e70a435d607e3089d0b121775 - 3da7d4d21dea166ea12b49e88a05a9f7a75790881a1f2d7588fa9e0e6ce592b4b5ee71994fa8b05236efeeb57890157a622c752c12a9059c2ee915adf3b4660d + 7330c179f1e2db815a675560d3d84648be02f7d0292f8cbe21d6033577fe688ed71ad23b5b8c9dc309395b45ebb554f9499e7a4b57091959b69679011fa59044 7fc2a4663c3103bef641be065bd7992a2b3dc0699f1b99dc2fdb34c1c48e58686e490d3ade523ef7c8e29b3f04109658eef652c26ff6ee3fb9aee65453bdb6c4 - 17b85051543c34a41c6b94ec8f46a10927aa4bc9554562650788c8257ffba8e362500cf3641708f2f9dabebc663a2d012fa9feacd7f9b33c637fbc965d405adf - 8eab0a922968465fee8537dc035ce781e51dc84cc05259a32acb5bf59c618bc1700dbf4eec90717ed5959841def119357974d109df8d7450c12ca4ea8576e55c 8c9e7debcaf60be1c2dda656f95e497f6812d704edc3ca4a1c915a3b3c9dc1749c91d96bc2d60db7d90d5edfd9e2dfc39010dfe4feabfecfffd27f1fffc3d675 ) +prepare() { + cd $srcdir/ZoneMinder-$pkgver + + # Patch for automake + sed -i "\|^am__api_version=| s|1[.]11|$_automake|; + " configure + + # Patch for GCC + sed -i 's|^#include [<]errno[.]h[>]$|#include <errno.h>\n#include <unistd.h>|; + ' src/zm_logger.cpp + sed -i 's|^#include [<]pthread[.]h[>]$|#include <pthread.h>\n#include <unistd.h>|; + ' src/zm_thread.h + sed -i 's|^#include [<]fcntl[.]h[>]$|#include <fcntl.h>\n#include <limits.h>|; + ' src/zm_local_camera.cpp + + # Patch for type cast in linux-libre kernel 3.5 and for wrong type "suppported" + sed -i 's|enum v4l2_buf_type type = v4l2_data[.]fmt[.]type|enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type|; + s|suppported|supported|; + ' src/zm_local_camera.cpp + + # configure crash on i686 + [[ $CARCH != i686 ]] && { + # Patch for fixing warning + sed -i 's|pdest[+][+] = ([*]blend_ptr)\[[*]pdest]\[[*]psrc[+][+]]|pdest = (*blend_ptr)[*pdest][*psrc++];\n pdest++|; + ' src/zm_image.cpp + } + + # Patch for support ffmpeg with <libavutil/mathematics.h> + #sed -i '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 + + # Patch for support C library + #sed -i '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 for disable ZM_CHECK_FOR_UPDATES + sed -i '\|ZM_CHECK_FOR_UPDATES|,+1 s|yes|no|; + ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in + + # Patch for support html5 video and flv + sed -i '\|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 + + # Patch for change path run dir and for change ZM name to ZoneMinder + sed -i '\|ZM_PATH_SOCKS|,+1 s|TMP|RUN|; + \|ZM_WEB_TITLE_PREFIX|,+1 s|"ZM"|"ZoneMinder"|; + ' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in + + # Patch for v4l2 convert support + sed -i '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 + + # Patch for add more socket tries + sed -i '\|^$max_socket_tries = | s|3|15|; + ' web/ajax/stream.php + + # Patch for text + sed -i 's|if ( fwrite( buffer, n_bytes, 1, stdout ) )|if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )|; + ' src/zm_stream.cpp + + # Patch for remove HACK in Makefile.* + sed -i '\|This is a HACK|d; + \|^install-data-hook:$|,+5 d; + s| install-data-hook||; + \|^uninstall-hook:$|,+5 d; + s| uninstall-hook||; + ' Makefile.{am,in} + + # Patch + for _patch in ffmpeg gcrypt; do + patch -Np1 -F99 -i $srcdir/$pkgname-$pkgver-$_patch.patch + done +} + build() { cd $srcdir/ZoneMinder-$pkgver - # 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 - 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 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 -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 - -export CXXFLAGS=-D__STDC_CONSTANT_MACROS -./configure --prefix=/usr\ + + # ZM_RUNDIR need change to run dir + export CPPFLAGS="$CPPFLAGS -D__STDC_CONSTANT_MACROS"\ + OPT_FFMPEG=yes\ + PATH_FFMPEG=/usr/bin/ffmpeg\ + ZM_LOGDIR=/var/log/$pkgname\ + ZM_RUNDIR=/tmp/$pkgname\ + ZM_SSL_LIB=libgcrypt\ + ZM_TMPDIR=/tmp/$pkgname + + ./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=/usr\ --with-libarch=lib\ - --with-ffmpeg=/usr \ --with-mysql=/usr\ - --with-webdir=/srv/http/$pkgbase\ + --with-webdir=/srv/http/$pkgname\ --with-webgroup=http\ --with-webhost=localhost\ - --with-webuser=http \ - + --with-webuser=http make V=0 } package() { cd $srcdir/ZoneMinder-$pkgver - 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 + mkdir -vp $pkgdir/{etc/{httpd/conf/extra,sysctl.d},srv/http/{cgi-bin,$pkgname/socks},usr/{lib/systemd/system,share/{licenses/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}} + chown -vR http.http $pkgdir/{etc/zm.conf,srv/http/$pkgname/socks,var/{cache/$pkgname,log/$pkgname}} + chmod -v 0700 $pkgdir/etc/zm.conf for i in events images temp; do - mv $pkgdir/srv/http/$pkgbase/$i $pkgdir/var/cache/$pkgbase/$i - ln -s /var/cache/$pkgbase/$i $pkgdir/srv/http/$pkgbase/$i - chown -h http.http $pkgdir/srv/http/$pkgbase/$i + mv -v $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i + ln -vs /var/cache/$pkgname/$i $pkgdir/srv/http/$pkgname/$i + chown -vh http.http $pkgdir/srv/http/$pkgname/$i done - ln -s /srv/http/cgi-bin $pkgdir/srv/http/$pkgbase - chown -h http.http $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin} + ln -vs /srv/http/cgi-bin $pkgdir/srv/http/$pkgname + chown -vh http.http $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin} - ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase + ln -vs /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname - install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra - install -D -m 644 $srcdir/$pkgbase $pkgdir/etc/rc.d - install -D -m 644 $srcdir/$pkgbase.service $pkgdir/usr/lib/systemd/system - install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgbase - install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgbase/db + install -vDm644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra + install -vDm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system + install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/etc/sysctl.d + install -vDm644 $srcdir/sysctl-$pkgname.conf $pkgdir/srv/http/$pkgname + install -vDm644 COPYING $pkgdir/usr/share/licenses/$pkgname + install -vDm644 db/zm*.sql $pkgdir/usr/share/$pkgname/db } diff --git a/pcr/zoneminder/sysctl-zoneminder.conf b/pcr/zoneminder/sysctl-zoneminder.conf new file mode 100644 index 000000000..ec1407dee --- /dev/null +++ b/pcr/zoneminder/sysctl-zoneminder.conf @@ -0,0 +1,3 @@ +# For Zoneminder Monitor +#kernel.shmall = 524288000 +#kernel.shmmax = 524288000 diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install index 899e2a5d1..66109d5fa 100644 --- a/pcr/zoneminder/zoneminder.install +++ b/pcr/zoneminder/zoneminder.install @@ -1,3 +1,4 @@ +#!/usr/bin/bash pre_install() { set -e abort=false @@ -27,20 +28,20 @@ EOF post_install() { if [[ -d /var/log/zoneminder ]]; then - chmod 0755 /var/log/zoneminder - chown http.http /var/log/zoneminder + chmod -v 0755 /var/log/zoneminder + chown -v http.http /var/log/zoneminder else - mkdir -m 0755 /var/log/zoneminder - chown http.http /var/log/zoneminder + mkdir -vm 0755 /var/log/zoneminder + chown -v http.http /var/log/zoneminder fi if [[ -d /tmp/zoneminder ]]; then - chmod 0700 /tmp/zoneminder - chown http.http /tmp/zoneminder + chmod -v 0700 /tmp/zoneminder + chown -v http.http /tmp/zoneminder else - mkdir -m 0700 /tmp/zoneminder - chown http.http /tmp/zoneminder + mkdir -vm 0700 /tmp/zoneminder + chown -v http.http /tmp/zoneminder fi - sed -i -e ' + sed -i ' /^;extension=mysql.so/ s/^;//; /^#extension=mysql.so/ s/^#//; /^;extension=mysqli.so/ s/^;//; @@ -69,8 +70,11 @@ post_install() { /^open_basedir/ s/:\/srv\/http\/zoneminder//; /^open_basedir/ s/:\/srv\/http\/zoneminder\///; /^open_basedir/ s/$/:\/srv\/http\/zoneminder/; - ' /etc/php/php.ini || read - sed -i -e ' + /^open_basedir/ s/:\/var\/cache\/zoneminder//; + /^open_basedir/ s/:\/var\/cache\/zoneminder\///; + /^open_basedir/ s/$/:\/var\/cache\/zoneminder/; + ' /etc/php/php.ini + sed -i ' /^LoadModule php5_module modules\/libphp5.so/d; /^LoadModule rewrite_module modules\/mod_rewrite.so/ s/$/\nLoadModule php5_module modules\/libphp5.so/; /^# PHP 5/d; @@ -78,11 +82,12 @@ post_install() { /^Include \/etc\/httpd\/conf\/extra\/php5_module.conf/d; /^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 + ' /etc/httpd/conf/httpd.conf + gpasswd -a http video cat << EOF Note for mysql: ==> To run Zoneminder, you must install the database running mysql service (as root): -==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd) +==> "systemctl start mysqld.service" ==> and add Zoneminder database typing (with passsword): ==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload" ==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p" @@ -92,6 +97,11 @@ Note for mysql: ==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf" ==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf mysql" +Note for sysctl: +==> You must uncomment that line in /etc/sysctl.d/sysctl-zoneminder.conf: +==> "kernel.shmall = 524288000" +==> "kernel.shmmax = 524288000" + Note for php: ==> You must uncomment that line in /etc/php/php.ini: ==> "extension=mysql.so" @@ -105,11 +115,11 @@ Note for php: ==> "extension=openssl.so" ==> "extension=ftp.so" ==> "extension=zip.so" -==> check and add to open_basedir "/etc" and -==> "/srv/http/zoneminder" like so -==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder" +==> 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" ==> and set your timezone in php.ini: -==> "date.timezone = <your_country>/<your_city>" +==> "date.timezone = <your_zone>/<your_city>" Note for apache: ==> You must edit /etc/httpd/conf/httpd.conf and add the line: @@ -122,21 +132,25 @@ EOF post_upgrade() { post_install + _mysqld=$(systemctl status mysqld.service | grep -o 'inactive (dead)') + [[ _mysqld == 'inactive (dead)' ]] && systemctl start mysqld.service /usr/bin/zmupdate.pl -f >/dev/null + [[ _mysqld == 'inactive (dead)' ]] && systemctl stop mysqld.service } post_remove() { - if [[ -d /tmp/zoneminder ]]; then - rm -vr /tmp/zoneminder - fi - sed -i -e ' + _zms=$(systemctl status zoneminder.service | grep -o 'active (running)') + [[ _zms == 'active (running)' ]] && systemctl stop zoneminder.service + [[ -d /tmp/zoneminder ]] && rm -vr /tmp/zoneminder + sed -i ' /^open_basedir/ s/:\/srv\/http\/zoneminder//; /^open_basedir/ s/:\/srv\/http\/zoneminder\///; - ' /etc/php/php.ini || read - sed -i -e ' + /^open_basedir/ s/:\/var\/cache\/zoneminder\/// + ' /etc/php/php.ini + sed -i ' /^# ZoneMinder/d; /Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d; - ' /etc/httpd/conf/httpd.conf || read + ' /etc/httpd/conf/httpd.conf cat << EOF Note: ==> To clean Zoneminder mysql database, run as root (with password): @@ -165,9 +179,12 @@ Note: ==> "extension=mysqli.so" ==> "extension=session.so" ==> "extension=sockets.so" -==> "date.timezone = <my_country>/<my_city>" +==> "date.timezone = <my_zone>/<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" and "/srv/http/zoneminder" +==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder" ==> in the "open_basedir". ==> Remove log files and "zonemider" directory in "/var/log/zoneminder". |