summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-06-11 00:02:18 +0000
committerroot <root@rshg054.dnsready.net>2012-06-11 00:02:18 +0000
commit4714cec7e8367a7618b168d0db4bc085dbfaac8a (patch)
treeb1f3049ee78988b0db6ec69637a1ee37c8b63b3f /community
parent7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff)
Mon Jun 11 00:02:18 UTC 2012
Diffstat (limited to 'community')
-rw-r--r--community/guake/PKGBUILD28
-rw-r--r--community/guake/guake-fix-notification.patch42
-rw-r--r--community/guake/guake-fix-pref.desktop.patch11
-rw-r--r--community/hostapd/PKGBUILD72
-rw-r--r--community/hostapd/hostapd.service11
-rw-r--r--community/lxdm/PKGBUILD7
-rw-r--r--community/miredo/PKGBUILD2
-rw-r--r--community/openntpd/PKGBUILD20
-rwxr-xr-xcommunity/openntpd/openntpd21
-rw-r--r--community/openntpd/openntpd.install25
-rw-r--r--community/openntpd/openntpd.service10
-rw-r--r--community/openntpd/openntpd.tmpfiles1
-rw-r--r--community/prosody/PKGBUILD2
-rw-r--r--community/prosody/prosody.service0
14 files changed, 174 insertions, 78 deletions
diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD
index 9bd937c0e..96de81dee 100644
--- a/community/guake/PKGBUILD
+++ b/community/guake/PKGBUILD
@@ -1,34 +1,36 @@
-# $Id: PKGBUILD 68559 2012-03-28 06:25:01Z bgyorgy $
+# $Id: PKGBUILD 72161 2012-06-09 09:50:29Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
pkgname=guake
-pkgver=0.4.2
-pkgrel=7
+pkgver=0.4.3
+pkgrel=1
pkgdesc='Drop-down terminal for GNOME'
arch=('i686' 'x86_64')
url="http://guake.org/"
license=('GPL')
-depends=('python-notify' 'vte' 'python2-gconf' 'dbus-python')
+depends=('python-notify' 'vte' 'python2-gconf' 'dbus-python' 'pyxdg')
makedepends=('intltool')
options=('!libtool')
install=$pkgname.install
source=(http://guake.org/files/$pkgname-$pkgver.tar.gz
- http://guake.org/raw-attachment/ticket/246/0001-Retrieve-port-as-int.2.patch
- guake-glib2.32.patch)
-md5sums=('1f0feff3bfc15c998147dbf07d9d8a8e'
- '9aca6ba8e46ae1b69958cda0e03320ff'
- 'ac692391e2fa171f6f96e5ceb2284c2d')
+ guake-fix-notification.patch
+ guake-fix-pref.desktop.patch)
+md5sums=('951e42f3c6b24912baab2f4f6c84e658'
+ '0b57227e6869dd84dd4fb0794ed0d082'
+ '0e042a6ac89f5e77c45a96c42494bc3d')
build() {
cd "$srcdir/$pkgname-$pkgver"
sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.in
- sed -i 's|PYTHON="/usr/bin/python"|PYTHON="/usr/bin/python2"|' src/guake{,-prefs}.in
- patch -Np1 -i "$srcdir/guake-glib2.32.patch"
+ sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake{,-prefs},prefs.py}
- # Patch to import proxy port setting as int (http://guake.org/ticket/246)
- patch -Np1 -i "$srcdir/0001-Retrieve-port-as-int.2.patch"
+ # http://guake.org/ticket/416
+ patch -Np1 -i "$srcdir/guake-fix-notification.patch"
+
+ # http://guake.org/ticket/448
+ patch -Np1 -i "$srcdir/guake-fix-pref.desktop.patch"
# Do not disable autostart in GNOME
sed -i '/X-GNOME-Autostart-enabled/ d' data/guake.desktop.in
diff --git a/community/guake/guake-fix-notification.patch b/community/guake/guake-fix-notification.patch
new file mode 100644
index 000000000..847dac10e
--- /dev/null
+++ b/community/guake/guake-fix-notification.patch
@@ -0,0 +1,42 @@
+--- a/src/guake 2011-02-09 20:00:35.000000000 +0100
++++ b/src/guake 2012-02-25 00:55:28.513075769 +0100
+@@ -46,7 +46,10 @@
+ TERMINAL_MATCH_EXPRS, TERMINAL_MATCH_TAGS, \
+ ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER
+
+-pynotify.init('Guake!')
++popup_works = True
++if not pynotify.init('Guake!') or pynotify.get_server_info() == None :
++ popup_works = False
++ print "WARNING: could not use popup notification"
+
+ GNOME_FONT_PATH = '/desktop/gnome/interface/monospace_font_name'
+
+@@ -637,7 +640,12 @@
+ 'Please use Guake Preferences dialog to choose another '
+ 'key (The trayicon was enabled)') % label, filename)
+ self.client.set_bool(KEY('/general/use_trayicon'), True)
+- notification.show()
++ if popup_works :
++ notification.show()
++ else :
++ print _('A problem happened when binding <b>%s</b> key.\n'
++ 'Please use Guake Preferences dialog to choose another '
++ 'key (The trayicon was enabled)') % label
+
+ elif self.client.get_bool(KEY('/general/use_popup')):
+ # Pop-up that shows that guake is working properly (if not
+@@ -646,7 +654,11 @@
+ _('Guake!'),
+ _('Guake is now running,\n'
+ 'press <b>%s</b> to use it.') % label, filename)
+- notification.show()
++ if popup_works :
++ notification.show()
++ else :
++ print _('Guake is now running,\n'
++ 'press <b>%s</b> to use it.') % label
+
+ def execute_command(self, command, tab=None):
+ """Execute the `command' in the `tab'. If tab is None, the
+
diff --git a/community/guake/guake-fix-pref.desktop.patch b/community/guake/guake-fix-pref.desktop.patch
new file mode 100644
index 000000000..6bd256d28
--- /dev/null
+++ b/community/guake/guake-fix-pref.desktop.patch
@@ -0,0 +1,11 @@
+--- guake-0.4.2-orig/data/guake-prefs.desktop.in 2009-12-01 12:51:08.000000000 +0100
++++ guake-0.4.2/data/guake-prefs.desktop.in 2012-05-21 17:07:05.982022360 +0200
+@@ -2,7 +2,7 @@
+ Encoding=UTF-8
+ Name=Guake Preferences
+ Name[pt_BR]=Preferências do Guake
+-Comment=Comment=Configure your Guake sessions
++Comment=Configure your Guake sessions
+ Comment[pt_BR]=Configurações do terminal Guake
+ TryExec=guake-prefs
+ Exec=guake-prefs
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 02d9efcfd..f9d8ccebf 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,62 +1,68 @@
-# $Id: PKGBUILD 70872 2012-05-18 10:00:26Z spupykin $
+# $Id: PKGBUILD 72181 2012-06-09 21:54:04Z heftig $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=hostapd
pkgver=1.0
-pkgrel=1
-pkgdesc="daemon for wireless software access points"
+pkgrel=2
+pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
arch=('i686' 'x86_64')
url="http://hostap.epitest.fi/hostapd/"
license=('custom')
depends=('openssl' 'libnl')
-makedepends=()
-provides=('hostapd')
-conflicts=('hostapd')
backup=('etc/hostapd/hostapd.conf'
- 'etc/conf.d/hostapd'
- 'etc/hostapd/hlr_auc_gw.milenage_db'
- 'etc/hostapd/hostapd.accept'
- 'etc/hostapd/hostapd.deny'
- 'etc/hostapd/hostapd.eap_user'
- 'etc/hostapd/hostapd.radius_clients'
- 'etc/hostapd/hostapd.sim_db'
- 'etc/hostapd/hostapd.vlan'
- 'etc/hostapd/hostapd.wpa_psk'
- 'etc/hostapd/wired.conf')
+ 'etc/conf.d/hostapd'
+ 'etc/hostapd/hlr_auc_gw.milenage_db'
+ 'etc/hostapd/hostapd.accept'
+ 'etc/hostapd/hostapd.deny'
+ 'etc/hostapd/hostapd.eap_user'
+ 'etc/hostapd/hostapd.radius_clients'
+ 'etc/hostapd/hostapd.sim_db'
+ 'etc/hostapd/hostapd.vlan'
+ 'etc/hostapd/hostapd.wpa_psk'
+ 'etc/hostapd/wired.conf')
install=hostapd.install
source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
- config
- hostapd
- hostapd.conf.d)
+ config hostapd hostapd.conf.d hostapd.service)
md5sums=('236247a7bbd4f60d5fa3e99849d1ffc9'
'5d7ee10b04e33f22c37be56a4c33dddb'
'd570327c385f34a4af24d3a0d61cea19'
- 'f169534b0f59b341f6df1a21e0344511')
+ 'f169534b0f59b341f6df1a21e0344511'
+ 'a0a16879eed5e4e41ae6b225a4809955')
build() {
- cd "$srcdir/$pkgname-$pkgver"/hostapd
- cp "$srcdir/config" ./.config
+ cd $pkgname-$pkgver/hostapd
+ cp ../../config .config
sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
- export CFLAGS="$CFLAGS `pkg-config --cflags libnl-3.0`"
+ export CFLAGS="$CFLAGS $(pkg-config --cflags libnl-3.0)"
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver/hostapd"
+ # RC script
+ install -D hostapd "$pkgdir/etc/rc.d/hostapd"
+ install -Dm644 hostapd.conf.d "$pkgdir/etc/conf.d/hostapd"
- install -D hostapd "$pkgdir/usr/bin/hostapd"
- install hostapd_cli "$pkgdir/usr/bin/hostapd_cli"
+ # Systemd unit
+ install -Dm644 hostapd.service "$pkgdir/usr/lib/systemd/system/hostapd.service"
- install -Dm644 hlr_auc_gw.milenage_db "$pkgdir/etc/hostapd/hlr_auc_gw.milenage_db"
+ cd $pkgname-$pkgver
+
+ # License
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+ cd hostapd
+
+ # Binaries
+ install -d "$pkgdir/usr/bin"
+ install -t "$pkgdir/usr/bin" hostapd hostapd_cli
+
+ # Configuration
+ install -d "$pkgdir/etc/hostapd"
install -m644 -t "$pkgdir/etc/hostapd" \
hostapd.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} \
- wired.conf
+ wired.conf hlr_auc_gw.milenage_db
+ # Man pages
install -Dm644 hostapd.8 "$pkgdir/usr/share/man/man8/hostapd.8"
install -Dm644 hostapd_cli.1 "$pkgdir/usr/share/man/man1/hostapd_cli.1"
-
- install -D "$srcdir/hostapd" "$pkgdir/etc/rc.d/hostapd"
- install -Dm644 "$srcdir/hostapd.conf.d" "$pkgdir/etc/conf.d/hostapd"
-
- install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}
diff --git a/community/hostapd/hostapd.service b/community/hostapd/hostapd.service
new file mode 100644
index 000000000..f278bf793
--- /dev/null
+++ b/community/hostapd/hostapd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/hostapd.pid
+ExecStart=/usr/bin/hostapd /etc/hostapd/hostapd.conf -P /run/hostapd.pid -B
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 0b729267c..1a9e48db5 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70485 2012-05-09 14:58:36Z bpiotrowski $
+# $Id: PKGBUILD 72159 2012-06-09 08:34:59Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski
# Contributor: AndyRTR <andyrtr@archlinux.org>
# Contributor: kiefer <jorgelmadrid@gmail.com>
pkgname=lxdm
pkgver=0.4.1
-pkgrel=10
+pkgrel=11
pkgdesc="Lightweight Display Manager (part of LXDE)"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/lxdm/"
@@ -54,4 +54,7 @@ package() {
# fix the greeter location
sed -i -e "s/local\/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf
+
+ # avoid conflict with filesystem>=2012.06
+ rm -r "$pkgdir/var/run"
}
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index 8499bfcd8..7e4715c96 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72132 2012-06-08 23:58:54Z dreisner $
+# $Id: PKGBUILD 72149 2012-06-09 06:02:05Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=miredo
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index 3d82658ca..5bddf7dca 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68196 2012-03-18 22:40:01Z arodseth $
+# $Id: PKGBUILD 72171 2012-06-09 14:07:36Z dreisner $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Mark Rosenstand <mark@borkware.net>
# Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch)
@@ -6,7 +6,7 @@
pkgname=openntpd
pkgver=3.9p1
-pkgrel=14
+pkgrel=15
pkgdesc="Free, easy to use implementation of the Network Time Protocol."
url="http://www.openntpd.org/"
arch=('x86_64' 'i686')
@@ -15,11 +15,13 @@ depends=('openssl')
backup=('etc/ntpd.conf' 'etc/conf.d/openntpd')
install=$pkgname.install
source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/$pkgname-$pkgver.tar.gz
- 'openntpd' 'openntpd.conf' 'linux-adjtimex.patch')
+ 'openntpd' 'openntpd.conf' 'linux-adjtimex.patch' 'openntpd.tmpfiles' 'openntpd.service')
sha256sums=('83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49'
- '14b08ad387b4e16293c43386f25758699461b8b57afe41a49cc795a5e517f71e'
+ 'b486b7034b8d3d790b6bc1793dd8a44c68b82c8dc833b617c60674b0a7c9d98f'
'77a0d1f3439d779c2ce259becf3fa583c21a16682a4f5327094da2e9837f6f96'
- '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2')
+ '3abcec94c072b5913ef7156a22049d796ff04e19105befe1ea81a66522928fd2'
+ 'fe12841110c3c080519e248988c4b6334f54bd9646b015753c7e15de2a9600c5'
+ 'b54b88cb0fe35636405e2b09744633cd815edb3e8c864035bcdb05f727858f53')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -30,7 +32,7 @@ build() {
--prefix=/usr \
--sysconfdir=/etc \
--with-privsep-user=ntp \
- --with-privsep-path=/var/run/openntpd/ \
+ --with-privsep-path=/run/openntpd/ \
--with-adjtimex
make
}
@@ -44,6 +46,12 @@ package() {
install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \
"$pkgdir/usr/share/licenses/$pkgname/LICENCE"
sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf
+
+ install -Dm644 "$srcdir/openntpd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/openntpd.conf"
+ install -Dm644 "$srcdir/openntpd.service" "$pkgdir/usr/lib/systemd/system/openntpd.service"
+
+ # avoid conflict with filesystem>=2012.06
+ rm -r "$pkgdir/run"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/openntpd/openntpd b/community/openntpd/openntpd
index 0e630736c..59fa8107d 100755
--- a/community/openntpd/openntpd
+++ b/community/openntpd/openntpd
@@ -1,32 +1,27 @@
#!/bin/bash
CONF=/etc/conf.d/openntpd
-RUNDIR=/var/run/openntpd
. /etc/rc.conf
. /etc/rc.d/functions
+[[ -f $CONF ]] && . "$CONF"
-[ -f $CONF ] && . $CONF
-
-PID=`pidof -o %PPID /usr/sbin/ntpd`
-case "$1" in
+PID=$(pidof -o %PPID /usr/sbin/ntpd)
+case $1 in
start)
stat_busy "Starting OpenNTPD"
- [ -d $RUNDIR ] || mkdir $RUNDIR
- [ -z "$PID" ] && /usr/sbin/ntpd $PARAMS
- if [ $? -gt 0 ]; then
+ [[ -d /run/openntpd ]] || mkdir /run/openntpd
+ if [[ $PID ]] || ! /usr/sbin/ntpd $PARAMS; then
stat_fail
else
- PID=`pidof -o %PPID /usr/sbin/ntpd`
- echo $PID >/var/run/openntpd.pid
+ pidof -o %PPID /usr/sbin/ntpd >/run/openntpd.pid
add_daemon openntpd
stat_done
fi
;;
stop)
stat_busy "Stopping OpenNTPD"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
+ if [[ -z $PID ]] || ! kill $PID &>/dev/null; then
stat_fail
else
rm_daemon openntpd
@@ -38,6 +33,6 @@ case "$1" in
$0 start
;;
*)
- echo "usage: $0 {start|stop|restart}"
+ echo "usage: $0 {start|stop|restart}"
esac
exit 0
diff --git a/community/openntpd/openntpd.install b/community/openntpd/openntpd.install
index 99223f355..42063ef21 100644
--- a/community/openntpd/openntpd.install
+++ b/community/openntpd/openntpd.install
@@ -1,17 +1,24 @@
-post_install() {
- if [ ! "`grep ^ntp /etc/group`" ]; then
- echo "adding new group: ntp"
- /usr/sbin/groupadd -g 87 ntp
+createuser() {
+ if ! getent group ntp >/dev/null; then
+ groupadd -g 87 ntp
fi
-
- if [ ! "`grep ^ntp /etc/passwd`" ]; then
- echo "adding new user: ntp"
- /usr/sbin/useradd -g ntp -u 87 -d /var/empty -s /bin/false -c 'Network Time Protocol' ntp
+
+ if ! getent passwd ntp >/dev/null; then
+ useradd -g ntp -u 87 -d /var/empty -s /bin/false -c 'Network Time Protocol' ntp
fi
}
+post_install() {
+ createuser
+ systemd-tmpfiles --create /usr/lib/tmpfiles.d/openntpd.conf
+}
+
post_upgrade() {
- post_install $1
+ createuser
+}
+
+post_remove() {
+ userdel ntp >/dev/null
}
# vim: ts=2 sw=2 et ft=sh
diff --git a/community/openntpd/openntpd.service b/community/openntpd/openntpd.service
new file mode 100644
index 000000000..db76531d1
--- /dev/null
+++ b/community/openntpd/openntpd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=OpenNTP Daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/ntpd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/openntpd/openntpd.tmpfiles b/community/openntpd/openntpd.tmpfiles
new file mode 100644
index 000000000..3a34146fc
--- /dev/null
+++ b/community/openntpd/openntpd.tmpfiles
@@ -0,0 +1 @@
+d /run/openntpd 0755 root root -
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 1955b7069..1eb5bc5c2 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70828 2012-05-17 10:16:37Z spupykin $
+# $Id: PKGBUILD 72148 2012-06-09 06:00:05Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Dwayne Bent <dbb.0@liqd.org>
# Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
diff --git a/community/prosody/prosody.service b/community/prosody/prosody.service
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/community/prosody/prosody.service