diff options
52 files changed, 668 insertions, 287 deletions
diff --git a/community/bcg729/PKGBUILD b/community/bcg729/PKGBUILD index 23cb66cf3..369c60744 100644 --- a/community/bcg729/PKGBUILD +++ b/community/bcg729/PKGBUILD @@ -1,25 +1,25 @@ -# $Id$ +# $Id: PKGBUILD 92852 2013-06-17 06:58:41Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=bcg729 pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="g729 codec" arch=('i686' 'x86_64') url="http://www.linphone.org/eng/documentation/dev/bcg729.html" license=('GPL') depends=('mediastreamer') options=('!libtool') -source=(http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/bcg729-$pkgver.tar.gz) +source=(http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/$pkgname-$pkgver.tar.gz) md5sums=('45e127a9a309aff94d3262d97b5aeab0') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir/" install } diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD index bfccd2274..ab5be235b 100644 --- a/community/dmd/PKGBUILD +++ b/community/dmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92352 2013-06-04 07:05:16Z svenstaro $ +# $Id: PKGBUILD 92844 2013-06-17 00:23:34Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,8 +7,8 @@ pkgname=('dmd' 'libphobos' 'dtools') pkgbase=dmd -pkgver=2.063.1 -pkgrel=2 +pkgver=2.063.2 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.dlang.org" makedepends=('git') diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index 38ad424ef..10ca7b8ae 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87417 2013-03-31 19:18:21Z stephane $ +# $Id: PKGBUILD 92874 2013-06-17 12:07:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=gpsdrive pkgver=2.11 _pkgver=20120928 -pkgrel=17 +pkgrel=18 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64") url="http://www.gpsdrive.de/" @@ -20,21 +20,23 @@ install="gpsdrive.install" source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz") md5sums=('bc53792529788b81c291a32d628a4850') -build() { +prepare() { cd "$srcdir" - # python2 fix for file in $(find . -name '*.py' -print); do sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done - - rm -rf build - mkdir build - cd build - sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp + sed -i 's|datasource_cache::instance()->|datasource_cache::instance().|' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp +} + +build() { + cd "$srcdir" + + mkdir -p build + cd build export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ diff --git a/community/kshutdown/PKGBUILD b/community/kshutdown/PKGBUILD index e54f7026d..6c1e0c174 100644 --- a/community/kshutdown/PKGBUILD +++ b/community/kshutdown/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88132 2013-04-12 11:15:41Z arodseth $ +# $Id: PKGBUILD 92861 2013-06-17 10:22:44Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kshutdown -pkgver=3.0beta7 +pkgver=3.0beta8 pkgrel=1 pkgdesc='Shutdown Utility for KDE' arch=('x86_64' 'i686') @@ -13,7 +13,7 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') install="$pkgname.install" source=("http://downloads.sourceforge.net/$pkgname/$pkgname-source-$pkgver.zip") -sha256sums=('5de50c532a9fd2e65706376232b7e641b05bbc5f54677f06d27bce0e0f9825ac') +sha256sums=('5b4242777943574e0607687af6e6270ff655f16612c8b35400a872de35c2a4bd') build() { mkdir "$srcdir/build" diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD index c79891f42..70f242c4c 100644 --- a/community/linphone/PKGBUILD +++ b/community/linphone/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 70981 2012-05-21 11:17:27Z spupykin $ +# $Id: PKGBUILD 92850 2013-06-17 06:54:08Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=linphone -pkgver=3.5.2 -pkgrel=4 +pkgver=3.6.0 +pkgrel=1 pkgdesc="A Voice-over-IP phone" arch=('i686' 'x86_64') url="http://www.linphone.org/index.php/eng" license=('GPL') depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4l-utils' - 'libpulse' 'libxv' 'mediastreamer' 'ortp' 'libzrtpcpp' 'bcg729') + 'libpulse' 'libxv' 'mediastreamer' 'ortp' 'libzrtpcpp' 'bcg729' 'libsoup') makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite') optdepends=('pulseaudio') options=('!libtool' '!emptydirs') -source=("http://download-mirror.savannah.gnu.org/releases/linphone/3.5.x/sources/linphone-$pkgver.tar.gz") -md5sums=('4be6e940372dba1f6793aef849c1ff0d') +source=("http://download-mirror.savannah.gnu.org/releases/${pkgname}/3.6.x/sources/${pkgname}-$pkgver.tar.gz") +md5sums=('9a101854bb16034b39096e18c80ceb78') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver export PKG_CONFIG=/usr/bin/pkg-config unset SGML_CATALOG_FILES ./configure --prefix=/usr --disable-static --enable-ipv6 --enable-video \ @@ -31,6 +31,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index 5a8903418..f5199755e 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91966 2013-05-30 13:14:21Z spupykin $ +# $Id: PKGBUILD 92863 2013-06-17 10:56:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> # Contributor: Daniel Micay <danielmicay@gmail.com> @@ -8,7 +8,7 @@ pkgname=lxc pkgver=0.9.0 epoch=1 -pkgrel=3 +pkgrel=4 pkgdesc="Linux Containers" arch=('i686' 'x86_64') url="http://lxc.sourceforge.net/" @@ -30,7 +30,7 @@ build() { ./configure \ --prefix=/usr \ --localstatedir=/var \ - --libexecdir=/usr/bin \ + --libexecdir=/usr/lib \ --sysconfdir=/etc \ --disable-apparmor \ --enable-seccomp diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 0acad8808..49d5d831b 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90058 2013-05-06 19:38:17Z foutrelis $ +# $Id: PKGBUILD 92865 2013-06-17 10:56:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik -pkgver=2.1.0 -pkgrel=10 +pkgver=2.2.0 +pkgrel=1 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64') url="http://mapnik.org/" @@ -23,16 +23,11 @@ optdepends=('libxslt: Web Map Service' 'mod_wsgi2: Web Map Service') makedepends=('scons' 'boost') install="mapnik.install" -source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2" - "mapnik-2.1.0-compile-fix-for-boost-1.53.patch") -md5sums=('d580c558a957444873bec9e24526b0a0' - 'fb456216b052742319428f65f1c979d6') +source=("https://github.com/mapnik/mapnik/archive/v$pkgver.tar.gz") +md5sums=('b837931c7f1a4dc630d8550d3e635036') build() { - cd "$srcdir/$pkgname-v$pkgver" - - # https://github.com/mapnik/mapnik/issues/1658 - patch -Np1 -i "$srcdir/mapnik-2.1.0-compile-fix-for-boost-1.53.patch" + cd "$srcdir/$pkgname-$pkgver" sed -i 's|lib64|lib|g' SConstruct sed -i 's|python|python2|' \ @@ -46,6 +41,6 @@ build() { } package(){ - cd "$srcdir/$pkgname-v$pkgver" + cd "$srcdir/$pkgname-$pkgver" scons install } diff --git a/community/qt-recordmydesktop/PKGBUILD b/community/qt-recordmydesktop/PKGBUILD index 9fcf83dc3..c8704f45e 100644 --- a/community/qt-recordmydesktop/PKGBUILD +++ b/community/qt-recordmydesktop/PKGBUILD @@ -1,18 +1,26 @@ +# $Id: PKGBUILD 92883 2013-06-17 19:06:55Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > -# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> +# Contributor: Daniel J Griffiths <griffithsdj@archlinux.us> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Marc poiroud <marci1 AT archlinux.fr> pkgname=qt-recordmydesktop pkgver=0.3.8 -pkgrel=5 +pkgrel=6 pkgdesc="Qt4 frontend for recordMyDesktop" arch=('i686' 'x86_64') url="http://recordmydesktop.sourceforge.net" license=('GPL') -depends=('recordmydesktop>=0.3.8.1' 'python2-qt') -source=(http://downloads.sourceforge.net/sourceforge/recordmydesktop/${pkgname}-${pkgver}.tar.gz) -md5sums=('bf1525740755615ae172ae27fef68fb5') +depends=('recordmydesktop>=0.3.8.1' 'python2-pyqt') +source=(http://downloads.sourceforge.net/sourceforge/recordmydesktop/${pkgname}-${pkgver}.tar.gz + 'pyqt4.patch') +md5sums=('bf1525740755615ae172ae27fef68fb5' + 'ce1dc05b512df883d0e204eac2b1eaaf') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/pyqt4.patch +} build() { cd ${pkgname}-${pkgver} diff --git a/community/qt-recordmydesktop/pyqt4.patch b/community/qt-recordmydesktop/pyqt4.patch new file mode 100644 index 000000000..5c082e446 --- /dev/null +++ b/community/qt-recordmydesktop/pyqt4.patch @@ -0,0 +1,11 @@ +--- qt-recordmydesktop-0.3.8/configure.ac~ 2013-06-17 18:22:27.747345090 +0000 ++++ qt-recordmydesktop-0.3.8/configure.ac 2013-06-17 18:22:46.937225955 +0000 +@@ -43,7 +43,7 @@ + + export PYTHONPATH=$PYTHONPATH + +-export PYQT4_VERSION=`python -c 'import PyQt4; from PyQt4 import QtCore; print QtCore.PYQT_VERSION_STR' 2>>/dev/null ` ++export PYQT4_VERSION=`python2 -c 'import PyQt4; from PyQt4 import QtCore; print QtCore.PYQT_VERSION_STR' 2>>/dev/null ` + if test x$PYQT4_VERSION == x; then + AC_MSG_ERROR(You need PyQt4>=4.1 installed to procceed); + fi diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index 65b5ef7f5..4e2d23b81 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92637 2013-06-10 09:42:34Z spupykin $ +# $Id: PKGBUILD 92869 2013-06-17 10:57:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat pkgver=10.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64') url="http://pagesperso-orange.fr/sebastien.godard/" @@ -16,9 +16,17 @@ options=(zipman) backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz - sysstat.service) + sysstat.service + lib64-fix.patch) md5sums=('909135c84e36d780d501274e7450f924' - '12ba479c606620193e8b7c6e982d5088') + '12ba479c606620193e8b7c6e982d5088' + '7ffa6bf990609d85367070f71b40a34b') + +prepare() { + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/lib64-fix.patch + autoreconf +} build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/sysstat/lib64-fix.patch b/community/sysstat/lib64-fix.patch new file mode 100644 index 000000000..6e4ca7c12 --- /dev/null +++ b/community/sysstat/lib64-fix.patch @@ -0,0 +1,17 @@ +diff -wbBur sysstat-10.1.6.q/configure.in sysstat-10.1.6/configure.in +--- sysstat-10.1.6.q/configure.in 2013-04-21 18:20:32.000000000 +0400 ++++ sysstat-10.1.6/configure.in 2013-06-17 14:45:41.733915298 +0400 +@@ -207,13 +207,6 @@ + fi + + SADC_DIR=$AuxPrefix/lib +-if test -d $AuxPrefix/lib64; then +- # Look for lm (long mode) flag to know if CPU is 64 bit +- grep " lm " /proc/cpuinfo >/dev/null 2>&1 +- if test $? = 0; then +- SADC_DIR=$AuxPrefix/lib64 +- fi +-fi + + AC_MSG_CHECKING(sadc directory) + AC_ARG_VAR([sa_lib_dir],[sadc directory]) diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 4065e7daf..46e0b30f6 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90741 2013-05-13 14:42:50Z spupykin $ +# $Id: PKGBUILD 92871 2013-06-17 10:57:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=13 +pkgrel=18 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" diff --git a/extra/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD index 5b7f43f8c..2a42dea3a 100755 --- a/extra/efibootmgr/PKGBUILD +++ b/core/efibootmgr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187100 2013-06-03 19:31:59Z tpowa $ +# $Id: PKGBUILD 188652 2013-06-17 10:52:28Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor : Murtuza Akhtari <inxsible at gmail dot com> # Contributor: Keshav P R <skodabenz at rocketmail dot com> diff --git a/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch b/core/efibootmgr/efibootmgr-tilt_slashes-func.patch index ce857bb3c..ce857bb3c 100644 --- a/extra/efibootmgr/efibootmgr-tilt_slashes-func.patch +++ b/core/efibootmgr/efibootmgr-tilt_slashes-func.patch diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 5f0fb0ce7..d9d0394c1 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 185564 2013-05-15 07:54:44Z heftig $ +# $Id: PKGBUILD 188618 2013-06-17 01:21:11Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=glib2 pkgname=(glib2 glib2-docs) -pkgver=2.36.2 -pkgrel=1 +pkgver=2.36.3 +pkgrel=2 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz revert-warn-glib-compile-schemas.patch) -sha256sums=('5ea98451fb57d0ba523a1e836545f0a919b498863056fdd9da69d148c1347f80' +sha256sums=('5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { cd glib-$pkgver - # workaround FS#34630 https://bugzilla.gnome.org/show_bug.cgi?id=698716 - export CFLAGS+=" -Wall" - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index 18a040887..b5d0d6622 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $ +# $Id: PKGBUILD 188637 2013-06-17 09:36:56Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=(i686 x86_64) @@ -15,7 +15,7 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v url="http://www.anjuta.org/" options=('!libtool' '!emptydirs') source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95') +sha256sums=('eea77ef71dd156a2296cbaf02a343f3b9099aec245ee7d1495f002ff2f81fa17') build() { cd "$pkgbase-$pkgver" diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD index 9bbdd6368..4183162fb 100644 --- a/extra/dbus-python/PKGBUILD +++ b/extra/dbus-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168991 2012-10-17 10:19:14Z allan $ +# $Id: PKGBUILD 188645 2013-06-17 09:56:29Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=dbus-python pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') -pkgver=1.1.1 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Python bindings for DBUS" arch=('i686' 'x86_64') license=('GPL' 'LGPL') @@ -12,7 +12,7 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings" makedepends=('docutils' 'dbus-glib' 'python' 'python2') options=('!libtool') source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz) -md5sums=('742c7432ad0f7c3f98291d58fa2e35dc') +md5sums=('b09cd2d1a057cc432ce944de3fc06bf7') build() { cd "${srcdir}" diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 9201400ce..704daff21 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 187887 2013-06-07 21:04:48Z heftig $ +# $Id: PKGBUILD 188610 2013-06-16 23:56:02Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop pkgver=3.8.3 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="Library with common API for various GNOME modules" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config' 'iso-codes') -makedepends=('intltool' 'gobject-introspection' 'itstool') +arch=(i686 x86_64) +license=(GPL LGPL) +depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes) +makedepends=(intltool gobject-introspection itstool) url="http://www.gnome.org" -groups=('gnome') -options=('!libtool') +groups=(gnome) +options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) sha256sums=('c9c8d1888e28cb30e466be46909efe640fb3cb348909cae2664489508790e5a2') build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-desktop \ - --with-gnome-distributor="Arch Linux" + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static \ + --with-gnome-distributor="Arch Linux" make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD index a892a6114..468b3f8be 100644 --- a/extra/gphoto2/PKGBUILD +++ b/extra/gphoto2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179980 2013-03-13 20:13:10Z jgc $ +# $Id: PKGBUILD 188639 2013-06-17 09:41:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=gphoto2 -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 pkgdesc="A digital camera download and access program." arch=(i686 x86_64) @@ -11,7 +11,7 @@ url="http://www.gphoto.org" license=('GPL' 'LGPL') depends=('libgphoto2' 'popt' 'readline') source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2) -md5sums=('03cda6d5b7c647ac4c90d0081f2cb7c7') +md5sums=('7e59e7e06a58febd35820978c6e48287') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index caa72c9ba..00fefb855 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,7 +4,7 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0.8 +pkgver=0.9.0.9 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2") -sha256sums=('c3b4458faf3bea75c5952ffe20b55724246c9cc3cd751a484b3e1832240d3ad6') +sha256sums=('d6a7603df2a48e14cef4c44dcaee5773d7ed3cad5b8780307b356df4639231ca') build() { mkdir build diff --git a/extra/kscreen/PKGBUILD b/extra/kscreen/PKGBUILD new file mode 100644 index 000000000..ff0a6b34a --- /dev/null +++ b/extra/kscreen/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 188671 2013-06-17 16:27:52Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> + +pkgname=kscreen +pkgver=1.0 +pkgrel=1 +pkgdesc="KDE's screen management software" +arch=('i686' 'x86_64') +url='https://projects.kde.org/kscreen' +license=('GPL' 'LGPL') +depends=('kdebase-runtime' "libkscreen>=${pkgver}") +makedepends=('cmake' 'automoc4') +install=$pkgname.install +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('52a0fef238ed71c08ee853f55e53f8bb') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/extra/kscreen/kscreen.install b/extra/kscreen/kscreen.install new file mode 100644 index 000000000..53d2ba911 --- /dev/null +++ b/extra/kscreen/kscreen.install @@ -0,0 +1,16 @@ +post_install() { + printf "==> To enable KSceen, run in a terminal:\n" + printf " qdbus org.kde.kded /kded org.kde.kded.unloadModule randrmonitor\n" + printf " qdbus org.kde.kded /kded org.kde.kded.setModuleAutoloading randrmonitor false\n" + printf " qdbus org.kde.kded /kded org.kde.kded.loadModule kscreen\n" + + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/extra/libkeybinder3/PKGBUILD b/extra/libkeybinder3/PKGBUILD index 6f6964d20..55bbfa97b 100644 --- a/extra/libkeybinder3/PKGBUILD +++ b/extra/libkeybinder3/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 188580 2013-06-16 02:22:32Z eric $ +# $Id: PKGBUILD 188643 2013-06-17 09:55:24Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: speps <speps at aur dot archlinux dot org> pkgname=libkeybinder3 pkgver=0.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="A library for registering global keyboard shortcuts" arch=('i686' 'x86_64') url="http://kaizer.se/wiki/keybinder/" license=('MIT') depends=('gtk3') -makedepends=('gtk-doc') +makedepends=('gtk-doc' 'gobject-introspection') optdepends=('lua-lgi: lua bindings') options=('!libtool') source=(http://archive.ubuntu.com/ubuntu/pool/universe/k/keybinder-3.0/keybinder-3.0_${pkgver}.orig.tar.gz) diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD new file mode 100644 index 000000000..00d84af60 --- /dev/null +++ b/extra/libkscreen/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 188666 2013-06-17 16:24:53Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> + +pkgname=libkscreen +pkgver=1.0 +pkgrel=1 +pkgdesc="KDE's screen management library" +arch=('i686' 'x86_64') +url='https://projects.kde.org/libkscreen' +license=('GPL') +depends=('kdelibs' 'qjson') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('83dc38c6ff5d33f253f7d9a43bc986cb') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/core/libusb-compat/PKGBUILD b/extra/libusb-compat/PKGBUILD index 3e6e5f39b..40d88dfe7 100644 --- a/core/libusb-compat/PKGBUILD +++ b/extra/libusb-compat/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169660 2012-10-25 08:23:04Z eric $ -# Maintainer: +# $Id: PKGBUILD 188653 2013-06-17 10:53:32Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: arjan <arjan@archlinux.org> pkgname=libusb-compat -pkgver=0.1.4 -pkgrel=2 +pkgver=0.1.5 +pkgrel=1 pkgdesc="Library to enable user space application programs to communicate with USB devices" arch=('i686' 'x86_64') url="http://libusb.sourceforge.net/" @@ -13,7 +13,6 @@ license=('LGPL') depends=('libusb' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2ca521fffadd0c28fdf174e6ec73865b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,3 +25,4 @@ package() { make DESTDIR="${pkgdir}" install } +md5sums=('2780b6a758a1e2c2943bdbf7faf740e4') diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index 970692754..c7932fe24 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183320 2013-04-21 22:06:39Z heftig $ +# $Id: PKGBUILD 188611 2013-06-16 23:57:46Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=nautilus pkgname=(nautilus libnautilus-extension) -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME file manager" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=(intltool gobject-introspection python) url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) -sha256sums=('9827e939aa0621041754379ca0227ceb82877785f013dd5935ecc4b791314892') +sha256sums=('dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75') build() { cd $pkgbase-$pkgver diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt4/PKGBUILD index 6ed0b16ad..1bdd0f4a8 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt4/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 183563 2013-04-23 13:10:46Z andrea $ +# $Id: PKGBUILD 188683 2013-06-17 19:05:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> -pkgbase=pyqt -pkgname=('pyqt-common' 'pyqt' 'python2-pyqt') -pkgver=4.10.1 -pkgrel=1 +pkgbase=pyqt4 +pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4') +pkgver=4.10.2 +pkgrel=2 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa' 'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus') -source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('e5973c4ec0b0469f329bc00209d2ad9c') +source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz") +md5sums=('9257e12fec9b1b21e5a0d76d455d1691') build() { cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} @@ -43,9 +43,12 @@ build() { make } -package_pyqt-common(){ - pkgdesc="Common PyQt files shared between pyqt and python2-pyqt" +package_pyqt4-common(){ + pkgdesc="Common PyQt files shared between python-pyqt4 and python2-pyqt4" depends=('qt4') + replaces=('pyqt-common') + conflicts=('pyqt-common') + provides=("pyqt-common=${pkgver}") cd PyQt-x11-gpl-${pkgver} make -C pyrcc DESTDIR="${pkgdir}" install @@ -54,12 +57,15 @@ package_pyqt-common(){ install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } -package_pyqt(){ +package_python-pyqt4(){ pkgdesc="A set of Python 3.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common') + depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt4-common') optdepends=('phonon: enable audio and video in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') + replaces=('pyqt') + conflicts=('pyqt') + provides=("pyqt=${pkgver}") cd PyQt-x11-gpl-${pkgver} # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR @@ -70,24 +76,26 @@ package_pyqt(){ rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } -package_python2-pyqt(){ +package_python2-pyqt4(){ pkgdesc="A set of Python 2.x bindings for the Qt toolkit" - depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common') + depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt4-common') optdepends=('phonon: enable audio and video in PyQt applications' 'python2-opengl: enable OpenGL 3D graphics in PyQt applications' 'qscintilla: QScintilla API' 'qt-assistant-compat: add PyQt online help in Qt Assistant') - provides=('python2-qt') + replaces=('python2-pyqt') + conflicts=('python2-pyqt') + provides=("python2-pyqt=${pkgver}") cd Py2Qt-x11-gpl-${pkgver} # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install - # Fix conflicts with pyqt + # Fix conflicts with python-pyqt4 mv "${pkgdir}"/usr/bin/{,python2-}pyuic4 - # Provided by pyqt + # Provided by python-pyqt4 rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4} - rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpythonplugin.so + rm "${pkgdir}"/usr/lib/qt4/plugins/designer/libpyqt4.so rm "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api } diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 53a7449a8..e8e899005 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179562 2013-03-07 08:19:46Z andrea $ +# $Id: PKGBUILD 188680 2013-06-17 18:07:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla' 'python-qscintilla-common') -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=1 license=('GPL') arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" makedepends=('python2-pyqt' 'pyqt' 'chrpath') source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('da8939b5679a075e30c6632e54dc5abf' +md5sums=('0fbfb06078f206a241a62c94861cce21' 'eae1bd23117c5f1f7f172a1c1e11f600') build() { @@ -21,21 +21,21 @@ build() { patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff" cd Qt4Qt5 - qmake qscintilla.pro + qmake-qt4 qscintilla.pro make cd ../designer-Qt4Qt5 - qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 + qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 make cd ../ cp -rf Python Python2 cd Python - python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c + python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make cd ../Python2 - python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c + python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 make } diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD index d932b06ab..a7cb7ced6 100644 --- a/extra/sg3_utils/PKGBUILD +++ b/extra/sg3_utils/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 180167 2013-03-18 13:36:39Z jgc $ +#$Id: PKGBUILD 188647 2013-06-17 10:00:27Z jgc $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=sg3_utils -pkgver=1.35 +pkgver=1.36 pkgrel=1 pkgdesc="Generic SCSI utilities" arch=(i686 x86_64) @@ -10,8 +10,8 @@ url="http://sg.danny.cz/sg/sg3_utils.html" license=('GPL' 'custom:BSD') depends=('glibc') options=('!libtool') -source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz) -md5sums=('55c32fb95a5b3907687b023f392fbd3c') +source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz) +md5sums=('5d1846c8aa03a2e39e1368cf05bf1cfd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 7dd7e4693..69b7828ca 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 183493 2013-04-22 09:21:24Z andrea $ +# $Id: PKGBUILD 188678 2013-06-17 18:06:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.14.6 +pkgver=4.14.7 pkgrel=1 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('d6493b9f0a7911566545f694327314c4') +md5sums=('f5c8001f16ecffd711708de0e07d542f') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 2dc83cb5e..a00a75488 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=1 +pkgrel=2 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 6d97546ee..8a42d10c3 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -10,7 +10,7 @@ _pkgname=calibre pkgname=calibre-libre pkgver=0.9.35 -pkgrel=1 +pkgrel=1.1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 8ea0dbba7..00f097046 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $ +# $Id: PKGBUILD 92742 2013-06-14 12:09:51Z tpowa $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install -pkgrel=45 +pkgrel=46 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 00dcb7f7a..b9088a4ff 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92066 2013-05-31 05:55:37Z fyan $ +# $Id: PKGBUILD 92845 2013-06-17 02:16:42Z 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.1 +pkgver=3.2.2 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 } -sha512sums=('2a311fd93aaf489849021e34de7cb7fb9343d7ff2d05edbdcf86a0346e616384e57d2367173d0a60916d1154b78f4a1a2a458b3047a96e81ee5b757274068a5e' - '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' - '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') +md5sums=('bea9522b2b008ffe4eeb0c7156753899' + 'fe4a243fabe24608f5c05e40f0f118f6' + 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/libre/grub/20_memtest86+ b/libre/grub/20_memtest86+ deleted file mode 100644 index 1d3096f6b..000000000 --- a/libre/grub/20_memtest86+ +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh -e -######################################################## -# This script generates a memtest86+ entry on grub.cfg # -# if memtest is installed on the system. # -######################################################## - -prefix="/usr" -exec_prefix="${prefix}" - -datarootdir="/usr/share" -datadir="${datarootdir}" - -. "${datadir}/grub/grub-mkconfig_lib" - -MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" -CLASS="--class memtest86 --class gnu --class tool" - -if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then - # image exists, create menu entry - echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2 - cat << EOF -menuentry "Memory test (memtest86+)" $CLASS { -EOF - prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /" - cat << EOF - linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE` -} -EOF -fi diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+ new file mode 100644 index 000000000..064922ef2 --- /dev/null +++ b/libre/grub/60_memtest86+ @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +######################################################## +# This script generates a memtest86+ entry on grub.cfg # +# if memtest is installed on the system. # +######################################################## + +prefix="/usr" +exec_prefix="${prefix}" + +datarootdir="/usr/share" +datadir="${datarootdir}" + +. "${datadir}/grub/grub-mkconfig_lib" + +MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" +CLASS="--class memtest86 --class gnu --class tool" + +if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then + ## image exists, create menu entry + echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2 + _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})" + _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})" + _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})" + cat << EOF +if [ "${grub_platform}" == "pc" ]; then + menuentry "Memory Tester (memtest86+)" ${CLASS} { + search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID} + linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86} + } +fi +EOF +fi diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 3969d713a..50a8eda05 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -9,11 +9,11 @@ _grub_915_ver=9 pkgname=('grub-common' 'grub-bios' 'grub-efi-i386') pkgbase=grub pkgver=2.00 -pkgrel=2 +pkgrel=4 url="https://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') -makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' +makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" @@ -23,10 +23,21 @@ source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" 'parabola_grub_mkconfig_fixes.patch' 'grub.default' 'grub.cfg' - '20_memtest86+' + '60_memtest86+' 'grub_bzr_export.sh' '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch' 'grub-2.00-fix-docs.patch') +md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' + '704ea9f250b6137f05fa0197fd07053a' + '77f7d5f8ce395663cd7fff4d37099957' + 'a80e2b1d3bab778c3b6117d5a698992f' + 'c776aaf2cc35488a7c531b59e697470d' + '52d374e0194e3f2e39ff7c92ecd58a6c' + '255eafb440b8c285b20431366c2d2d27' + 'ae9f1bc1a579ddc88b9b2e8b46f7e1d5' + 'f343ed2340ebc86c427873641bb72419' + 'ab751d1d8cd3fd47e5ee24d71ecc31ed' + '342dd18472a24e5fd252458b24f39a29') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" @@ -181,7 +192,9 @@ build() { package_grub-common() { pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files (Parabola rebranded)" - depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse') + depends=('sh' 'xz' 'gettext' 'device-mapper') + optdepends=('freetype2: for grub-mkfont usage' + 'fuse: for grub-mount usage') conflicts=('grub-legacy' 'grub') replaces=('grub2-common') provides=('grub2-common') @@ -197,7 +210,7 @@ package_grub-common() { echo ## install extra /etc/grub.d/ files - install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" + install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+" ## install /etc/default/grub (used by grub-mkconfig) install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" @@ -253,14 +266,3 @@ package_grub-efi-i386() { rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true } -md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91' - '704ea9f250b6137f05fa0197fd07053a' - '77f7d5f8ce395663cd7fff4d37099957' - 'a80e2b1d3bab778c3b6117d5a698992f' - 'c776aaf2cc35488a7c531b59e697470d' - '52d374e0194e3f2e39ff7c92ecd58a6c' - '255eafb440b8c285b20431366c2d2d27' - '9b6358d3de5c4bb95a041ab7c44a21ec' - 'f343ed2340ebc86c427873641bb72419' - 'ab751d1d8cd3fd47e5ee24d71ecc31ed' - '342dd18472a24e5fd252458b24f39a29') diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index bbed77b21..156525eef 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187912 2013-06-08 06:38:24Z tpowa $ +# $Id: PKGBUILD 188624 2013-06-17 06:29:16Z tpowa $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -6,7 +6,7 @@ # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname="gummiboot" -pkgver="32" +pkgver="33" pkgrel="1" pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)" url="http://freedesktop.org/wiki/Software/gummiboot" diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 4dd77dda3..4a9a91be1 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $ +# $Id: PKGBUILD 92750 2013-06-14 12:14:28Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=22 +pkgrel=23 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules index e4de1dca7..39ae3a4ec 100644 --- a/libre/vhba-module-libre/60-vhba.rules +++ b/libre/vhba-module-libre/60-vhba.rules @@ -1,13 +1 @@ -ACTION=="remove", GOTO="vhba_end" -KERNEL!="vhba_ctl", GOTO="vhba_end" - -NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" - -TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess" -TAG+="udev-acl" -GOTO="vhba_end" - -LABEL="vhba_uaccess" -TAG+="uaccess" - -LABEL="vhba_end" +ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess" diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index b1f8c6ffb..1016c0185 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $ +# $Id: PKGBUILD 92752 2013-06-14 12:15:10Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -6,9 +6,9 @@ _pkgname=vhba-module pkgname=vhba-module-libre -pkgver=20120422 +pkgver=20130607 _extramodules=extramodules-3.9-LIBRE -pkgrel=25 +pkgrel=2 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" @@ -22,28 +22,24 @@ conflicts=('vhba-module') provides=("vhba-module=$pkgver") source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2" '60-vhba.rules') -md5sums=('d97372da1d270d1605742b2995fb6678' - 'b5e82d0160e7a181219b67c1794d5c27') +md5sums=('92a681e4665aa85a8335d00395a61697' + '4dc37dc348b5a2c83585829bde790dcc') build() { - cd "$srcdir/$_pkgname-$pkgver" - + cd $_pkgname-$pkgver _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - make KDIR=/usr/lib/modules/$_kernver/build } package() { - cd "$srcdir/$_pkgname-$pkgver" - - install -Dm644 vhba.ko \ - "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" - - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ - "$startdir/vhba-module.install" - - install -Dm644 "$srcdir/60-vhba.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" + cd $_pkgname-$pkgver + install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" + install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" + + cd $startdir + cp -f $install ${install}.pkg + true && install=${install}.pkg + sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install } # vim:set ts=2 sw=2 et: diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install index 88b96f7b4..793cffd8d 100644 --- a/libre/vhba-module-libre/vhba-module.install +++ b/libre/vhba-module-libre/vhba-module.install @@ -1,6 +1,7 @@ +EXTRAMODULES= + _updatemod() { echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.9-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD index 3a2e54dd8..f5a900b88 100644 --- a/pcr/ganglia/PKGBUILD +++ b/pcr/ganglia/PKGBUILD @@ -2,80 +2,69 @@ pkgname=ganglia pkgver=3.6.0 -pkgrel=1 -pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids' -arch=( - i686 - x86_64 - mips64el -) -url=http://$pkgname.sourceforge.net/ -license=BSD -depends=( - apr - confuse - #php-embed - python2 - rrdtool -) -options=(!libtool) -optdepends="$pkgname-web: Web frontend" -backup=( - etc/gmond.conf - etc/gmetad.conf -) -source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz -sha512sums=2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394 +pkgrel=2 +pkgdesc="A scalable distributed monitoring system for high-performance computing systems such as clusters and Grids." +arch=('i686' 'x86_64') +url="http://ganglia.sourceforge.net/" +license=('BSD') +depends=('apr' 'confuse' 'expat' 'pcre' 'python2' 'rrdtool') +options=('!libtool') +optdepends=('ganglia-web: Web frontend') +install='ganglia.install' +backup=('etc/ganglia/gmond.conf' + 'etc/ganglia/gmetad.conf') +source=("http://downloads.sourceforge.net/ganglia/$pkgname-$pkgver.tar.gz" + 'gmond.rc' + 'gmetad.rc' + 'gmond.service' + 'gmetad.service' + 'ganglia.install' + 'uid.patch') +md5sums=('05926bb18c22af508a3718a90b2e9a2c' + '12b2f85361754eaf6fc5129cccec7034' + '292b74a5a09a0bd9a4a658823adc034b' + '25ebc6cf829089a9f330ad177befdd45' + 'd795bca44fb73cdf8a2b550e27c50b6f' + 'acad2273520f13f4d0638ca9109ca2d8' + 'a0d469dd2b9ec40dbe20377c51ca904c') prepare() { - cd $srcdir/$pkgname-$pkgver - #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure - touch gm{on,eta}d/gm{on,eta}d.service.in + cd "$srcdir/$pkgname-$pkgver" - echo '[Unit]' > gmetad/gmetad.service.in - echo 'Description=Ganglia Meta Daemon' >> gmetad/gmetad.service.in - echo 'After=network.target' >> gmetad/gmetad.service.in - echo '' >> gmetad/gmetad.service.in - echo '[Service]' >> gmetad/gmetad.service.in - echo 'Type=forking' >> gmetad/gmetad.service.in - echo 'PIDFile=/run/gmetad.pid' >> gmetad/gmetad.service.in - echo 'ExecStart=/usr/sbin/gmetad -p /run/gmetad.pid' >> gmetad/gmetad.service.in - echo '' >> gmetad/gmetad.service.in - echo '[Install]' >> gmetad/gmetad.service.in - echo 'WantedBy=multi-user.target' >> gmetad/gmetad.service.in + for patch in $srcdir/*.patch; do + msg2 "Applying $(basename $patch)" + patch -Np1 -i $patch + done - echo '[Unit]' > gmond/gmond.service.in - echo 'Description=Ganglia Monitor Daemon' >> gmond/gmond.service.in - echo 'After=network.target' >> gmond/gmond.service.in - echo '' >> gmond/gmond.service.in - echo '[Service]' >> gmond/gmond.service.in - echo 'ExecStart=/usr/sbin/gmond -f -p /run/gmond.pid' >> gmond/gmond.service.in - echo '' >> gmond/gmond.service.in - echo '[Install]' >> gmond/gmond.service.in - echo 'WantedBy=multi-user.target' >> gmond/gmond.service.in + # FIXME: Hopefully this will soon no longer be required? + msg2 "Copying systemd units into source as workaround for bug" + cp "$srcdir/gmond.service" "$srcdir/$pkgname-$pkgver/gmond/gmond.service.in" + cp "$srcdir/gmetad.service" "$srcdir/$pkgname-$pkgver/gmetad/gmetad.service.in" } build() { - cd $srcdir/$pkgname-$pkgver - setarch $CARCH ./configure --prefix=/usr\ - --enable-gexec\ - --enable-perl\ - --enable-status\ - --disable-static\ - --libdir=/usr/lib\ - --with-gmetad\ - --with-python=/usr/bin/python2\ - --sysconfdir=/etc -# --enable-php\ - setarch $CARCH make + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc/ganglia \ + --with-gmetad --enable-gexec --enable-status \ + --with-python=/usr/bin/python2 + make } package() { - cd $srcdir/$pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # Move sbin to bin + mv "$pkgdir/usr/sbin"/* "$pkgdir/usr/bin/" + rmdir "$pkgdir/usr/sbin" - mkdir $pkgdir/usr/lib/$pkgname/python_modules + mkdir -p "$pkgdir/usr/lib/ganglia/python_modules" - msg2 'Generating default gmond.conf' - ./gmond/gmond --default_config > $pkgdir/etc/gmond.conf + msg2 "Generating default gmond.conf" + ./gmond/gmond --default_config > "$pkgdir/etc/ganglia/gmond.conf" + + # Uncomment these lines to install the rc files + #install -m 755 -D "$srcdir/gmond.rc" "$pkgdir/etc/rc.d/gmond" + #install -m 755 -D "$srcdir/gmetad.rc" "$pkgdir/etc/rc.d/gmetad" } diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install new file mode 100644 index 000000000..60b7f102d --- /dev/null +++ b/pcr/ganglia/ganglia.install @@ -0,0 +1,32 @@ +# arg 1: the new package version +post_install() { + post_upgrade +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "`vercmp $2 3.4.0`" -lt 0 ]; then + echo "WARNING: The ganglia package has been split. If you use the" \ + "web frontend, you'll need to install the ganglia-web package as well." + fi + id ganglia >& /dev/null + if [ $? -ne 0 ]; then + echo "Adding ganglia system group and user..." + groupadd -r ganglia + useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia + # Lock the account to prevent logging in + passwd -l ganglia &> /dev/null + fi + install -d -o ganglia -g ganglia /var/lib/ganglia + install -d -o ganglia -g ganglia /var/lib/ganglia/rrds +} + +# arg 1: the old package version +post_remove() { + echo "Removing ganglia system group and user..." + userdel ganglia + echo "NOTE: Please remove /var/lib/ganglia manually if it is no longer required." +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ganglia/gmetad.rc b/pcr/ganglia/gmetad.rc new file mode 100644 index 000000000..823062fac --- /dev/null +++ b/pcr/ganglia/gmetad.rc @@ -0,0 +1,62 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + PID=`pidof -o %PPID /usr/sbin/gmetad` +} +get_pid + +case "$1" in + start) + stat_busy "Starting Ganglia gmetad" + [ -z "$PID" ] && /usr/sbin/gmetad + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + sleep 1 + get_pid + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $PID > /var/run/gmetad.pid + add_daemon gmetad + stat_done + fi + fi + ;; + + stop) + stat_busy "Stopping Ganglia gmetad" + [ ! -z "$PID" ] && kill $PID > /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + sleep 1 + get_pid + if [ $? -gt 0 ]; then + rm /var/run/gmetad.pid + rm_daemon gmetad + stat_done + else + stat_fail + exit 1 + fi + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 {start|stop|restart}" + exit 1 + +esac diff --git a/pcr/ganglia/gmetad.service b/pcr/ganglia/gmetad.service new file mode 100644 index 000000000..a721c2b4c --- /dev/null +++ b/pcr/ganglia/gmetad.service @@ -0,0 +1,11 @@ +[Unit] +Description=Ganglia Meta Daemon +After=network.target + +[Service] +Type=forking +PIDFile=/run/gmetad.pid +ExecStart=/usr/bin/gmetad -p /run/gmetad.pid + +[Install] +WantedBy=multi-user.target diff --git a/pcr/ganglia/gmond.rc b/pcr/ganglia/gmond.rc new file mode 100644 index 000000000..c465c4dbf --- /dev/null +++ b/pcr/ganglia/gmond.rc @@ -0,0 +1,62 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + PID=`pidof -o %PPID /usr/sbin/gmond` +} +get_pid + +case "$1" in + start) + stat_busy "Starting Ganglia gmond" + [ -z "$PID" ] && /usr/sbin/gmond + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + sleep 1 + get_pid + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo $PID > /var/run/gmond.pid + add_daemon gmond + stat_done + fi + fi + ;; + + stop) + stat_busy "Stopping Ganglia gmond" + [ ! -z "$PID" ] && kill $PID > /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + sleep 1 + get_pid + if [ $? -gt 0 ]; then + rm /var/run/gmond.pid + rm_daemon gmond + stat_done + else + stat_fail + exit 1 + fi + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 {start|stop|restart}" + exit 1 + +esac diff --git a/pcr/ganglia/gmond.service b/pcr/ganglia/gmond.service new file mode 100644 index 000000000..5cbd31629 --- /dev/null +++ b/pcr/ganglia/gmond.service @@ -0,0 +1,9 @@ +[Unit] +Description=Ganglia Monitor Daemon +After=network.target + +[Service] +ExecStart=/usr/bin/gmond -f -p /run/gmond.pid + +[Install] +WantedBy=multi-user.target diff --git a/pcr/ganglia/uid.patch b/pcr/ganglia/uid.patch new file mode 100644 index 000000000..165549033 --- /dev/null +++ b/pcr/ganglia/uid.patch @@ -0,0 +1,33 @@ +--- a/configure ++++ b/configure +@@ -1588,7 +1588,7 @@ Optional Features: + + --enable-debug turn on debugging output and compile options + --enable-gexec turn on gexec support (platform-specific) +- --enable-setuid=USER turn on setuid support (default setuid=nobody) ++ --enable-setuid=USER turn on setuid support (default setuid=ganglia) + --enable-setgid=GROUP turn on setgid support (default setgid=no) + --enable-pedantic turn on pedantic mode during compile + --enable-memcheck turn on memory checking during compile +@@ -11152,7 +11152,7 @@ $as_echo "#define SUPPORT_GEXEC 0" >>confdefs.h + fi + + +-setuid_user=nobody ++setuid_user=ganglia + # Check whether --enable-setuid was given. + if test "${enable_setuid+set}" = set; then : + enableval=$enable_setuid; if test x"$enableval" != xno; then no_setuid=0; setuid_user=$enableval ; fi +--- a/gmetad/gmetad.conf.in ++++ b/gmetad/gmetad.conf.in +@@ -99,8 +99,8 @@ data_source "my cluster" localhost + #------------------------------------------------------------------------------- + # User gmetad will setuid to (defaults to "nobody") + # default: "nobody" +-# setuid_username "nobody" +-# ++setuid_username "ganglia" ++ + #------------------------------------------------------------------------------- + # Umask to apply to created rrd files and grid directory structure + # default: 0 (files are public) diff --git a/pcr/gitflow/PKGBUILD b/pcr/gitflow/PKGBUILD new file mode 100644 index 000000000..b62042262 --- /dev/null +++ b/pcr/gitflow/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Techlive Zheng <techlivezheng@gmail.com> +# Contributor: Ernie Brodeur <ebrodeur@ujami.net> + +pkgname=gitflow +pkgver=0.4.1 +pkgrel=3 +pkgdesc='Extend git with the Gitflow branching model.' +arch=('any') +url='https://github.com/nvie/gitflow' +license=('BSD') +depends=('git' 'shflags') +source=("https://github.com/nvie/gitflow/tarball/${pkgver}/${pkgname}-${pkgver}.tar.gz") +md5sums=('adc7a52512052938a9b42ac8bd7d91dd') + +prepare() { + cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*` + sed -i "s:\$GITFLOW_DIR/gitflow-shFlags:/usr/share/lib/shflags/shflags.sh:" git-flow +} + +package() { + cd $srcdir/`find . -maxdepth 1 -type d -name nvie\*` + + install -d -m 0755 $pkgdir/usr/lib/git-core + install -m 0755 git-flow $pkgdir/usr/lib/git-core + install -m 0644 git-flow-feature \ + git-flow-hotfix \ + git-flow-release \ + git-flow-support \ + git-flow-version \ + git-flow-init \ + gitflow-common \ + $pkgdir/usr/lib/git-core/ +} +md5sums=('adc7a52512052938a9b42ac8bd7d91dd') diff --git a/pcr/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD index 074205e79..7b20fc288 100644 --- a/pcr/ruby-headers/PKGBUILD +++ b/pcr/ruby-headers/PKGBUILD @@ -3,8 +3,8 @@ pkgname=ruby-headers _pkgname=ruby -pkgver=2.0.0_p0 -_pkgver=2.0.0-p0 +pkgver=2.0.0_p195 +_pkgver=2.0.0-p195 pkgrel=1 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug." arch=('any') @@ -23,4 +23,4 @@ package() { install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a') +md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6') diff --git a/pcr/shflags/PKGBUILD b/pcr/shflags/PKGBUILD new file mode 100644 index 000000000..c4f3ee7a9 --- /dev/null +++ b/pcr/shflags/PKGBUILD @@ -0,0 +1,31 @@ +#Maintainer max_meyer +pkgname=shflags +pkgver=1.0.3 +pkgrel=1 +pkgdesc="Shell Flags (shFlags) is a library written to greatly simplify the handling of command-line flags" +arch=(any) +url="http://code.google.com/p/shflags/" +license=('LGPL') +depends=(sh) +provides=(shflags) +optdepends=(bash zsh dash ksh) +options=(zipman) +source=(http://shflags.googlecode.com/files/$pkgname-$pkgver.tgz{,.sig}) +md5sums=('b4d7133696ec05b71b27d8df5e278f0f' + 'SKIP') + +package() { + src="$srcdir/$pkgname-$pkgver/src/" + dst="$pkgdir/usr/share/lib/shflags" + mkdir -p "$dst" + + if [ -f "$src/shflags" ]; then + cp "$src/shflags" "$dst/shflags.sh" + else + msg "Warning shflags not found" + exit 1 + fi + +} + +# vim:set ts=2 sw=2 et: |