diff options
Diffstat (limited to 'community')
209 files changed, 705 insertions, 3867 deletions
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 617aba45f..6d3363a02 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86363 2013-03-15 22:40:51Z seblu $ +# $Id: PKGBUILD 90487 2013-05-12 22:11:59Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: xduugu # Contributor: Manolis Tzanidakis @@ -6,7 +6,7 @@ pkgname=acpid pkgver=2.0.18 -pkgrel=2 +pkgrel=3 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') url='http://tedfelix.com/linux/acpid-netlink.html' @@ -22,13 +22,13 @@ source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.ta 'handler.sh') md5sums=('7c4ff315ae960c54eea303c71c49f152' 'd11700eb136e0489835ddaf977a7905b' - '10290f69491206cd104654e5b900b661' + '79cc7a9dceacdeffd51f070c2ba5f023' '2d37b98d6e74bab815604b8b48c6cfd4' '47f44ff5f02685dce8bcdab8568f0c38') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } @@ -46,7 +46,7 @@ package() { install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service" # fix acpid rights - chmod 755 "$pkgdir/usr/sbin/acpid" + chmod 755 "$pkgdir/usr/bin/acpid" } # vim:set ts=2 sw=2 et: diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service index e4ddacdbe..022f72a71 100644 --- a/community/acpid/acpid.service +++ b/community/acpid/acpid.service @@ -3,7 +3,7 @@ Description=ACPI event daemon Requires=acpid.socket [Service] -ExecStart=/usr/sbin/acpid -f +ExecStart=/usr/bin/acpid -f [Install] WantedBy=multi-user.target diff --git a/community/apcupsd/PKGBUILD b/community/apcupsd/PKGBUILD index 26336fecb..1d03de73d 100644 --- a/community/apcupsd/PKGBUILD +++ b/community/apcupsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75815 2012-09-01 11:15:13Z mtorromeo $ +# $Id: PKGBUILD 90645 2013-05-13 14:17:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Todd Musall <tmusall@comcast.net> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=apcupsd pkgver=3.14.10 -pkgrel=3 +pkgrel=4 pkgdesc="Power mangement and controlling most of APC's UPS models" arch=(i686 x86_64) url="http://www.apcupsd.org" @@ -14,17 +14,19 @@ depends=('gcc-libs') optdepends=('gd: for CGI' 'gconf: for frontend' 'gtk2: for frontend') -makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2') +makedepends=('pkgconfig' 'gd' 'gconf' 'gtk2' 'systemd-sysvcompat') backup=(etc/apcupsd/apcupsd.conf etc/apcupsd/hosts.conf etc/apcupsd/multimon.conf) source=(http://downloads.sourceforge.net/apcupsd/$pkgname-$pkgver.tar.gz - apcupsd apcupsd.service apcupsd-tmpfiles.conf) sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032' 'cae38570847f5d90f38a0634e502f35d6c76a9c928b3a322e3fe1a097fbbc04a' 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d' 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55') +sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032' + 'fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d' + 'b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55') build() { cd "$srcdir/$pkgname-$pkgver" @@ -39,7 +41,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/apcupsd" "$pkgdir/etc/rc.d/apcupsd" install -Dm644 "$srcdir/apcupsd.service" "$pkgdir/usr/lib/systemd/system/apcupsd.service" install -Dm644 "$srcdir/apcupsd-tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/apcupsd.conf" chmod 755 "$pkgdir"/sbin/* diff --git a/community/apcupsd/apcupsd b/community/apcupsd/apcupsd deleted file mode 100644 index 8a96e9b07..000000000 --- a/community/apcupsd/apcupsd +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /sbin/apcupsd` -case "$1" in - start) - stat_busy "Starting APCUPSD Daemon" - [ -z "$PID" ] && /sbin/apcupsd -f /etc/apcupsd/apcupsd.conf - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon apcupsd - stat_done - fi - ;; - stop) - stat_busy "Stopping APCUPSD Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon apcupsd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - status) - /sbin/apcaccess status - ;; - *) - echo "usage: $0 {start|stop|restart|status}" -esac -exit 0 diff --git a/community/arptables/PKGBUILD b/community/arptables/PKGBUILD index c87d046bd..edc4066e8 100644 --- a/community/arptables/PKGBUILD +++ b/community/arptables/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82774 2013-01-24 11:14:44Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 90489 2013-05-12 22:21:54Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Michal Soltys <soltys@ziu.info> pkgname=arptables pkgver=0.0.4 -pkgrel=1 +pkgrel=2 pkgdesc='ARP filtering utility' arch=('i686' 'x86_64') url='http://ebtables.sourceforge.net/' @@ -30,7 +30,7 @@ package() { DESTDIR="$pkgdir" \ PREFIX=/usr \ LIBDIR=/usr/lib/arptables \ - BINDIR=/usr/sbin \ + BINDIR=/usr/bin \ MANDIR=/usr/share/man \ INITDIR=/etc/rc.d \ SYSCONFIGDIR=/etc diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD index 83dd65c14..6af77b344 100644 --- a/community/atop/PKGBUILD +++ b/community/atop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79031 2012-10-29 09:19:40Z spupykin $ +# $Id: PKGBUILD 90647 2013-05-13 14:18:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: John Gerritse <john.gerritse@gmail.com> pkgname=atop pkgver=2.0_1 -pkgrel=1 +pkgrel=2 pkgdesc="A system and process level monitor." arch=(i686 x86_64) url="http://www.atoptool.nl/" @@ -25,6 +25,6 @@ package() { rm -f $pkgdir/etc/cron.d/atop install -dm0755 $pkgdir/etc/cron.daily mv $pkgdir/etc/atop/atop.daily $pkgdir/etc/cron.daily/atop - sed -i 's|/etc/atop/atop.daily|/etc/cron.daily/atop|g' $pkgdir/etc/rc.d/atop install -Dm0644 atop.service $pkgdir/usr/lib/systemd/system/atop.service + rm -rf $pkgdir/etc/rc.d } diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index 2214d82be..3a4f77974 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90166 2013-05-07 19:14:15Z seblu $ +# $Id: PKGBUILD 90491 2013-05-12 22:34:17Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=bird pkgname=('bird' 'bird6') pkgver=1.3.10 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://bird.network.cz/' license=('GPL2') @@ -13,8 +13,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" 'bird.service' 'bird6.service') md5sums=('553c331b32bca9e926519cb2f67d68be' - 'ccd12c994501e28a7256a6a2a17154b2' - '631eea3de9be2f259aaf91f281d2d39a') + '01360e3b71ff2ed2223e87a3176e0659' + '13a5f066a39f82136291f1461458651c') build() { cd $pkgbase-$pkgver @@ -24,12 +24,12 @@ build() { # build ipv4 bird cd _build4 - ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ../configure make # build ipv6 bird cd ../_build6 - ../configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-ipv6 + ../configure --enable-ipv6 make } @@ -38,7 +38,12 @@ package_bird () { backup=('etc/bird.conf') cd $pkgbase-$pkgver/_build4 - make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install + make \ + prefix="$pkgdir/usr" \ + sysconfdir="$pkgdir/etc" \ + sbindir="$pkgdir/usr/bin" \ + localstatedir="$pkgdir/var" \ + install make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs # no /var inside pkg @@ -53,7 +58,12 @@ package_bird6 () { backup=('etc/bird6.conf') cd $pkgbase-$pkgver/_build6 - make prefix="$pkgdir/usr" sysconfdir="$pkgdir/etc" localstatedir="$pkgdir/var" install + make \ + prefix="$pkgdir/usr" \ + sysconfdir="$pkgdir/etc" \ + sbindir="$pkgdir/usr/bin" \ + localstatedir="$pkgdir/var" \ + install make docdir="$pkgdir/usr/share/doc/$pkgname" install-docs # no /var inside pkg diff --git a/community/bird/bird.service b/community/bird/bird.service index f40068646..faee0d845 100644 --- a/community/bird/bird.service +++ b/community/bird/bird.service @@ -3,9 +3,9 @@ Description=BIRD routing daemon After=network.target [Service] -ExecStart=/usr/sbin/bird -d -ExecReload=/usr/sbin/birdc configure -ExecStop=/usr/sbin/birdc down +ExecStart=/usr/bin/bird -d +ExecReload=/usr/bin/birdc configure +ExecStop=/usr/bin/birdc down [Install] WantedBy=multi-user.target diff --git a/community/bird/bird6.service b/community/bird/bird6.service index 284c75842..8eb1dd505 100644 --- a/community/bird/bird6.service +++ b/community/bird/bird6.service @@ -3,9 +3,9 @@ Description=BIRD IPv6 routing daemon After=network.target [Service] -ExecStart=/usr/sbin/bird6 -d -ExecReload=/usr/sbin/bird6c configure -ExecStop=/usr/sbin/bird6c down +ExecStart=/usr/bin/bird6 -d +ExecReload=/usr/bin/bird6c configure +ExecStop=/usr/bin/bird6c down [Install] WantedBy=multi-user.target diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD index 3f394f00b..6788553f2 100644 --- a/community/conntrack-tools/PKGBUILD +++ b/community/conntrack-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85682 2013-03-04 23:03:57Z seblu $ +# $Id: PKGBUILD 90503 2013-05-12 23:32:26Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Valere Monseur <valere_monseur@hotmail.com> # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> @@ -6,7 +6,7 @@ pkgname=conntrack-tools pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/conntrack-tools' @@ -22,7 +22,7 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b '01-config-file-path.patch') install=$pkgname.install sha1sums=('6fda497ef1ebd5e4afe01830ece072d2df2fe50f' - '2c205952a447ee0a6a7fc99bddeea1bfaf1b8034' + 'ab888d59b98b673709d2d89554c668e2bea0cb86' 'e7607a9ac14dd839f3716ac68d46e19ab26ef112') build() { @@ -30,7 +30,7 @@ build() { for i in "$srcdir"/*.patch; do patch -p1 -i "$i" done - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } diff --git a/community/conntrack-tools/conntrackd.service b/community/conntrack-tools/conntrackd.service index 25a113785..250c558cc 100644 --- a/community/conntrack-tools/conntrackd.service +++ b/community/conntrack-tools/conntrackd.service @@ -2,7 +2,7 @@ Description=Conntrack Daemon [Service] -ExecStart=/usr/sbin/conntrackd +ExecStart=/usr/bin/conntrackd [Install] WantedBy=multi-user.target diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index d60f4c930..92a5e7393 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,31 +1,29 @@ -# $Id: PKGBUILD 88676 2013-04-21 22:16:43Z heftig $ +# $Id: PKGBUILD 90750 2013-05-13 15:02:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64') url="http://couchdb.apache.org" license=('APACHE') -depends=('icu' 'erlang' 'js' 'openssl' 'curl') +depends=('icu' 'erlang' 'js185' 'openssl' 'curl') install=couchdb.install options=('!libtool') backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') -source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} +source=("http://www.sai.msu.su/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} "couchdb.service" "couchdb.tmpfiles" - "couchdb.rc" "build-fix.patch") md5sums=('6cc49c22fadcf7d8cf8aa34dae71b203' - '1346a657d7552188f6cc9e0cdc231b05' + 'SKIP' '8914a7ffc6745f94106d96206709acb4' '1e254ebe32eeb061be64193bafa35dbf' - 'a75ee9b310a950eea13b07274b7a0669' '71afe48505dfc07ba2091786b4650fa2') build() { @@ -44,8 +42,6 @@ package() { install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb - install -Dm755 $srcdir/couchdb.rc $pkgdir/etc/rc.d/couchdb - rm -rf $pkgdir/etc/default/ $pkgdir/var/run install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service diff --git a/community/couchdb/couchdb.rc b/community/couchdb/couchdb.rc deleted file mode 100644 index af41c6460..000000000 --- a/community/couchdb/couchdb.rc +++ /dev/null @@ -1,157 +0,0 @@ -#!/bin/bash -. /etc/rc.conf -. /etc/rc.d/functions - -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -### BEGIN INIT INFO -# Provides: couchdb -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Apache CouchDB init script -# Description: Apache CouchDB init script for the database server. -### END INIT INFO - -SCRIPT_OK=0 -SCRIPT_ERROR=1 - -DESCRIPTION="database server" -NAME=couchdb -SCRIPT_NAME=`basename $0` -COUCHDB=/usr/bin/couchdb -CONFIGURATION_FILE=/etc/conf.d/couchdb -RUN_DIR=/var/run/couchdb -LSB_LIBRARY=/lib/lsb/init-functions - -if test ! -x $COUCHDB; then - exit $SCRIPT_ERROR -fi - -if test -r $CONFIGURATION_FILE; then - . $CONFIGURATION_FILE -fi - -log_daemon_msg () { - stat_busy $@ -} - -log_end_msg () { - if test "$1" != "0"; then - stat_fail - else - stat_done - fi - return $1 -} - -if test -r $LSB_LIBRARY; then - . $LSB_LIBRARY -fi - -run_command () { - command="$1" - if test -n "$COUCHDB_OPTIONS"; then - command="$command $COUCHDB_OPTIONS" - fi - if test -n "$COUCHDB_USER"; then - if su $COUCHDB_USER -s /bin/bash -c "$command"; then - return $SCRIPT_OK - else - return $SCRIPT_ERROR - fi - else - if $command; then - return $SCRIPT_OK - else - return $SCRIPT_ERROR - fi - fi -} - -start_couchdb () { - # Start Apache CouchDB as a background process. - - mkdir -p "$RUN_DIR" - chown -R $COUCHDB_USER "$RUN_DIR" - command="$COUCHDB -b" - if test -n "$COUCHDB_STDOUT_FILE"; then - command="$command -o $COUCHDB_STDOUT_FILE" - fi - if test -n "$COUCHDB_STDERR_FILE"; then - command="$command -e $COUCHDB_STDERR_FILE" - fi - if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then - command="$command -r $COUCHDB_RESPAWN_TIMEOUT" - fi - run_command "$command" > /dev/null -} - -stop_couchdb () { - # Stop the running Apache CouchDB process. - - run_command "$COUCHDB -d" > /dev/null -} - -display_status () { - # Display the status of the running Apache CouchDB process. - - run_command "$COUCHDB -s" -} - -parse_script_option_list () { - # Parse arguments passed to the script and take appropriate action. - - case "$1" in - start) - log_daemon_msg "Starting $DESCRIPTION" $NAME - if start_couchdb; then - log_end_msg $SCRIPT_OK - else - log_end_msg $SCRIPT_ERROR - fi - ;; - stop) - log_daemon_msg "Stopping $DESCRIPTION" $NAME - if stop_couchdb; then - log_end_msg $SCRIPT_OK - else - log_end_msg $SCRIPT_ERROR - fi - ;; - restart) - log_daemon_msg "Restarting $DESCRIPTION" $NAME - if stop_couchdb; then - if start_couchdb; then - log_end_msg $SCRIPT_OK - else - log_end_msg $SCRIPT_ERROR - fi - else - log_end_msg $SCRIPT_ERROR - fi - ;; - status) - display_status - ;; - *) - cat << EOF >&2 -Usage: $SCRIPT_NAME {start|stop|restart|status} -EOF - exit $SCRIPT_ERROR - ;; - esac -} - -parse_script_option_list $@ diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index e8033246c..b6fe2544f 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79500 2012-11-06 11:18:47Z spupykin $ +# $Id: PKGBUILD 90649 2013-05-13 14:18:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante pkgver=1.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64) @@ -14,10 +14,8 @@ backup=('etc/socks.conf' 'etc/sockd.conf') options=('!libtool') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz - sockd.rc sockd.service) md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd' - '5110dfd78a2b38fff27a886ee88b58a6' 'ceb86b5bd97f7e3ceff28c6e6172a25b') build() { @@ -30,13 +28,9 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - # Config files mkdir -p ${pkgdir}/etc/conf.d cp example/{socks,sockd}.conf ${pkgdir}/etc - # License install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - # rc-script - install -D -m755 ${srcdir}/sockd.rc ${pkgdir}/etc/rc.d/sockd echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf install -Dm0644 $srcdir/sockd.service $pkgdir/usr/lib/systemd/system/sockd.service } diff --git a/community/dante/sockd.rc b/community/dante/sockd.rc deleted file mode 100644 index 00ea5a7d4..000000000 --- a/community/dante/sockd.rc +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -daemon_name=sockd - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sockd.conf - -get_pid() { - cat /var/run/sockd.pid 2>/dev/null -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name $SOCKD_OPTS 1>/dev/null 2>/dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD index 289faa868..4ef26c787 100644 --- a/community/darkstat/PKGBUILD +++ b/community/darkstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86508 2013-03-18 12:20:58Z spupykin $ +# $Id: PKGBUILD 90651 2013-05-13 14:19:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=darkstat pkgver=3.0.715 -pkgrel=8 +pkgrel=9 pkgdesc="Network statistics gatherer (packet sniffer)" url="http://dmr.ath.cx/net/darkstat/" license=("GPL") @@ -11,12 +11,10 @@ arch=(i686 x86_64) depends=('libpcap' 'zlib' 'gcc-libs') backup=('etc/conf.d/darkstat.conf') source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2 - darkstat darkstat.service darkstat.conf) install=darkstat.install md5sums=('5b7abc7538dcd8e30667dac150e81d77' - '1021f95fabe16cfab4c95f6264d535e5' '91dd1cf9d01c2b37896f01b4570b5521' 'aa9a9effd1e8f08860afcd6439fc94c5') @@ -29,9 +27,6 @@ build() { package() { cd $srcdir/darkstat-$pkgver make DESTDIR=$pkgdir install - - # darkstat script - install -D -m755 "$srcdir"/darkstat "$pkgdir"/etc/rc.d/darkstat install -D -m644 "$srcdir"/darkstat.conf "$pkgdir"/etc/conf.d/darkstat.conf install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/darkstat/darkstat b/community/darkstat/darkstat deleted file mode 100755 index 26df1761a..000000000 --- a/community/darkstat/darkstat +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -daemon_bin="/usr/sbin/darkstat" -daemon_name=$(basename $daemon_bin) -daemon_chroot=/var/$daemon_name -daemon_database="$daemon_name.dat" -daemon_output="$daemon_chroot/$daemon_name.out" -PIDF="$daemon_chroot/$daemon_name.pid" - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $PIDF ] && rm -f $PIDF - # RUN - $daemon_bin --user "$daemon_name" --chroot "$daemon_chroot" \ - --import "$daemon_database" \ - --export "$daemon_database" \ - --pidfile "$(basename $PIDF)" \ - -i "$DARKSTAT_IFACE" \ - $DARKSTAT_ARGS \ - 2>&1 | tee "$daemon_output" - ret=$? - grep -q error "$daemon_output" 2>/dev/null - error_output=$? - rm -f "$daemon_output" - # - if [ $ret -gt 0 -o $error_output -eq 0 ] ; then - stat_fail - rm -f "$PIDF" - exit 1 - else - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $PIDF &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index f41aead36..284566097 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84536 2013-02-19 15:03:09Z spupykin $ +# $Id: PKGBUILD 90653 2013-05-13 14:20:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.2 -pkgrel=9 +pkgrel=10 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -15,14 +15,11 @@ optdepends=('libldap: for LDAP authentication' url="http://www.dbmail.org" license=('GPL') options=('!libtool' 'zipman') -backup=(etc/conf.d/dbmail - etc/xinetd.d/dbmail-imapd +backup=(etc/xinetd.d/dbmail-imapd etc/xinetd.d/dbmail-pop3d etc/xinetd.d/dbmail-lmtpd etc/xinetd.d/dbmail-timsieved) source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz - dbmail.conf.d - dbmail.rc.d dbmail.tmpfiles dbmail-imapd.service dbmail-lmtpd.service @@ -33,8 +30,6 @@ source=(http://www.dbmail.org/download/3.0/dbmail-${pkgver/_/-}.tar.gz dbmail-pop3d.xinetd dbmail-timsieved.xinetd) md5sums=('eb32235abffdf967253ee9d004e0e4a9' - 'e7f72bc360decdb2475266391ad12329' - '30774513fb016b9da08e9cf6f2a0b8e7' 'c4b5793c5422b62a675d4c66ff7e9300' '84efa46eaac66057c4eb131d9bc27fa8' '19560277f6a56d1f3f2fdb02315dcf0f' @@ -59,8 +54,6 @@ package() { mkdir $pkgdir/etc install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample - install -Dm644 ../dbmail.conf.d $pkgdir/etc/conf.d/dbmail - install -Dm755 ../dbmail.rc.d $pkgdir/etc/rc.d/dbmail mkdir $pkgdir/usr/share/dbmail cp -r sql/* $pkgdir/usr/share/dbmail/ cp dbmail.schema $pkgdir/usr/share/dbmail/ diff --git a/community/dbmail/dbmail.conf.d b/community/dbmail/dbmail.conf.d deleted file mode 100644 index 73309a4a2..000000000 --- a/community/dbmail/dbmail.conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Parameters to be passed to dbmail -# -# -# Select the service you want started with dbmail -# -# Available options : -# dbmail-imapd dbmail-pop3d dbmail-lmtpd dbmail-timsieved -# -DBMAIL_DAEMONS="dbmail-imapd" diff --git a/community/dbmail/dbmail.rc.d b/community/dbmail/dbmail.rc.d deleted file mode 100644 index f849b1679..000000000 --- a/community/dbmail/dbmail.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/dbmail ] && . /etc/conf.d/dbmail - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - mkdir -p /var/run/dbmail - chown -R nobody:nobody /var/run/dbmail - for daemon in $DBMAIL_DAEMONS; do - stat_busy "Starting DbMail ${daemon}" - /usr/sbin/${daemon} -p /var/run/dbmail/${daemon}.pid - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - done - add_daemon dbmail - ;; - stop) - for daemon in $DBMAIL_DAEMONS; do - stat_busy "Stopping DbMail ${daemon}" - pid=$(cat /var/run/dbmail/${daemon}.pid 2>/dev/null) - kill $pid 2>/dev/null - while kill -0 "$pid" 2>/dev/null; do - sleep 0.2 - done - stat_done - done - rm_daemon dbmail - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac - -exit 0 diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD index 128ebd9e2..80c5edc16 100644 --- a/community/dictd/PKGBUILD +++ b/community/dictd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79187 2012-10-31 09:43:20Z spupykin $ +# $Id: PKGBUILD 90655 2013-05-13 14:21:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> pkgname=dictd pkgver=1.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Online dictionary client and server" url="http://sourceforge.net/projects/dict/" license=('GPL') @@ -20,7 +20,6 @@ backup=(etc/dict/dictd.conf etc/dict/colorit.conf) options=('!emptydirs') source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz" - dictd dict.conf dictd.conf dictd.confd @@ -29,7 +28,6 @@ source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz" dictd.xinetd colorit.conf) md5sums=('62696491174c22079f664830d07c0623' - '6542df4fc585773fc03f1a088730126b' 'fb72f7d8c55f84b1b37bbc8d33a8e55a' '64cd6ffdb40fb3367224f91ac44926ac' '838887fee38ae4cebd652d399b1f2266' @@ -47,7 +45,6 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -D -m 0755 $srcdir/dictd $pkgdir/etc/rc.d/dictd install -D -m 0644 $srcdir/dictd.xinetd $pkgdir/etc/xinetd.d/dictd install -D -m 0644 $srcdir/dictd.conf $pkgdir/etc/dict/dictd.conf install -D -m 0644 $srcdir/dict.conf $pkgdir/etc/dict/dict.conf diff --git a/community/dictd/dictd b/community/dictd/dictd deleted file mode 100644 index 4f435d6f0..000000000 --- a/community/dictd/dictd +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/dictd -. /etc/rc.conf - -. /etc/rc.d/functions - -preconfiguration() { - stat_busy "Check dictd configuration" - if [ ! -e ${DICTD_CONF} ]; then - echo "No configuration" - stat_fail - exit 1 - fi - stat_done - - # The new way of doing this is to scan /usr/lib/dict and tweek the conf - stat_busy "Scanning for dictionaries..." - if [ ! -d "${DICTD_DICTDIR}" ]; then - echo "No dictionaries found" - stat_fail - exit 1 - fi - stat_done - pushd ${DICTD_DICTDIR} >/dev/null - INDEXFILES=`ls *.index` - if [ -z "$INDEXFILES" ]; then - echo "No dictionaries found" - stat_fail - exit 1 - fi - - cat $DICTD_CONF | sed -e '/^#LASTLINE/,$d' > $DICTD_TMPCONF - echo "#LASTLINE" >> $DICTD_TMPCONF - - CNT=0 - for i in $INDEXFILES - do - DNAME=`echo $i | awk -F . '{print $1;}'` - #two possible names for a matching dictionary, check which is there. - if [ -f ${DNAME}.dict.dz ]; then - DICT=${DNAME}.dict.dz - elif [ -f ${DNAME}.dict ];then - DICT=${DNAME}.dict - else - echo "Index $i has no matching dictionaray..." - fi - - #ok, go an index, and a dixtionary, append. - echo "database $DNAME { data \"${DICTD_DICTDIR}/${DICT}\"" >> $DICTD_TMPCONF - echo " index \"${DICTD_DICTDIR}/$i\" }" >> $DICTD_TMPCONF - - CNT=`expr $CNT + 1` - done - popd >/dev/null - mv ${DICTD_TMPCONF} ${DICTD_CONF} - echo "$CNT dictionary indexes found." -} - -PID=`pidof -o %PPID /usr/sbin/dictd` - -case "$1" in - start) - preconfiguration || exit 1 - stat_busy "Start dictd daemon" - /usr/sbin/dictd $DICTD_ARGS -- $DICTD_EARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dictd - stat_done - fi - ;; - - stop) - stat_busy "Stop dictd daemon" - kill $PID 2>/dev/null 1>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dictd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD index 4c3bd645e..c790c7ac6 100644 --- a/community/distcc/PKGBUILD +++ b/community/distcc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81575 2012-12-24 15:00:09Z spupykin $ +# $Id: PKGBUILD 90657 2013-05-13 14:21:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=distcc pkgver=3.1 -pkgrel=10 +pkgrel=11 pkgdesc="A distributed C, C++, Obj C compiler" arch=('i686' 'x86_64') url="http://code.google.com/p/distcc/" @@ -17,11 +17,9 @@ optdepends=('gtk2: for distccmon-gnome' backup=('etc/conf.d/distccd' 'etc/distcc/hosts') source=(http://distcc.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 - distccd distccd.conf.d distccd.service) md5sums=('a1a9d3853df7133669fffec2a9aab9f3' - '1c918474372c09304772c20c4de484fa' '239aae53250e3e35288cba566bc0bbf1' '09f0688da9c1840e518d2593bd5c3830') @@ -46,7 +44,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd - install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd install -d ${pkgdir}/usr/lib/${pkgname}/bin ln -sf /usr/bin/${pkgname} ${pkgdir}/usr/lib/${pkgname}/bin/cc diff --git a/community/distcc/distccd b/community/distcc/distccd deleted file mode 100644 index 4702d6820..000000000 --- a/community/distcc/distccd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/distccd` -case "$1" in - start) - stat_busy "Starting distcc Daemon" - [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon distccd - stat_done - fi - ;; - stop) - stat_busy "Stopping distcc Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon distccd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD index fc79acfde..62e027320 100644 --- a/community/drbd/PKGBUILD +++ b/community/drbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 86842 2013-03-22 19:15:09Z seblu $ +# $Id: PKGBUILD 90502 2013-05-12 23:31:07Z seblu $ # Maintainer: Sébastien Luttringer pkgname=drbd pkgver=8.4.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc='Userland tools for Distributed Replicated Block Device' url='http://www.drbd.org' @@ -13,16 +13,20 @@ source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz" "$pkgname.service") backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') md5sums=('b081f1046adda1d51ba351c40a8b1107' - 'afbb345094db49b0a474c0b4e51c0acd') + '7dc909b5895c0b5289d3ee0581d7d333') + +prepare() { + # fix hardcoded path in udev rules + sed -i 's,/sbin/drbdadm,/usr/bin/drbdadm,' $pkgname-$pkgver/scripts/drbd.rules +} build() { cd $pkgname-$pkgver - # fix hardcoded path in udev rules - sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' scripts/drbd.rules ./configure \ --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc \ + --sbindir=/usr/bin \ --with-distro=generic \ --with-utils \ --with-bashcompletion \ @@ -41,7 +45,7 @@ package() { make DESTDIR="$pkgdir" install # move forced /sbin binaries cd "$pkgdir" - mv sbin/* usr/sbin + mv sbin/* usr/bin rmdir sbin # move udev files mv etc/udev usr/lib diff --git a/community/drbd/drbd.service b/community/drbd/drbd.service index ddd6c62b7..a8053fb05 100644 --- a/community/drbd/drbd.service +++ b/community/drbd/drbd.service @@ -7,13 +7,13 @@ Type=oneshot RemainAfterExit=yes # load config -ExecStart=/usr/sbin/drbdadm adjust all +ExecStart=/usr/bin/drbdadm adjust all # user interruptible version of wait-connect all -ExecStart=/usr/sbin/drbdadm wait-con-int +ExecStart=/usr/bin/drbdadm wait-con-int # become primary if configured -ExecStart=/usr/sbin/drbdadm sh-b-pri all +ExecStart=/usr/bin/drbdadm sh-b-pri all # disconnect and detach all resources -ExecStop=/usr/sbin/drbdadm down all +ExecStop=/usr/bin/drbdadm down all [Install] WantedBy=multi-user.target diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index daf1572a0..7bdba6e41 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86999 2013-03-25 19:16:37Z bpiotrowski $ +# $Id: PKGBUILD 90661 2013-05-13 14:22:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam pkgver=3.10.2 -pkgrel=4 +pkgrel=5 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64') url="http://dspam.nuclearelephant.com/" @@ -24,13 +24,11 @@ options=('zipman' 'docs' '!libtool') install=$pkgname.install source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz dspam.logrotated - dspam dspam.service dspam.tmpfiles dspam_maintenance.cron) md5sums=('0e0e405d3284485b2a43f47eaf6b09bb' 'cec7e3df4cbc6feca387fb516a5b3490' - 'bb2300eff5b2a6eb987750c71a2c2169' '1581a94598cec370b66f37b118970676' '933643f2204ccbd7e451a439f83db1ea' 'ebfb0fec16a56f6e1a3a61ced2d5015d') @@ -58,10 +56,8 @@ package() { find $pkgdir/srv/http/dspam/ -type f -name '*.in' -exec rm -f {} \; install -d $pkgdir/etc/logrotate.d \ - $pkgdir/etc/rc.d \ $pkgdir/usr/share/dspam/{mysql,pgsql} install -m644 ../dspam.logrotated $pkgdir/etc/logrotate.d/dspam - install -m755 ../dspam $pkgdir/etc/rc.d sed -i 's|#ServerPID|ServerPID|' $pkgdir/etc/dspam/dspam.conf diff --git a/community/dspam/dspam b/community/dspam/dspam deleted file mode 100644 index be533ba5f..000000000 --- a/community/dspam/dspam +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/dspam` -case "$1" in - start) - stat_busy "Starting DSPAM Daemon" - [ -d /var/run/dspam ] || mkdir -p /var/run/dspam - [ -z "$PID" ] && /usr/bin/dspam --daemon &> /dev/null & - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon dspam - stat_done - fi - ;; - stop) - stat_busy "Stopping DSPAM Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dspam - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index f14cda2e2..337b32525 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87844 2013-04-08 09:22:21Z spupykin $ +# $Id: PKGBUILD 90663 2013-05-13 14:23:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=ejabberd pkgver=2.1.12 -pkgrel=1 +pkgrel=2 pkgdesc="Jabber server written in Erlang" arch=('x86_64' 'i686') url="http://www.ejabberd.im/" @@ -17,11 +17,9 @@ backup=('etc/ejabberd/ejabberd.cfg' install=$pkgname.install source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz" "$pkgname.logrotate" - "$pkgname" "ejabberd.service") md5sums=('7d49242cf04282f3c4cebfafa2cc2f46' 'f97c8a96160f30e0aecc9526c12e6606' - '2338a6230ce5f9f60be6dddcfa39bc7e' 'df32aa17e40a7bc5d9946d3ba6fe5e16') build() { @@ -34,7 +32,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver/src" make DESTDIR="$pkgdir" install - install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname" install -d "$pkgdir/var/lib/$pkgname" install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname" chmod ug+r "$pkgdir/etc/$pkgname/"* diff --git a/community/ejabberd/ejabberd b/community/ejabberd/ejabberd deleted file mode 100644 index c73be811c..000000000 --- a/community/ejabberd/ejabberd +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -cd /var/log/ejabberd/ - -get_pid() { - pidof epmd >/dev/null || { echo '' ; return 0; } - # get port from 'epmd -names', then get pid from 'ss -tlnp' - PORT=`epmd -names | grep ejabberd | cut -f5 -d\ ` - [ -z "$PORT" ] && { echo '' ; return 0; } - PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1` - [ -z "$PID" ] && { echo '' ; return 0; } - echo ${PID%/} -} - -case "$1" in - start) - stat_busy "Starting ejabber daemon" - - [ -d /var/lock/ejabberdctl ] || mkdir -p /var/lock/ejabberdctl - [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid - PID=`get_pid` - if [ -z "$PID" ]; then - su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"' - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/ejabberd.pid - add_daemon ejabberd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping ejabber daemon" - PID=`get_pid` - [ ! -z "$PID" ] && su ejabberd -s /bin/bash - -c "kill $PID" &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/ejabberd.pid &> /dev/null - rm_daemon ejabberd - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD index 3c87df6d6..37a9418fa 100644 --- a/community/etl/PKGBUILD +++ b/community/etl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69579 2012-04-19 07:26:16Z spupykin $ +# $Id: PKGBUILD 90600 2013-05-13 10:14:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=etl -pkgver=0.04.15 +pkgver=0.04.16 pkgrel=1 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('synfig-etl') replaces=('synfig-etl') #source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.04.tar.gz) source=(http://downloads.sourceforge.net/project/synfig/ETL/$pkgver/ETL-$pkgver.tar.gz) -md5sums=('aac5038cdb4067100e57fb52337b0cfd') +md5sums=('e330d2045e980d424beb054423c73797') build() { cd $srcdir/ETL-$pkgver diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD index 3734d6aa7..539d58039 100644 --- a/community/ext4magic/PKGBUILD +++ b/community/ext4magic/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 76580 2012-09-23 20:37:13Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 90509 2013-05-12 23:37:59Z seblu $ +# Maintainer: Sébastien Luttringer pkgname=ext4magic pkgver=0.3.1 -pkgrel=1 -pkgdesc='Linux admin tool, can help to recover deleted or overwritten files on ext3 and ext4 filesystems' +pkgrel=2 +pkgdesc='Recover deleted or overwritten files on ext3 and ext4 filesystems' arch=('i686' 'x86_64') url='http://developer.berlios.de/projects/ext4magic/' license=('GPL2') depends=('bzip2' 'file' 'util-linux' 'e2fsprogs') -source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") +source=("http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('59c194b71e33aa6bd098b91f802e67d5') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index 46372974a..da96df47e 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87000 2013-03-25 19:16:38Z bpiotrowski $ +# $Id: PKGBUILD 90665 2013-05-13 14:24:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius pkgver=2.2.0 -pkgrel=5 +pkgrel=6 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64') url="http://www.freeradius.org/" @@ -15,13 +15,11 @@ optdepends=('libpcap' 'unixodbc' 'python2') options=('!libtool' '!makeflags') install=$pkgname.install source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} - radiusd freeradius.tmpfiles freeradius.service krb5-build-fix.patch) md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119' - '5dd57af81ba075102581fec45316ba7b' - 'f1a6530b1b69d2fa793aa45b2de379bb' + 'SKIP' 'f959e89812bedfc9f8308076f78cd74e' '39eba6d34f8249781e9e917646465632' 'c6a61de7576933f59154a53bfc12a2d2') @@ -43,7 +41,6 @@ build() { package() { cd $srcdir/freeradius-server-$pkgver make install R=$pkgdir - install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd chmod o+r $pkgdir/etc/raddb/* mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default rm -rf $pkgdir/var/run diff --git a/community/freeradius/radiusd b/community/freeradius/radiusd deleted file mode 100644 index bf872b6f2..000000000 --- a/community/freeradius/radiusd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/radiusd` -case "$1" in - start) - stat_busy "Starting radiusd Server" - - [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd - [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid - chown -R radiusd.radiusd /var/run/radiusd - - [ -z "$PID" ] && /usr/sbin/radiusd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/radiusd.pid - add_daemon radiusd - stat_done - fi - ;; - stop) - stat_busy "Stopping radiusd Server" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/radiusd.pid - rm_daemon radiusd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/fssos-nsvs/PKGBUILD b/community/fssos-nsvs/PKGBUILD index 5a8d6fb89..d9e7a0399 100644 --- a/community/fssos-nsvs/PKGBUILD +++ b/community/fssos-nsvs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87001 2013-03-25 19:16:40Z bpiotrowski $ +# $Id: PKGBUILD 90505 2013-05-12 23:35:37Z eric $ # Maintainer: Dale Blount <dale@archlinux.org> pkgname=fssos-nsvs pkgver=0.5 -pkgrel=10 +pkgrel=11 pkgdesc="NSVS for FSSOS" arch=('i686' 'x86_64') url="http://fssos.sourceforge.net/" @@ -13,21 +13,18 @@ backup=('etc/nsvsd.conf') options=('!libtool' '!makeflags') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz" - 'nsvsd' - 'nsvsd.service') + 'nsvsd.service') +md5sums=('3f17c2f6339f1a322b712b467023d825' + '9c791d2086e13f774548d9d6ba2cf9d5') build() { - cd $srcdir/nsvs-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc + cd nsvs-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make CFLAGS="${CFLAGS} -D_GNU_SOURCE" } package() { - cd $srcdir/nsvs-$pkgver - make DESTDIR=$pkgdir install - install -D -m755 "$srcdir/nsvsd" "$pkgdir/etc/rc.d/nsvsd" + cd nsvs-$pkgver + make DESTDIR="$pkgdir" install install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service" } -md5sums=('3f17c2f6339f1a322b712b467023d825' - '4dfd9dc0d69b375587e39ab2621d9ea9' - '61e970d0704875b1da83cb4e9fc0eef5') diff --git a/community/fssos-nsvs/nsvsd b/community/fssos-nsvs/nsvsd deleted file mode 100755 index f9b4845ab..000000000 --- a/community/fssos-nsvs/nsvsd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting nsvsd" - /usr/sbin/nsvsd -f /etc/nsvsd.conf - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon nsvsd - stat_done - fi - ;; - stop) - stat_busy "Stopping nsvsd" - kill `cat /var/run/nsvsd.pid` &>/dev/null - rm -f /var/run/nsvsd.pid - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nsvsd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/fssos-nsvs/nsvsd.service b/community/fssos-nsvs/nsvsd.service index 0df5444ab..8c3d12b67 100644 --- a/community/fssos-nsvs/nsvsd.service +++ b/community/fssos-nsvs/nsvsd.service @@ -2,7 +2,7 @@ Description=Name Service Via Sockets Daemon [Service] -ExecStart=/usr/sbin/nsvsd -f /etc/nsvsd.conf +ExecStart=/usr/bin/nsvsd -f /etc/nsvsd.conf [Install] WantedBy=multi-user.target diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index c89e98d6f..44b8ea42e 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90032 2013-05-06 19:37:11Z foutrelis $ +# $Id: PKGBUILD 90772 2013-05-13 19:16:06Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gdal pkgver=1.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64') url="http://www.gdal.org/" diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index cbea9fbae..c6f12cd2a 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 86359 2013-03-15 17:39:45Z arodseth $ +# $Id: PKGBUILD 90623 2013-05-13 11:47:21Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Thanks to Moonprincessluna at DeviantArt for the default icon: # http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a pkgname=gendesk -pkgver=0.4.4 +pkgver=0.5.0 pkgrel=1 -pkgdesc="Utility to generate .desktop files and download icons" +pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686') -url="http://roboticoverlords.org/gendesk/" +url='http://roboticoverlords.org/gendesk/' license=('MIT') depends=('glibc') makedepends=('go') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" - "http://roboticoverlords.org/images/default.png") -sha256sums=('23ca20823dc225ebc35baf53fa07558a1ddf314fe3f9cb9d2c5fc6523ca62334' + 'http://roboticoverlords.org/images/default.png') +sha256sums=('05693b8cb6562407b0f61f855b3e61bfe063acec4c1bd42c609f469d25fb080c' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { diff --git a/community/girara/PKGBUILD b/community/girara/PKGBUILD index d62759137..65ac95c0e 100644 --- a/community/girara/PKGBUILD +++ b/community/girara/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82561 2013-01-20 23:41:34Z dwallace $ +# $Id: PKGBUILD 90573 2013-05-13 09:52:42Z spupykin $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: mlq <mlq@pwmt.org> pkgbase=girara pkgname=(girara-common girara-gtk2 girara-gtk3) -pkgver=0.1.5 +pkgver=0.1.6 pkgrel=1 pkgdesc="user interface library" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://pwmt.org/projects/girara" license=('custom') makedepends=('gtk3' 'gtk2') source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) -md5sums=('fe725fd935c85657008c18bb07c671d4') +md5sums=('1f213274fc710a5f9693d0d61f9ea66d') build() { true diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index 006770423..656fc7597 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80469 2012-11-22 12:21:36Z spupykin $ +# $Id: PKGBUILD 90667 2013-05-13 14:24:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be @@ -7,7 +7,7 @@ pkgname=glusterfs _basever=3.3 pkgver=$_basever.1 -pkgrel=1 +pkgrel=2 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64) url='http://www.gluster.org/' @@ -16,7 +16,6 @@ depends=(fuse python2 libxml2) makedepends=(flex bison) options=(!libtool) source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz - glusterd.rc glusterd.service) sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' @@ -24,6 +23,8 @@ sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' 'f8c113d2a101c93f0e899ba498d0cb6308caf02da37552f12245a863bec39ab4' 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') +sha256sums=('19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519' + 'e9aa54fcff422e0266e0f89d4bda73e0c77458f7c5443b8327db1e7b4242e6f7') build() { cd $srcdir/$pkgname-$pkgver @@ -56,10 +57,6 @@ package() { $srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \ $pkgdir/usr/share/doc/glusterfs/ - install -D -m 755 \ - $srcdir/glusterd.rc \ - $pkgdir/etc/rc.d/glusterd - install -D -m 644 \ $srcdir/glusterd.service \ $pkgdir/usr/lib/systemd/system/glusterd.service diff --git a/community/glusterfs/glusterd.rc b/community/glusterfs/glusterd.rc deleted file mode 100644 index 61cc26476..000000000 --- a/community/glusterfs/glusterd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Thanks to igor - -. /etc/rc.conf -. /etc/rc.d/functions - -PID="/var/run/glusterd.pid" - -case "$1" in - start) - stat_busy "Starting glusterd" - /usr/sbin/glusterd -p $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon glusterd - stat_done - fi - ;; - stop) - stat_busy "Stopping glusterd" - kill -QUIT `cat "$PID"` &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - rm_daemon glusterd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - -exit 0 diff --git a/community/gnokii/PKGBUILD b/community/gnokii/PKGBUILD new file mode 100644 index 000000000..98bdd0b23 --- /dev/null +++ b/community/gnokii/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 90761 2013-05-13 18:04:36Z heftig $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Roman Kyrylych <roman@archlinux.org> +# Contributor: Aurelien Foret <orelien@chez.com> + +pkgname=gnokii +pkgver=0.6.31 +pkgrel=3 +pkgdesc="Tools and user space driver for use with mobile phones" +arch=('i686' 'x86_64') +url="http://www.gnokii.org/" +license=('GPL') +depends=('libusb-compat' 'libxpm' 'bluez' 'libical') +makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb') +optdepends=('gtk2: xgnokii GUI' + 'libmariadbclient: smsd mysql backend' + 'postgresql-libs: smsd postgresql backend') +backup=('etc/gnokiirc') +options=('!libtool' '!makeflags') +source=("http://www.gnokii.org/download/$pkgname/$pkgname-${pkgver}.tar.bz2" + 'gnokii.patch') +md5sums=('d9627f4a1152d3ea7806df4532850d5f' + 'fd1c448114c2e0de8e05981030f0e69f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # FS#13249 + sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in + + patch -Np1 -i "${srcdir}/gnokii.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --enable-security \ + --disable-unix98test + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 Docs/sample/gnokiirc "${pkgdir}/etc/gnokiirc" +} diff --git a/community/gnokii/gnokii.patch b/community/gnokii/gnokii.patch new file mode 100644 index 000000000..db593cdf4 --- /dev/null +++ b/community/gnokii/gnokii.patch @@ -0,0 +1,12 @@ +diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc +--- gnokii-0.6.31.orig/Docs/sample/gnokiirc 2011-12-02 15:53:04.000000000 +0100 ++++ gnokii-0.6.31/Docs/sample/gnokiirc 2012-02-18 12:49:26.957557504 +0100 +@@ -238,7 +238,7 @@ + # In particular ensure that mgnokiidev is in this location, with + # permissions 4750, owned by root, group gnokii. Ensure you + # are in the gnokii group and that the group exists... +-bindir = /usr/local/sbin/ ++bindir = /usr/sbin/ + + # Any entries in the following two sections will be set as environment + # variables when running the scripts. diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index 34a8f8ff0..71bae8d67 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84387 2013-02-17 20:28:03Z spupykin $ +# $Id: PKGBUILD 90671 2013-05-13 14:25:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet pkgver=0.9.5_a -pkgrel=1 +pkgrel=2 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64') url="http://gnunet.org" @@ -16,14 +16,10 @@ backup=(etc/gnunetd.conf) options=('!libtool' '!makeflags') install=gnunet.install source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-${pkgver/_/}.tar.gz - gnunet.rc gnunet.service - gnunet.conf.d defaults.conf) md5sums=('b0e204cf9711f9799baaeb477992e66a' - '5baf691913b007fb33e365239e3f7217' '54cce3d2415d95b2e5bd1bd88db3a0ea' - 'f161b46915736e4017e77ad735521453' '0fe23b2ca5b3fc47a0b5645e04406da0') build() { @@ -36,8 +32,6 @@ build() { package() { cd $srcdir/gnunet-${pkgver/_/} make DESTDIR=$pkgdir install - install -D -m0755 $srcdir/gnunet.rc $pkgdir/etc/rc.d/gnunetd - install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd install -D -m0644 $srcdir/defaults.conf $pkgdir/etc/gnunetd.conf rm -rf $pkgdir/usr/include/libltdl $pkgdir/usr/lib/libltdl.* $pkgdir/usr/include/ltdl.h install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service diff --git a/community/gnunet/gnunet.conf.d b/community/gnunet/gnunet.conf.d deleted file mode 100644 index f10a322ce..000000000 --- a/community/gnunet/gnunet.conf.d +++ /dev/null @@ -1 +0,0 @@ -GNUNETD_USER=nobody diff --git a/community/gnunet/gnunet.rc b/community/gnunet/gnunet.rc deleted file mode 100644 index 30ac4d2ad..000000000 --- a/community/gnunet/gnunet.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -GNUNETD_USER=nobody - -. /etc/conf.d/gnunetd -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/gnunet-arm) -case "$1" in - start) - stat_busy "Starting gnunet services" - [ -z "$PID" ] && su -c '/usr/bin/gnunet-arm -s -c /etc/gnunetd.conf' - $GNUNETD_USER 1>/dev/null 2>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon gnunetd - stat_done - fi - ;; - stop) - stat_busy "Stopping gnunet services" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon gnunetd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index 6b896a69d..1ac198b22 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,11 +1,11 @@ -#$Id: PKGBUILD 90350 2013-05-11 18:38:52Z arodseth $ +#$Id: PKGBUILD 90755 2013-05-13 16:04:18Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=golangide pkgver=18.1 -pkgrel=1 +pkgrel=2 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') arch=('x86_64' 'i686') @@ -16,22 +16,16 @@ options=('!strip') source=("$pkgname.tgz::https://github.com/visualfc/liteide/archive/x$pkgver.zip" 'golangide.png' 'golangide.sh') -sha256sums=('4ca6438099314789f4cd8fd3acc8016d8e32594634a6d0f130f5666dcb0a3d6c' +sha256sums=('d3706ff01ebb501eec4d237f418121bbc4523dac793e6c2430f7b5ac3712ce53' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' '93ef16d59054ef9b37f8781e90f7d0f83d726779d2029660dfd21e84d808bf04') -_name=('Golang IDE') prepare() { cd "$srcdir" - gendesk -n - - cd "$srcdir/liteide-x$pkgver/build" - head -n-3 build_linux.sh > build_linux_fixed.sh - mv build_linux_fixed.sh build_linux.sh - head -n-4 webkit_linux.sh > webkit_linux_fixed.sh - mv webkit_linux_fixed.sh webkit_linux.sh - chmod +x build_linux.sh webkit_linux.sh + gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'Golang IDE' + cd "liteide-x$pkgver/build" + chmod +x build_linux.sh } build() { @@ -39,7 +33,6 @@ build() { msg2 'Compiling...' QTDIR=/usr ./build_linux.sh - QTDIR=/usr ./webkit_linux.sh # Fixing insecure RPATH, need to test if this is still needed msg2 'Fixing...' diff --git a/community/hdapsd/PKGBUILD b/community/hdapsd/PKGBUILD index 74aa528f0..61c0d5d0d 100644 --- a/community/hdapsd/PKGBUILD +++ b/community/hdapsd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=hdapsd pkgver=20090401 -pkgrel=5 +pkgrel=6 pkgdesc='HDAPS userspace hard drive protection daemon' arch=('i686' 'x86_64') url='http://sourceforge.net/projects/hdaps/' @@ -13,12 +13,10 @@ depends=('glibc') backup=('etc/conf.d/hdapsd') source=("http://downloads.sourceforge.net/hdaps/hdapsd-${pkgver}.tar.gz" 'hdapsd.conf.d' - 'hdapsd.rc.d' 'hdapsd.systemd' 'hdapsd.wrapper') md5sums=('897cee8b0192febd127470f3e9506aeb' '07fc036c8717bf5a38bbc269ed38ad19' - '9ab70348da9751810a2bbac51e18ac75' '4b1378d43dc9431982f6605265c24f3b' '11270661f3a543268786a68bbe74a6bb') @@ -36,7 +34,6 @@ package() { # install rc script and its configuration file install -Dm0644 "${srcdir}/hdapsd.conf.d" "${pkgdir}/etc/conf.d/hdapsd" - install -Dm0755 "${srcdir}/hdapsd.rc.d" "${pkgdir}/etc/rc.d/hdapsd" install -Dm0644 "${srcdir}/hdapsd.systemd" "${pkgdir}/usr/lib/systemd/system/hdapsd.service" install -Dm0755 "${srcdir}/hdapsd.wrapper" "${pkgdir}/usr/sbin/hdapsd-wrapper" } diff --git a/community/hdapsd/hdapsd.rc.d b/community/hdapsd/hdapsd.rc.d deleted file mode 100644 index f4e8a6b99..000000000 --- a/community/hdapsd/hdapsd.rc.d +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/hdapsd ] && . /etc/conf.d/hdapsd - -. /etc/rc.conf -. /etc/rc.d/functions - -PIDFILE=/var/run/hdapsd.pid -PID=`cat ${PIDFILE} 2> /dev/null` - -case "$1" in - start) - stat_busy "Starting hdapsd" - - ## The daemon will try to autoload the kernel module - #if [ ! -d /sys/devices/platform/hdaps ]; then - # stat_fail - # echo "You need to load the hdaps kernel module." - # exit 1 - #fi - - ## Set up options to the hdapsd daemon - HDAPSD_OPTS="-bp" - if [ -z "${DEVICE}" ]; then - HDAPSD_OPTS="${HDAPSD_OPTS} -d sda" - else - for i in ${DEVICE[@]}; do - HDAPSD_OPTS="${HDAPSD_OPTS} -d ${i}" - done - fi - [ ! -z "${SENSITIVITY}" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -s ${SENSITIVITY}" - [ "${ADAPTIVE}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -a" - [ "${SYSLOG}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -l" - [ "${FORCE}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -f" - [ -z "${PID}" ] && /usr/sbin/hdapsd ${HDAPSD_OPTS} - if [ ${?} -gt 0 ]; then - stat_fail - else - add_daemon hdapsd - stat_done - fi - ;; - stop) - stat_busy "Stopping hdapsd" - [ ! -z "${PID}" ] && kill $PID &> /dev/null - if [ ${?} -gt 0 ]; then - stat_fail - else - rm_daemon hdapsd - stat_done - fi - ;; - restart) - ${0} stop - sleep 1 - ${0} start - ;; - *) - echo "usage: ${0} {start|stop|restart}" -esac diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index 6e7474371..3b6f2eb3d 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85915 2013-03-08 23:40:40Z foutrelis $ +# $Id: PKGBUILD 90673 2013-05-13 14:26:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd pkgver=2.0 -pkgrel=3 +pkgrel=6 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" arch=('i686' 'x86_64') url="http://w1.fi/hostapd/" @@ -23,13 +23,9 @@ backup=('etc/hostapd/hostapd.conf' install=hostapd.install source=(http://w1.fi/releases/$pkgname-$pkgver.tar.gz config - hostapd - hostapd.conf.d hostapd.service) md5sums=('ba22e639bc57aa4035d2ea8ffa9bbbee' '5d7ee10b04e33f22c37be56a4c33dddb' - 'd570327c385f34a4af24d3a0d61cea19' - 'f169534b0f59b341f6df1a21e0344511' 'a0a16879eed5e4e41ae6b225a4809955') build() { @@ -41,10 +37,6 @@ build() { } package() { - # RC script - install -D hostapd "$pkgdir/etc/rc.d/hostapd" - install -Dm644 hostapd.conf.d "$pkgdir/etc/conf.d/hostapd" - # Systemd unit install -Dm644 hostapd.service "$pkgdir/usr/lib/systemd/system/hostapd.service" diff --git a/community/hostapd/hostapd b/community/hostapd/hostapd deleted file mode 100644 index b4709d7bf..000000000 --- a/community/hostapd/hostapd +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/hostapd - -case "$1" in - start) - stat_busy "Starting hostapd" - /usr/bin/hostapd -B -P ${HOSTAPD_PID} ${HOSTAPD_CONF} &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon hostapd - fi - ;; - stop) - stat_busy "Stopping hostapd" - [ -f ${HOSTAPD_PID} ] && kill `cat ${HOSTAPD_PID}` &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - rm_daemon hostapd - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/hostapd/hostapd.conf.d b/community/hostapd/hostapd.conf.d deleted file mode 100644 index 7a7bbc806..000000000 --- a/community/hostapd/hostapd.conf.d +++ /dev/null @@ -1,2 +0,0 @@ -HOSTAPD_PID="/var/run/hostapd.pid" -HOSTAPD_CONF="/etc/hostapd/hostapd.conf" diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD index 8c873ac8c..11bd4bb06 100644 --- a/community/hwinfo/PKGBUILD +++ b/community/hwinfo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89408 2013-04-29 10:54:52Z arodseth $ +# $Id: PKGBUILD 90497 2013-05-12 23:11:39Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> @@ -10,7 +10,7 @@ pkgname=hwinfo pkgver=20.1 _subver=3.10 -pkgrel=1 +pkgrel=2 pkgdesc='Hardware detection tool from openSUSE' arch=('x86_64' 'i686') url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' @@ -41,6 +41,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make LIBDIR=/usr/lib DESTDIR="$pkgdir" install + mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" rmdir "$pkgdir/sbin" } diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD index 803bedec1..d5c01654d 100644 --- a/community/ibus-anthy/PKGBUILD +++ b/community/ibus-anthy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90320 2013-05-11 14:52:54Z fyan $ +# $Id: PKGBUILD 90641 2013-05-13 13:18:31Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ibus-anthy -pkgver=1.5.1 +pkgver=1.5.3 pkgrel=1 pkgdesc='Japanese input method Anthy IMEngine for IBus Framework' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('ibus' 'anthy' 'python2' 'pygtk' 'gtk-update-icon-cache') makedepends=('swig' 'intltool') options=('!libtool') install=$pkgname.install -source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) +source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") build() { cd $srcdir/$pkgname-$pkgver @@ -34,4 +34,4 @@ package() { make DESTDIR=$pkgdir/ install } -sha512sums=('ba5456d4b16c168ff90945c948109bd3bb9d64c145ae746a471789ef74a1e657a9f891e198ecf64b733c03880f81a28cc9cd2c1fa82ad006eb0ac6e7e5c2c3a5') +sha512sums=('490a89ef78e31ad9e0f61aadd1d93b7a670852a765cc784cbfa307a208aab4344e851dceee316dd04bdf004e901a1b23bf40ff505e55fa18ab9dafdf097263d3') diff --git a/community/icecast/PKGBUILD b/community/icecast/PKGBUILD index 3888f8540..aad4ca008 100644 --- a/community/icecast/PKGBUILD +++ b/community/icecast/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84031 2013-02-08 17:31:49Z lfleischer $ +# $Id: PKGBUILD 90559 2013-05-13 07:47:15Z lfleischer $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,7 +6,7 @@ pkgname=icecast pkgver=2.3.3 -pkgrel=3 +pkgrel=4 pkgdesc='Streaming audio over the Internet' arch=('i686' 'x86_64') license=('GPL') @@ -15,12 +15,10 @@ depends=('libxslt' 'libvorbis' 'curl' 'speex' 'libtheora') backup=('etc/icecast.xml' 'etc/logrotate.d/icecast') source=("http://downloads.us.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'icecastd' 'icecast.logrotate' 'start-by-nobody.patch' 'icecast.service') md5sums=('2b5d1b40778922e5f6431b7758c359ad' - 'e823c1fdb080aae3d0c54ef8be95f7cb' '59c6552bcb1dd9fb542af8670dfabd3c' 'd8e929d2214123a1954da4383bf16583' '1468e59f76de194579b615889e20198f') @@ -43,8 +41,7 @@ package() { sed -i -e 's/icecast2/icecast/g' debian/icecast2.1 install -Dm644 debian/icecast2.1 "${pkgdir}/usr/share/man/man1/icecast.1" - # install rc.d script and logrotate config (taken from Fedora) - install -Dm755 "${srcdir}/icecastd" "${pkgdir}/etc/rc.d/icecast" + # install logrotate config (taken from Fedora) install -Dm644 "${srcdir}/icecast.logrotate" "${pkgdir}/etc/logrotate.d/icecast" # create log directory diff --git a/community/icecast/icecastd b/community/icecast/icecastd deleted file mode 100644 index e6c91b08c..000000000 --- a/community/icecast/icecastd +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -timeo=30 - -getPID() { - pgrep -u nobody icecast 2>/dev/null -} - -case $1 in - start) - stat_busy "Starting Icecast Server" - if getPID >/dev/null; then - # already running - stat_fail - exit 1 - else - /usr/bin/icecast -b -c /etc/icecast.xml &>/dev/null - while (( timeo > 0 )); do - if getPID >/dev/null; then - add_daemon icecast - stat_done - exit 0 - fi - sleep 1 - (( timeo-- )) - done - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Icecast Server" - if ! getPID >/dev/null; then - # not running - stat_done - exit 1 - fi - if ! kill $(getPID) &> /dev/null; then - stat_fail - exit 1 - fi - while (( timeo > 0 )); do - if getPID >/dev/null; then - rm_daemon icecast - stat_done - exit 0 - fi - sleep 1 - (( timeo-- )) - done - stat_fail - exit 1 - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/idesk/PKGBUILD b/community/idesk/PKGBUILD index bd870bcfa..027925bcc 100644 --- a/community/idesk/PKGBUILD +++ b/community/idesk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65602 2012-02-21 09:26:32Z spupykin $ +# $Id: PKGBUILD 90753 2013-05-13 15:08:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Claudio Sabattoli <gasherbrum3@alice.it> @@ -16,14 +16,18 @@ md5sums=('beb48c97815c7b085e3b3d601297fbb8') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - - sed -i '1,1i#include <unistd.h>' src/DesktopConfig.cpp - sed -i '1,1i#include <sys/stat.h>' src/DesktopConfig.cpp - sed -i '1,1i#include <sys/types.h>' src/DesktopConfig.cpp + sed -i \ + -e '1,1i#include <unistd.h>' \ + -e '1,1i#include <sys/stat.h>' \ + -e '1,1i#include <sys/types.h>' \ + src/DesktopConfig.cpp + sed -i 's#usr/local#usr#' examples/default.lnk + ./configure --prefix=/usr make - make DESTDIR=$pkgdir install +} - sed -i 's#usr/local#usr#' $pkgdir/usr/share/idesk/default.lnk +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/igmpproxy/PKGBUILD b/community/igmpproxy/PKGBUILD index ab3e7e291..1e2002b0c 100644 --- a/community/igmpproxy/PKGBUILD +++ b/community/igmpproxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80944 2012-12-07 13:00:49Z spupykin $ +# $Id: PKGBUILD 90675 2013-05-13 14:26:33Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: sda <sda00@himki.net> pkgname=igmpproxy pkgver=0.1 -pkgrel=1 +pkgrel=2 pkgdesc="a simple multicast router for Linux only using the IGMP protocol" arch=(i686 x86_64) url="http://sourceforge.net/projects/igmpproxy" @@ -13,10 +13,8 @@ license=('GPL') depends=() backup=("etc/igmpproxy.conf") source=("http://downloads.sourceforge.net/sourceforge/igmpproxy/igmpproxy-$pkgver.tar.gz" - "igmpproxy.rc.d" "igmpproxy.service") md5sums=('c56f41ec195bc1fe016369bf74efc5a1' - '642054dd586e5b0e7f660863e8131f57' '2ff8500f8a59cdfaf910e48cd54ab659') build() { @@ -28,6 +26,5 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -Dm755 $srcdir/$pkgname.rc.d $pkgdir/etc/rc.d/$pkgname install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/igmpproxy/igmpproxy.rc.d b/community/igmpproxy/igmpproxy.rc.d deleted file mode 100644 index 5b88e94f1..000000000 --- a/community/igmpproxy/igmpproxy.rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/igmpproxy` -case "$1" in - start) - stat_busy "Starting igmpproxy routing daemon" - if [ -z "$PID" ]; then - /usr/sbin/igmpproxy /etc/igmpproxy.conf & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - disown - add_daemon igmpproxy - stat_done - fi - ;; - stop) - stat_busy "Stopping igmpproxy routing daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon igmpproxy - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD index 32778331c..21370d6af 100644 --- a/community/incron/PKGBUILD +++ b/community/incron/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74646 2012-08-01 06:33:04Z spupykin $ +# $Id: PKGBUILD 90677 2013-05-13 14:26:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> # Contributor: scj <scj(at)archlinux(dot)us> pkgname=incron pkgver=0.5.10 -pkgrel=3 +pkgrel=4 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods" arch=('i686' 'x86_64') url="http://incron.aiken.cz/" @@ -14,10 +14,8 @@ depends=('gcc-libs' 'bash') install=incron.install options=('emptydirs') source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz" - 'incron.init' 'incrond.service') md5sums=('67f8b671db8169edccc8ef11c7d2c8be' - '648e1ca1a4b1e624401d9d71aa3756b3' '859a90af9e4efe40db381ea07167a66a') build() { @@ -39,6 +37,5 @@ package() { CFGDIR="${pkgdir}"/etc \ SYSDATADIR="${pkgdir}"/etc/incron.d install - install -Dm0755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond install -Dm0644 "${srcdir}/incrond.service" "${pkgdir}/usr/lib/systemd/system/incrond.service" } diff --git a/community/incron/incron.init b/community/incron/incron.init deleted file mode 100644 index 337c0fa0b..000000000 --- a/community/incron/incron.init +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting Incrond" - /usr/sbin/incrond - add_daemon incrond - stat_done - ;; - stop) - stat_busy "Stopping Incrond" - PID=`pidof -o %PPID /usr/sbin/incrond` - [ -z "$PID" ] || kill $PID - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon incrond - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD index b2e23f518..9af8ff540 100644 --- a/community/inn/PKGBUILD +++ b/community/inn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82923 2013-01-25 21:39:24Z spupykin $ +# $Id: PKGBUILD 90747 2013-05-13 14:54:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Edward Tjörnhammar <xhemi@cube2.se> # Contributor: Edward Tjörnhammar <xhemi@cube2.se> pkgname=inn pkgver=2.5.3 -pkgrel=2 +pkgrel=4 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." url="http://www.isc.org/software/inn/" arch=('i686' 'x86_64') @@ -47,18 +47,10 @@ backup=(etc/inn/newsfeeds var/db/inn/history.index var/db/inn/newsgroups) source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz - innd.rc - nnrpd.rc - innd.conf - nnrpd.conf innd.service inn.tmpfiles site.make.patch) md5sums=('353fe95232828ddbc80debff86c240bc' - 'a243d9498568f1beee20da5684b5fbfc' - 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' - 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' - 'bb4bbe86ae52fbbf08b0f6f370dea052' '9da925a486fcf0cd67fdf462cbb9c0b4' '050b7bffff3361c673a118739e42349e' '960c800026ed6e03901cf0bafdfd53d8') @@ -96,7 +88,6 @@ build() { EOF sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch - export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH make } @@ -107,13 +98,6 @@ package() { make DESTDIR=$pkgdir install - mkdir -p $pkgdir/etc/{conf,rc}.d - install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd - install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd - - install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd - install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd - cd $pkgdir/usr/lib for i in lib*.a; do gcc -shared -o ${i%%.a}.so.2.0.0 $i diff --git a/community/inn/innd.conf b/community/inn/innd.conf deleted file mode 100644 index 48f96ba5e..000000000 --- a/community/inn/innd.conf +++ /dev/null @@ -1,2 +0,0 @@ -NEWS_USER=news -NEWS_GROUP=news diff --git a/community/inn/innd.rc b/community/inn/innd.rc deleted file mode 100644 index 5e36aec0d..000000000 --- a/community/inn/innd.rc +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/innd ] && . /etc/conf.d/innd -[ -z "$NEWS_USER" ] && print "Please set news username" && exit 1; -[ -z "$NEWS_GROUP" ] && print "Please set news groupname" && exit 1; - -case "$1" in - start) - stat_busy "Starting InterNetNews" - [ -d /var/run/inn ] || { - mkdir -p /var/run/inn - chown -R $NEWS_USER:$NEWS_GROUP /var/run/inn - } - su $NEWS_USER -c /usr/bin/rc.news 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - echo $! > /var/run/innd.pid - add_daemon innd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews" - ctlinnd throttle "shutting down" 2>&- >&- - su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - kill `ps faxu| grep ^$NEWS_USER | awk -- '{print $2}'` 2>&- >&- - rm /var/run/innd.pid - rm_daemon innd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/inn/nnrpd.conf b/community/inn/nnrpd.conf deleted file mode 100644 index 689a289ce..000000000 --- a/community/inn/nnrpd.conf +++ /dev/null @@ -1,3 +0,0 @@ -USE_SSL=1 -LISTEN_PORT=563 -NNRPD_OPTS="-D -S -p $LISTEN_PORT -c /etc/inn/readers.conf" diff --git a/community/inn/nnrpd.rc b/community/inn/nnrpd.rc deleted file mode 100644 index d7c902832..000000000 --- a/community/inn/nnrpd.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/nnrpd ] && . /etc/conf.d/nnrpd -[ -z "$NNRPD_OPTS" ] && print "FATAL: No arguments where passed" && exit 1; - -PID=`pidof -o %PPID nnrpd` -case "$1" in - start) - stat_busy "Starting InterNetNews Readers Daemon" - if [ ! -f /var/run/nnrpd.pid ]; then - stat_append ":: InterNetNews (innd) is not running" - stat_fail - exit 1 - fi - - [ -d /var/run/inn ] || mkdir -p /var/run/inn - [ -z "$PID" ] && nnrpd $NNRPD_OPTS 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID nnrpd` - echo $PID > /var/run/nnrpd.pid - add_daemon nnrpd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews Readers Daemon" - [ ! -z "$PID" ] && kill $PID >&- - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/nnrpd.pid - rm_daemon nnrpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD index ea6fca2b6..802c1a5f6 100644 --- a/community/inputattach/PKGBUILD +++ b/community/inputattach/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77899 2012-10-15 16:07:24Z spupykin $ +# $Id: PKGBUILD 90759 2013-05-13 16:35:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=inputattach pkgver=1.24 -pkgrel=6 +pkgrel=9 pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system" arch=('i686' 'x86_64') url="http://linuxconsole.sourceforge.net/" @@ -12,13 +12,9 @@ license=('GPL') depends=('bash') makedepends=('gcc') backup=(etc/conf.d/inputattach) -install=inputattach.install -#source=('http://kernel.org/pub/linux/kernel/people/dtor/inputattach.c' -# 'http://kernel.org/pub/linux/kernel/people/dtor/serio-ids.h' source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c' 'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h' 'inputattach.conf.d' - 'inputattach.rc.d' 'inputattach.service' 'inputattachctl' '0001-Add-w8001-flag.patch' @@ -26,7 +22,6 @@ source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c' md5sums=('eb595a766ca363edb3b14c25404596ce' '93d34d96cd3ad19ea1aeca7f68a66b4a' '7ca903e54829764c8241233af5069216' - 'aa2e404fc113abdd2ab14e2a6352c331' 'c19b9ed38b243191cf5378b87a42a4cc' '84c6463660c10bd34c0390102da087d5' 'f1b3ddae308351357f557cbd5c6cda81' @@ -49,8 +44,7 @@ build() { package() { cd "$srcdir/src" install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach" - install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" - install -Dm755 $srcdir/inputattach.rc.d "$pkgdir/etc/rc.d/inputattach" install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl + install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service } diff --git a/community/inputattach/inputattach.install b/community/inputattach/inputattach.install deleted file mode 100644 index d705bceaf..000000000 --- a/community/inputattach/inputattach.install +++ /dev/null @@ -1,16 +0,0 @@ -## arg 1: the new package version - -post_upgrade() { - (( $(vercmp 1.24-3 $2) > 0 )) && cat <<EOF -ATTENTION: - /etc/conf.d/inputattach.conf has been replaced by /etc/conf.d/inputattach - Make sure you adjust the new config file, which has a new format. -EOF -} - -post_install() { - cat << EOF -The correct device mode and /dev device file will need to be set in -/etc/conf.d/inputattach before starting /etc/rc.d/inputattach -EOF -} diff --git a/community/inputattach/inputattach.rc.d b/community/inputattach/inputattach.rc.d deleted file mode 100644 index eb626e199..000000000 --- a/community/inputattach/inputattach.rc.d +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/inputattach - -case "$1" in - start) - stat_busy "Starting inputattach" - for param in "${IAPARAMS[@]}"; do - if ! /usr/sbin/inputattach --daemon $param; then - stat_fail - exit 1 - fi - done - - add_daemon inputattach - stat_done - ;; - stop) - stat_busy "Stopping inputattach" - PID=`pidof -o %PPID /usr/sbin/inputattach` - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm_daemon inputattach - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index c371018ae..a5683ebc4 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86151 2013-03-12 12:49:56Z spupykin $ +# $Id: PKGBUILD 90745 2013-05-13 14:45:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> pkgname=ipsec-tools pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64') url="http://ipsec-tools.sourceforge.net/" @@ -13,14 +13,10 @@ makedepends=('linux-headers') license=('GPL') options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 - racoon.rc - ipsec.rc racoon.service ipsec.service ipsec-tools-linux-3.7-compat.patch) md5sums=('d38b39f291ba2962387c3232e7335dd8' - '416b8e362d86987b8c55f7153cdafbeb' - '90d0810267cbd847383ae3101699b192' '1632fce55ba5592dea1f8bf661106e7d' '5bf7478590c751b465617681a31619fe' 'ae1dd20c83dcfce3dedb46ee73e83613') @@ -34,15 +30,14 @@ build() { ./bootstrap ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ - --enable-adminport --enable-gssapi + --enable-adminport --enable-gssapi \ + --with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include make } package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -Dm0755 $srcdir/racoon.rc $pkgdir/etc/rc.d/racoon - install -Dm0755 $srcdir/ipsec.rc $pkgdir/etc/rc.d/ipsec install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service } diff --git a/community/ipsec-tools/ipsec.rc b/community/ipsec-tools/ipsec.rc deleted file mode 100644 index cff472c59..000000000 --- a/community/ipsec-tools/ipsec.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Loading IPSec Security Policy Database..." - /usr/sbin/setkey -f /etc/ipsec.conf &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ipsec - stat_done - fi - ;; - stop) - stat_busy "Unloading IPSec Security Policy Database..." - /usr/sbin/setkey -F -P - /usr/sbin/setkey -F - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ipsec - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ipsec-tools/racoon.rc b/community/ipsec-tools/racoon.rc deleted file mode 100644 index 1a67dcac5..000000000 --- a/community/ipsec-tools/racoon.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/racoon` -case "$1" in - start) - stat_busy "Starting Racoon IPSec daemon" - [ -z "$PID" ] && /usr/sbin/racoon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon racoon - stat_done - fi - ;; - stop) - stat_busy "Stopping Racoon IPSec daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon racoon - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index ff50f148f..a4d3cb929 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90287 2013-05-10 23:18:07Z seblu $ +# $Id: PKGBUILD 90514 2013-05-12 23:45:55Z seblu $ # Maintainer: Sébastien Luttringer pkgname=ipset pkgver=6.19 -pkgrel=1 +pkgrel=2 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') url='http://ipset.netfilter.org' @@ -14,11 +14,11 @@ options=('!libtool') source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.service") md5sums=('cabba1bd63a93f6e1c3db3fb22412b64' - 'f74642f7bb88056103c63a62a91c782c') + '6be6a2b34c1f38fc8ad60828403e2077') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --with-kmod=no + ./configure --prefix=/usr --sbindir=/usr/bin --with-kmod=no make } diff --git a/community/ipset/ipset.service b/community/ipset/ipset.service index 1af453668..39183c7d7 100644 --- a/community/ipset/ipset.service +++ b/community/ipset/ipset.service @@ -5,8 +5,8 @@ Before=iptables.service [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/usr/sbin/ipset -f /etc/ipset.conf restore -ExecStop=/usr/sbin/ipset destroy +ExecStart=/usr/bin/ipset -f /etc/ipset.conf restore +ExecStop=/usr/bin/ipset destroy [Install] WantedBy=multi-user.target diff --git a/community/iptstate/PKGBUILD b/community/iptstate/PKGBUILD index 9f1321bbe..458bc3ad1 100644 --- a/community/iptstate/PKGBUILD +++ b/community/iptstate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71896 2012-06-03 00:25:44Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 90516 2013-05-12 23:47:26Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=iptstate pkgver=2.2.5 -pkgrel=1 +pkgrel=2 pkgdesc='top-like interface to netfilter connection-tracking table' arch=('i686' 'x86_64') url='http://www.phildev.net/iptstate/' @@ -20,8 +20,8 @@ build() { package() { cd $pkgname-$pkgver - install -D -m755 $pkgname "$pkgdir/usr/sbin/$pkgname" + install -D -m755 $pkgname "$pkgdir/usr/bin/$pkgname" install -D -m644 $pkgname.8 "$pkgdir/usr/share/man/man8/$pkgname.8" install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD index 7e0f14a77..e34683321 100644 --- a/community/ipvsadm/PKGBUILD +++ b/community/ipvsadm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83590 2013-02-03 14:26:41Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 90518 2013-05-12 23:51:34Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ipvsadm pkgver=1.26 -pkgrel=7 +pkgrel=8 pkgdesc='The IP Virtual Server administration utility' arch=('i686' 'x86_64') url='http://www.linuxvirtualserver.org/software/ipvs.html' @@ -22,9 +22,12 @@ md5sums=('eac3ba3f62cd4dea2da353aeddd353a8' 'dc87684064f85b64c1e79c1eac336303' 'e9fb77d2fbe2d3f41d60257316338543') +prepare() { + patch -p1 -d $pkgname-$pkgver < 01-fix-not-showing-all-server.patch +} + build() { cd $pkgname-$pkgver - patch -p1 -i ../01-fix-not-showing-all-server.patch make } @@ -33,7 +36,7 @@ package() { make \ BUILD_ROOT="$pkgdir" \ MANDIR=usr/share/man \ - SBIN="$pkgdir/usr/sbin" \ + SBIN="$pkgdir/usr/bin" \ INIT="$pkgdir/etc/rc.d" \ install popd diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index e350de11c..c5bb554c4 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83710 2013-02-04 14:57:08Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 90520 2013-05-12 23:55:17Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived pkgver=1.2.7 -pkgrel=2 +pkgrel=3 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64') url='http://www.keepalived.org/' @@ -14,11 +14,11 @@ depends=('openssl' 'popt' 'libnl1') source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.service') md5sums=('8551a34ee048895dbe5350a031ff29c1' - 'edbeda8c8777cf36110c1623e49bc5c9') + '0a5171f4298528315e8a8004b55befb7') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin make } @@ -31,10 +31,8 @@ package() { install -d -m 755 "$pkgdir/usr/share/$pkgname" mv "$pkgdir/etc/keepalived/samples" "$pkgdir/usr/share/$pkgname/samples" # systemd - cd "$srcdir" - install -D -m 644 $pkgname.service \ + install -D -m 644 "$srcdir/$pkgname.service" \ "$pkgdir/usr/lib/systemd/system/$pkgname.service" - } # vim:set ts=2 sw=2 et: diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service index b96a8f474..a1bbeabb3 100644 --- a/community/keepalived/keepalived.service +++ b/community/keepalived/keepalived.service @@ -3,7 +3,7 @@ Description=Keepalive Daemon After=network.target [Service] -ExecStart=/usr/sbin/keepalived --dont-fork +ExecStart=/usr/bin/keepalived --dont-fork [Install] WantedBy=multi-user.target diff --git a/community/libident/PKGBUILD b/community/libident/PKGBUILD index db678c3d8..4e4207c6a 100644 --- a/community/libident/PKGBUILD +++ b/community/libident/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 67228 2012-03-05 13:41:53Z arodseth $ +# $Id: PKGBUILD 90500 2013-05-12 23:26:42Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> -# -# TODO: Write a pkg-conf file pkgname=libident pkgver=0.32 -pkgrel=3 -pkgdesc="New libident C library" +pkgrel=5 +pkgdesc='Library for querying IDENT servers' arch=('x86_64' 'i686') -url="http://www.remlab.net/libident/" +url='http://www.remlab.net/libident/' license=('custom') -options=('!libtool') -source=("http://www.remlab.net/files/libident/libident-$pkgver.tar.gz") -sha256sums=('8cc8fb69f1c888be7cffde7f4caeb3dc6cd0abbc475337683a720aa7638a174b') +depends=('glibc') +options=('!emptydirs' '!libtool') +source=("http://www.remlab.net/files/libident/libident-$pkgver.tar.gz" + 'libident.pc') +sha256sums=('8cc8fb69f1c888be7cffde7f4caeb3dc6cd0abbc475337683a720aa7638a174b' + '81907cda4fe9c925e78bf58bc9c61d1af439784e4f01da4bd6fc7e4d87750f5c') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man make @@ -29,6 +31,7 @@ package() { make DESTDIR="$pkgdir" install install -Dm755 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 "$srcdir/libident.pc" "$pkgdir/usr/lib/pkgconfig/libident.pc" } # vim:set ts=2 sw=2 et: diff --git a/community/libident/libident.pc b/community/libident/libident.pc new file mode 100644 index 000000000..835504e9a --- /dev/null +++ b/community/libident/libident.pc @@ -0,0 +1,10 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: libident +Description: IDENT query library +Version: 0.32 +Libs: -L${libdir} -lident +Cflags: -I${includedir} diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD index 0e222d90c..5b8ccc1e7 100644 --- a/community/libpaper/PKGBUILD +++ b/community/libpaper/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83644 2013-02-04 09:47:51Z arodseth $ +# $Id: PKGBUILD 90780 2013-05-13 21:25:37Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: royrocks <royrocks13@gmail.com> pkgname=libpaper pkgver=1.1.24 -pkgrel=4 +pkgrel=5 pkgdesc='Library for handling paper characteristics' arch=('x86_64' 'i686') url='http://packages.debian.org/unstable/source/libpaper' @@ -17,13 +17,18 @@ sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96') build() { cd "$srcdir/$pkgname-$pkgver+nmu2" - ./configure --prefix=/usr --sysconfdir=/etc + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin make } package() { cd "$srcdir/$pkgname-$pkgver+nmu2" - make prefix="$pkgdir/usr" install + + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/libtorrent/PKGBUILD b/community/libtorrent/PKGBUILD index 6c6402a93..01884fc7b 100644 --- a/community/libtorrent/PKGBUILD +++ b/community/libtorrent/PKGBUILD @@ -1,19 +1,21 @@ +# $Id: PKGBUILD 90569 2013-05-13 09:41:28Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: sh__ pkgname=libtorrent -pkgver=0.13.2 +pkgver=0.13.3 pkgrel=2 pkgdesc='BitTorrent library with a focus on high performance and good code' url='http://libtorrent.rakshasa.no/' -license=('GPL') arch=('i686' 'x86_64') -depends=('libsigc++2.0' 'openssl') -options=('!libtool') +license=('GPL') +depends=('openssl') source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz") -sha1sums=('4f34a744fbe10c54aaf53d34681fabc1a49d7257') +sha1sums=('e65a20b9e6d5c04b4e0849543d58befb60d948b7') + +options=('!libtool') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index ca24a1995..cab1b749b 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89909 2013-05-05 14:49:00Z spupykin $ +# $Id: PKGBUILD 90621 2013-05-13 11:43:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=1.0.5 -pkgrel=1 +pkgrel=3 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -31,15 +31,11 @@ backup=('etc/conf.d/libvirtd' 'etc/sasl2/libvirt.conf') install="libvirt.install" source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" - libvirtd.rc.d libvirtd.conf.d - libvirtd-guests.rc.d libvirtd-guests.conf.d libvirt.tmpfiles.d) md5sums=('91c4145f49bcf92e89470fa3fb28fff6' - 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' - '0ee5b6c58590ff392a266f20f7928d1f' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '020971887442ebbf1b6949e031c8dd3f') @@ -77,17 +73,13 @@ package() { make DESTDIR="$pkgdir" install - install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd - - install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests # systemd stuff install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/ - rm -rf \ "$pkgdir"/var/run \ "$pkgdir"/etc/sysconfig \ diff --git a/community/libvirt/libvirtd-guests.rc.d b/community/libvirt/libvirtd-guests.rc.d deleted file mode 100644 index 3100b34fb..000000000 --- a/community/libvirt/libvirtd-guests.rc.d +++ /dev/null @@ -1,161 +0,0 @@ -#!/bin/bash - -source /etc/conf.d/libvirtd-guests -[ -f /etc/rc.conf ] && source /etc/rc.conf - -if [ -f /etc/rc.d/functions ]; then - . /etc/rc.d/functions -else - stat_busy() { - echo "$*" - } - - stat_fail() { - echo "FAIL" - } - - stat_done() { - echo "DONE" - } - - add_daemon() { - true - } - - rm_daemon() { - true - } -fi - - -LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list" - -# get guest state by name -libvirt_get_guest_state() -{ - virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}' -} - -# list IDs of running guests -libvirt_list() -{ - - list=$(virsh $LIBVIRTD_URI list) - - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - fi - - uuids= - for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do - uuid=$(virsh $LIBVIRTD_UTI dominfo $id | awk '/^UUID:/{print $2}') - if [ -z "$uuid" ]; then - RETVAL=1 - return 1 - fi - uuids="$uuids $uuid" - done - - echo $uuids - -} - -libvirt_domname() -{ - uuid=$1 - name=$(virsh $LIBVIRTD_URI dominfo $uuid | awk 'NR == 2 {$1=""; print}') - - echo $name -} - -# suspend guest by name -libvirt_suspend() -{ - virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null - timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT - while [ "$timeout" -gt 0 ]; do - sleep 1 - timeout=$((timeout - 1)) - state=`libvirt_get_guest_state "$1"` - [ "x$state" == "xshut" ] && return 0 - done - return 1 -} - -# shutdown guest by name -libvirt_shutdown() -{ - virsh $LIBVIRTD_URI shutdown "$1" >/dev/null - timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT - while [ "$timeout" -gt 0 ]; do - sleep 1 - timeout=$((timeout - 1)) - state=`libvirt_get_guest_state "$1"` - [ "x$state" == "xshut" ] && return 0 - done - return 1 -} - -# start guest by name -libvirt_start() -{ - virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null -} - -# stop all guests -libvirt_stop_all() -{ - mkdir -p `dirname $LIBVIRTD_LISTFILE` - echo -n >$LIBVIRTD_LISTFILE - - for i in `libvirt_list`; do - name=`libvirt_domname $i` - if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then - stat_busy "Suspending libvirtd/$name guest" - libvirt_suspend "$i" - else - stat_busy "Shutting libvirtd/$i guest down" - libvirt_shutdown "$i" - fi - [ $? -eq 0 ] && stat_done || stat_fail - echo $i >>$LIBVIRTD_LISTFILE - done -} - -# start all guests -libvirt_start_all() -{ - if [ -f $LIBVIRTD_LISTFILE ]; then - for i in `cat $LIBVIRTD_LISTFILE`; do - name=`libvirt_domname $i` - stat_busy "Starting/resuming libvirtd/$name guest" - libvirt_start "$i" - [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail - done - fi - rm -f $LIBVIRTD_LISTFILE -} - -# main -LC_ALL=C -LANG=C -case "$1" in - start) - libvirt_start_all - add_daemon libvirtd-guests - ;; - stop) - libvirt_stop_all - rm_daemon libvirtd-guests - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo $"Usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/libvirt/libvirtd.rc.d b/community/libvirt/libvirtd.rc.d deleted file mode 100644 index 193bffa9c..000000000 --- a/community/libvirt/libvirtd.rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/libvirtd -. /etc/rc.d/functions - -LIBVIRTD_CONFIG_ARGS= -if [ -n "$LIBVIRTD_CONFIG" ] -then - LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" -fi - -PID=`pidof -o %PPID /usr/sbin/libvirtd` -case "$1" in - start) - stat_busy "Starting libvirtd" - export RADVD=/usr/sbin/radvd - for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do - [ -d $i ] || mkdir -p $i - done - [ -z "$PID" ] && ( - mkdir -p /var/{cache,run}/libvirt - rm -rf /var/cache/libvirt/* - KRB5_KTNAME=$KRB5_KTNAME \ - /usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS - ) - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon libvirtd - stat_done - fi - ;; - stop) - stat_busy "Stopping libvirtd" - [ ! -z "$PID" ] && ( - kill $PID &> /dev/null - rm -rf /var/cache/libvirt/* - rm -f /var/run/libvirtd.pid - ) - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon libvirtd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading libvirtd configuration" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index e554c877b..33f0ac807 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89638 2013-04-30 19:20:26Z seblu $ +# $Id: PKGBUILD 90493 2013-05-12 22:57:07Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools @@ -9,7 +9,7 @@ pkgname=('linux-tools-meta' 'x86_energy_perf_policy' 'usbip') pkgver=3.9 -pkgrel=1 +pkgrel=2 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -35,7 +35,7 @@ sha256sums=('60bc3e64ee5dc778de2cd7cd7640abf518a4c9d4f31b8ed624e16fad53f54541' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' - '8053a6bcd0776a7fefccc5012f93a1710653529e0eab59afcc39f24361c64869') + '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f') build() { # apply stable patching set @@ -78,7 +78,7 @@ build() { # fix missing man page sed -i 's/usbip_bind_driver.8//' Makefile.am ./autogen.sh - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make popd } @@ -128,6 +128,7 @@ package_cpupower() { pushd linux-$pkgver/tools/power/cpupower make \ DESTDIR="$pkgdir" \ + sbindir='/usr/bin' \ mandir='/usr/share/man' \ docdir='/usr/share/doc/cpupower' \ install install-man diff --git a/community/linux-tools/usbipd.service b/community/linux-tools/usbipd.service index 1f3da08db..1807e94b1 100644 --- a/community/linux-tools/usbipd.service +++ b/community/linux-tools/usbipd.service @@ -3,7 +3,7 @@ Description=USB/IP server After=network.target [Service] -ExecStart=/usr/sbin/usbipd +ExecStart=/usr/bin/usbipd [Install] WantedBy=multi-user.target diff --git a/community/makedev/PKGBUILD b/community/makedev/PKGBUILD index bb21237d9..85285e4ab 100644 --- a/community/makedev/PKGBUILD +++ b/community/makedev/PKGBUILD @@ -1,11 +1,11 @@ -# $Id$ -# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> +# $Id: PKGBUILD 90528 2013-05-13 00:22:02Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Jonathan Liu <net147@gmail.com> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=makedev pkgver=3.23_1 -pkgrel=1 +pkgrel=2 pkgdesc='The ubiquitous script to create static device nodes' arch=('i686' 'x86_64') license=('GPL2') @@ -20,7 +20,9 @@ build() { package() { cd ${pkgname^^*}-${pkgver/_*} - make DESTDIR="${pkgdir}" devdir=/usr/sbin makedevdir=/usr/sbin install + # We make devdir == makedevdir to avoid install script to symlink into /dev + # As previous make doesn't have a bad devdir, everything goes well + make DESTDIR="$pkgdir" devdir=/usr/bin makedevdir=/usr/bin sbindir=/usr/bin install } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index f6493bd0d..f508e02af 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88089 2013-04-11 09:34:40Z spupykin $ +# $Id: PKGBUILD 90683 2013-05-13 14:28:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> pkgname=mcelog pkgver=20130411 -pkgrel=1 +pkgrel=2 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") @@ -14,10 +14,8 @@ makedepends=('git') options=('docs') backup=('etc/mcelog/mcelog.conf') source=("git://github.com/andikleen/mcelog.git" - "${pkgname}.rc" "mcelog.service") md5sums=('SKIP' - 'f039a77d7bde3518d3d695b144816e8a' 'b71eb82e532aed3918ebf6b30e158e7f') build() { @@ -30,7 +28,6 @@ package() { mkdir -p $pkgdir/usr/share/doc/mcelog make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron" - install -Dm0755 "${srcdir}/mcelog.rc" "${pkgdir}/etc/rc.d/mcelog" install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate" install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README" install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service diff --git a/community/mcelog/mcelog.rc b/community/mcelog/mcelog.rc deleted file mode 100644 index fb73743c7..000000000 --- a/community/mcelog/mcelog.rc +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/mcelog` -case "$1" in - start) - stat_busy "Starting mcelog" - if [ -z "$PID" ]; then - /usr/sbin/mcelog --daemon --pidfile /var/run/mcelog.pid - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon mcelog - stat_done - fi - ;; - stop) - stat_busy "Stopping mcelog" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mcelog - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD index 5c278c044..940e7b69f 100644 --- a/community/mediaproxy/PKGBUILD +++ b/community/mediaproxy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80024 2012-11-15 14:41:33Z spupykin $ +# $Id: PKGBUILD 90685 2013-05-13 14:28:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Colin Pitrat <colin.pitrat@gmail.com> pkgname=mediaproxy pkgver=2.5.2 -pkgrel=4 +pkgrel=5 pkgdesc="Open-source media proxy for OpenSER" url="http://mediaproxy.ag-projects.com/" arch=('i686' 'x86_64') @@ -13,24 +13,24 @@ depends=('python2' 'libnetfilter_conntrack' 'iptables' 'python2-application' 'python2-cjson' 'python2-gnutls') #backup=('opt/mediaproxy/config.ini') source=("http://download.ag-projects.com/MediaProxy/mediaproxy-$pkgver.tar.gz" - "mediaproxy.init" "mediaproxy-dispatcher.service" "mediaproxy-relay.service" "mediaproxy.tmpfiles") md5sums=('840de8f52e656991be728c15ec30bb5e' - '66f4417f40dda0dfa31569ee4ccc32c7' '4a1fa0b6ce0a8bd44bf0f1d9d36a6154' '23c1a584835de00a958ef963cdd40040' '60a25f2cb6429a0a7d62d45d0c75a0ea') build() { cd $srcdir/mediaproxy-$pkgver - sed -i "s|libraries = get_link_libraries(),|libraries = ['netfilter_conntrack', 'ip4tc'],|g" setup.py +} + +package() { + cd $srcdir/mediaproxy-$pkgver python2 setup.py install --root=$pkgdir - install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy install -Dm0644 $srcdir/$pkgname-dispatcher.service $pkgdir/usr/lib/systemd/system/$pkgname-dispatcher.service install -Dm0644 $srcdir/$pkgname-relay.service $pkgdir/usr/lib/systemd/system/$pkgname-relay.service install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf diff --git a/community/mediaproxy/mediaproxy.init b/community/mediaproxy/mediaproxy.init deleted file mode 100644 index ba9fe90b2..000000000 --- a/community/mediaproxy/mediaproxy.init +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# mediaproxy starts and stops the SER MediaProxy server - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting mediaproxy" - media-dispatcher && media-relay - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - stop) - stat_busy "Stopping mediaproxy" - kill `cat /var/run/mediaproxy/relay.pid` - kill `cat /var/run/mediaproxy/dispatcher.pid` - stat_done - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac diff --git a/community/minbif/PKGBUILD b/community/minbif/PKGBUILD index 96fb69a40..ebc095a12 100644 --- a/community/minbif/PKGBUILD +++ b/community/minbif/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75192 2012-08-15 19:32:50Z lfleischer $ +# $Id: PKGBUILD 90561 2013-05-13 08:02:43Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: AkiraYB <brunoyb!yahoo,com,br> pkgname=minbif pkgver=1.0.5 -pkgrel=2 +pkgrel=3 pkgdesc='An IRC gateway to IM networks that uses libpurple.' arch=('i686' 'x86_64') url='http://minbif.im/' @@ -17,12 +17,10 @@ backup=('etc/minbif/minbif.conf' install='minbif.install' source=("http://minbif.im/attachments/download/148/${pkgname}-${pkgver}.tar.gz" 'minbif-gcc-4.7.patch' - 'minbif' 'minbif.service' 'minbif.tmpfiles.conf') md5sums=('00c5c1abbe2b8a9d900961832c7909a8' '2235c45d5bdb01e9ef4b11d2a41d49bb' - '307a6fab42bcaeed11a55b5fb4589778' 'b34876e339a37dfb1dc6cd0b9d8edf9d' '3360f5d1bf9bc69fd9b7c9326f321dc3') @@ -42,7 +40,6 @@ package() { install -dm0755 "${pkgdir}/var/lib" install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif" install -dm0770 -o67 -g67 "${pkgdir}/var/lib/minbif/users" - install -Dm0755 "${srcdir}/minbif" "${pkgdir}/etc/rc.d/minbif" make DESTDIR="${pkgdir}" install diff --git a/community/minbif/minbif b/community/minbif/minbif deleted file mode 100644 index 47888d169..000000000 --- a/community/minbif/minbif +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/minbif` -case "$1" in - start) - stat_busy "Starting minbif daemon" - if [ -z "$PID" ]; then - if [ ! -d /var/run/minbif ]; then - mkdir -p /var/run/minbif && chown minbif:minbif /var/run/minbif - fi - [ -f /var/run/minbif/minbif.pid ] && rm -f /var/run/minbif/minbif.pid - CMD='/usr/bin/minbif --pidfile /var/run/minbif/minbif.pid \ - /etc/minbif/minbif.conf' - su -s /bin/sh -c "$CMD" minbif - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon minbif - stat_done - fi - else - stat_fail - fi - ;; - - stop) - stat_busy "Stopping minbif daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/minbif/minbif.pid - rm_daemon minbif - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 8d9a7075b..be80755bf 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84354 2013-02-16 22:50:32Z ioni $ +# $Id: PKGBUILD 90574 2013-05-13 09:53:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -6,8 +6,8 @@ # Contributor: Kamil Kaminski <kyle@kkaminsk.com> pkgname=minidlna -pkgver=1.0.25 -pkgrel=5 +pkgver=1.1.0 +pkgrel=1 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/minidlna/" @@ -17,19 +17,16 @@ backup=('etc/minidlna.conf' 'etc/conf.d/minidlna') install=minidlna.install changelog=changelog -source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz - minidlna.rc +source=(http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz minidlna.service minidlna.tmpfiles) -md5sums=('d966256baf2f9b068b9de871ab5dade5' - '1b92f88905abe8f719585d48f4b25a49' - '1903ed9ceee43b8bb86146b9ad8eb50c' +md5sums=('26484a84af3fceafdee26595aae097f7' + '10ef548e6b2ad15b17b5090e6e074db8' '26de27b12d6a37c47d9714107d07aac9') build() { cd "$srcdir/$pkgname-$pkgver" - sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh - find -type f -name '*.c' -exec sed -i '1,1i#include </usr/include/time.h>' {} \; + ./configure --prefix=/usr make } @@ -37,13 +34,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" DESTDIR=$pkgdir make install install -Dm644 minidlna.conf ${pkgdir}/etc/minidlna.conf - - install -Dm755 ${srcdir}/minidlna.rc ${pkgdir}/etc/rc.d/minidlna - mkdir -p $pkgdir/etc/conf.d - echo 'MINIDLNA_USER=nobody' >$pkgdir/etc/conf.d/minidlna - echo 'MINIDLNA_OPTS=""' >>$pkgdir/etc/conf.d/minidlna - - # systemd files install -Dm0644 $srcdir/minidlna.tmpfiles $pkgdir/usr/lib/tmpfiles.d/minidlna.conf install -Dm0644 $srcdir/minidlna.service $pkgdir/usr/lib/systemd/system/minidlna.service } diff --git a/community/minidlna/minidlna.rc b/community/minidlna/minidlna.rc deleted file mode 100644 index dd5910544..000000000 --- a/community/minidlna/minidlna.rc +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/minidlna -. /etc/minidlna.conf - -daemon_name=minidlna - -get_pid() { - pidof -o %PPID /usr/sbin/minidlna -} - -case "$1" in - start) - stat_busy "Starting minidlna" - PID=$(get_pid) - if [[ -z "$PID" ]]; then - rm -f /var/run/$daemon_name.pid - touch /var/run/$daemon_name.pid && chown $MINIDLNA_USER:$MINIDLNA_USER /var/run/$daemon_name.pid - mkdir -p /var/cache/minidlna - chown -R $MINIDLNA_USER /var/cache/minidlna - su -s /bin/sh -l -c "/usr/sbin/minidlna ${MINIDLNA_OPTS} $2" - $MINIDLNA_USER - if [[ $? -gt 0 ]]; then - stat_fail - exit 1 - else - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping minidlna" - PID=$(get_pid) - [[ -n $PID ]] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon minidlna - stat_done - fi - ;; - - clean) - $0 stop - sleep 1 - stat_busy "Cleaning minidlna cache" - [ -z $db_dir ] || rm -r $db_dir/* - stat_done - sleep 1 - $0 start - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - rescan) - $0 stop - sleep 1 - $0 start -R - ;; - - *) - echo "usage: $0 {start|stop|restart|clean}" -esac -exit 0 diff --git a/community/minidlna/minidlna.service b/community/minidlna/minidlna.service index 6c9a40152..a2a20720e 100644 --- a/community/minidlna/minidlna.service +++ b/community/minidlna/minidlna.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking User=nobody -ExecStart=/usr/sbin/minidlna -P /var/run/minidlna/minidlna.pid +ExecStart=/usr/sbin/minidlnad -P /run/minidlna/minidlna.pid PIDFile=/var/run/minidlna/minidlna.pid [Install] diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index 04760be3a..c0f4cfea3 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79082 2012-10-30 09:54:22Z spupykin $ +# $Id: PKGBUILD 90687 2013-05-13 14:29:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo pkgver=1.2.5 -pkgrel=3 +pkgrel=4 pkgdesc="Teredo client and server." arch=('i686' 'x86_64') url="http://www.remlab.net/miredo/" @@ -13,16 +13,10 @@ backup=('etc/miredo/miredo.conf' 'etc/miredo/client-hook') options=('!libtool') source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz - isatapd.rc.d miredo.install - miredo.rc.d - miredo-server.rc.d miredo.service) md5sums=('5114debbf9fcab5d292176e4548f8cd1' - '51ab6d091192605ee9206944869cb2ab' 'd1b655d7a851cdb46c91c3418ed1962f' - 'c5a9be5c3175fecec387f1710bfd2788' - '319aba1ae06349b76cb25fda0dba60a9' 'abd7d8831cab7f3ea6d0d4e51b8f8f6a') build() { @@ -35,11 +29,13 @@ build() { --libexecdir=/usr/lib \ --with-Judy make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo - install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server - install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook # avoid conflict with filesystem>=2012.06 diff --git a/community/miredo/isatapd.rc.d b/community/miredo/isatapd.rc.d deleted file mode 100644 index fa7bbd708..000000000 --- a/community/miredo/isatapd.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/isatapd` -case "$1" in - start) - stat_busy "Starting userspace ISATAP client" - if [ -z "$PID" ]; then - /usr/sbin/isatapd - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon isatapd - stat_done - fi - ;; - stop) - stat_busy "Stopping userspace ISATAP client" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon isatapd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/miredo/miredo-server.rc.d b/community/miredo/miredo-server.rc.d deleted file mode 100644 index d05513b23..000000000 --- a/community/miredo/miredo-server.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/miredo-server` -case "$1" in - start) - stat_busy "Starting teredo protocol server" - if [ -z "$PID" ]; then - /usr/sbin/miredo-server - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon miredo-server - stat_done - fi - ;; - stop) - stat_busy "Stopping teredo protocol server" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon miredo-server - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/miredo/miredo.rc.d b/community/miredo/miredo.rc.d deleted file mode 100644 index 500374b12..000000000 --- a/community/miredo/miredo.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/miredo` -case "$1" in - start) - stat_busy "Starting teredo protocol client" - if [ -z "$PID" ]; then - /usr/sbin/miredo - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon miredo - stat_done - fi - ;; - stop) - stat_busy "Stopping teredo protocol client" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon miredo - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/misdnuser/PKGBUILD b/community/misdnuser/PKGBUILD deleted file mode 100644 index dde4a06f8..000000000 --- a/community/misdnuser/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 83164 2013-01-27 16:21:34Z pierre $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=misdnuser -pkgver=2.0.17_20120917 -pkgrel=1 -pkgdesc="Tools and library for mISDN" -arch=('i686' 'x86_64') -url="http://www.misdn.org" -license=('GPL') -depends=('isdn4k-utils' 'spandsp') -backup=('etc/capi20.conf') -options=('!makeflags' '!libtool' '!strip') -source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz - misdncapid.rc - mISDNcapid.service - c2faxrecv-mISDNcapid.service - mISDNcapid.conf) - -build() { - # only enable for debugging! - #export CFLAGS+=" -g -O0" - #export CXXFLAGS+=" -g -O0" - cd ${srcdir}/${pkgname}-${pkgver} - make - ./configure --prefix=/usr --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m 755 ${srcdir}/misdncapid.rc ${pkgdir}/etc/rc.d/misdncapid - # fix udev rule - mkdir -p ${pkgdir}/usr/lib/udev/rules.d - mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d - rm -r ${pkgdir}/etc/udev/ - # add systemd files - install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service - # mISDNcapid: - # tends to crash on avmfritz card, add an extra systemd file for - # restarting the services until segfaults are fixed! - install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service - install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf -} -md5sums=('4cdb52f2c0ff1a1426573ac5ef09e9f8' - '2009563b144de037ecb20f8d727a772e' - '8f305ee6e35fa12a8bec0632bfe7a076' - '32ead7f063e007c784aa883d441f33c2' - '42c3b46880a68c3883ee1ed00af34b45') diff --git a/community/misdnuser/c2faxrecv-mISDNcapid.service b/community/misdnuser/c2faxrecv-mISDNcapid.service deleted file mode 100644 index 7a98ca435..000000000 --- a/community/misdnuser/c2faxrecv-mISDNcapid.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=mISDN CAPI to fax receive -Requires=faxq.service mISDNcapid.service -After=faxq.service mISDNcapid.service - -[Service] -ExecStart=/usr/bin/c2faxrecv -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/community/misdnuser/mISDNcapid.conf b/community/misdnuser/mISDNcapid.conf deleted file mode 100644 index 7607e262d..000000000 --- a/community/misdnuser/mISDNcapid.conf +++ /dev/null @@ -1 +0,0 @@ -D /var/run/mISDNcapid 0755 root root - diff --git a/community/misdnuser/mISDNcapid.service b/community/misdnuser/mISDNcapid.service deleted file mode 100644 index 94f38478a..000000000 --- a/community/misdnuser/mISDNcapid.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=mISDN CAPI daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/mISDNcapid -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/community/misdnuser/misdncapid.rc b/community/misdnuser/misdncapid.rc deleted file mode 100755 index 5c47ca0a9..000000000 --- a/community/misdnuser/misdncapid.rc +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$(pidof -o %PPID /usr/sbin/mISDNcapid)" -case "$1" in - start) - stat_busy "Starting misdncapid" - if [ ! -x /var/run/mISDNcapid ] ; then - install -m755 -d /var/run/mISDNcapid - fi - - [ -z "$PID" ] && /usr/sbin/mISDNcapid >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -o %PPID /usr/sbin/mISDNcapid) - echo $PID > /var/run/misdncapid.pid - add_daemon misdncapid - stat_done - fi - ;; - stop) - stat_busy "Stopping misdncapid" - [ -f /var/run/misdncapid.pid ] && kill `cat /var/run/misdncapid.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/misdncapid.pid - rm_daemon misdncapid - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index ba728dfe8..c2a552c34 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77069 2012-10-04 09:18:24Z spupykin $ +# $Id: PKGBUILD 90575 2013-05-13 09:53:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=moreutils -pkgver=0.47 -pkgrel=2 +pkgver=0.48 +pkgrel=1 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64') url="http://joeyh.name/code/moreutils/" @@ -14,11 +14,16 @@ depends=('perl' 'perl-ipc-run' 'perl-timedate' 'perl-time-duration') options=('!emptydirs' 'zipman') replaces=(moreutils-svn) source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz) -md5sums=('4cd3b41a90d07166632942e173ac5ce2') +md5sums=('c6f1eb13132a88ce053be709aa2625d2') build() { - cd $srcdir/moreutils + cd $srcdir/$pkgname + sed -i 's|schema/dtd/4.4|xml-dtd-4.5|g' *.docbook make DOCBOOK2XMAN=docbook2man +} + +package() { + cd $srcdir/$pkgname make PREFIX=$pkgdir/usr install chmod 0644 $pkgdir/usr/share/man/man1/* diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index 7eb15220f..d4b737918 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 84356 2013-02-16 22:50:34Z ioni $ +# $Id: PKGBUILD 90689 2013-05-13 14:29:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=8 +pkgrel=9 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64') license=('GPL') @@ -12,14 +12,12 @@ depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat') backup=('etc/motion/motion.conf') options=('!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz - rc.motion motion.service motion.tmpfiles ffmpeg-0.8.patch linux-headers.patch ffmpeg-compat.patch) md5sums=('1ba0065ed50509aaffb171594c689f46' - '2e8c53c4980edddd420f08fdd572c9be' 'b5b589f8f39939b7a1802cbd9dbe2e1a' 'f863f8c025f7f025b2178def8418decd' 'd36687710837d69fbce4608b1345fa34' @@ -45,7 +43,6 @@ package(){ cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf" - install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" install -Dm644 "${srcdir}/motion.service" "${pkgdir}/usr/lib/systemd/system/motion.service" install -Dm644 "${srcdir}/motion.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/motion.conf" } diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD index 597b62b92..99bbe8325 100644 --- a/community/ndisc6/PKGBUILD +++ b/community/ndisc6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86933 2013-03-25 01:19:53Z seblu $ +# $Id: PKGBUILD 90526 2013-05-13 00:18:50Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Chris Brannon <chris@the-brannons.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=ndisc6 pkgver=1.0.2 -pkgrel=6 +pkgrel=7 pkgdesc='Collection of IPv6 networking utilities' arch=('i686' 'x86_64') url='http://www.remlab.net/ndisc6/' @@ -13,17 +13,25 @@ license=('GPL') depends=('glibc' 'perl') makedepends=('glibc' 'gcc') options=(!emptydirs) -install=ndisc6.install +install=$pkgname.install source=("http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2" 'rdnssd.service') md5sums=('50cb4c19606cf6ff2b7388e71832f579' - 'beeb4f033e9eb951e2de962f609c7c2a') + '88a290cbcf51ac5e10ed5f995a8ba4b9') + +prepare() { + # patch invalid path + sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' \ + $pkgname-$pkgver/rdnssd/merge-hook.in +} build() { cd $pkgname-$pkgver - # patch invalid path - sed -ri 's,PATH=/sbin:/bin,PATH=/sbin:/bin:/usr/sbin:/usr/bin,' rdnssd/merge-hook.in - ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --sysconfdir=/etc make } diff --git a/community/ndisc6/rdnssd.service b/community/ndisc6/rdnssd.service index dcaf73331..6fdf91f2d 100644 --- a/community/ndisc6/rdnssd.service +++ b/community/ndisc6/rdnssd.service @@ -6,7 +6,7 @@ Requires=network.target [Service] Type=forking PIDFile=/run/rdnssd.pid -ExecStart=/usr/sbin/rdnssd -H /etc/rdnssd/merge-hook +ExecStart=/usr/bin/rdnssd -H /etc/rdnssd/merge-hook [Install] WantedBy=multi-user.target diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD index b38b7e59c..5a4727a7e 100644 --- a/community/netcf/PKGBUILD +++ b/community/netcf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88327 2013-04-16 13:30:25Z spupykin $ +# $Id: PKGBUILD 90691 2013-05-13 14:30:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com> pkgname=netcf pkgver=0.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring network interfaces" arch=('i686' 'x86_64') license=('LGPL') @@ -30,5 +30,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install - rm -rf $pkgdir/etc/rc.d/init.d + rm -rf $pkgdir/etc/rc.d } diff --git a/community/nfacct/PKGBUILD b/community/nfacct/PKGBUILD index 98cacbdfe..c1041dfa4 100644 --- a/community/nfacct/PKGBUILD +++ b/community/nfacct/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85684 2013-03-04 23:04:09Z seblu $ +# $Id: PKGBUILD 90530 2013-05-13 00:24:07Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> pkgname=nfacct pkgver=1.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='Command line tool to create/retrieve/delete accounting objects' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/nfacct/' @@ -16,7 +16,7 @@ md5sums=('992e863409d144350dbc8f0554a0f478') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/community/noip/PKGBUILD b/community/noip/PKGBUILD index 3d299aefb..86d19b280 100644 --- a/community/noip/PKGBUILD +++ b/community/noip/PKGBUILD @@ -1,40 +1,42 @@ -# $Id: PKGBUILD 79265 2012-11-02 00:34:36Z arodseth $ +# $Id: PKGBUILD 90507 2013-05-12 23:35:57Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daenyth # Contributor: Lyle Putnam <lcputnam@amerytel.net> pkgname=noip pkgver=2.1.9 -pkgrel=4 +pkgrel=5 pkgdesc='Dynamic DNS Client Updater for no-ip.com services' arch=('x86_64' 'i686') url='http://www.no-ip.com/downloads.php?page=linux' license=('GPL') -depends=('bash') -#backup=('etc/no-ip2.conf') -install=noip.install +install="$pkgname.install" +depends=('glibc') source=('http://www.no-ip.com/client/linux/noip-duc-linux.tar.gz' - 'noip-rc.d' - 'noip2.service') + 'noip.service') sha256sums=('82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593' - '95bbebf584e0bc33186fb95f76a85bbd103fcea8ca073c7e4d36a811c3ac5d5d' '624553d92d69bb76cb457a056a7722dc051b5bbd17ea0e622b5cc08909019ea5') -build() { - cd $srcdir/$pkgname-$pkgver-1 - # Their Makefile is fucking horrid, do it by hand instead +prepare() { + cd "$srcdir/$pkgname-$pkgver-1" + sed -i '/^#define CONFIG_FILEPATH/s/PREFIX//' noip2.c sed -i '/^#define CONFIG_FILENAME/s/PREFIX//' noip2.c - cc -Wall $CLFAGS $LDFLAGS -g -Dlinux -DPREFIX=/usr noip2.c -o noip2 +} + +build() { + cd "$srcdir/$pkgname-$pkgver-1" + + cc -Wall $CLFAGS $LDFLAGS -g -Dlinux -DPREFIX=/usr noip2.c -o noip2 -Wno-unused-but-set-variable } package() { - cd $srcdir/$pkgname-$pkgver-1 + cd "$srcdir/$pkgname-$pkgver-1" - install -Dm755 noip2 $pkgdir/usr/bin/noip2 - install -Dm755 ../noip-rc.d $pkgdir/etc/rc.d/noip - install -Dm644 ../noip2.service $pkgdir/usr/lib/systemd/system/noip2.service + install -Dm755 noip2 "$pkgdir/usr/bin/noip2" + install -Dm644 "$srcdir/$pkgname.service" \ + "$pkgdir/usr/lib/systemd/system/noip2.service" } # vim:set ts=2 sw=2 et: diff --git a/community/noip/noip-rc.d b/community/noip/noip-rc.d deleted file mode 100644 index c40b9d12a..000000000 --- a/community/noip/noip-rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -_DAEMON=noip - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/${_DAEMON}2` -case "$1" in - start) - stat_busy "Starting $_DAEMON" - [ -z "$PID" ] && /usr/bin/${_DAEMON}2 - if [ $? -gt 0 ]; then - stat_fail - else - echo `pidof -o %PPID /usr/bin/${_DAEMON}2` > /var/run/$_DAEMON.pid - add_daemon $_DAEMON - stat_done - fi - ;; - stop) - stat_busy "Stopping $_DAEMON" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/$_DAEMON.pid - rm_daemon $_DAEMON - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/noip/noip2.service b/community/noip/noip.service index 2ad0ba867..2ad0ba867 100644 --- a/community/noip/noip2.service +++ b/community/noip/noip.service diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD index 9145e8d2a..eb58ef8fc 100644 --- a/community/notmuch/PKGBUILD +++ b/community/notmuch/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 90380 2013-05-12 06:14:15Z dwallace $ +# $Id: PKGBUILD 90768 2013-05-13 18:27:06Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: fauno <fauno at kiwwwi.com.ar> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> # Contributor: Richard Murri <admin@richardmurri.com> pkgbase=notmuch -pkgname=('notmuch' 'notmuch-mutt' 'notmuch-runtime') +pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime') pkgver=0.15.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://notmuchmail.org/" license=('GPL3') @@ -16,47 +16,49 @@ options=(!distcc !makeflags) source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz") md5sums=('e86968dfcd7ffaf162b7b87de56b7f18') +prepare(){ + #cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver" + cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2} + + find "$srcdir/${pkgname}-${pkgver}/bindings/python" -name '*.py' -exec sed -i -e '1s,python$,python3,' {} + + find "$srcdir/${pkgname}-${pkgver}/bindings/python2" -name '*.py' -exec sed -i -e '1s,python$,python2,' {} + +} build() { cd "$srcdir/${pkgname}-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --includedir=/usr/include + --includedir=/usr/include \ + --without-zsh-completion + make + (cd "${srcdir}/$pkgname-${pkgver}/contrib/${pkgname}-mutt" make ${pkgname}-mutt.1) - cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-runtime-$pkgver" - cd bindings/ruby ruby extconf.rb - cp -dpr --no-preserve=ownership "$srcdir/${pkgname}-$pkgver"/bindings/python{,2} - - cd "$srcdir/${pkgname}-${pkgver}/bindings/python" - #env LD_LIBRARY_PATH="." python setup.py build - find "." -name '*.py' -exec sed -i -e '1s,python$,python3,' {} + + cd "$srcdir/${pkgname}-${pkgver}/bindings/python" python setup.py build - cd "$srcdir/${pkgname}-${pkgver}/bindings/python2" - find "." -name '*.py' -exec sed -i -e '1s,python$,python2,' {} + - #env LD_LIBRARY_PATH="." python2 setup.py build + cd "$srcdir/${pkgname}-${pkgver}/bindings/python2" python2 setup.py build } package_notmuch-runtime(){ pkgdesc="Runtime for notmuch and notmuch-mutt" depends=('xapian-core' 'gmime' 'talloc') - cd "$srcdir/${pkgname}-$pkgver" + cd "$srcdir/${pkgbase}-$pkgver" make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install + chmod 755 $pkgdir/usr/bin/notmuch +} - install -Dm644 notmuch "$pkgdir/usr/bin/notmuch" +package_notmuch-vim(){ + pkgdesc="Vim plugins for notmuch" + depends=('notmuch-runtime') mkdir -p "$pkgdir"/usr/share/vim/vimfiles/{plugin,syntax} - - make -C vim prefix="$pkgdir/usr/share/vim/vimfiles" install - - # Remove conflicting zsh completion - rm -r ${pkgdir}/usr/share/zsh + make -C "$srcdir/$pkgbase-$pkgver/vim" prefix="$pkgdir/usr/share/vim/vimfiles" install } @@ -90,7 +92,7 @@ package_notmuch(){ package_notmuch-mutt(){ pkgdesc="The mail indexer" depends=('notmuch-runtime' 'perl-mailtools' 'perl-mail-box' 'perl-term-readline-gnu' 'perl-string-shellquote' 'perl-file-which') - cd "$srcdir/$pkgbase-runtime-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" install -Dm755 "contrib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" install -Dm644 "contrib/$pkgname/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1.gz" diff --git a/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD index 8841f76cc..b93d89d74 100644 --- a/community/oidentd/PKGBUILD +++ b/community/oidentd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75286 2012-08-17 22:22:42Z heftig $ +# $Id: PKGBUILD 90524 2013-05-13 00:06:48Z eric $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: simo <simo@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> @@ -6,33 +6,30 @@ pkgname=oidentd pkgver=2.0.8 -pkgrel=7 +pkgrel=8 pkgdesc='An RFC1413 compliant ident daemon' arch=('i686' 'x86_64') url="http://dev.ojnk.net/" license=('GPL') depends=('glibc' 'bash') -source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz - rc.d conf.d service socket) +source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz{,.asc} + service socket) md5sums=('c3d9a56255819ef8904b867284386911' - '93cbf742cdd0b053f67482273d715f25' - '603307525771724b0f55a2c34fbc3f3e' - 'b215bee5764cdecb0939f44d5d2dccbe' + 'SKIP' + 'f54c5ed2a532a559c837af18735a28f1' '4442fb9fc10754914568e6ffc3d5fc42') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr + cd $pkgname-$pkgver + ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man make } package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - install -D -m644 $srcdir/conf.d $pkgdir/etc/conf.d/oidentd - install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/oidentd - install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/oidentd@.service - install -D -m644 $srcdir/socket $pkgdir/usr/lib/systemd/system/oidentd.socket + install -D -m644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/oidentd@.service" + install -D -m644 "$srcdir/socket" "$pkgdir/usr/lib/systemd/system/oidentd.socket" } diff --git a/community/oidentd/conf.d b/community/oidentd/conf.d deleted file mode 100644 index 5eefa80e2..000000000 --- a/community/oidentd/conf.d +++ /dev/null @@ -1,5 +0,0 @@ -USER=nobody -GROUP=nobody -OPTS="" -# You will need this, when you want oidentd listen both on IPv4 and IPv6 -# OPTS="-a ::" diff --git a/community/oidentd/rc.d b/community/oidentd/rc.d deleted file mode 100644 index 8b3c04c45..000000000 --- a/community/oidentd/rc.d +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/oidentd - -# no daemon check needed for oidentd, and no pid nesecary. -case "$1" in - start) - stat_busy "Starting oidentd Daemon..." - # oidentd is smart enough to only run one copy of - # itsself, no check nesecary, and no pidfile - /usr/sbin/oidentd -u ${USER} -g ${GROUP} ${OPTS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon oidentd - stat_done - fi - ;; - stop) - stat_busy "Stopping oidentd Daemon..." - # kill the process by it's full name, or the init script - # will terminate as well, wreaking havok. - killall /usr/sbin/oidentd - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon oidentd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/oidentd/service b/community/oidentd/service index 3688298c1..72ca7c244 100644 --- a/community/oidentd/service +++ b/community/oidentd/service @@ -2,7 +2,7 @@ Description=Ident (RFC 1413) per-connection server [Service] -ExecStart=/usr/sbin/oidentd -I -u nobody -g nobody +ExecStart=/usr/bin/oidentd -I -u nobody -g nobody ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket StandardError=syslog diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index a6ddb975d..6afba6f7c 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87200 2013-03-28 14:27:14Z spupykin $ +# $Id: PKGBUILD 90693 2013-05-13 14:31:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.8.2 -pkgrel=1 +pkgver=2.8.3 +pkgrel=2 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) url="http://www.opendkim.org/" @@ -16,11 +16,9 @@ backup=(etc/conf.d/opendkim) install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz opendkim.conf - opendkim.rc opendkim.service) -md5sums=('62d7b22f3b15049e3692caa28bcc801e' +md5sums=('0ae9d37e3221a244eb34c3e0e2d665cc' '3e2bb1058ac0662f01e675aa6ac7ee8f' - '093f5c098a45cc68753f97e45a5b374c' 'bc1b73856bc1941faaa4842e00437cb5') build() { @@ -44,10 +42,7 @@ package() { mv "$pkgdir/usr/share/doc/opendkim/opendkim.conf.sample" "$pkgdir/etc/opendkim/opendkim.conf.sample" chmod 0700 "$pkgdir/etc/opendkim" chmod 0600 "$pkgdir/etc/opendkim/opendkim.conf.sample" - - # Init script install -Dm644 "$srcdir/opendkim.conf" "$pkgdir/etc/conf.d/opendkim" - install -Dm755 "$srcdir/opendkim.rc" "$pkgdir/etc/rc.d/opendkim" # License mkdir -p "$pkgdir/usr/share/licenses/opendkim" diff --git a/community/opendkim/opendkim.rc b/community/opendkim/opendkim.rc deleted file mode 100644 index f87bfcfc9..000000000 --- a/community/opendkim/opendkim.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/opendkim - -PID=`pidof -o %PPID /usr/sbin/opendkim` -case "$1" in - start) - stat_busy "Starting OpenDKIM filter" - if [ -z "$PID" ]; then - /usr/sbin/opendkim $OPENDKIM_FILTER > /dev/null & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon dkim - stat_done - fi - ;; - stop) - stat_busy "Stopping OpenDKIM filter" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon dkim - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 1137965cf..818ef5086 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88548 2013-04-19 16:08:52Z spupykin $ +# $Id: PKGBUILD 90577 2013-05-13 09:54:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=opensips -pkgver=1.9.0 +pkgver=1.9.1 pkgrel=1 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" @@ -24,10 +24,8 @@ license=('GPL') install=opensips.install options=('!emptydirs' 'zipman' '!makeflags' 'docs') source=(http://opensips.org/pub/opensips/$pkgver/src/opensips-${pkgver}_src.tar.gz - opensips.init opensips.service) -md5sums=('2d989e49c9f5f6bd6d0910937fd49802' - '685fbe00826df1285b410d4610dcbb0c' +md5sums=('0b7b93f4df29a96daedf12e490e7ec86' '7b786d758fe3174af34e2ced44b549e7') build() @@ -57,11 +55,6 @@ package() { mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/ sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg - # Install starting script - mkdir -p $pkgdir/etc/rc.d/ - cp ../opensips.init $pkgdir/etc/rc.d/opensips - chmod 755 $pkgdir/etc/rc.d/opensips - # fix bad paths cd $pkgdir/usr/share find -type f -exec sed -i "s#$pkgdir##" {} \; diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index 81b659984..f8199ecbd 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78366 2012-10-17 15:27:49Z spupykin $ +# $Id: PKGBUILD 90697 2013-05-13 14:32:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: jlvsimoes pkgname=osiris pkgver=4.2.3 -pkgrel=5 +pkgrel=6 pkgdesc="A file integrity management system" arch=('i686' 'x86_64') url="http://osiris.shmoo.com/" @@ -13,21 +13,14 @@ depends=('openssl' 'readline') install=$pkgname.install #source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz - osirismd.init - osirisd.init osirismd.service osirisd.service) md5sums=('1951c7dc0fe729af9ffaf58910340d12' - '96c1ba5433bd0ed7d9520583a07b9bdd' - 'b6dde0a539ca798fa81489f717507f25' '48644676b88b231803785b8e2da956e5' 'c0355b453770f6bbc6a58f5cd80766b4') build() { cd $srcdir/$pkgname-$pkgver - mkdir -p $pkgdir/usr/share/licenses/$pkgname/ - install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt - mkdir -p $pkgdir/etc/rc.d ./configure --prefix=/usr --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname make all @@ -36,11 +29,16 @@ build() { sed -i "s|^INSTALL_OSIRISM=0|INSTALL_OSIRISM=1|" src/install/install.sh sed -i "s|^INSTALL_OSIRISD=0|INSTALL_OSIRISD=1|" src/install/install.sh sed -i "s|^ROOT_GROUP=wheel|ROOT_GROUP=root|" src/install/install.sh +} + +package() { + cd $srcdir/$pkgname-$pkgver + + mkdir -p $pkgdir/usr/share/licenses/$pkgname/ + install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt make DESTDIR=$pkgdir install - install -D -m755 $srcdir/osirismd.init $pkgdir/etc/rc.d/osirismd - install -D -m755 $srcdir/osirisd.init $pkgdir/etc/rc.d/osirisd rm -rf $pkgdir/usr/osiris install -Dm0644 $srcdir/osirisd.service $pkgdir/usr/lib/systemd/system/osirisd.service diff --git a/community/osiris/osirisd.init b/community/osiris/osirisd.init deleted file mode 100644 index 8262d902e..000000000 --- a/community/osiris/osirisd.init +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -LOCKFILE=/var/run/osirisd.lock - -case "$1" in - start) - stat_busy "Starting Osiris Scanning Daemon" - [ ! -f $LOCKFILE ] && [ ! $UID = 0 ] && /usr/sbin/osirisd && touch $LOCKFILE - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - stop) - stat_busy "Stopping Osiris Scanning Daemon" - [ -f $LOCKFILE ] && rm $LOCKFILE && killall osirisd - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/osiris/osirismd.init b/community/osiris/osirismd.init deleted file mode 100644 index 0bdae5e10..000000000 --- a/community/osiris/osirismd.init +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -LOCKFILE=/var/run/osirismd.lock - -case "$1" in - start) - stat_busy "Starting Osiris Management Daemon" - [ ! -f $LOCKFILE ] && [ ! $UID = 0 ] && touch $LOCKFILE && /usr/sbin/osirismd - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - stop) - stat_busy "Stopping Osiris Management Daemon" - [ -f $LOCKFILE ] && rm $LOCKFILE && killall osirismd - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD index 7312974e8..92190ab71 100644 --- a/community/p3scan/PKGBUILD +++ b/community/p3scan/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78346 2012-10-17 14:53:26Z spupykin $ +# $Id: PKGBUILD 90699 2013-05-13 14:33:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: v01d <phreakuencies@gmail.com> pkgname=p3scan pkgver=2.3.2 -pkgrel=7 +pkgrel=8 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection" arch=('i686' 'x86_64') url="http://p3scan.sourceforge.net/" @@ -12,11 +12,9 @@ depends=('pcre' 'openssl') license=('GPL') install=p3scan.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - "rc.p3scan" "p3scan.service" "p3scan.tmpfiles") md5sums=('9f8decc7d4701228788e3c8717096ca0' - '482a783e699b6532cbc478977f429eb5' 'dc724b50963d80be7924fc4d9d4856f0' '265a730e20e3d8aaf0cd7816dc98ca71') @@ -35,14 +33,13 @@ package() { cd $srcdir/$pkgname-$pkgver # Create base dirs, the Makefile assumes they're there - install -d $pkgdir/usr/sbin $pkgdir/etc/rc.d $pkgdir/usr/man/man8 + install -d $pkgdir/usr/sbin $pkgdir/usr/man/man8 $pkgdir/etc/rc.d # install with root set on $pkgdir make DESTDIR=$pkgdir install # delete init script provided and use an arch compatible one - rm -f $pkgdir/etc/rc.d/rc.p3scan - install -D -m755 -g root -o root $srcdir/rc.p3scan $pkgdir/etc/rc.d/p3scan + rm -rf $pkgdir/etc/rc.d # BUG?: make absolute link a relative one ( diff --git a/community/p3scan/rc.p3scan b/community/p3scan/rc.p3scan deleted file mode 100644 index fc8b79b22..000000000 --- a/community/p3scan/rc.p3scan +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting p3scan" - [ -d /var/run/p3scan ] || mkdir -p /var/run/p3scan - if [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi - - # Start p3scan - /usr/sbin/p3scan - if ! [ -a /var/run/p3scan/p3scan.pid ]; then stat_die; fi - add_daemon p3scan - stat_done - ;; - stop) - stat_busy "Stopping p3scan" - - # Stop p3scan - if [ -a /var/run/p3scan/p3scan.pid ]; then - kill `cat /var/run/p3scan/p3scan.pid` &>/dev/null || stat_die - rm -f /var/run/p3scan/p3scan.pid - rm_daemon p3scan - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: $0 { start | stop | restart }" -esac -exit 0 diff --git a/community/pam_pwcheck/PKGBUILD b/community/pam_pwcheck/PKGBUILD index 84fc7be25..5fd677e1e 100644 --- a/community/pam_pwcheck/PKGBUILD +++ b/community/pam_pwcheck/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 70355 2012-05-04 23:55:13Z allan $ +# $Id: PKGBUILD 90578 2013-05-13 09:54:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pam_pwcheck -pkgver=3.9 -pkgrel=4 +pkgver=3.12.1 +pkgrel=1 pkgdesc="A password strength checking module for PAM-aware password changing programs" arch=(i686 x86_64) url="http://www.thkukuk.de/pam/pam_pwcheck/" depends=('pam') license=('GPL') source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2) -md5sums=('27be63338af88d14610d182b6a161cd1') +md5sums=('85cd0d48500c160abcb0b9902e5594ce') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD index b6c872299..db92359f5 100644 --- a/community/pdnsd/PKGBUILD +++ b/community/pdnsd/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 75512 2012-08-26 18:24:09Z bpiotrowski $ +# $Id: PKGBUILD 90701 2013-05-13 14:33:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrik Nymann Jensen <h@henriknj.dk> pkgname=pdnsd pkgver=1.2.9.a _pkgver=${pkgver/.a/a} -pkgrel=1 +pkgrel=2 pkgdesc="Proxy DNS server with permanent caching" arch=(i686 x86_64) url="http://members.home.nl/p.a.rombouts/pdnsd/" license=('GPL') depends=('glibc') source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz - rc.d - service) + service) md5sums=('2f3e705d59a0f9308ad9504b24400769' - '3670bd47c9303fbb655d9216715512de' 'fad5e518d126b29fc947941d57a0a494') build() { @@ -27,7 +25,5 @@ build() { package() { cd $srcdir/$pkgname-$_pkgver make DESTDIR=$pkgdir install - - install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/pdnsd install -Dm0644 $srcdir/service $pkgdir/usr/lib/systemd/system/pdnsd.service } diff --git a/community/pdnsd/rc.d b/community/pdnsd/rc.d deleted file mode 100644 index 34a541d18..000000000 --- a/community/pdnsd/rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/pdnsd` -case "$1" in - start) - stat_busy "Starting pdnsd Daemon" - if [ -z "$PID" ]; then - /usr/sbin/pdnsd -d - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon pdnsd - stat_done - fi - ;; - stop) - stat_busy "Stopping pdnsd Daemon" - [ ! -z "$PID" ] && kill -TERM $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pdnsd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/perl-datetime-format-builder/PKGBUILD b/community/perl-datetime-format-builder/PKGBUILD index 71c3ed617..d924762bc 100644 --- a/community/perl-datetime-format-builder/PKGBUILD +++ b/community/perl-datetime-format-builder/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 65778 2012-02-22 12:27:49Z spupykin $ +# $Id: PKGBUILD 90637 2013-05-13 12:43:31Z spupykin $ # Contributor: Caleb Cushing <xenoterracide@gmail.com> pkgname=perl-datetime-format-builder -pkgver=0.8000 -pkgrel=6 +pkgver=0.8100 +pkgrel=1 pkgdesc="Create DateTime parser classes and objects" arch=('i686' 'x86_64') license=('PerlArtistic' 'GPL') diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD index 62eed7371..c4ccab0a8 100644 --- a/community/perl-datetime/PKGBUILD +++ b/community/perl-datetime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85696 2013-03-05 09:22:28Z spupykin $ +# $Id: PKGBUILD 90635 2013-05-13 12:43:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-datetime -pkgver=0.78 +pkgver=1.03 pkgrel=1 pkgdesc="A complete, easy to use date and time object" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ LC_NUMERIC=C provides=("perl-datetime=`printf %.4f $pkgver`") options=('!emptydirs') source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('9d71a13933e3afc55c2c54202d40ae13') +md5sums=('ea0fc830410b9ce3baeef3525bc0acdd') build() { cd $srcdir/DateTime-$pkgver diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index 852bc535f..90ac79303 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78356 2012-10-17 15:19:00Z spupykin $ +# $Id: PKGBUILD 90705 2013-05-13 14:34:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=pound pkgver=2.6 -pkgrel=3 +pkgrel=4 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64') url="http://www.apsis.ch/pound/index_html" @@ -13,12 +13,10 @@ license=('GPL') depends=('pcre' 'openssl') backup=(etc/pound/pound.cfg) source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz - pound.init pound.runit pound.service pound.cfg) md5sums=('8c913b527332694943c4c67c8f152071' - 'bd3bddb6dc17fdcab824815a4705b055' '4bd5e2a8d8e707eb900ae88929e00d4c' '23c70776fcd1cf71572f90a8809f7408' '8937808acd22c6391ebe4340af8df854') @@ -34,8 +32,6 @@ package() { install -d $pkgdir/usr/sbin make DESTDIR=$pkgdir install chown root.root -R $pkgdir/usr - install -d $pkgdir/etc/rc.d - install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound install -d $pkgdir/etc/sv install -d $pkgdir/etc/sv/pound install -m0755 $srcdir/pound.runit $pkgdir/etc/sv/pound/run diff --git a/community/pound/pound.init b/community/pound/pound.init deleted file mode 100644 index b8187c81f..000000000 --- a/community/pound/pound.init +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting Pound" - /usr/sbin/pound -f /etc/pound/pound.cfg -p /var/run/pound.pid &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pound - stat_done - fi - ;; - stop) - stat_busy "Stopping Pound" - [ -f /var/run/pound.pid ] && kill `cat /var/run/pound.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/pound.pid - rm_daemon pound - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/pptpd/PKGBUILD b/community/pptpd/PKGBUILD index d7e98e032..fdfbfa4de 100644 --- a/community/pptpd/PKGBUILD +++ b/community/pptpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 77852 2012-10-15 09:47:33Z spupykin $ +# $Id: PKGBUILD 90707 2013-05-13 14:34:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pptpd pkgver=1.3.4 -pkgrel=11 +pkgrel=12 pkgdesc="Poptop server" arch=(i686 x86_64) url="http://poptop.sourceforge.net/" @@ -11,11 +11,9 @@ license=('GPL') depends=(ppp glibc) backup=(etc/pptpd.conf) source=(http://downloads.sourceforge.net/sourceforge/poptop/pptpd-$pkgver.tar.gz - pptpd pptpd.service unrecognized-opt.patch) md5sums=('b38df9c431041922c997c1148bedf591' - 'e09f81beb5d59a0fdfba94e3a60d992b' '144c17c7d5c1b95cfb3450eb73aa2e50' 'cfa02c86d0413eb94fac15599986f54c') @@ -26,6 +24,7 @@ build() { cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/unrecognized-opt.patch + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.in autoreconf -i ./configure --prefix=/usr --libdir=/usr/lib --exec-prefix=/usr --mandir=/usr/share/man sed -i "s|#define VERSION.*|#define VERSION \"${_pppver}\"|" plugins/patchlevel.h @@ -39,7 +38,6 @@ package() { make DESTDIR=$pkgdir install mkdir -p $pkgdir/etc/ echo -e "# Read man pptpd.conf, see samples in /usr/share/doc/pptpd\n# and write your pptpd configuration here" >$pkgdir/etc/pptpd.conf - install -Dm0755 ../pptpd $pkgdir/etc/rc.d/pptpd install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service mkdir -p $pkgdir/usr/share/doc/pptpd cp -a samples $pkgdir/usr/share/doc/pptpd/ diff --git a/community/pptpd/pptpd b/community/pptpd/pptpd deleted file mode 100644 index 08c4de496..000000000 --- a/community/pptpd/pptpd +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting PPTP Daemon" - pptpd -c /etc/pptpd.conf -p /var/run/pptpd.pid - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pptpd - stat_done - fi - ;; - stop) - stat_busy "Stopping PPTP Daemon" - kill `cat /var/run/pptpd.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pptpd - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD index 736800b65..a6a5bb846 100644 --- a/community/preload/PKGBUILD +++ b/community/preload/PKGBUILD @@ -1,50 +1,44 @@ -# $Id: PKGBUILD 74711 2012-08-02 09:27:00Z bpiotrowski $ +# $Id: PKGBUILD 90536 2013-05-13 00:33:46Z eric $ # Maintainer: # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=preload pkgver=0.6.4 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') pkgdesc="Makes applications run faster by prefetching binaries and shared objects" url="http://sourceforge.net/projects/preload" license=('GPL2') depends=('glib2' 'bash') -makedepends=('help2man' 'pkgconfig') +makedepends=('help2man') backup=('etc/preload.conf') options=('!makeflags') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz" - rc.d service) + service) md5sums=('10786287b55afd3a2b433b4f898809f4' - 'bde0dd7867c77e7c4d10b481b5cddcd3' - 'db9350ab52fd643edbc88ebab2c8c1bb') + 'b4871a6ade86968322b3bdf3fce88e99') build() { - cd "${srcdir}"/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ + --sbindir=/usr/bin \ --localstatedir=/var make } package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" sysconfigdir=/etc/conf.d install - install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/preload install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/preload.service - rm -rf "${pkgdir}"/etc/rc.d/init.d - + rm -rf "${pkgdir}"/etc/rc.d rm -rf "${pkgdir}"/var/lib/preload/preload.state rm -rf "${pkgdir}"/var/log/preload.log - install -d "${pkgdir}"/etc/conf.d - mv "${pkgdir}"/etc/sysconfig/* "${pkgdir}"/etc/conf.d - rm -rf "${pkgdir}"/etc/sysconfig - sed -r -i 's#^((map|exe)prefix =) (.+)$#\1 /opt;\3#' "${pkgdir}"/etc/preload.conf } diff --git a/community/preload/rc.d b/community/preload/rc.d deleted file mode 100644 index a3cb01ba0..000000000 --- a/community/preload/rc.d +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash -# -# /etc/rc.d/init.d/preload -# -# Starts the preload daemon -# -# Heavily modified for Arch Linux by Leslie P. Polzer <polzer@gnu.org>. - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/preload` - -if [ -f /etc/conf.d/preload ]; then - . /etc/conf.d/preload -fi - -MIN_MEMORY=${MIN_MEMORY:-256} -# Check for > MIN_MEMORY MB -free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0 - -RETVAL=0 - -# -# See how we were called. -# - -start() { - if [ -z "$PID" ]; then - stat_busy "Starting preload daemon: " - /usr/sbin/preload $PRELOAD_OPTS - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - if [ -n $IONICE_OPTS ]; then - /usr/bin/ionice $IONICE_OPTS -p "`pidof -o %PPID /usr/sbin/preload`" - fi - add_daemon preload - stat_done - else - stat_fail - fi - fi - return $RETVAL -} - -stop() { - stat_busy "Stopping preload daemon: " - kill $PID &>/dev/null - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - rm_daemon preload - stat_done - PID="" - else - stat_fail - fi - return $RETVAL -} - - -restart() { - $0 stop - sleep 1 - $0 start -} - -reload() { - trap "" SIGHUP - kill -HUP $PID -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - reload) - reload - ;; - restart) - restart - ;; - condrestart) - if [ ! -z $PID ]; then - restart - else - stat_fail - fi - ;; - *) - echo "Usage: $0 {start|stop|restart|condrestart|reload}" - exit 1 -esac - -exit $RETVAL diff --git a/community/preload/service b/community/preload/service index e4202751f..a26e2d01b 100644 --- a/community/preload/service +++ b/community/preload/service @@ -5,7 +5,7 @@ Description=Adaptive readahead daemon Type=simple IOSchedulingClass=3 EnvironmentFile=/etc/conf.d/preload -ExecStart=/usr/sbin/preload --foreground $PRELOAD_OPTS +ExecStart=/usr/bin/preload --foreground $PRELOAD_OPTS [Install] WantedBy=multi-user.target diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 071bdf72a..4278a2596 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81207 2012-12-13 02:54:35Z seblu $ +# $Id: PKGBUILD 90613 2013-05-13 10:55:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.0@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> pkgname=prosody pkgver=0.8.2 -pkgrel=8 +pkgrel=9 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64') url="http://prosody.im/" @@ -16,15 +16,13 @@ install=prosody.install backup=('etc/logrotate.d/prosody' 'etc/prosody/prosody.cfg.lua') source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz" - 'prosody.rcd' 'prosody.logrotated' 'fix-config.patch' 'prosody.tmpfile.d' 'prosody.service') md5sums=('6e907bf0d0acf24f1011083020ba6ffb' - 'd2b5f9c8e42bb31819e715eb1756ee53' - '26466fdbea87963a3ca6f48f76fe4a29' - '59a1bf2dfd0bd386cef6fa646e2a3752' + '5b44aee99f1fa9e7f055e067688cafbd' + 'a4a5b968b5809037f83465c571eb9afe' 'e2f5a1df410b05696a30dcb058841084' 'e74045f27cb60908d535969906781f75') @@ -46,19 +44,16 @@ package() { rm $pkgdir/etc/prosody/certs/* - install -d "$pkgdir/etc/rc.d" install -d "$pkgdir/etc/logrotate.d" install -d "$pkgdir/var/log/prosody" for i in tools/*.lua; do install -Dm0644 $i $pkgdir/usr/share/prosody/$i done - install -o root -g root -m 755 "$srcdir/prosody.rcd" \ - "$pkgdir/etc/rc.d/prosody" install -o root -g root -m 644 "$srcdir/prosody.logrotated" \ "$pkgdir/etc/logrotate.d/prosody" install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf + install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir/usr/lib/tmpfiles.d/prosody.conf install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service } diff --git a/community/prosody/fix-config.patch b/community/prosody/fix-config.patch index 8856bfb92..3d01fd88a 100644 --- a/community/prosody/fix-config.patch +++ b/community/prosody/fix-config.patch @@ -6,7 +6,7 @@ diff -wbBur prosody-0.8.0/prosody.cfg.lua.dist prosody-0.8.0.my/prosody.cfg.lua. -- Example: admins = { "user1@example.com", "user2@example.net" } admins = { } +daemonize = true -+pidfile = "/var/run/prosody/prosody.pid" ++pidfile = "/run/prosody/prosody.pid" -- Enable use of libevent for better performance under high load -- For more information see: http://prosody.im/doc/libevent diff --git a/community/prosody/prosody.install b/community/prosody/prosody.install index f935e3d63..792681038 100644 --- a/community/prosody/prosody.install +++ b/community/prosody/prosody.install @@ -10,6 +10,8 @@ post_install() { chown prosody:prosody var/log/prosody echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" + + systemd-tmpfiles --create prosody.conf } post_upgrade() { diff --git a/community/prosody/prosody.logrotated b/community/prosody/prosody.logrotated index 5659ba01f..13876230f 100644 --- a/community/prosody/prosody.logrotated +++ b/community/prosody/prosody.logrotated @@ -4,6 +4,6 @@ sharedscripts missingok postrotate - /bin/kill -HUP `cat /var/run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true endscript } diff --git a/community/prosody/prosody.rcd b/community/prosody/prosody.rcd deleted file mode 100644 index afaf77903..000000000 --- a/community/prosody/prosody.rcd +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -daemon_name=prosody -pid_file=/var/run/$daemon_name/$daemon_name.pid - -source /etc/rc.conf -source /etc/rc.d/functions - -get_pid() { - if [ -f $pid_file ]; then - /bin/kill -0 $(cat $pid_file) - if [ $? == 0 ]; then - cat $pid_file - fi - fi -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - [ -d /var/run/$daemon_name ] || { mkdir -p /var/run/$daemon_name ; chown prosody:prosody /var/run/prosody; } - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $pid_file ] && rm -f $pid_file - mkdir -p `dirname $pid_file` - prosodyctl start 1>/dev/null 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon $daemon_name - stat_done - fi - else - stat_fail - printhl "$daemon_name is already running" - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - if [ ! -z "$PID" ]; then - prosodyctl stop 1>/dev/null 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $pid_file &> /dev/null - rm_daemon $daemon_name - stat_done - fi - else - stat_fail - printhl "$daemon_name is not running" - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - stat_busy "Reloading $daemon_name" - PID=$(get_pid) - if [ ! -z "$PID" ]; then - /bin/kill -HUP $PID 2> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - stat_done - fi - else - stat_fail - printhl "$daemon_name is not running" - fi - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|reload|status}" - esac - -exit 0 diff --git a/community/python-cchardet/PKGBUILD b/community/python-cchardet/PKGBUILD index ac36b156f..839d69e74 100644 --- a/community/python-cchardet/PKGBUILD +++ b/community/python-cchardet/PKGBUILD @@ -1,27 +1,51 @@ -# $Id: PKGBUILD 80436 2012-11-21 15:45:04Z mtorromeo $ +# $Id: PKGBUILD 90632 2013-05-13 12:37:47Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=python-cchardet -pkgver=0.3.2 +pkgname=(python-cchardet python2-cchardet) +pkgver=0.3.3 pkgrel=1 -_libname=${pkgname/python-/} pkgdesc="Universal encoding detector faster than chardet." url="http://pypi.python.org/pypi/cchardet/" -depends=('python') -makedepends=('cython' 'python-distribute') +makedepends=('cython' 'cython2' 'python-distribute' 'python2-distribute') license=('MIT') arch=('i686' 'x86_64') -source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz) +source=(http://pypi.python.org/packages/source/c/cchardet/cchardet-$pkgver.tar.gz) build() { - cd "$srcdir/$_libname-$pkgver" - python setup.py build + cd "$srcdir/cchardet-$pkgver" + + rm -rf ../buildpy3; mkdir ../buildpy3 + python setup.py build -b ../buildpy3 + + rm -rf ../buildpy2; mkdir ../buildpy2 + python2 setup.py build -b ../buildpy2 + find ../buildpy2 -name \*.py -exec sed -r 's|^#!(.*)python$|#!\1python2|' -i {} + } package() { - cd "$srcdir/$_libname-$pkgver" + cd "$srcdir/cchardet-$pkgver" python setup.py install --root="$pkgdir" install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" } -sha256sums=('a3e92811d5a8aacd9ecfdb4ea9637ba801b9b18b7c779dbdf41d07bb48235a23') +package_python-cchardet() { + depends=(python) + + + cd "$srcdir/cchardet-$pkgver" + rm -rf build; ln -s ../buildpy3 build + python setup.py install --skip-build -O1 --root="$pkgdir" + install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" +} + +package_python2-cchardet() { + depends=(python2) + + cd "$srcdir/cchardet-$pkgver" + rm -rf build; ln -s ../buildpy2 build + python2 setup.py install --skip-build -O1 --root="$pkgdir" + install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst" +} + +sha256sums=('f326245fa9dc1541a3251cbae66ce2fa8d94969a6f6dfb2800e3beb3636cd2b8') diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD index 3a350e3ed..d52fc06ea 100644 --- a/community/quagga/PKGBUILD +++ b/community/quagga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88141 2013-04-12 12:11:57Z seblu $ +# $Id: PKGBUILD 90540 2013-05-13 00:51:44Z seblu $ # Maintainer: Sébastien Luttringer pkgname=quagga pkgver=0.99.22.1 -pkgrel=1 +pkgrel=2 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' arch=('i686' 'x86_64') url='http://www.quagga.net' @@ -21,14 +21,14 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar 'ripngd.service' 'zebra.service') md5sums=('d9ab848661720d6da2551c7a4a19c731' - '87bf4ae8aca3b3cf70e3986bc669aa78' - '9b14110bed4982baa801808db6ac9135' - 'b685b5c12637cb963e1fb78ecd926e14' - '1fee8cdf03f87b9bb129948058246c88' - '4d95a4af1ddb4ae21b867bebbedc77d5' - '7e33c2a2e1c12309ba28d75a34294ed0' - '6c682c0cd06c109bc10d29c1d9af3e38' - '18964536b7ed012aa5b22f2fa9fb3e87') + '20a8e36ad851d4e06467aeb56a84b245' + 'cc90c234aac9098c5132d653037d5269' + '67d0ada0f3000b9a86351798786c5256' + '6e2569ef339838aa41375e913a8e19ce' + '260f5fcf9b53ef201a8fb34e7ea90457' + 'b6e3549d780355914ae8edd43e15630a' + '72dd63c49fdaea41729a4318d0fbac79' + '577f1e7caeea31d910f2dc29c28ada7d') prepare() { cd $pkgname-$pkgver @@ -43,6 +43,7 @@ build() { cd $pkgname-$pkgver ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/quagga \ --localstatedir=/run/quagga \ --enable-exampledir=/usr/share/doc/quagga/examples \ diff --git a/community/quagga/babeld.service b/community/quagga/babeld.service index aa107afca..7279f0336 100644 --- a/community/quagga/babeld.service +++ b/community/quagga/babeld.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/babeld.conf [Service] Type=forking PIDFile=/run/quagga/babeld.pid -ExecStart=/usr/sbin/babeld -d +ExecStart=/usr/bin/babeld -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/bgpd.service b/community/quagga/bgpd.service index aae58be2c..b0bf1db0f 100644 --- a/community/quagga/bgpd.service +++ b/community/quagga/bgpd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/bgpd.conf [Service] Type=forking PIDFile=/run/quagga/bgpd.pid -ExecStart=/usr/sbin/bgpd -d +ExecStart=/usr/bin/bgpd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/isisd.service b/community/quagga/isisd.service index fa5a716e8..5ad16c1a4 100644 --- a/community/quagga/isisd.service +++ b/community/quagga/isisd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/isisd.conf [Service] Type=forking PIDFile=/run/quagga/isisd.pid -ExecStart=/usr/sbin/isisd -d +ExecStart=/usr/bin/isisd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/ospf6d.service b/community/quagga/ospf6d.service index eacb89159..dae3dc322 100644 --- a/community/quagga/ospf6d.service +++ b/community/quagga/ospf6d.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ospf6d.conf [Service] Type=forking PIDFile=/run/quagga/ospf6d.pid -ExecStart=/usr/sbin/ospf6d -d +ExecStart=/usr/bin/ospf6d -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/ospfd.service b/community/quagga/ospfd.service index 57a946f8e..e43c474cc 100644 --- a/community/quagga/ospfd.service +++ b/community/quagga/ospfd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ospfd.conf [Service] Type=forking PIDFile=/run/quagga/ospfd.pid -ExecStart=/usr/sbin/ospfd -d +ExecStart=/usr/bin/ospfd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/ripd.service b/community/quagga/ripd.service index bf7c5ac6f..a55498100 100644 --- a/community/quagga/ripd.service +++ b/community/quagga/ripd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ripd.conf [Service] Type=forking PIDFile=/run/quagga/ripd.pid -ExecStart=/usr/sbin/ripd -d +ExecStart=/usr/bin/ripd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/ripngd.service b/community/quagga/ripngd.service index 465263ba3..4990669d2 100644 --- a/community/quagga/ripngd.service +++ b/community/quagga/ripngd.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/ripngd.conf [Service] Type=forking PIDFile=/run/quagga/ripngd.pid -ExecStart=/usr/sbin/ripngd -d +ExecStart=/usr/bin/ripngd -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/quagga/zebra.service b/community/quagga/zebra.service index c8707083e..02813c37c 100644 --- a/community/quagga/zebra.service +++ b/community/quagga/zebra.service @@ -8,7 +8,7 @@ ConditionPathExists=/etc/quagga/zebra.conf Type=forking PIDFile=/run/quagga/zebra.pid ExecStartPre=/sbin/ip route flush proto zebra -ExecStart=/usr/sbin/zebra -d +ExecStart=/usr/bin/zebra -d ExecReload=/bin/kill -HUP $MAINPID Restart=on-abort diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index 63ba99525..15ee454e2 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88368 2013-04-16 19:57:49Z seblu $ +# $Id: PKGBUILD 90532 2013-05-13 00:28:44Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd pkgver=1.9.3 -pkgrel=1 +pkgrel=2 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') @@ -15,10 +15,14 @@ backup=('etc/radvd.conf') source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" "$pkgname.service") sha1sums=('14b025bdcec77ea7278cd8ee2a32af3f81d26f4d' - 'f1e97885117b5ee2a533916624fa4297ce66e418') + '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc') build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \ + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --with-pidfile=/run/radvd.pid \ --mandir=/usr/share/man make } diff --git a/community/radvd/radvd.service b/community/radvd/radvd.service index 92685d73b..2f1b1a7fa 100644 --- a/community/radvd/radvd.service +++ b/community/radvd/radvd.service @@ -3,7 +3,7 @@ Description=IPv6 Router Advertisement Daemon After=network.target [Service] -ExecStart=/usr/sbin/radvd --nodaemon --logmethod=stderr +ExecStart=/usr/bin/radvd --nodaemon --logmethod=stderr [Install] WantedBy=multi-user.target diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD index 5c5d940e5..7840a28b1 100644 --- a/community/recoll/PKGBUILD +++ b/community/recoll/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88329 2013-04-16 13:30:45Z spupykin $ +# $Id: PKGBUILD 90588 2013-05-13 09:57:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=recoll -pkgver=1.18.2 +pkgver=1.19.0 pkgrel=1 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ optdepends=('libxslt: for XML based formats (fb2,etc)' 'aspell-en: English stemming support') install=recoll.install source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('fee17c0edbe9199ae7662f6ec46eda07') +md5sums=('118d5e256604dd5fb83fbcd8f9680bc5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 9f7dd0322..cb766dbda 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89919 2013-05-05 14:50:37Z spupykin $ +# $Id: PKGBUILD 90717 2013-05-13 14:36:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis pkgver=2.6.13 -pkgrel=1 +pkgrel=2 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') url="http://redis.io/" @@ -15,11 +15,9 @@ makedepends=('gcc>=3.1' 'make' 'pkgconfig') backup=("etc/redis.conf" "etc/logrotate.d/redis") source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" - "redis.d" "redis.service" "redis.logrotate") md5sums=('c4be422013905c64af18b1ef140de21f' - '8d843919d9f165e9a47e56cadb4ac2ed' '5ab9fdb200e15c13b450fda77fa030b6' '9e2d75b7a9dc421122d673fe520ef17f') @@ -35,7 +33,6 @@ package() { make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING" - install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis" install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis" sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf diff --git a/community/redis/redis.d b/community/redis/redis.d deleted file mode 100644 index e1c79dd2b..000000000 --- a/community/redis/redis.d +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -daemon_name=redis - -. /etc/rc.conf -. /etc/rc.d/functions - -REDISPORT=6379 -EXEC=/usr/bin/redis-server -CLIEXEC=/usr/bin/redis-cli -PIDFILE=/var/run/redis.pid -WORKDIR=/var/lib/redis -CONF="/etc/redis.conf" - -# Check if process exists -PID=$(cat $PIDFILE 2>/dev/null) -[ -d /proc/${PID} ] || rm -f $PIDFILE - -# Grab the server password, if exists -REDISPASS=`egrep -o '^requirepass ([^#]+)' $CONF | cut -d\ -f 2` -[ -n "$REDISPASS" ] && CLIEXEC="$CLIEXEC -a $REDISPASS" - -case "$1" in - start) - stat_busy "Starting $daemon_name" - [ -d $WORKDIR ] || mkdir $WORKDIR - - if [ -f $PIDFILE ]; then - stat_fail - exit 1 - else - $EXEC $CONF >/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon $daemon_name - stat_done - fi - fi - ;; - - stop) - stat_busy "Stopping $daemon_name" - - if [ ! -f $PIDFILE ]; then - stat_fail - exit 1 - else - PID=$(cat $PIDFILE) - - # And grab the server address - REDISADDR=`egrep -o '^bind ([^#]+)' $CONF | cut -d' ' -f2` - [ -n "$REDISADDR" ] && CLIEXEC="$CLIEXEC -h $REDISADDR" - - $CLIEXEC -p $REDISPORT shutdown - [ -d /proc/${PID} ] && sleep 1 - [ -d /proc/${PID} ] && sleep 5 - [ -d /proc/${PID} ] && kill -9 $PID - [ -d /proc/${PID} ] && stat_fail || { stat_done; rm_daemon $daemon_name; } - fi - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac -exit 0 diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index 2ce6fe698..8729200d3 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88526 2013-04-19 10:32:19Z spupykin $ +# $Id: PKGBUILD 90719 2013-05-13 14:37:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog pkgver=7.2.7 -pkgrel=1 +pkgrel=2 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64') @@ -19,14 +19,10 @@ backup=('etc/rsyslog.conf' 'etc/conf.d/rsyslog') options=('strip' 'zipman' '!libtool') source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" - 'rsyslog' 'rsyslog.logrotate' - 'rsyslog.conf.d' 'rsyslog.conf') md5sums=('4a61d182acb5b5487e7b99dea8974857' - 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' - '18565f38a4445136446a31a3c95ffc3e' 'd61dd424e660eb16401121eed20d98bc') build() { @@ -47,11 +43,9 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make install DESTDIR=${pkgdir} # Install Daemons and Configuration Files - install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d install -D -m644 doc/${pkgname}-example.conf ${pkgdir}/usr/share/doc/$pkgname/${pkgname}.conf.example install -D -m644 $srcdir/${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname} - install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname} # fix location of systemctl and remove start precondition sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \ diff --git a/community/rsyslog/rsyslog b/community/rsyslog/rsyslog deleted file mode 100644 index ee0145418..000000000 --- a/community/rsyslog/rsyslog +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rsyslog - -PID=`pidof -o %PPID /usr/sbin/rsyslogd` -case "$1" in - start) - stat_busy "Starting RSyslogd" - [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon rsyslogd - stat_done - fi - ;; - stop) - stat_busy "Stopping RSyslogd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/rsyslogd.pid - rm -f /var/rsyslogd.persist - rm_daemon rsyslogd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/rsyslog/rsyslog.conf.d b/community/rsyslog/rsyslog.conf.d deleted file mode 100644 index fc0770666..000000000 --- a/community/rsyslog/rsyslog.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Parameters to be passed to rsyslogd -# This should almost certainly include at least the current compatability -# level, e.g. -c4 -# -RSYSLOGD_ARGS="-c6" diff --git a/community/rtorrent/PKGBUILD b/community/rtorrent/PKGBUILD index a8ba161e7..010020527 100644 --- a/community/rtorrent/PKGBUILD +++ b/community/rtorrent/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: sh__ pkgname=rtorrent -pkgver=0.9.2 +pkgver=0.9.3 pkgrel=2 pkgdesc='Ncurses BitTorrent client based on libTorrent' url='http://libtorrent.rakshasa.no/' license=('GPL') arch=('i686' 'x86_64') -depends=('libtorrent=0.13.2' 'curl' 'xmlrpc-c') +depends=('libtorrent=0.13.3' 'curl' 'xmlrpc-c' 'libsigc++') source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz") -sha1sums=('2a642d722745091265037ed8929a23c237a3b99f') +sha1sums=('89ec5683a46f000dc23c9bf8a8808985759220e4') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,8 +29,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - install -D doc/faq.xml "${pkgdir}"/usr/share/doc/rtorrent/faq.xml - install -D doc/rtorrent.1 "${pkgdir}"/usr/share/man/man1/rtorrent.1 install -D doc/rtorrent.rc "${pkgdir}"/usr/share/doc/rtorrent/rtorrent.rc } diff --git a/community/ser2net/PKGBUILD b/community/ser2net/PKGBUILD index 50cf15ded..02b694c11 100644 --- a/community/ser2net/PKGBUILD +++ b/community/ser2net/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 77110 2012-10-05 10:16:21Z spupykin $ +# $Id: PKGBUILD 90721 2013-05-13 14:37:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=ser2net pkgver=2.8rc3 -pkgrel=1 +pkgrel=2 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports" arch=(i686 x86_64) url="http://sourceforge.net/projects/ser2net" @@ -12,10 +12,8 @@ license=('GPL') depends=('glibc') backup=(etc/ser2net.conf) source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz - ser2net.init ser2net.service) md5sums=('bbe95fb557781c314d321356897a50b9' - '6db420d54ce8f78464e885efe935dd18' '7f9d879325b9ed6ddc313dcbc3f83e56') build() { @@ -28,6 +26,5 @@ package() { cd $srcdir/${pkgname}-${pkgver/rc/-rc} make DESTDIR=$pkgdir install install -Dm0644 ser2net.conf $pkgdir/etc/ser2net.conf - install -Dm0755 $srcdir/ser2net.init $pkgdir/etc/rc.d/ser2net install -Dm0644 $srcdir/ser2net.service $pkgdir/usr/lib/systemd/system/ser2net.service } diff --git a/community/ser2net/ser2net.init b/community/ser2net/ser2net.init deleted file mode 100644 index f35984686..000000000 --- a/community/ser2net/ser2net.init +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof ser2net -} - -case "$1" in - start) - stat_busy "Starting ser2net daemon" - - PID=`get_pid` - if [ -z "$PID" ]; then - [ -f /var/run/ser2net.pid ] && rm -f /var/run/ser2net.pid - ser2net - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/ser2net.pid - add_daemon ser2net - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping ser2net daemon" - PID=`get_pid` - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/ser2net.pid &> /dev/null - rm_daemon ser2net - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD index 7e880f082..d178697fd 100644 --- a/community/smbnetfs/PKGBUILD +++ b/community/smbnetfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76408 2012-09-17 10:51:59Z spupykin $ +# $Id: PKGBUILD 90723 2013-05-13 14:38:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=smbnetfs pkgver=0.5.3a -pkgrel=5 +pkgrel=6 pkgdesc="small C program that mounts Microsoft network neighborhood in single directory." arch=('i686' 'x86_64') url="http://smbnetfs.sourceforge.net/" @@ -17,19 +17,23 @@ backup=('etc/smbnetfs/.smb/smb.conf' install=smbnetfs.install options=(docs) source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2 - rc-smbnetfs conf-smbnetfs smbnetfs.service) md5sums=('66d1477ca981f5a07b4b21c6bdbdc442' - 'b6cff0ee75cafd739ad44216236b5e28' 'e150c4cd894cc6ade11b94c95cf17ec4' '0fdd0dbaa5f16b1ecd00ec1ddcdfc223') build() { cd $srcdir/$pkgname-$pkgver - + sed -i 's|libsmbclient.h|samba-4.0/libsmbclient.h|g' \ + src/smb_conn_srv.c src/smb_conn_proto.h src/function.c src/main.c src/event.c [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --docdir=/usr/share/doc/smbnetfs --with-gnome-keyring=no make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install mv $pkgdir/usr/share/doc/smbnetfs* $pkgdir/usr/share/doc/smbnetfs @@ -37,7 +41,6 @@ build() { mkdir -p $pkgdir/etc/smbnetfs/.smb install -m0644 $srcdir/$pkgname-$pkgver/conf/* $pkgdir/etc/smbnetfs/.smb/ install -Dm0644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/smbnetfs/README - install -Dm0755 $srcdir/rc-smbnetfs $pkgdir/etc/rc.d/smbnetfs install -Dm0644 $srcdir/conf-smbnetfs $pkgdir/etc/conf.d/smbnetfs install -Dm0644 $srcdir/smbnetfs.service $pkgdir/usr/lib/systemd/system/smbnetfs.service touch $pkgdir/etc/smbnetfs/.smb/smb.conf diff --git a/community/smbnetfs/rc-smbnetfs b/community/smbnetfs/rc-smbnetfs deleted file mode 100644 index 69c00d120..000000000 --- a/community/smbnetfs/rc-smbnetfs +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/smbnetfs -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - echo `pidof smbnetfs` -} - -case "$1" in - start) - stat_busy "Starting smbnetfs" - - [ -f /var/run/smbnetfs.pid ] && rm -f /var/run/smbnetfs.pid - PID=`get_pid` - if [ -z "$PID" ]; then - cd /tmp && \ - [ -d $SMBNETFS_MOUNT_POINT ] && \ - su - nobody -s /bin/bash -c "HOME=/etc/smbnetfs exec smbnetfs -o allow_other $SMBNETFS_MOUNT_POINT" &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/smbnetfs.pid - add_daemon smbnetfs - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping smbnetfs" - - fusermount -u $SMBNETFS_MOUNT_POINT &> /dev/null - rm -f /var/run/smbnetfs.pid &> /dev/null - rm_daemon smbnetfs - stat_done - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 070376bf2..2300e0472 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 88474 2013-04-18 12:16:13Z spupykin $ +# $Id: PKGBUILD 90617 2013-05-13 10:59:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Coolen <mark.coolen@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=squid -pkgver=3.3.3 -pkgrel=1 +pkgver=3.3.4 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' @@ -15,18 +15,13 @@ makedepends=('libcap') license=('GPL') options=('emptydirs') backup=('etc/squid/squid.conf' - 'etc/squid/mime.conf' - 'etc/conf.d/squid') + 'etc/squid/mime.conf') install=$pkgname.install source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" - 'squid' - 'squid.conf.d' 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('20f63ab34eae93b36969c9c7519f6462' - 'e90895ce22c0b618c89a46a9a181fe6c' - '2383772ef94efddc7b920628bc7ac5b0' +md5sums=('0ef8e63a980389c62130fa639079fb54' '270977cdd9b47ef44c0c427ab9034777' 'b499c2b725aefd7bd60bec2f1a9de392' '20e00e1aa1198786795f3da32db3c1d8') @@ -85,9 +80,7 @@ package() { cd "$srcdir" make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/squid" "$pkgdir/etc/rc.d/squid" install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid" - install -Dm755 "$srcdir/squid.conf.d" "$pkgdir/etc/conf.d/squid" install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid" install -Dm644 "$srcdir/squid.service" \ "$pkgdir/usr/lib/systemd/system/squid.service" diff --git a/community/squid/squid b/community/squid/squid deleted file mode 100644 index ea80aaa2e..000000000 --- a/community/squid/squid +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid - -. /etc/rc.conf -. /etc/rc.d/functions - -pidfile=/run/squid.pid -{ read -r PID </run/squid.pid; } 2>/dev/null -if [[ $PID && ! /proc/$PID/exe -ef /usr/sbin/squid ]]; then - rm /run/squid.pid - unset PID -fi - -case $1 in - start) - stat_busy "Starting squid" - if [[ $PID ]] || ! squid $SQUID_ARGS; then - stat_fail - else - add_daemon squid - stat_done - fi - ;; - - stop) - stat_busy "Stopping squid" - if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then - stat_fail - else - # squid takes forever to shutdown all its listening FDs - while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do - stat_append "." - sleep 3 - done - rm_daemon squid - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/squid/squid.conf.d b/community/squid/squid.conf.d deleted file mode 100644 index ea248b76c..000000000 --- a/community/squid/squid.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to squid -# -SQUID_ARGS="-sYC" diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD index d67de08e9..386d73c83 100644 --- a/community/sshguard/PKGBUILD +++ b/community/sshguard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84143 2013-02-11 15:20:18Z spupykin $ +# $Id: PKGBUILD 90628 2013-05-13 12:25:45Z mtorromeo $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=sshguard pkgver=1.5 -pkgrel=10 +pkgrel=12 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables" arch=('i686' 'x86_64') #url="http://sourceforge.net/projects/sshguard/" @@ -14,20 +14,16 @@ depends=('iptables') options=(zipman) install=sshguard.install source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2" - sshguard.rc - sshguard.conf.d sshguard.service sshguard-journalctl) sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19' - 'a810da878e40be8616a93c9984e7dbd3700367d665b78b8aa2498228bb33cb6e' - '66f28e2cc81e5686f8fd5c0d5a5015d7feecbe018a259f4032cfbacf6fe8d1c3' - '2b2a3c1140349296c3629e77f74c3b29f4ef2ce5f77cb3a811cbed5b46d23028' - '9491c4cd23d789dd04af551e16dc123f1517ca02ad3539f25715bbeec70ee21e') + 'e9713a067b33b8ea91d203853a033c0b9f6d40ebebd77f2e72903ed4fd355ebd' + '7423224107b28cabb69489056968581f1c9e94f3edc6a1d189e56a9df0bab4f7') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's|^DAYNO.*|DAYNO [0-9]?[1-9]|' src/parser/attack_scanner.l - ./configure --prefix=/usr --with-firewall=iptables + ./configure --prefix=/usr --sbindir=/usr/bin --with-firewall=iptables make } @@ -38,9 +34,7 @@ check() { package() { cd "$srcdir/$pkgname-$pkgver" - make prefix="$pkgdir/usr" install + make DESTDIR="$pkgdir" install install -Dm0644 "$srcdir/sshguard.service" "$pkgdir/usr/lib/systemd/system/sshguard.service" - install -Dm0755 "$srcdir/sshguard.rc" "$pkgdir/etc/rc.d/sshguard" - install -Dm0644 "$srcdir/sshguard.conf.d" "$pkgdir/etc/conf.d/sshguard" install -Dm0755 "$srcdir/sshguard-journalctl" "$pkgdir/usr/lib/systemd/scripts/sshguard-journalctl" } diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl index 13afd6f33..fb106f5b6 100644 --- a/community/sshguard/sshguard-journalctl +++ b/community/sshguard/sshguard-journalctl @@ -1,2 +1,2 @@ #!/bin/sh -/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@" +/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/bin/sshguard -l- "$@" diff --git a/community/sshguard/sshguard.conf.d b/community/sshguard/sshguard.conf.d deleted file mode 100644 index 8fa351a19..000000000 --- a/community/sshguard/sshguard.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Arguments to be passed to sshguard -# -SSHGUARD_ARGS="" diff --git a/community/sshguard/sshguard.install b/community/sshguard/sshguard.install index 0821c61e0..486e55fbd 100644 --- a/community/sshguard/sshguard.install +++ b/community/sshguard/sshguard.install @@ -1,8 +1,14 @@ post_install() { - mkdir -p /var/db/sshguard - echo "-- You should add chain to your firewall:" + mkdir -p var/db/sshguard + echo "-- You should add chains to your firewall:" echo "-- iptables -N sshguard" echo "-- iptables -A INPUT -p tcp --dport 22 -j sshguard" - echo "-- For more information, see http://www.sshguard.net/doc/" - /bin/true + echo "-- ip6tables -N sshguard" + echo "-- ip6tables -A INPUT -p tcp --dport 22 -j sshguard" + echo "-- touch /etc/iptables/ip6tables.rules if you don't use IPv6" + echo "-- For more information, see https://wiki.archlinux.org/index.php/Sshguard" +} + +post_upgrade() { + echo "-- touch /etc/iptables/ip6tables.rules if you don't use IPv6" } diff --git a/community/sshguard/sshguard.rc b/community/sshguard/sshguard.rc deleted file mode 100644 index dbd95c9ea..000000000 --- a/community/sshguard/sshguard.rc +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/sshguard ] && . /etc/conf.d/sshguard - -case "$1" in - start) - stat_busy "Starting SSHGuard" - /usr/sbin/sshguard -l /var/log/auth.log -b /var/db/sshguard/blacklist.db ${SSHGUARD_ARGS} &> /dev/null & - add_daemon sshguard - stat_done - ;; - stop) - stat_busy "Stopping SSHGuard" - kill `pidof sshguard` &> /dev/null - rm_daemon sshguard - stat_done - ;; - restart) - $0 stop - $0 start - ;; -*) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service index 9340d8e9f..d6324d459 100644 --- a/community/sshguard/sshguard.service +++ b/community/sshguard/sshguard.service @@ -1,7 +1,7 @@ [Unit] Description=Block hacking attempts -After=iptables.service network.target -Wants=iptables.service +After=iptables.service ip6tables.service network.target +Wants=iptables.service ip6tables.service [Service] ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl -b /var/db/sshguard/blacklist.db diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD index 168bbc623..5c286dcdc 100644 --- a/community/stuntrally/PKGBUILD +++ b/community/stuntrally/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Jason Melton <jason.melton@gmail.com> pkgname=stuntrally -pkgver=1.9 -pkgrel=3 +pkgver=2.0 +pkgrel=1 pkgdesc='Stunt Rally game with track editor, based on VDrift' arch=('x86_64' 'i686') license=('GPL3') @@ -14,14 +14,16 @@ depends=('libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stu makedepends=('cmake' 'boost') install=stuntrally.install source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/$pkgname/$pkgname/tar.gz/$pkgver") -sha256sums=('651d10aa00cf73b275198f08b0360a34ff98e6b520013041863854babeb20da7') +sha256sums=('ef3e645e4911f37c28925e3339c39555e849b7ac13511f009742030f531eed68') build() { cd "$srcdir/stuntrally-$pkgver/" rm -rf build mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX="/usr" -DSHARE_INSTALL="share/stuntrally" .. + cmake .. \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DSHARE_INSTALL="share/stuntrally" make } diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 64b9ce516..4223d1dfe 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 90094 2013-05-06 19:39:42Z foutrelis $ +# $Id: PKGBUILD 90606 2013-05-13 10:37:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig -pkgver=0.63.05 -pkgrel=3 +pkgver=0.64.0 +pkgrel=1 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64) url="http://synfig.org" license=('GPL2') depends=('libxml++' 'libsigc++2.0' 'etl' 'imagemagick' 'ffmpeg-compat' 'fontconfig' 'libpng' - 'libtiff' 'libdv' 'libmng') + 'libtiff' 'libdv' 'libmng' 'cairo' 'pango' 'boost-libs') +makedepends=('boost') optdepends=('openexr' 'libsigc++') conflicts=('synfig-core') replaces=('synfig-core') @@ -18,7 +19,7 @@ options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz build-fix.patch ffmpeg-0.8.patch) -md5sums=('8591cf17c26405d68d2cc050a2929292' +md5sums=('124cb4059b9f48dc5c37204660053d6f' 'b5568b06fae1a7ee465b5380b1139b83' 'ebf41046097cfd778dee9a9854561dae') diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index 818ad5e61..cb4996bee 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 69586 2012-04-19 09:14:58Z spupykin $ +# $Id: PKGBUILD 90608 2013-05-13 10:38:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfigstudio -pkgver=0.63.05 +pkgver=0.64.0 pkgrel=1 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64) @@ -11,11 +11,11 @@ url="http://synfig.org" license=('GPL2') depends=('gtkmm' 'synfig') makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' - 'xorg-fonts-misc' 'xorg-fonts-type1') + 'xorg-fonts-misc' 'xorg-fonts-type1' 'intltool') install=synfigstudio.install options=('!libtool') source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz) -md5sums=('ca01b7523118e32c904b681d8ff0a085') +md5sums=('bbda14359a07254b8efe5e706de192df') build() { cd $srcdir/synfigstudio-$pkgver diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index aa51c36f7..7fd8d4357 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87478 2013-04-01 10:36:38Z spupykin $ +# $Id: PKGBUILD 90725 2013-05-13 14:38:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat pkgver=10.1.5 -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,10 +16,8 @@ options=(zipman) backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz - sysstat sysstat.service) md5sums=('cdf66d6acd5c8cab709e07980b77ea6b' - '3ce41ebf7330aba01e70b38658afed1f' '12ba479c606620193e8b7c6e982d5088') build() { @@ -37,7 +35,6 @@ package() { make DESTDIR=$pkgdir install install -D -m 744 cron/sysstat.cron.hourly $pkgdir/etc/cron.hourly/sysstat install -D -m 744 cron/sysstat.cron.daily $pkgdir/etc/cron.daily/sysstat - install -D -m 755 $srcdir/sysstat $pkgdir/etc/rc.d/sysstat chown -R root:root $pkgdir install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service } diff --git a/community/sysstat/sysstat b/community/sysstat/sysstat deleted file mode 100644 index d0e40aa05..000000000 --- a/community/sysstat/sysstat +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -. /etc/rc.d/functions -. /etc/conf.d/sysstat -. /etc/rc.conf - -case "$1" in - start) - stat_busy "Writing SysStat restart record" - /usr/lib/sa/sadc -L -F ${SADC_OPTIONS} - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon sysstat - stat_done - fi - ;; - stop) - echo "Stopping SysStat is useless" - rm_daemon sysstat - ;; - *) - echo "usage: $0 {start|stop}" -esac -exit 0 diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index 6a1b3ec48..dc66e4093 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80483 2012-11-22 17:38:18Z lfleischer $ +# $Id: PKGBUILD 90563 2013-05-13 08:20:47Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor pkgver=0.2.3.25 -pkgrel=1 +pkgrel=2 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64') url='http://www.torproject.org/' @@ -13,19 +13,14 @@ depends=('openssl' 'libevent' 'tsocks' 'bash') makedepends=('ca-certificates') backup=('etc/tor/torrc' 'etc/tor/torrc-dist' - 'etc/tor/tor-tsocks.conf' - 'etc/conf.d/tor') + 'etc/tor/tor-tsocks.conf') install='tor.install' source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} 'torrc' - 'tor' - 'tor.conf.d' 'tor.service') md5sums=('a1c364189a9a66ed9daa8e6436489daf' 'a4c12795ffb8f68550a5dab4a9eb0654' '56c75d4e8a66f34167d31e38c43793dd' - 'f8e6868a389877346e7eebaacd1078bb' - '5c7c6834064b3530c442def6079ac3aa' 'b8989a7b3ab39d697624b243f7fc255d') build() { @@ -44,8 +39,6 @@ package() { mv "${pkgdir}/etc/tor/torrc.sample" "${pkgdir}/etc/tor/torrc-dist" install -Dm0644 "${srcdir}/torrc" "${pkgdir}/etc/tor/torrc" - install -Dm0755 "${srcdir}/tor" "${pkgdir}/etc/rc.d/tor" - install -Dm0644 "${srcdir}/tor.conf.d" "${pkgdir}/etc/conf.d/tor" install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/community/tor/tor b/community/tor/tor deleted file mode 100644 index 522c498ce..000000000 --- a/community/tor/tor +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/tor ] && . /etc/conf.d/tor - -PID=`pidof -o %PPID /usr/bin/tor` -case "$1" in - start) - stat_busy "Starting Tor Daemon" - if [ -z "${TOR_MAX_FD}" ] || ulimit -n "${TOR_MAX_FD}"; then - [ -z "$PID" ] && /usr/bin/tor -f ${TOR_CONF} ${TOR_ARGS} &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon tor - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping Tor Daemon" - [ ! -z "$PID" ] && kill -INT $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon tor - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ft=sh ts=2 sw=2 diff --git a/community/tor/tor.conf.d b/community/tor/tor.conf.d deleted file mode 100644 index e9fa098e0..000000000 --- a/community/tor/tor.conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Location of the config file. -TOR_CONF='/etc/tor/torrc' - -# Custom ulimit for maximum number of open files. -TOR_MAX_FD= - -# Additional arguments. -TOR_ARGS="--quiet" - diff --git a/community/ucarp/PKGBUILD b/community/ucarp/PKGBUILD index 11548155e..467613303 100644 --- a/community/ucarp/PKGBUILD +++ b/community/ucarp/PKGBUILD @@ -1,37 +1,37 @@ -# $Id: PKGBUILD 83576 2013-02-03 13:21:29Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# $Id: PKGBUILD 90534 2013-05-13 00:32:20Z seblu $ +# Maintainer: Sébastien Luttringer pkgname=ucarp pkgver=1.5.2 -pkgrel=4 +pkgrel=5 pkgdesc='Userspace implementation of the CARP protocol' arch=('i686' 'x86_64') url='http://www.ucarp.org/project/ucarp' license=('GPL2') depends=('libpcap') optdepends=('iproute2') -source=("http://download.pureftpd.org/pub/ucarp/ucarp-$pkgver.tar.gz" - 'ucarp.service' - 'ucarp.8' +source=("http://download.pureftpd.org/pub/$pkgname/$pkgname-$pkgver.tar.gz" + "$pkgname.service" + "$pkgname.8" '01-fix-getopt.patch' '02-fix-downscript-on-error.c') md5sums=('e3caa733316a32c09e5d3817617e9145' - '40fdef66560e3c98eb7c04adf7c31739' + 'fdc72a8d6f89224b40c78705df1f46f9' '2ccfdc464b88c437b38bd0324cf1fef3' '3f20699aaf2ef8139dcd337f1e7f06ab' '09d26233c37956cf08e629554a91b8cd') +prepare() { + # Apply patches + patch -N -p1 -d $pkgname-$pkgver < 01-fix-getopt.patch + patch -N -p1 -d $pkgname-$pkgver < 02-fix-downscript-on-error.c +} + build() { cd $pkgname-$pkgver - patch -N -p1 -i ../01-fix-getopt.patch - patch -N -p1 -i ../02-fix-downscript-on-error.c - - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make - # fix iproute2 path - sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-down.sh - sed -i 's|/sbin|/usr/sbin|g' examples/linux/vip-up.sh } package() { diff --git a/community/ucarp/ucarp.service b/community/ucarp/ucarp.service index 41c8322e2..2ff694d2c 100644 --- a/community/ucarp/ucarp.service +++ b/community/ucarp/ucarp.service @@ -2,7 +2,7 @@ Description=UCARP daemon [Service] -ExecStart=/usr/sbin/ucarp +ExecStart=/usr/bin/ucarp [Install] WantedBy=multi-user.target diff --git a/community/ude/PKGBUILD b/community/ude/PKGBUILD index c878df59e..4a6a50f1a 100644 --- a/community/ude/PKGBUILD +++ b/community/ude/PKGBUILD @@ -1,31 +1,36 @@ -# $Id: PKGBUILD 65333 2012-02-21 02:10:03Z spupykin $ +# $Id: PKGBUILD 90591 2013-05-13 09:59:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: eric <eric@archlinux.org> # Contributor: dorphell <dorphell@gmx.net> pkgname=ude -pkgver=0.2.10a -pkgrel=4 -pkgdesc="Unix Desktop Environment is a GUI desktop environment" -arch=('i686' 'x86_64') +pkgver=0.2.11 +pkgrel=1 +pkgdesc="Unix Desktop Environment (GUI desktop environment)" +arch=('x86_64' 'i686') license=('GPL') -depends=('libjpeg' 'libxmu' 'libxpm') +depends=('libjpeg' 'libxmu' 'libxpm' 'bash') +makedepends=('gendesk') url="http://udeproject.sourceforge.net/index.shtml" -source=(http://downloads.sourceforge.net/udeproject/uwm-$pkgver.tar.gz - $pkgname.desktop) -md5sums=('1370418179f56612ffe63d6ed0c89d13' - '84f94253ea284258c4465cd76edf599f') +source=(http://downloads.sourceforge.net/udeproject/uwm-$pkgver.tar.gz) +md5sums=('d4952a7edffd30ac07f32fce244c86d7') build() { - cd $srcdir/uwm-$pkgver + cd "$srcdir" + gendesk + + cd "uwm-$pkgver" ./configure --prefix=/usr make } package() { - cd $srcdir/uwm-$pkgver + cd "$srcdir/uwm-$pkgver" + mkdir -p $pkgdir/etc/X11/sessions make prefix=$pkgdir/usr install - cp $srcdir/$pkgname.desktop $pkgdir/etc/X11/sessions + install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/etc/X11/sessions" + install -Dm644 "$srcdir/$pkgname.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" mv $pkgdir/usr/doc $pkgdir/usr/share/ } diff --git a/community/ude/ude.desktop b/community/ude/ude.desktop deleted file mode 100644 index 48a022d0b..000000000 --- a/community/ude/ude.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Ude -Comment=The ude window manager -Exec=uwm -# no icon yet, only the top three are currently used -Icon= -Type=Application diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 3a49d62bb..aa519f85c 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87022 2013-03-25 19:17:05Z bpiotrowski $ +# $Id: PKGBUILD 90538 2013-05-13 00:36:03Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sébastien Luttringer # Contributor: Dale Blount <dale@archlinux.org> @@ -6,7 +6,7 @@ pkgname=ulogd pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' @@ -30,12 +30,18 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" md5sums=('660516de4b5b1e110c12dae414619e0f' 'dd32eeee0949adff4188544419acd17e' 'c21531312f95e790ed19aa267a17d35a' - '42fc2c0568ff89ec00c2f0797280f296') + '092d72209e30c132e0a08112e4062772') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --with-mysql \ + --with-pgsql \ + --with-dbi make } diff --git a/community/ulogd/ulogd.service b/community/ulogd/ulogd.service index 8858427fa..12450c9cc 100644 --- a/community/ulogd/ulogd.service +++ b/community/ulogd/ulogd.service @@ -3,7 +3,7 @@ Description=Netfilter Ulogd daemon After=network.target [Service] -ExecStart=/usr/sbin/ulogd +ExecStart=/usr/bin/ulogd [Install] WantedBy=multi-user.target diff --git a/community/ultimate-ircd/PKGBUILD b/community/ultimate-ircd/PKGBUILD index 88aaeff64..4a3f0c2da 100644 --- a/community/ultimate-ircd/PKGBUILD +++ b/community/ultimate-ircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 78358 2012-10-17 15:20:09Z spupykin $ +# $Id: PKGBUILD 90729 2013-05-13 14:39:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ultimate-ircd pkgver=3.0.2 -pkgrel=6 +pkgrel=7 pkgdesc="ultimate irc server" arch=(i686 x86_64) url="http://www.shadow-realm.org/" @@ -16,12 +16,10 @@ provides=(ircd) backup=() install=ircd.install source=(http://downloads.sourceforge.net/sourceforge/ultimate/Ultimate$pkgver.tar.bz2 - ultimate-ircd ultimate-ircd.service ultimate-ircd.tmpfiles conf-fix.patch) md5sums=('8bc14b97d22a3ce3415cc0540ae459f6' - 'cf6ab14d8dd8805342b70a9beb01c9af' '526fd78018b9b011787e4e9012437116' 'e51723ab29e7a3ddc3589846815de0c9' '5e0f2a02e12675ac070a148c3234e111') @@ -42,7 +40,10 @@ build() { cd include && patch -N <../../conf-fix.patch && cd .. make || return 1 +} +package() { + cd $srcdir/Ultimate$pkgver mkdir -p $pkgdir/usr/bin mkdir -p $pkgdir/var/log/ircd mkdir -p $pkgdir/etc/ircd/networks @@ -54,7 +55,6 @@ build() { mv mkpasswd irc-mkpasswd mv ssl-cert.sh irc-ssl-cert.sh mv ssl-search.sh irc-ssl-search.sh - install -D -m 0755 $srcdir/ultimate-ircd $pkgdir/etc/rc.d/ultimate-ircd install -d -m 0755 $pkgdir/var/lib/ircd install -Dm0644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf diff --git a/community/ultimate-ircd/ultimate-ircd b/community/ultimate-ircd/ultimate-ircd deleted file mode 100644 index df73d7389..000000000 --- a/community/ultimate-ircd/ultimate-ircd +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof /usr/bin/ircd -} - -case "$1" in - start) - stat_busy "Starting Ultimate IRCd" - - [ -d /var/run/ircd ] || mkdir -p /var/run/ircd - [ -f /var/run/ircd/ircd.pid ] && rm -f /var/run/ircd/ircd.pid - PID=`get_pid` - if [ -z "$PID" ]; then - su -c '/usr/bin/ircd -f /etc/ircd/ircd.conf' ircd 1>>/var/log/ircd/stdout.log 2>>/var/log/ircd/sterr.log - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon ultimate-ircd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Ultimate IRCd" - PID=`get_pid` - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/ircd/ircd.pid &> /dev/null - rm_daemon ultimate-ircd - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 244544976..f04ab0934 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82103 2013-01-08 15:57:53Z spupykin $ +# $Id: PKGBUILD 90731 2013-05-13 14:39:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.10 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64') url="http://unrealircd.com" @@ -15,17 +15,13 @@ provides=('ircd') backup=('etc/unrealircd/unrealircd.conf' 'etc/conf.d/unrealircd') source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz - unrealircd.rc unrealircd.service arch-fixes.patch) md5sums=('05b0bbdbfab9ffc2304f7595951d7cec' - '07ffa1e82a01f319a8b997e155d2af1d' '2103ce8a4a4e79f6955920bfebea0202' '77807313c4578f2c30286b9f9e3fb21c') build() { - mkdir -p $pkgdir/etc/unrealircd - mkdir -p $pkgdir/usr/bin cd $srcdir/Unreal$pkgver patch -p1 <$srcdir/arch-fixes.patch @@ -44,6 +40,14 @@ build() { --with-system-cares make +} + +package() { + cd $srcdir/Unreal$pkgver + + mkdir -p $pkgdir/etc/unrealircd + mkdir -p $pkgdir/usr/bin + make IRCDDIR=$pkgdir/etc/unrealircd BINDIR=$pkgdir/usr/bin install mv $srcdir/Unreal$pkgver/src/ircd $pkgdir/usr/bin/unrealircd @@ -51,7 +55,6 @@ build() { mkdir -p $pkgdir/usr/lib/unrealircd mv $pkgdir/etc/unrealircd/modules $pkgdir/usr/lib/unrealircd/ ln -s /usr/lib/unrealircd/modules $pkgdir/etc/unrealircd/modules - install -D -m0755 $srcdir/unrealircd.rc $pkgdir/etc/rc.d/unrealircd # log mkdir -p $pkgdir/var/log/unrealircd/ diff --git a/community/unrealircd/unrealircd.rc b/community/unrealircd/unrealircd.rc deleted file mode 100644 index 2cede46c8..000000000 --- a/community/unrealircd/unrealircd.rc +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -daemon_name=unrealircd - -. /etc/conf.d/unrealircd -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof ircd unrealircd -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=`get_pid` - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - export PID_FILE="/var/run/unrealircd.pid" - su -c /usr/bin/unrealircd -p - $UNREALIRCD_USER 1>>/var/log/unrealircd/ircd.log 2>>/var/log/unrealircd/ircd.log - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=`get_pid` - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD index 12ae4bb73..b1a758000 100644 --- a/community/uptimed/PKGBUILD +++ b/community/uptimed/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72798 2012-06-22 12:52:28Z dreisner $ +# $Id: PKGBUILD 90733 2013-05-13 14:40:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Tom Killian <tomk@runbox.com> @@ -6,7 +6,7 @@ pkgname=uptimed pkgver=0.3.17 -pkgrel=2 +pkgrel=3 pkgdesc="A system uptime record daemon" arch=(i686 x86_64) url="http://podgorny.cz/uptimed/" @@ -16,20 +16,19 @@ backup=(etc/uptimed.conf) options=('!libtool') install=$pkgname.install source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2 - rc.d service) md5sums=('528b62c33454b33537c3bf2366977bdb' - '4ae90bee9fc78014a889a5072effb735' '657102b06613ddb9811427bee1973c6b') build() { cd $srcdir/$pkgname-$pkgver - + # Change log path to Arch standard for M in `ls M*`; do - sed -i "s|/var/spool/uptimed|$pkgdir/var/log/uptimed|" $M + sed -i "s|/var/spool/uptimed|/var/log/uptimed|" $M done sed -i 's|spool|log|' libuptimed/urec.h + sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.ac autoreconf libtoolize --force @@ -40,9 +39,8 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install + make install DESTDIR=$pkgdir mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf - install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/uptimed install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/uptimed.service } diff --git a/community/uptimed/rc.d b/community/uptimed/rc.d deleted file mode 100644 index 6fe9ec3e3..000000000 --- a/community/uptimed/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/uptimed` -case "$1" in - start) - stat_busy "Starting Uptimed Daemon" - [ -z "$PID" ] && /usr/sbin/uptimed -b # create the boot record - if [ $? -gt 0 ] ; then - stat_fail - else - add_daemon uptimed # create the 'state' dir - /usr/sbin/uptimed # fire up the daemon - if [ $? -gt 0 ]; then - stat_fail - fi - stat_done - fi - ;; - stop) - stat_busy "Stopping Uptimed Daemon" - [ "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon uptimed # remove the 'state' dir - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD index 1a2dad59d..09a8ffa37 100644 --- a/community/ushare/PKGBUILD +++ b/community/ushare/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 75096 2012-08-13 19:22:01Z spupykin $ +# $Id: PKGBUILD 90735 2013-05-13 14:41:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=ushare pkgver=1.1a -pkgrel=18 +pkgrel=19 pkgdesc="A free UPnP A/V Media Server for Linux" url="http://ushare.geexbox.org" license=('GPL2') @@ -15,13 +15,11 @@ backup=('etc/ushare/ushare.conf' 'etc/conf.d/ushare') install=ushare.install source=("http://ushare.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" - "ushare" "upnp-build-fix.patch" "ushare-config.patch" "segfault.patch" "ushare.service") md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251' - 'e3cf0a44b0280da4966177c21e49361c' '32c29f9f673e8b3a3d9e7bf5e60febbc' '5243475c0cebc5db49296b2f3691085b' '0b0fbf5d103f0ebb72716cbad0b28ffa' @@ -44,7 +42,6 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/etc/${pkgname}/init.d - install -Dm0755 ${srcdir}/ushare ${pkgdir}/etc/rc.d/ushare install -dm0755 ${pkgdir}/etc/conf.d/ cat >${pkgdir}/etc/conf.d/ushare <<EOF #PARAMS="-c /tmp -i eth0" diff --git a/community/ushare/ushare b/community/ushare/ushare deleted file mode 100644 index b545b85d4..000000000 --- a/community/ushare/ushare +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -DESC="uShare UPnP A/V Media Server" - -. /etc/rc.conf -. /etc/rc.d/functions -[ -r "/etc/ushare/ushare.conf" ] && . /etc/ushare/ushare.conf -[ -r "/etc/conf.d/ushare" ] && . /etc/conf.d/ushare - -[ -z $USHARE_USER ] && USHARE_USER=ushare - -# abort if no executable exists -#[ -x $DAEMON ] || stat_fail - -# abort if no shared directory is defined -#[ -z "$USHARE_DIR" ] && stat_fail - -#set -e - -#checkpid() { -# [ -e $PIDFILE ] || touch $PIDFILE -#} - -PID=`pidof -o %PPID /usr/bin/ushare` -case "$1" in - start) - stat_busy "Starting $DESC" - [ -z "$PID" ] && sudo -u $USHARE_USER /usr/bin/ushare -D -x $PARAMS - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID /usr/bin/ushare` - echo $PID > /var/run/ushare.pid - add_daemon ushare - stat_done - fi - ;; - stop) - stat_busy "Stopping $DESC" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/ushare.pid - rm_daemon ushare - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD index c6efc2d18..1efe1b8ca 100644 --- a/community/vnstat/PKGBUILD +++ b/community/vnstat/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72799 2012-06-22 12:52:33Z dreisner $ +# $Id: PKGBUILD 90737 2013-05-13 14:41:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=vnstat pkgver=1.11 -pkgrel=3 +pkgrel=4 pkgdesc="A console-based network traffic monitor" arch=('i686' 'x86_64') url="http://humdi.net/vnstat/" @@ -15,10 +15,8 @@ makedepends=('gd') optdepends=('gd: image output') backup=(etc/vnstat.conf) source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz - http://humdi.net/vnstat/init.d/arch/vnstat - service) + service) md5sums=('a5a113f9176cd61fb954f2ba297f5fdb' - 'e89a566dd7514ff0d2d3fc77b2d4ca7e' 'fcc189e3dee616ff414dac72637c1a19') build() { @@ -30,7 +28,6 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - install -D -m0755 $srcdir/vnstat $pkgdir/etc/rc.d/vnstat install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/vnstat.service install -D -m0644 examples/vnstat.cron $pkgdir/usr/share/doc/vnstat/examples/vnstat.cron diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD index b78ea24fe..e915453bf 100644 --- a/community/wesnoth/PKGBUILD +++ b/community/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90106 2013-05-06 19:40:04Z foutrelis $ +# $Id: PKGBUILD 90785 2013-05-13 21:57:41Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -7,7 +7,7 @@ pkgname=wesnoth pkgver=1.10.6 -pkgrel=3 +pkgrel=5 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') license=('GPL') @@ -19,15 +19,19 @@ options=(!emptydirs) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 wesnothd.tmpfiles.conf wesnothd.rc.d - wesnothd.service) + wesnothd.service + https://github.com/wesnoth/wesnoth-old/commit/bbd7f6.patch) md5sums=('547e3489bbfa778912b11dbee612c380' '2d2fea6b3d86dfd589f5ad35a3be1f97' '85659b47d22dfdf4e4d046556973fc3e' - 'd1b6bf1d3dc05086ee6a370adff0ae4a') + 'd1b6bf1d3dc05086ee6a370adff0ae4a' + 'edc7c0547e67cba4ca4f813ca261f572') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/bbd7f6.patch + mkdir build && cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index 508523e77..b2ca19414 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84936 2013-02-26 10:20:29Z spupykin $ +# $Id: PKGBUILD 90592 2013-05-13 10:00:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard -pkgver=4.7.0 +pkgver=4.7.1 pkgrel=1 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('gendesk') optdepends=('perl') install=${pkgname}.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('646e5091f7ee4b5fa9998d2cca9cf795') +md5sums=('e42383c4594c24ebf2f9fdc5dc89e255') build() { cd "${srcdir}" diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD index 54e33f731..b6e76d97c 100644 --- a/community/xl2tpd/PKGBUILD +++ b/community/xl2tpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79633 2012-11-09 12:06:24Z spupykin $ +# $Id: PKGBUILD 90739 2013-05-13 14:42:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hengfu <rhfcaesar@gmail.com> pkgname=xl2tpd pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation" arch=('i686' 'x86_64') url="http://www.xelerance.com/services/software/xl2tpd/" @@ -13,7 +13,6 @@ depends=('ppp') options=(emptydirs zipman docs) backup=(etc/ppp/options.l2tpd) source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz - xl2tpd.rc xl2tpd.conf.client-example xl2tpd.conf.server-example options.l2tpd @@ -21,7 +20,6 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p xl2tpd.tmpfiles ipparam.patch) md5sums=('38c2461d3562f98b08454ca403706886' - '1439d13084fc09c2a19c97b24a834345' '5f0ae07026e61a3dd15a76fd4144a6d5' '16ed0886115d4dcc21072cfb847250bb' 'ed57eb67335cdf246251285dad502cc7' @@ -35,9 +33,13 @@ build() { patch -p1 <$srcdir/ipparam.patch make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make KERNELSRC=/usr/src/linux-`uname -r` PREFIX=/usr DESTDIR=$pkgdir install - install -D -m0755 $srcdir/xl2tpd.rc $pkgdir/etc/rc.d/xl2tpd install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd diff --git a/community/xl2tpd/xl2tpd.rc b/community/xl2tpd/xl2tpd.rc deleted file mode 100644 index a06e0d41e..000000000 --- a/community/xl2tpd/xl2tpd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - [ -d /var/run/xl2tpd ] || mkdir -p /var/run/xl2tpd - stat_busy "Starting xl2tpd" - /usr/sbin/xl2tpd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon xl2tpd - stat_done - fi - ;; - stop) - stat_busy "Stopping xl2tpd" - [ -f /var/run/xl2tpd.pid ] && kill `cat /var/run/xl2tpd.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/xl2tpd.pid - rm_daemon xl2tpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index bc5a8e13b..4065e7daf 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 88557 2013-04-19 17:25:15Z spupykin $ +# $Id: PKGBUILD 90741 2013-05-13 14:42:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 pkgver=0.8DrO_o -pkgrel=12 +pkgrel=13 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64') url="http://xmms2.org/" @@ -52,12 +52,10 @@ conflicts=('xmms2-devel') install=xmms2.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "xmms2d.conf" - "xmms2d.rc" "xmms2d.service" "ffmpeg-0.11.diff") md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' - '31ab8c0980966dbe3e9f5e80b7b82612' '47e68461589578e8a99857746c5b6f29' 'e176971ef96807f72fa8fc17d260c20a') @@ -90,7 +88,6 @@ package() { ./waf build ./waf --destdir=${pkgdir} install - install -Dm0755 $srcdir/xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d install -Dm0644 $srcdir/xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf install -Dm0644 $srcdir/xmms2d.service $pkgdir/usr/lib/systemd/system/xmms2d.service } diff --git a/community/xmms2/xmms2d.rc b/community/xmms2/xmms2d.rc deleted file mode 100644 index 5387448d9..000000000 --- a/community/xmms2/xmms2d.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/xmms2d.conf -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof xmms2d xmms2-et` -case "$1" in - start) - stat_busy "Starting xmms2d" - [ -z "$PID" ] && su -c "/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null" - $XMMS2_USER - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon xmms2d - stat_done - fi - ;; - stop) - stat_busy "Stopping xmms2d" - [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER - if [ $? -gt 0 ]; then - stat_fail - else - for i in `seq 1 10`; do - [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; } - sleep 1 - done - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD index 19bbf6f6e..db543f2a9 100644 --- a/community/zathura-pdf-mupdf/PKGBUILD +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Moritz Lipp <mlq@pwmt.org> pkgname=zathura-pdf-mupdf -pkgver=0.2.3 -pkgrel=2 +pkgver=0.2.4 +pkgrel=1 pkgdesc="Adds pdf support to zathura by using the mupdf library" arch=('i686' 'x86_64') url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" @@ -13,7 +13,7 @@ license=('custom') depends=('mupdf>=1.1' 'zathura') conflicts=('zathura-pdf-poppler') source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") -md5sums=('777ba69a321ef4bb9cbced8f6733927a') +md5sums=('aa9667425dab93147dd8605eda020e59') build() { make -C "${srcdir}/$pkgname-$pkgver" diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index 3bc552d46..b40481192 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82563 2013-01-21 00:12:49Z dwallace $ +# $Id: PKGBUILD 90594 2013-05-13 10:03:23Z spupykin $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura -pkgver=0.2.2 +pkgver=0.2.3 pkgrel=1 pkgdesc="a document viewer" arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ url="http://pwmt.org/projects/zathura/" license=('custom') depends=('girara-gtk2' 'sqlite' 'desktop-file-utils') makedepends=('python2-docutils') -optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') +optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-pdf-mupdf' 'zathura-ps') install=zathura.install source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz bash-completion) -md5sums=('51558163e942b52036ee00c60bd1500c' +md5sums=('c0265fd9fa64a37b01d729efb75a7c32' 'cac20c37f0e77ba62a8138788f4ccabb') build() { |