diff options
author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-06-20 15:57:08 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-06-20 15:57:08 -0300 |
commit | 3bdbfb0d0e7c56a94ef8b0f5cda1a87ee6ceb72c (patch) | |
tree | 93ef4ed4433cc10bd93ea7df7d783c6dcf6e6ba4 | |
parent | 8b8d7e159368a5b54e9c9e20927c3347caae6e26 (diff) | |
parent | 2ea4fee3286319c7f08c4ef0862be2e156f2a860 (diff) |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r-- | pcr/corosync/PKGBUILD | 15 | ||||
-rw-r--r-- | pcr/ganglia/PKGBUILD | 112 | ||||
-rw-r--r-- | pcr/ganglia/ganglia.install | 28 | ||||
-rw-r--r-- | pcr/ganglia/gmetad.rc | 62 | ||||
-rw-r--r-- | pcr/ganglia/gmetad.service.in (renamed from pcr/ganglia/gmetad.service) | 0 | ||||
-rw-r--r-- | pcr/ganglia/gmond.rc | 62 | ||||
-rw-r--r-- | pcr/ganglia/gmond.service.in (renamed from pcr/ganglia/gmond.service) | 0 | ||||
-rw-r--r-- | pcr/ganglia/uid.patch | 33 | ||||
-rw-r--r-- | pcr/libqb/PKGBUILD | 7 | ||||
-rw-r--r-- | pcr/spacenav-daemon/PKGBUILD | 44 | ||||
-rw-r--r-- | pcr/spacenav-daemon/spacenav.service (renamed from pcr/spacenavd/spacenav.service) | 0 | ||||
-rw-r--r-- | pcr/spacenav-daemon/spnavrc | 8 | ||||
-rw-r--r-- | pcr/spacenavd/PKGBUILD | 30 | ||||
-rw-r--r-- | pcr/spacenavd/spacenavd | 38 |
14 files changed, 135 insertions, 304 deletions
diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD index e176cb112..7bd87f791 100644 --- a/pcr/corosync/PKGBUILD +++ b/pcr/corosync/PKGBUILD @@ -3,7 +3,7 @@ pkgname=corosync _pkgflag=lts pkgver=2.3.0 -pkgrel=2 +pkgrel=4 pkgdesc='Cluster engine for nodal communication systems with additional features for implementing high availability within applications' arch=( i686 @@ -13,21 +13,23 @@ arch=( url=http://www.$pkgname.org license=BSD depends=( + dbus libqb libstatgrab net-snmp nss ) -makedepends=doxygen +optdepends='augeas: for config files' +makedepends=( + augeas + doxygen + graphviz +) conflicts=$pkgname-$_pkgflag options=(!libtool) source=http://$pkgname.org/download/$pkgname-$pkgver.tar.gz sha512sums=cd2ff5182f0d4827a10d50a211aa073e3d544bf7b98f9b0c834243c0d2cd5446d7950021cb1a21fc16f4951c8b2acf4b75c0b0c72d815b7d67dcba71623d2e51 -prepare() { - cd $srcdir/$pkgname-$pkgver -} - build() { cd $srcdir/$pkgname-$pkgver setarch $CARCH ./configure --prefix=/usr\ @@ -49,6 +51,7 @@ build() { --enable-xmlconf\ --libdir=/usr/lib\ --localstatedir=/var\ + --sbindir=/usr/bin\ --sysconfdir=/etc\ --with-initddir=/etc/rc.d\ --with-systemddir=/usr/lib/systemd/system diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD index f5a900b88..9fed072aa 100644 --- a/pcr/ganglia/PKGBUILD +++ b/pcr/ganglia/PKGBUILD @@ -2,69 +2,77 @@ pkgname=ganglia pkgver=3.6.0 -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') +pkgrel=4 +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 +) +install=$pkgname.install +options=(!libtool) +optdepends="$pkgname-web: Web frontend" +backup=( + etc/ganglia/gmond.conf + etc/ganglia/gmetad.conf +) +source=( + http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + gmetad.service.in + gmond.service.in +) +sha512sums=( + 2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394 + a42b7dcb7dd81961cc9fef114f8c4c352375ed931dc2ae77b1139c6fde7cbd6544fcb5fe286ff6066ef37696821dc9f6fcab7c6b14d3ebaa59e895219cd89836 + c362a383cbbaf5540b5d698f664534bd0da73bcc5ee4336c468844ed17706e05450f35e4f6cf969f1d2495c462883873b30e4575b9ee8ded74ab475afda608bb +) prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver - for patch in $srcdir/*.patch; do - msg2 "Applying $(basename $patch)" - patch -Np1 -i $patch - done + #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure + + sed -i 's|nobody|ganglia|' gmetad/gmetad.conf.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" + msg2 'Copying systemd units into source as workaround for bug' + cp $srcdir/gmetad.service.in gmetad/gmetad.service.in + cp $srcdir/gmond.service.in gmond/gmond.service.in } build() { - 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 + cd $srcdir/$pkgname-$pkgver + setarch $CARCH ./configure --prefix=/usr\ + --enable-gexec\ + --enable-perl\ + --enable-setuid=ganglia\ + --enable-status\ + --disable-static\ + --libdir=/usr/lib\ + --with-gmetad\ + --with-python=/usr/bin/python2\ + --sbindir=/usr/bin\ + --sysconfdir=/etc/ganglia +# --enable-php\ +# --enable-setgid=ganglia\ + setarch $CARCH make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - # Move sbin to bin - mv "$pkgdir/usr/sbin"/* "$pkgdir/usr/bin/" - rmdir "$pkgdir/usr/sbin" + cd $srcdir/$pkgname-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install - mkdir -p "$pkgdir/usr/lib/ganglia/python_modules" + mkdir $pkgdir/usr/lib/$pkgname/python_modules - 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" + msg2 'Generating default gmond.conf' + ./gmond/gmond --default_config > $pkgdir/etc/ganglia/gmond.conf } diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install index 60b7f102d..6a196af1f 100644 --- a/pcr/ganglia/ganglia.install +++ b/pcr/ganglia/ganglia.install @@ -1,32 +1,24 @@ -# 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" \ + 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 + 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 + install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds +} + +post_upgrade() { + post_install } -# arg 1: the old package version post_remove() { - echo "Removing ganglia system group and user..." + echo 'Removing ganglia system group and user...' userdel ganglia - echo "NOTE: Please remove /var/lib/ganglia manually if it is no longer required." + 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 deleted file mode 100644 index 823062fac..000000000 --- a/pcr/ganglia/gmetad.rc +++ /dev/null @@ -1,62 +0,0 @@ -#!/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.in index a721c2b4c..a721c2b4c 100644 --- a/pcr/ganglia/gmetad.service +++ b/pcr/ganglia/gmetad.service.in diff --git a/pcr/ganglia/gmond.rc b/pcr/ganglia/gmond.rc deleted file mode 100644 index c465c4dbf..000000000 --- a/pcr/ganglia/gmond.rc +++ /dev/null @@ -1,62 +0,0 @@ -#!/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.in index 5cbd31629..5cbd31629 100644 --- a/pcr/ganglia/gmond.service +++ b/pcr/ganglia/gmond.service.in diff --git a/pcr/ganglia/uid.patch b/pcr/ganglia/uid.patch deleted file mode 100644 index 165549033..000000000 --- a/pcr/ganglia/uid.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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/libqb/PKGBUILD b/pcr/libqb/PKGBUILD index 6b9d7d9d7..85b3ff082 100644 --- a/pcr/libqb/PKGBUILD +++ b/pcr/libqb/PKGBUILD @@ -2,7 +2,7 @@ pkgname=libqb pkgver=0.14.4 -pkgrel=2 +pkgrel=3 pkgdesc='Library with the primary purpose of providing high performance client server reusable features' arch=( i686 @@ -14,7 +14,7 @@ makedepends=( splint ) license=LGPL2.1 -options=!libtool +options=(!libtool) url=https://github.com/asalkeld/$pkgname/wiki source=https://github.com/asalkeld/$pkgname/archive/v$pkgver.tar.gz sha512sums=1377e38d5547eb516b255c0aa0972e858048053202692d7d5ef1c746d79dee2c78eddc29e797215376990f2c776b34261f765858606b59d77f9218fb0dac5977 @@ -25,7 +25,8 @@ build() { setarch $CARCH ./configure --prefix=/usr\ --disable-fatal-warnings\ --disable-static\ - --libdir=/usr/lib + --libdir=/usr/lib\ + --sbindir=/usr/bin setarch $CARCH make } diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD new file mode 100644 index 000000000..0f06af418 --- /dev/null +++ b/pcr/spacenav-daemon/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=spacenav-daemon +_pkgname=${pkgname%-daemon} +pkgver=0.5 +pkgrel=3 +pkgdesc="Free Spacenav Daemon is a free alternative to the 3Dconnexion device driver, for their 3D input devices." +arch=( + i686 + x86_64 + mips64el +) +conflicts=${_pkgname}d +replaces=${_pkgname}d +url=http://$_pkgname.sourceforge.net/ +license=GPL2 +depends=libx11 +backup=etc/spnavrc +source=( + http://downloads.sourceforge.net/$_pkgname/${_pkgname}d-$pkgver.tar.gz + $_pkgname.service + spnavrc +) +sha512sums=( + 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2 + 61397646f7dda23b2cef5168f23e21c017801f156374c7fab7bae650cd3cee0ea173d3cb65ae2f0be580aa399999a388df2d804b9d00c01db430c820dbc60160 + f97866a77fe9e6bee8df046ad62576a1cdbba26323218cd6336de66e0898f403bb33da12666fe75f00bb9bf078f895e8e7de360196079f83082fc94a23f71728 +) + +build() { + cd $srcdir/${_pkgname}d-$pkgver + ./configure --prefix=$pkgdir/usr + make +} + +package() { + cd $srcdir/${_pkgname}d-$pkgver + make DESTDIR=$pkgdir install + + install -Dm644 $srcdir/$_pkgname.service $pkgdir/usr/lib/systemd/system/$_pkgname.service + install -Dm644 $srcdir/spnavrc $pkgdir/etc/spnavrc +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/spacenavd/spacenav.service b/pcr/spacenav-daemon/spacenav.service index 30e8019e9..30e8019e9 100644 --- a/pcr/spacenavd/spacenav.service +++ b/pcr/spacenav-daemon/spacenav.service diff --git a/pcr/spacenav-daemon/spnavrc b/pcr/spacenav-daemon/spnavrc new file mode 100644 index 000000000..7d19ae03b --- /dev/null +++ b/pcr/spacenav-daemon/spnavrc @@ -0,0 +1,8 @@ +# sensitivity is multiplied with every motion (1.0 normal). +sensitivity = 1.000 + +# dead zone; any motion less than this number, is discarded as noise. +dead-zone = 2 + +# disable led +led = 0 diff --git a/pcr/spacenavd/PKGBUILD b/pcr/spacenavd/PKGBUILD deleted file mode 100644 index cf8a43c32..000000000 --- a/pcr/spacenavd/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Jan Hambrecht <jaham at gmx dot net> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -pkgname=spacenavd -pkgver=0.5 -pkgrel=2 -pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)." -arch=('i686' 'x86_64' 'mips64el') -url="http://spacenav.sourceforge.net/" -license=('GPL') -depends=('libx11') -backup=('etc/spnavrc') -source=(http://downloads.sourceforge.net/spacenav/$pkgname-$pkgver.tar.gz - spacenavd - spacenav.service) - -md5sums=('0bb21da5315bd376aa508157a9455aaa' - '27a739300d4de07920879af2d2bdd47f' - 'b404c8021254636b861651a7a48d17a6') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=$pkgdir/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 - # for initscript service - install -D -m755 $srcdir/spacenavd $pkgdir/etc/rc.d/spacenavd || return 1 - # for systend service - install -D -m755 $srcdir/spacenav.service $pkgdir/usr/lib/systemd/system/spacenav.service || return 1 -} diff --git a/pcr/spacenavd/spacenavd b/pcr/spacenavd/spacenavd deleted file mode 100644 index 61946197c..000000000 --- a/pcr/spacenavd/spacenavd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON=/usr/bin/spacenavd - -PID=`pidof -o %PPID $DAEMON` -case "$1" in - start) - stat_busy "Starting Spacenavigator Daemon" - [ -z "$PID" ] && $DAEMON - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon spacenavd - stat_done - fi - ;; - stop) - stat_busy "Stopping Spacenavigator Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon spacenavd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 |