summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/amule/PKGBUILD6
-rw-r--r--extra/consolekit/PKGBUILD10
-rw-r--r--extra/mtools/PKGBUILD6
-rw-r--r--extra/postgresql/PKGBUILD9
-rwxr-xr-xextra/postgresql/postgresql74
-rw-r--r--extra/postgresql/postgresql.install14
-rw-r--r--extra/rdesktop/PKGBUILD21
-rw-r--r--extra/wireshark/PKGBUILD6
8 files changed, 91 insertions, 55 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index c2451cb91..dbeee3c53 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 117693 2011-04-04 16:32:27Z giovanni $
+# $Id: PKGBUILD 120058 2011-04-18 22:46:19Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Henrik Ronellenfitsch <searinox@web.de>
# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
pkgname=amule
-pkgver=10515
+pkgver=10525
pkgrel=1
pkgdesc="An eMule-like client for ed2k p2p network"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://www.amule.org"
license=('GPL')
depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('68bb769089615e5b3a1b3e88fc5da0c6')
+md5sums=('d1b925a2ceac1c63b5fb1e42702c1a2a')
build() {
cd "${srcdir}/aMule-SVN-r${pkgver}"
diff --git a/extra/consolekit/PKGBUILD b/extra/consolekit/PKGBUILD
index d1a6f8519..f8ed34036 100644
--- a/extra/consolekit/PKGBUILD
+++ b/extra/consolekit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 119015 2011-04-10 13:37:10Z ibiru $
+# $Id: PKGBUILD 120022 2011-04-18 12:49:11Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: onestep_ua <onestep@ukr.net>
pkgname=consolekit
-pkgver=0.4.3
-pkgrel=3
+pkgver=0.4.4
+pkgrel=1
pkgdesc="A framework for defining and tracking users, login sessions, and seats"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
@@ -14,7 +14,7 @@ makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
options=(!libtool)
source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2
pam-foreground-compat.ck consolekit.logrotate)
-md5sums=('4c39c6eacc75334b890f21eead1d2945'
+md5sums=('b57eb18eae8c4d3631d5f4f030218a29'
'a8a4de71d9b0549b8143e5f6c2a36fc7'
'6fefa451d9fe2fc6d6269629d3529793')
@@ -37,5 +37,5 @@ package() {
# install the logrotate config
install -D -m644 ${srcdir}/consolekit.logrotate ${pkgdir}/etc/logrotate.d/consolekit
- rm -rf "${pkgdir}/var/run"
+# rm -rf "${pkgdir}/var/run"
}
diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD
index dd1eb2c81..4db0f42fe 100644
--- a/extra/mtools/PKGBUILD
+++ b/extra/mtools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108705 2011-02-02 17:20:00Z giovanni $
+# $Id: PKGBUILD 120053 2011-04-18 22:34:00Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=mtools
-pkgver=4.0.15
+pkgver=4.0.16
pkgrel=1
pkgdesc="A collection of utilities to access MS-DOS disks"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ optdepends=('libx11: required by floppyd'
backup=('etc/mtools.conf')
install=mtools.install
source=("http://ftp.gnu.org/gnu/mtools/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b7550b649af77812cb696a780e853f47')
+md5sums=('e9b07f35272210f407012abaf5d1b9b5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 741ffc2fe..f6c50c036 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108463 2011-01-31 13:52:30Z dan $
+# $Id: PKGBUILD 120038 2011-04-18 17:35:03Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgbase=postgresql
pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.0.3
+pkgver=9.0.4
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.postgresql.org"
@@ -11,6 +11,7 @@ license=('custom:PostgreSQL')
makedepends=('libxml2' 'python2' 'perl')
source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate)
+install=postgresql.install
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -128,8 +129,8 @@ package_postgresql() {
"${pkgdir}/etc/logrotate.d/postgresql"
}
-md5sums=('928df8c40bb012ad10756e58b70516fb'
- '49bfa0d1089e26e2098d362ca5fa6503'
+md5sums=('80390514d568a7af5ab61db1cda27e29'
+ '89ada7c282d9ffb82c6adc89bc2778ad'
'd63a05943cf0a2726aa2070f3033c569'
'4d74f4227dc5e12bf95b3490758d86c9'
'96f82c38f3f540b53f3e5144900acf17'
diff --git a/extra/postgresql/postgresql b/extra/postgresql/postgresql
index fb7be3dd7..3a8bf44f8 100755
--- a/extra/postgresql/postgresql
+++ b/extra/postgresql/postgresql
@@ -4,34 +4,31 @@
. /etc/rc.d/functions
. /etc/conf.d/postgresql
+# Default PGROOT if it wasn't defined in the conf.d file
+PGROOT=${PGROOT:-/var/lib/postgres}
+PG_CTL="/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -s -w"
+
+postgres_init() {
+ # initialization
+ if [ ! -d $PGROOT/data ]; then
+ mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT
+ su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
+ fi
+ if [ ! -e /var/log/postgresql.log ]; then
+ touch /var/log/postgresql.log
+ chown postgres /var/log/postgresql.log
+ fi
+}
+
case "$1" in
start)
+ postgres_init
stat_busy "Starting PostgreSQL"
- # initialization
- if [ ! `egrep '^postgres:' /etc/group` ]; then
- stat_busy "Adding postgres group"
- groupadd -g 88 postgres
- stat_done
- fi
- if [ ! `egrep '^postgres:' /etc/passwd` ]; then
- stat_busy "Adding postgres user"
- useradd -u 88 -g postgres -d $PGROOT -s /bin/bash postgres
- [ -d $PGROOT ] && chown -R postgres:postgres $PGROOT
- stat_done
- fi
- if [ ! -d $PGROOT/data ]; then
- mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT
- su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
- fi
- if [ ! -e /var/log/postgresql.log ]; then
- touch /var/log/postgresql.log
- chown postgres /var/log/postgresql.log
- fi
- # start the process
su - postgres -c \
- "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -W start"
+ "$PG_CTL start"
if [ $? -gt 0 ]; then
stat_fail
+ exit 1
else
add_daemon postgresql
stat_done
@@ -40,7 +37,7 @@ case "$1" in
stop)
stat_busy "Stopping PostgreSQL"
su - postgres -c \
- "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -w stop"
+ "$PG_CTL stop -m fast"
if [ $? -gt 0 ]; then
stat_fail
else
@@ -48,12 +45,35 @@ case "$1" in
stat_done
fi
;;
+ reload)
+ stat_busy "Reloading PostgreSQL"
+ su - postgres -c \
+ "$PG_CTL reload"
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ stat_done
+ fi
+ ;;
restart)
- $0 stop
- sleep 3
- $0 start
+ postgres_init
+ stat_busy "Restarting PostgreSQL"
+ su - postgres -c \
+ "$PG_CTL restart -m fast"
+ if [ $? -gt 0 ]; then
+ stat_fail
+ exit 1
+ else
+ add_daemon postgresql
+ stat_done
+ fi
+ ;;
+ status)
+ stat_busy "Checking PostgreSQL status";
+ ck_status postgresql
;;
*)
- echo "usage: $0 {start|stop|restart}"
+ echo "usage: $0 {start|stop|reload|restart|status}"
esac
exit 0
diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install
new file mode 100644
index 000000000..4a6f9b848
--- /dev/null
+++ b/extra/postgresql/postgresql.install
@@ -0,0 +1,14 @@
+post_install() {
+ getent group postgres >/dev/null || groupadd -g 88 postgres
+ getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /sbin/nologin postgres
+ passwd -l postgres >/dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ getent passwd postgres >/dev/null && userdel postgres
+ getent group postgres >/dev/null && groupdel postgres
+}
diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD
index bdcd3a283..c2adab552 100644
--- a/extra/rdesktop/PKGBUILD
+++ b/extra/rdesktop/PKGBUILD
@@ -1,30 +1,31 @@
-# $Id: PKGBUILD 77123 2010-04-10 21:21:07Z andrea $
+# $Id: PKGBUILD 120030 2011-04-18 14:48:32Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Dan McGee <dan@archlinux.org>
pkgname=rdesktop
-pkgver=1.6.0
-pkgrel=5
+pkgver=1.7.0
+pkgrel=1
depends=('libx11' 'openssl' 'libao' 'libsamplerate')
-pkgdesc="Is used to connect to windows terminal servers"
+pkgdesc="An open source client for Windows Remote Desktop Services"
url="http://www.rdesktop.org/"
license=('GPL')
arch=('i686' 'x86_64')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
- 'rdesktop-send_physical_buttons.diff')
-md5sums=('c6fcbed7f0ad7e60ac5fcb2d324d8b16'
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'rdesktop-send_physical_buttons.diff')
+md5sums=('77fa93b21aa38837a85e81c00e757228'
'880d3aeac67b901e6bf44d1323374768')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -i ${srcdir}/rdesktop-send_physical_buttons.diff || return 1
+ # FS#15113
+ patch -i ${srcdir}/rdesktop-send_physical_buttons.diff
./configure --prefix=/usr
- make || return 1
+ make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR=${pkgdir} install
}
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index e99b73914..530da2b20 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 111927 2011-03-02 08:18:23Z guillaume $
+# $Id: PKGBUILD 119998 2011-04-18 09:40:46Z guillaume $
# Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
pkgname=(wireshark-cli wireshark-gtk)
pkgbase=wireshark
-pkgver=1.4.4
+pkgver=1.4.5
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'heimdal' 'libpcap' 'bash' 'gnutls' 'libcap')
url="http://www.wireshark.org/"
options=(!libtool)
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('11ce019d85d9822597b163ce5b4da858')
+md5sums=('d278e377a830024e7ee1f279d0a50035')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"