From 7f6f69dc52c8601768ba48fa7b69507a80d532cb Mon Sep 17 00:00:00 2001 From: root Date: Thu, 5 Jul 2012 00:02:54 +0000 Subject: Thu Jul 5 00:02:54 UTC 2012 --- community/allegro/PKGBUILD | 8 +- community/cdemu-daemon/PKGBUILD | 29 ++++--- community/cdemu-daemon/cdemu-daemon.install | 37 +++++---- community/cdemu-daemon/cdemu-daemon.service | 10 +++ community/cdemu-daemon/cdemud-dbus.conf | 24 ++++++ community/cdemu-daemon/cdemud.conf | 3 - community/cdemu-daemon/cdemud.rc | 25 +----- community/converseen/PKGBUILD | 6 +- community/me-tv/PKGBUILD | 13 ++- community/milkytracker/PKGBUILD | 17 ++-- community/nethack/PKGBUILD | 6 +- community/nginx/PKGBUILD | 118 +++++++++++++--------------- community/nginx/nginx.install | 11 +++ community/nginx/nginx.logrotate | 8 ++ community/nginx/rc.d | 68 ++++++++++++++++ community/nginx/service | 13 +++ community/puzzles/PKGBUILD | 4 +- community/spectrwm/PKGBUILD | 11 +-- community/vhba-module/60-vhba.rules | 14 +++- community/vhba-module/PKGBUILD | 6 +- community/vhba-module/vhba-module.install | 2 +- 21 files changed, 284 insertions(+), 149 deletions(-) create mode 100644 community/cdemu-daemon/cdemu-daemon.service create mode 100644 community/cdemu-daemon/cdemud-dbus.conf create mode 100644 community/nginx/nginx.install create mode 100644 community/nginx/nginx.logrotate create mode 100644 community/nginx/rc.d create mode 100644 community/nginx/service (limited to 'community') diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD index 3269d92ac..62ca6a91e 100644 --- a/community/allegro/PKGBUILD +++ b/community/allegro/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 71052 2012-05-22 19:41:59Z arodseth $ +# $Id: PKGBUILD 73179 2012-07-03 10:15:07Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Ionut Biru # Contributor: Tom Newsom # Contributor: arjan pkgname=allegro -pkgver=5.0.6 -pkgrel=3 +pkgver=5.0.7 +pkgrel=1 pkgdesc="Portable library mainly aimed at video game and multimedia programming" arch=('x86_64' 'i686') url="http://alleg.sourceforge.net/" @@ -14,7 +14,7 @@ license=('custom') depends=('jack' 'libxpm' 'libxxf86dga' 'libgl' 'physfs' 'gtk2' 'libpulse') makedepends=('cmake' 'mesa') source=("http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz") -sha256sums=('d981a1cac937085e6636e597c492ddb743066516c1d215c2a39e4049bd70dc24') +sha256sums=('47f29e564d9a4babfbbf024f34fc8a04eea932a073af921d17caffbec0c3ad9b') build() { cd "$srcdir" diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD index 4163ffbc1..4dec04ed8 100644 --- a/community/cdemu-daemon/PKGBUILD +++ b/community/cdemu-daemon/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68530 2012-03-26 10:24:56Z schiv $ +# $Id: PKGBUILD 73196 2012-07-03 19:16:11Z dreisner $ # Maintainer: Ray Rashif # Contributor: Mateusz Herych # Contributor: Charles Lindsay pkgname=cdemu-daemon pkgver=1.5.0 -pkgrel=5 +pkgrel=6 pkgdesc="CD/DVD-ROM device emulator daemon" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" @@ -17,13 +17,14 @@ backup=('etc/conf.d/cdemud' 'etc/dbus-1/system.d/cdemud-dbus.conf') install=$pkgname.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" - 'cdemud.conf' - 'cdemud.rc' - 'system.patch') + 'cdemud.conf' 'cdemud.rc' 'system.patch' 'cdemu-daemon.service' + 'cdemud-dbus.conf') md5sums=('5ba780caa26d855942512b5b3c22405a' - '5d9e08255e45ca3c0987329b7920e206' - '4bbf42b69133e4e91c1be2c6825fa392' - '90a2516639c05737fa10a110a1cba467') + '6f31ad7a64d320cf4d6820432184070b' + 'cbc0937ef4ac50db3ce5cdbbe2e17a3b' + '90a2516639c05737fa10a110a1cba467' + 'be9a8f50da3f42129c0a0e3dea8cd56c' + 'afbf24bcdec382f58d95ba5de29bff71') build() { cd "$srcdir/$pkgname-$pkgver" @@ -42,13 +43,21 @@ package() { make DESTDIR="$pkgdir" install + # Custom dbus policy, tightening security to console and 'cdemu' group + install -m644 "$srcdir/cdemud-dbus.conf" \ + "$pkgdir/etc/dbus-1/system.d/cdemud-dbus.conf" + # the init stuff install -Dm644 "$srcdir/cdemud.conf" "$pkgdir/etc/conf.d/cdemud" install -Dm755 "$srcdir/cdemud.rc" "$pkgdir/etc/rc.d/cdemud" - - # for systemd install -d "$pkgdir/usr/lib/modules-load.d" echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" + + # for systemd + install -Dm644 "$srcdir/cdemu-daemon.service" \ + "$pkgdir/usr/lib/systemd/system/cdemu-daemon.service" + echo "SystemdService=cdemu-daemon.service" >> \ + "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEMUD_Daemon.service" } # vim:set ts=2 sw=2 et: diff --git a/community/cdemu-daemon/cdemu-daemon.install b/community/cdemu-daemon/cdemu-daemon.install index 7a3e8a9f5..ba34d1ea0 100644 --- a/community/cdemu-daemon/cdemu-daemon.install +++ b/community/cdemu-daemon/cdemu-daemon.install @@ -1,20 +1,27 @@ -post_upgrade() { - echo " > The 'cdemu' group is now created by vhba-module" - echo " >> you may have to re-add yourself to the group and relogin" - echo - echo " > Daemon can be used in session mode as user, simply run 'cdemud'" - echo " >> you do not need to use the init script in this case" - echo " >> put your configuration in ~/.cdemud instead" +post_install () { + cat < The daemon is automatically started, but can be manually + started via /etc/rc.d/cdemud or cdemu-daemon.service. + > See /etc/conf.d/cdemud for further configuration. + + > Only users at the console or in the 'cdemu' group can + communicate with the system daemon or use a session + daemon. + + > If you want to output CD-Audio, write AUDIO_DRIVER=pulse or + AUDIO_DRIVER=alsa to ~/.cdemud and use "cdemu -b session" + to control a session daemon. +MSG + + return 0 } -post_install () { - echo " > Add yourself to the 'cdemu' group for non-root access" - echo " > Start the daemon as root with /etc/rc.d/cdemud" - echo " > See /etc/conf.d/cdemud for further configuration" - echo - echo " > Daemon can be used in session mode as user, simply run 'cdemud'" - echo " >> you do not need to use the init script in this case" - echo " >> put your configuration in ~/.cdemud instead" +post_upgrade () { + # Repeat install message due to policy changes + # Added on 2012-06-19, remove after a grace period + post_install + + return 0 } # vim:set ts=2 sw=2 et: diff --git a/community/cdemu-daemon/cdemu-daemon.service b/community/cdemu-daemon/cdemu-daemon.service new file mode 100644 index 000000000..9879a3e6f --- /dev/null +++ b/community/cdemu-daemon/cdemu-daemon.service @@ -0,0 +1,10 @@ +[Unit] +Description=CDEmu Daemon + +[Service] +Type=dbus +BusName=net.sf.cdemu.CDEMUD_Daemon +ExecStart=/usr/lib/cdemu-daemon/cdemu-daemon-system.sh + +[Install] +WantedBy=multi-user.target diff --git a/community/cdemu-daemon/cdemud-dbus.conf b/community/cdemu-daemon/cdemud-dbus.conf new file mode 100644 index 000000000..3043fe251 --- /dev/null +++ b/community/cdemu-daemon/cdemud-dbus.conf @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/community/cdemu-daemon/cdemud.conf b/community/cdemu-daemon/cdemud.conf index 6f14947a6..1d8c55fe6 100644 --- a/community/cdemu-daemon/cdemud.conf +++ b/community/cdemu-daemon/cdemud.conf @@ -6,6 +6,3 @@ AUDIO_DRIVER=null # log file LOG_FILE=/var/log/cdemud.log - -# bus to use (system or session) -BUS="system" diff --git a/community/cdemu-daemon/cdemud.rc b/community/cdemu-daemon/cdemud.rc index e8dab1f08..09b9ec345 100644 --- a/community/cdemu-daemon/cdemud.rc +++ b/community/cdemu-daemon/cdemud.rc @@ -2,32 +2,11 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/cdemud case "$1" in start) - stat_busy "Loading vhba and loop modules" - modprobe vhba - if [ $? -ne 0 ]; then - stat_fail - else - stat_done - fi - - stat_busy "Waiting for /dev/vhba_ctl" - i=0 - until [ -c /dev/vhba_ctl -o $i -ge 10 ]; do - i=`expr $i + 1` - sleep 1 - done - if [ -c /dev/vhba_ctl ]; then - stat_done - else - stat_fail - fi - stat_busy "Starting cdemud" - cdemud --ctl-device=/dev/vhba_ctl --bus=$BUS --num-devices=$NUM_DEVICES --audio-driver=$AUDIO_DRIVER --logfile=$LOG_FILE & + /usr/lib/cdemu-daemon/cdemu-daemon-system.sh & if [ $? -ne 0 ]; then stat_fail else @@ -37,7 +16,7 @@ case "$1" in ;; stop) stat_busy "Stopping cdemud" - kill -9 `pidof cdemud` &>/dev/null && sleep 1 && rmmod vhba + kill `pidof cdemud` &>/dev/null if [ $? -ne 0 ]; then stat_fail else diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 7b44ecc55..95e10cc13 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72015 2012-06-05 17:23:40Z giovanni $ +# $Id: PKGBUILD 73175 2012-07-03 06:23:26Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: archtux pkgname=converseen -pkgver=0.5 +pkgver=0.5.1 pkgrel=1 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('imagemagick' 'qt' 'libwmf' 'openexr') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('b1ed24de45456a76dac0e3bcbea0033f') +md5sums=('db00c0cf86977494effa971fd238c786') build() { cd "${srcdir}" diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD index 12bd3392d..d0d6c1d33 100644 --- a/community/me-tv/PKGBUILD +++ b/community/me-tv/PKGBUILD @@ -5,14 +5,14 @@ #Previous Contributor: Jeff Bailes pkgname=me-tv -pkgver=1.4.0.9 +pkgver=1.4.0.10 pkgrel=1 epoch=1 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" arch=('i686' 'x86_64') url="https://launchpad.net/me-tv" license=('GPL') -depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base') +depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base') makedepends=('intltool' 'gnome-common') install='me-tv.install' source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver:0:5}/+download/${pkgname}-${pkgver}.tar.gz") @@ -24,6 +24,13 @@ build() { ./autogen.sh ./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr + + # Missing unistd.h includes :| https://bugs.launchpad.net/me-tv/+bug/1020690 + for file in common/common.cc server/thread.cc; do + sed -i '1 i\ + #include ' $file + done + make } @@ -42,4 +49,4 @@ package() { } -md5sums=('4d097d8893bc8c5dec0811e6cdcf4d7b') +md5sums=('842953c4e9eb37f79704ebd8bb23608a') diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD index e8e54ee08..cad1cfc2e 100644 --- a/community/milkytracker/PKGBUILD +++ b/community/milkytracker/PKGBUILD @@ -4,26 +4,27 @@ pkgname=milkytracker pkgver=0.90.85 -pkgrel=5 +pkgrel=6 pkgdesc="Fast Tracker II inspired music tracker" arch=('x86_64' 'i686') url="http://www.milkytracker.org/" license=('GPL3') -depends=('sdl>=1.2.0' 'alsa-lib' 'zlib' 'gcc-libs') +depends=('sdl>=1.2.0' 'alsa-lib' 'zlib' 'gcc-libs' 'setconf' 'gendesk') makedepends=('jack-audio-connection-kit') optdepends=('jack-audio-connection-kit: JACK audio support') options=('docs' '!strip') install=$pkgname.install source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2" - 'arch.patch' - "$pkgname.desktop") + 'arch.patch') sha256sums=('59a0d294d63752be74b157e07b0c70252c9198c312d9b1ad0ca460129fe5bd80' - 'cb9dfa99491d72eae7c09e7bae6c35871dddbc5b6a71730e772daa2f31f922bc' - 'c947a7b0689900c8ebfa29113553be87b7b151714c24f84f286ff81cd5e69063') + 'cb9dfa99491d72eae7c09e7bae6c35871dddbc5b6a71730e772daa2f31f922bc') +_name=('MilkyTracker') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$srcdir" + gendesk -n + setconf "$pkgname.desktop" Categories 'AudioVideo;Audio;AudioVideoEditing;' + cd "$pkgname-$pkgver" patch -p1 -i ../arch.patch ./configure --prefix=/usr --with-alsa --with-jack make diff --git a/community/nethack/PKGBUILD b/community/nethack/PKGBUILD index a3da43710..ccb4a8c60 100644 --- a/community/nethack/PKGBUILD +++ b/community/nethack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54249 2011-08-15 09:38:46Z schuay $ +# $Id: PKGBUILD 73189 2012-07-03 18:35:52Z schuay $ # Maintainer : schuay # Contributor : kevin # Contributor : Christian Schmidt @@ -7,7 +7,7 @@ pkgname=nethack pkgver=3.4.3 -pkgrel=6 +pkgrel=7 pkgdesc='A single player dungeon exploration game' arch=('i686' 'x86_64') url="http://www.nethack.org/index.html" @@ -22,7 +22,7 @@ build(){ sh sys/unix/setup.sh sed -e '/define HACKDIR/ s|/usr/games/lib/nethackdir|/var/games/nethack/|' \ - -e '/^#define COMPRESS\s/ s|/usr/bin/compress|/bin/gzip|' \ + -e "/^#define COMPRESS\s/ s|/usr/bin/compress|$(which gzip)|" \ -e '/^#define COMPRESS_EXTENSION/ s|".Z"|".gz"|' \ -e 's|^/\* \(#define DLB\) \*/|\1|' -i include/config.h diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index c045ceb98..adb01b4f5 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,19 +1,11 @@ -# $Id: PKGBUILD 72049 2012-06-07 08:10:36Z bpiotrowski $ +# $Id: PKGBUILD 73197 2012-07-03 19:16:22Z dreisner $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot -_doc_root=/usr/share/nginx/http -_server_root=/etc/nginx -_conf_path=${_server_root}/conf -_tmp_path=/var/spool/nginx -_log_path=/var/log/nginx -_user=http -_group=http - pkgname=nginx pkgver=1.2.1 -pkgrel=1 +pkgrel=6 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl') @@ -21,47 +13,54 @@ makedepends=('passenger') optdepends=('passenger') url="http://nginx.org" license=('custom') -backup=("etc/nginx/conf/fastcgi.conf" - "etc/nginx/conf/fastcgi_params" - "etc/nginx/conf/koi-win" - "etc/nginx/conf/koi-utf" - "etc/nginx/conf/mime.types" - "etc/nginx/conf/nginx.conf" - "etc/nginx/conf/scgi_params" - "etc/nginx/conf/uwsgi_params" - "etc/nginx/conf/win-utf" - "etc/logrotate.d/nginx" - "etc/conf.d/nginx") -source=("http://nginx.org/download/nginx-$pkgver.tar.gz" - 'nginx') +install=nginx.install +backup=('etc/nginx/fastcgi.conf' + 'etc/nginx/fastcgi_params' + 'etc/nginx/koi-win' + 'etc/nginx/koi-utf' + 'etc/nginx/mime.types' + 'etc/nginx/nginx.conf' + 'etc/nginx/scgi_params' + 'etc/nginx/uwsgi_params' + 'etc/nginx/win-utf' + 'etc/logrotate.d/nginx') +source=(http://nginx.org/download/nginx-$pkgver.tar.gz + rc.d service + nginx.logrotate) md5sums=('ceacae12d66d1f021bf3737a0269b6f4' - '0e8032d3ba26c3276e8c7c30588d375f') + 'f62c7c9b5a53471d4666a4c49ad363fb' + '16c6b4cbe24001a3f4f58b9d5f4e3d4c' + 'b38744739022876554a0444d92e6603b') + +_cfgdir=/etc/nginx +_tmpdir=/var/tmp/nginx build() { - cd "$srcdir/nginx-${pkgver}" + cd "$srcdir"/$pkgname-$pkgver ./configure \ - --prefix=${_server_root} \ + --prefix=$_cfgdir \ + --conf-path=$_cfgdir/nginx.conf \ --sbin-path=/usr/sbin/nginx \ --pid-path=/var/run/nginx.pid \ --lock-path=/var/lock/nginx.lock \ - --http-client-body-temp-path=${_tmp_path}/client_body_temp \ - --http-proxy-temp-path=${_tmp_path}/proxy_temp \ - --http-fastcgi-temp-path=${_tmp_path}/fastcgi_temp \ - --http-log-path=${_log_path}/access.log \ - --error-log-path=${_log_path}/error.log \ - --user=${_user} --group=${_group} \ - --with-imap --with-imap_ssl_module --with-http_ssl_module \ - --with-http_stub_status_module \ + --user=http --group=http \ + --http-log-path=/var/log/nginx/access.log \ + --error-log-path=/var/log/nginx/error.log \ + --http-client-body-temp-path=$_tmpdir/client-body \ + --http-proxy-temp-path=$_tmpdir/proxy \ + --http-fastcgi-temp-path=$_tmpdir/fastcgi \ + --http-scgi-temp-path=$_tmpdir/scgi \ + --http-uwsgi-temp-path=$_tmpdir/uwsgi \ + --with-imap --with-imap_ssl_module \ + --with-ipv6 --with-pcre-jit \ + --with-file-aio \ --with-http_dav_module \ --with-http_gzip_static_module \ - --with-ipv6 \ + --with-http_realip_module \ + --with-http_ssl_module \ + --with-http_stub_status_module \ --add-module=/usr/lib/passenger/ext/nginx \ - --conf-path=${_conf_path}/nginx.conf \ - --http-scgi-temp-path=${_tmp_path} \ - --http-uwsgi-temp-path=${_tmp_path} \ - --with-pcre-jit \ - --with-http_realip_module --with-file-aio #--with-http_mp4_module \ #--with-http_realip_module \ #--with-http_addition_module \ @@ -82,34 +81,23 @@ package() { cd "$srcdir/nginx-${pkgver}" make DESTDIR="$pkgdir" install - install -d "$pkgdir"/etc/logrotate.d/ - cat < $pkgdir/etc/logrotate.d/nginx - $_log_path/*log { - create 640 http log - compress - postrotate - /bin/kill -USR1 \`cat /var/run/nginx.pid 2>/dev/null\` 2> /dev/null || true - endscript - } -EOF - - sed -i -e "s/\$pkgdir/etc/conf.d/nginx rm -rf $pkgdir/var/run } diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install new file mode 100644 index 000000000..b31ee41d7 --- /dev/null +++ b/community/nginx/nginx.install @@ -0,0 +1,11 @@ +post_upgrade() { + if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then + echo " >>> Since 1.2.1-2 several changes has been made in package:" + echo " - *.conf files have been moved to /etc/nginx" + echo " - /etc/conf.d/nginx has been removed" + echo " Main configuration file is set to /etc/nginx/nginx.conf" + echo " - access.log and error.log can be found in /var/log/nginx by default" + echo " - bundled *.html files have been moved to /usr/share/nginx/html" + echo " - /etc/nginx/{html,logs} symbolic links and *.default files have been removed" + fi +} diff --git a/community/nginx/nginx.logrotate b/community/nginx/nginx.logrotate new file mode 100644 index 000000000..d490d5d9b --- /dev/null +++ b/community/nginx/nginx.logrotate @@ -0,0 +1,8 @@ +/var/log/nginx/*.log { + missingok + sharedscripts + compress + postrotate + test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid` + endscript +} diff --git a/community/nginx/rc.d b/community/nginx/rc.d new file mode 100644 index 000000000..eb9031e81 --- /dev/null +++ b/community/nginx/rc.d @@ -0,0 +1,68 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +function check_config { + stat_busy "Checking nginx configuration" + /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf + if [ $? -ne 0 ]; then + stat_die + else + stat_done + fi +} + +case "$1" in + start) + check_config + $0 careless_start + ;; + careless_start) + stat_busy "Starting nginx" + if [ -s /var/run/nginx.pid ]; then + stat_fail + # probably ;) + stat_busy "Nginx is already running" + stat_die + fi + /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null + if [ $? -ne 0 ]; then + stat_fail + else + add_daemon nginx + stat_done + fi + ;; + stop) + stat_busy "Stopping nginx" + PID=$(cat /var/run/nginx.pid) + kill -QUIT $PID &>/dev/null + if [ $? -ne 0 ]; then + stat_fail + else + for i in {1..10}; do + [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; } + sleep 1 + done + stat_fail + fi + ;; + restart) + check_config + $0 stop + sleep 1 + $0 careless_start + ;; + reload) + check_config + if [ -s /var/run/nginx.pid ]; then + status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid) + fi + ;; + check) + check_config + ;; + *) + echo "usage: $0 {start|stop|restart|reload|check|careless_start}" +esac diff --git a/community/nginx/service b/community/nginx/service new file mode 100644 index 000000000..78d0a492c --- /dev/null +++ b/community/nginx/service @@ -0,0 +1,13 @@ +[Unit] +Description=A high performance web server and a reverse proxy server + +[Service] +Type=forking +PIDFile=/run/nginx.pid +ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' +ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload +ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit + +[Install] +WantedBy=multi-user.target diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index b6a96fe17..645f6555f 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay pkgname=puzzles -pkgver=9455 +pkgver=9561 pkgrel=1 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64') @@ -38,4 +38,4 @@ package() { mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } -md5sums=('b1c08158b5ea14f374485cc72b7307f1') +md5sums=('d8b900ae4a7d70c692003a412241e94f') diff --git a/community/spectrwm/PKGBUILD b/community/spectrwm/PKGBUILD index b97b60386..323262e45 100644 --- a/community/spectrwm/PKGBUILD +++ b/community/spectrwm/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 68224 2012-03-19 15:53:19Z kkeen $ +# $Id: PKGBUILD 73201 2012-07-03 19:38:15Z kkeen $ # Maintainer: Kyle Keen # Contributor: Christoph Zeiler pkgname=spectrwm -pkgver=1.0.0 -pkgrel=3 -pkgdesc="A minimalistic dynamic tiling window manager that tries to stay out of the way." +pkgver=1.1.1 +pkgrel=1 +pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way." arch=('i686' 'x86_64') url="http://www.spectrwm.org" +_watch="https://opensource.conformal.com/snapshots/spectrwm/" license=('custom:ISC') depends=('dmenu' 'libxrandr' 'libxtst' 'profont') replaces=('scrotwm') @@ -17,7 +18,7 @@ backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('8dd279f53f998c0543fa1ce35a9b4a13' +md5sums=('fd97b626ea09c3ab302fc9082efe8c31' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e') diff --git a/community/vhba-module/60-vhba.rules b/community/vhba-module/60-vhba.rules index 91de6f86a..e4de1dca7 100644 --- a/community/vhba-module/60-vhba.rules +++ b/community/vhba-module/60-vhba.rules @@ -1 +1,13 @@ -KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" +ACTION=="remove", GOTO="vhba_end" +KERNEL!="vhba_ctl", GOTO="vhba_end" + +NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" + +TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess" +TAG+="udev-acl" +GOTO="vhba_end" + +LABEL="vhba_uaccess" +TAG+="uaccess" + +LABEL="vhba_end" diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index 27c41637c..5df6ebe38 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72473 2012-06-15 09:20:59Z ibiru $ +# $Id: PKGBUILD 73199 2012-07-03 19:16:32Z dreisner $ # Maintainer: Ray Rashif # Contributor: Mateusz Herych # Contributor: Charles Lindsay @@ -6,7 +6,7 @@ pkgname=vhba-module pkgver=20120422 _extramodules=extramodules-3.4-ARCH -pkgrel=1 +pkgrel=2 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" @@ -17,7 +17,7 @@ install=$pkgname.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" '60-vhba.rules') md5sums=('d97372da1d270d1605742b2995fb6678' - '549bd2d9696bd1884c8eed7193c00e21') + 'b5e82d0160e7a181219b67c1794d5c27') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index 73029498f..d9264d853 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -1,7 +1,7 @@ post_upgrade() { ! grep -q 'cdemu' /etc/group && groupadd cdemu echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.2-ARCH' + EXTRAMODULES='extramodules-3.4-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) } -- cgit v1.2.3-54-g00ecf