diff options
Diffstat (limited to 'community')
35 files changed, 1068 insertions, 155 deletions
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD index 53ff54a87..677e10b47 100644 --- a/community/acpid/PKGBUILD +++ b/community/acpid/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69396 2012-04-15 17:01:41Z seblu $ +# $Id: PKGBUILD 70904 2012-05-18 22:37:04Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: xduugu # Contributor: Manolis Tzanidakis @@ -6,7 +6,7 @@ pkgname=acpid pkgver=2.0.16 -pkgrel=1 +pkgrel=2 pkgdesc='A daemon for delivering ACPI power management events with netlink support' arch=('i686' 'x86_64') url='http://tedfelix.com/linux/acpid-netlink.html' @@ -16,15 +16,19 @@ optdepends=('perl: use perl based examples') replaces=('acpid2') backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz" - 'acpid' + 'acpid.rc' + 'acpid.conf' + 'acpid.socket' + 'acpid.service' 'anything' - 'handler.sh' - 'acpid.conf.d') + 'handler.sh') md5sums=('d59fc02c9c34f0d5c137495302e2c074' - 'd69203a032c4583f9abaafcf21a7ed84' + '077475c75fbdd9de75f9a397130ccd91' + '929c6d2e91295c22ed9ec6212d7eabef' + 'ee6cb99e50e580c50331a73045412ae9' + '953e26477c5d4f5f013d6861c04b4af6' '2d37b98d6e74bab815604b8b48c6cfd4' - '615439f4a89716c747907d4fc3c8df75' - '929c6d2e91295c22ed9ec6212d7eabef') + '74ee3c33714ff5cb44f30c9a0dceeef0') build() { cd $pkgname-$pkgver @@ -33,15 +37,22 @@ build() { } package() { - cd $pkgname-$pkgver + pushd $pkgname-$pkgver make DESTDIR="$pkgdir" install + popd + + # default config + install -Dm644 anything "$pkgdir/etc/acpi/events/anything" + install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh" - install -Dm755 ../acpid "$pkgdir/etc/rc.d/acpid" - install -Dm644 ../anything "$pkgdir/etc/acpi/events/anything" - install -Dm755 ../handler.sh "$pkgdir/etc/acpi/handler.sh" - install -Dm644 ../acpid.conf.d "$pkgdir/etc/conf.d/acpid" + # initscripts + install -Dm755 acpid.rc "$pkgdir/etc/rc.d/acpid" + install -Dm644 acpid.conf "$pkgdir/etc/conf.d/acpid" + install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket" + install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service" - chmod 755 "$pkgdir"/usr/sbin/acpid + # fix acpid rights + chmod 755 "$pkgdir/usr/sbin/acpid" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/acpid/acpid.conf b/community/acpid/acpid.conf new file mode 100644 index 000000000..b60103a2d --- /dev/null +++ b/community/acpid/acpid.conf @@ -0,0 +1,5 @@ +# +# Arguments to be passed to the acpid daemon +# + +ACPID_ARGS="" diff --git a/community/acpid/acpid.rc b/community/acpid/acpid.rc new file mode 100644 index 000000000..674f4621b --- /dev/null +++ b/community/acpid/acpid.rc @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid + +PID=$(pidof -o %PPID /usr/sbin/acpid) +case "$1" in + start) + stat_busy "Starting acpid" + [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon acpid + stat_done + fi + ;; + stop) + stat_busy "Stopping acpid" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon acpid + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service new file mode 100644 index 000000000..31fcc0575 --- /dev/null +++ b/community/acpid/acpid.service @@ -0,0 +1,7 @@ +[Unit] +Description=ACPI event daemon +Requires=acpid.socket + +[Service] +EnvironmentFile=/etc/conf.d/acpid +ExecStart=/usr/sbin/acpid -f $ACPID_ARGS diff --git a/community/acpid/acpid.socket b/community/acpid/acpid.socket new file mode 100644 index 000000000..1e5365bf1 --- /dev/null +++ b/community/acpid/acpid.socket @@ -0,0 +1,8 @@ +[Unit] +Description=ACPID Listen Socket + +[Socket] +ListenStream=/run/acpid.socket + +[Install] +WantedBy=sockets.target diff --git a/community/acpid/handler.sh b/community/acpid/handler.sh index aac143a9a..b5a548f43 100644 --- a/community/acpid/handler.sh +++ b/community/acpid/handler.sh @@ -9,16 +9,24 @@ set $* case "$1" in button/power) - #echo "PowerButton pressed!">/dev/tty5 case "$2" in - PBTN|PWRF) logger "PowerButton pressed: $2" ;; - *) logger "ACPI action undefined: $2" ;; + PBTN|PWRF) + logger "PowerButton pressed: $2" + poweroff + ;; + *) + logger "ACPI action undefined: $2" + ;; esac ;; button/sleep) case "$2" in - SLPB|SBTN) echo -n mem >/sys/power/state ;; - *) logger "ACPI action undefined: $2" ;; + SLPB|SBTN) + echo -n mem >/sys/power/state + ;; + *) + logger "ACPI action undefined: $2" + ;; esac ;; ac_adapter) @@ -28,43 +36,51 @@ case "$1" in 00000000) echo -n $minspeed >$setspeed #/etc/laptop-mode/laptop-mode start - ;; + ;; 00000001) echo -n $maxspeed >$setspeed #/etc/laptop-mode/laptop-mode stop - ;; + ;; esac ;; - *) logger "ACPI action undefined: $2" ;; + *) + logger "ACPI action undefined: $2" + ;; esac ;; battery) case "$2" in BAT0) case "$4" in - 00000000) #echo "offline" >/dev/tty5 - ;; - 00000001) #echo "online" >/dev/tty5 - ;; + 00000000) + logger 'Battery online' + ;; + 00000001) + logger 'Battery offline' + ;; esac ;; - CPU0) + CPU0) ;; *) logger "ACPI action undefined: $2" ;; esac ;; button/lid) - case "$3" in - close) - #echo "LID closed!">/dev/tty5 - ;; - open) - #echo "LID opened!">/dev/tty5 - ;; - esac - ;; - + case "$3" in + close) + logger 'LID closed' + ;; + open) + logger 'LID opened' + ;; + *) + logger "ACPI action undefined: $3" + ;; + esac + ;; *) logger "ACPI group/action undefined: $1 / $2" ;; esac + +# vim:set ts=4 sw=4 ft=sh et: diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 4e4d062c7..32dcd10e3 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70693 2012-05-14 21:35:24Z lfleischer $ +# $Id: PKGBUILD 70879 2012-05-18 11:38:46Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef pkgver=0.5.4 -pkgrel=1 +pkgrel=2 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' @@ -12,7 +12,7 @@ license=('GPL2') depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' - 'libsamplerate') + 'libsamplerate' 'yasm') optdepends=('libsamplerate: for Resampler plugin' 'libvorbis: for Ogg Vorbis playback' 'libmad: for MP1/MP2/MP3 playback' diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD index 1dc0c2a38..ade9c7dae 100644 --- a/community/doublecmd/PKGBUILD +++ b/community/doublecmd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70226 2012-05-02 13:40:27Z idevolder $ +# $Id: PKGBUILD 70846 2012-05-17 18:29:58Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: (sirocco AT ngs.ru) @@ -6,7 +6,7 @@ pkgbase=doublecmd pkgname=('doublecmd-gtk2' 'doublecmd-qt') pkgver=0.5.4 _helpver=0.5.1 -pkgrel=2 +pkgrel=2.1 url="http://doublecmd.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD index a2bb91007..44cd7b43e 100644 --- a/community/fpc/PKGBUILD +++ b/community/fpc/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 61619 2012-01-04 22:27:59Z spupykin $ +# $Id: PKGBUILD 70842 2012-05-17 18:20:47Z idevolder $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Jan Willemson <janwil@hot.ee> # Contributor: Hugo Ideler <hugoideler@dse.nl> +# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org> # See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc pkgname=fpc pkgver=2.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library." arch=('i686' 'x86_64' 'mips64el') url="http://www.freepascal.org/" @@ -45,6 +46,9 @@ package() { mkdir -p ${pkgdir}/etc ${pkgdir}/usr/lib/fpc/${pkgver}/samplecfg $pkgdir/usr/lib/fpc/${pkgver} ${pkgdir}/etc + # use -fPIC by default + echo -e "#ifdef cpux86_64\n# for x86_64 use -fPIC by default\n-Cg\n#endif" >> "$pkgdir/etc/fpc.cfg" + mv $pkgdir/usr/man $pkgdir/usr/share/ find $pkgdir/etc/ -type f -exec sed -i "s|$pkgdir||g" {} \; diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index 8ff73274b..6b8be0415 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64430 2012-02-13 06:18:52Z spupykin $ +# $Id: PKGBUILD 70883 2012-05-18 13:41:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Lee.MaRS <leemars@gmail.com> pkgname=gsoap -pkgver=2.8.7 +pkgver=2.8.8 pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" @@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) -md5sums=('48a8dfddffd8f10b3ca82a6a9583e206' +md5sums=('cffb523b66eb36c51ca455645f1cfeb0' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/hardlink/PKGBUILD b/community/hardlink/PKGBUILD new file mode 100644 index 000000000..edf5d6973 --- /dev/null +++ b/community/hardlink/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 70897 2012-05-18 22:12:06Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgname=hardlink +pkgver=0.2.0 +pkgrel=1 +pkgdesc='Replace file copies using hardlinks' +arch=('i686' 'x86_64') +url='http://jak-linux.org/projects/hardlink/' +license=('custom: MIT') +depends=('glibc' 'pcre') +source=("http://jak-linux.org/projects/hardlink/hardlink_$pkgver.tar.gz") +md5sums=('4c1621ee7850a1c8b316735a7bced993') + +build() { + cd $pkgname-$pkgver + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # install icense + install -Dm 644 debian/copyright "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD index a52740de9..54ca1c75b 100644 --- a/community/hostapd/PKGBUILD +++ b/community/hostapd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67614 2012-03-13 14:20:23Z spupykin $ +# $Id: PKGBUILD 70872 2012-05-18 10:00:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hostapd -pkgver=0.7.3 -pkgrel=8 +pkgver=1.0 +pkgrel=1 pkgdesc="daemon for wireless software access points" arch=('i686' 'x86_64' 'mips64el') url="http://hostap.epitest.fi/hostapd/" @@ -25,25 +25,19 @@ backup=('etc/hostapd/hostapd.conf' 'etc/hostapd/wired.conf') install=hostapd.install source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz - hostap_allow-linking-with-libnl-3.2.patch config hostapd hostapd.conf.d) -md5sums=('91a7c8d0f090b7104152d3455a84c112' - 'e904e62b12c5d64132dd9441e8b45dce' +md5sums=('236247a7bbd4f60d5fa3e99849d1ffc9' '5d7ee10b04e33f22c37be56a4c33dddb' 'd570327c385f34a4af24d3a0d61cea19' 'f169534b0f59b341f6df1a21e0344511') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch" - - cd hostapd + cd "$srcdir/$pkgname-$pkgver"/hostapd cp "$srcdir/config" ./.config - sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf - + export CFLAGS="$CFLAGS `pkg-config --cflags libnl-3.0`" make } diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD index 2ec9ba308..5b24c72be 100644 --- a/community/hubbub/PKGBUILD +++ b/community/hubbub/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 59698 2011-11-29 12:42:33Z arodseth $ +# $Id: PKGBUILD 70911 2012-05-18 23:52:08Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> + pkgname=hubbub -pkgver=0.1.1 -pkgrel=2 +pkgver=0.1.2 +pkgrel=1 pkgdesc="HTML5 compliant parsing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.netsurf-browser.org/projects/hubbub/" license=('MIT') depends=('libparserutils') source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -md5sums=('98f49be58e228010c88381bc39f39e19') +sha256sums=('95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index bd9501371..10b0f1561 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 68868 2012-04-04 11:24:37Z stativ $ +# $Id: PKGBUILD 70885 2012-05-18 16:05:18Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=11.1.1 -_pkgver=117.117 +pkgver=11.1.2 +_pkgver=117.418 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('09f814cc26b6c98d6e5f0fdf2aaa293c') +md5sums=('eae2d36d088677e1d5670986da311f85') build() { cd "$srcdir" diff --git a/community/iperf/PKGBUILD b/community/iperf/PKGBUILD new file mode 100644 index 000000000..71a359d8d --- /dev/null +++ b/community/iperf/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 70860 2012-05-18 02:29:56Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dale Blount <dale@archlinux.org> + +pkgname=iperf +pkgver=2.0.5 +pkgrel=5 +pkgdesc='A tool to measure maximum TCP bandwidth' +arch=('i686' 'x86_64') +license=('custom') +url='http://iperf.sourceforge.net' +depends=('gcc-libs') +source=("http://downloads.sourceforge.net/iperf/iperf-$pkgver.tar.gz" + 'iperf.rc' + 'iperf.conf' + 'iperf.service' + 'client.cpp.patch') +md5sums=('44b5536b67719f4250faed632a3cd016' + 'e99dc0d41eb800970390dd149d70b544' + 'c75cb18434c6bf19fdc89b9caa766d7d' + 'b0c1165e21fb686e449c6bab9852be31' + '82ce63c87cc8bb2f0f94069857ac14a9') + +build() { + cd $pkgname-$pkgver + # fix FS#25159 + patch -Np1 -i "$srcdir/client.cpp.patch" + ./configure --prefix=/usr \ + --enable-ipv6 \ + --enable-multicast \ + --enable-threads + make +} + +package() { + pushd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/iperf/LICENSE" + popd + # install initscripts + install -Dm755 iperf.rc "$pkgdir/etc/rc.d/iperf" + install -Dm644 iperf.conf "$pkgdir/etc/conf.d/iperf" + install -Dm644 iperf.service "$pkgdir/usr/lib/systemd/system/iperf.service" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/iperf/client.cpp.patch b/community/iperf/client.cpp.patch new file mode 100644 index 000000000..85f89e765 --- /dev/null +++ b/community/iperf/client.cpp.patch @@ -0,0 +1,17 @@ +--- a/src/Client.cpp 2010-04-01 22:23:17.000000000 +0200 ++++ b/src/Client.cpp 2011-07-19 11:03:42.000000000 +0200 +@@ -212,10 +212,10 @@ + char* readAt = mBuf; + + #if HAVE_THREAD +- if ( !isUDP( mSettings ) ) { +- RunTCP(); +- return; +- } ++// if ( !isUDP( mSettings ) ) { ++// RunTCP(); ++// return; ++// } + #endif + + // Indicates if the stream is readable diff --git a/community/iperf/iperf.conf b/community/iperf/iperf.conf new file mode 100644 index 000000000..0685ff011 --- /dev/null +++ b/community/iperf/iperf.conf @@ -0,0 +1,7 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +# daemon pid file +#PIDFILE='/run/iperf.pid' + +# daemon options. treated as an array. +#DAEMON_OPTS='--port 5001' diff --git a/community/iperf/iperf.rc b/community/iperf/iperf.rc new file mode 100644 index 000000000..617b666ad --- /dev/null +++ b/community/iperf/iperf.rc @@ -0,0 +1,52 @@ +#!/bin/bash + +# You can use this script to run iperf as tcp and udp. +# Copy and rename this script to /etc/rc.d/iperf-udp and copy config file to +# /etc/conf.d/iperf-udp and add -u to daemon options + +. /etc/rc.conf +. /etc/rc.d/functions +[[ -r /etc/conf.d/${0##*/} ]] && . /etc/conf.d/${0##*/} + +DAEMON=${DAEMON:-/usr/bin/iperf} +PIDFILE=${PIDFILE:-/run/${0##*/}.pid} +DAEMON_OPTS="--server $DAEMON_OPTS" + +# check pid +[[ -r "$PIDFILE" ]] && + read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID &>/dev/null || unset PID + +case "$1" in + start) + stat_busy "Starting ${0##*/} daemon" + [[ -z $PID ]] && + { $DAEMON $DAEMON_OPTS </dev/null &>/dev/null & } && + echo "$!" > "$PIDFILE" && + disown %% && + add_daemon ${0##*/} && + stat_done && + exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping ${0##*/} daemon" + [[ -n $PID ]] && kill $PID &> /dev/null && + rm_daemon ${0##*/} && + rm -f "$PIDFILE" && + stat_done && + exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh noet: diff --git a/community/iperf/iperf.service b/community/iperf/iperf.service new file mode 100644 index 000000000..1bdcf86e9 --- /dev/null +++ b/community/iperf/iperf.service @@ -0,0 +1,8 @@ +[Unit] +Description=Iperf Server + +[Service] +ExecStart=/usr/bin/iperf -s + +[Install] +WantedBy=multi-user.target diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index a79b15671..04c191398 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70728 2012-05-15 20:37:13Z idevolder $ +# $Id: PKGBUILD 70866 2012-05-18 06:01:51Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> @@ -6,7 +6,7 @@ pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') pkgver=0.9.30.4 -pkgrel=4 +pkgrel=5 url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD index b54f06cbc..30f881397 100644 --- a/community/libcss/PKGBUILD +++ b/community/libcss/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64859 2012-02-18 18:11:23Z arodseth $ +# $Id: PKGBUILD 70909 2012-05-18 23:49:56Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libcss -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="CSS parser and selection engine" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://www.netsurf-browser.org/projects/libcss/" license=('MIT') depends=('libparserutils' 'libwapcaplet') source=("http://www.netsurf-browser.org/projects/releases/libcss-$pkgver-src.tar.gz") -sha256sums=('383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0') +sha256sums=('92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index cfcbb45d8..9f1501a8b 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70770 2012-05-16 14:43:00Z spupykin $ +# $Id: PKGBUILD 70825 2012-05-17 09:48:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.9.11 -pkgrel=7 +pkgver=0.9.12 +pkgrel=3 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -12,8 +12,8 @@ license=('LGPL') depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'netcf' 'libnl1') -makedepends=('pkgconfig' 'lvm2') + 'iproute2' 'netcf' 'libnl') +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' 'kvm' @@ -34,13 +34,15 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.rc.d libvirtd-guests.conf.d - openbsd-netcat-default.patch) -md5sums=('6e9fab115075a8fd21d9bd0d7e558a52' + openbsd-netcat-default.patch + libvirt-libnl3.patch) +md5sums=('5e842bc55733ceba60c64767580ff3e4' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '8297b1be794a24cc77f66af9380ace59' 'bc2971dacdbac967fc3474e50affc345' - 'b0be50eb9dfe4d133decf23b60880f7d') + 'b0be50eb9dfe4d133decf23b60880f7d' + 'ba27fbcd989de8d84cfff98326f10c54') build() { cd "$srcdir/$pkgname-$pkgver" @@ -54,6 +56,11 @@ build() { [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch + patch -Np1 -i ${srcdir}/libvirt-libnl3.patch + aclocal + automake --add-missing || true + autoreconf + export LDFLAGS=-lX11 export RADVD=/usr/sbin/radvd [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ diff --git a/community/libvirt/libvirt-libnl3.patch b/community/libvirt/libvirt-libnl3.patch new file mode 100644 index 000000000..1e5f141b9 --- /dev/null +++ b/community/libvirt/libvirt-libnl3.patch @@ -0,0 +1,111 @@ +diff -wbBur libvirt-0.9.12/configure.ac libvirt-0.9.12.my/configure.ac +--- libvirt-0.9.12/configure.ac 2012-05-14 06:15:40.000000000 +0400 ++++ libvirt-0.9.12.my/configure.ac 2012-05-17 13:18:22.000000000 +0400 +@@ -71,7 +71,7 @@ + LIBCURL_REQUIRED="7.18.0" + OPENWSMAN_REQUIRED="2.2.3" + LIBPCAP_REQUIRED="1.0.0" +-LIBNL_REQUIRED="1.1" ++LIBNL_REQUIRED="3.2" + LIBSSH2_REQUIRED="1.0" + LIBBLKID_REQUIRED="2.17" + DBUS_REQUIRED="1.0.0" +@@ -2652,21 +2652,9 @@ + PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ + have_libnl=yes + AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) +- AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) + PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0]) + LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS" + LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS" +- ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ +- have_libnl=yes +- AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1], +- [whether the netlink library is available]) +- AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1], +- [whether the netlink v1 library is available]) +- ], [ +- if test "$with_macvtap" = "yes"; then +- AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) +- fi +- ]) + ]) + fi + AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) +diff -wbBur libvirt-0.9.12/daemon/Makefile.am libvirt-0.9.12.my/daemon/Makefile.am +--- libvirt-0.9.12/daemon/Makefile.am 2012-04-20 08:25:25.000000000 +0400 ++++ libvirt-0.9.12.my/daemon/Makefile.am 2012-05-17 13:18:22.000000000 +0400 +@@ -96,6 +96,7 @@ + $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ + $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ + $(WARN_CFLAGS) \ ++ $(LIBNL_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ + -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" +diff -wbBur libvirt-0.9.12/src/Makefile.am libvirt-0.9.12.my/src/Makefile.am +--- libvirt-0.9.12/src/Makefile.am 2012-05-05 16:53:48.000000000 +0400 ++++ libvirt-0.9.12.my/src/Makefile.am 2012-05-17 13:18:22.000000000 +0400 +@@ -16,6 +16,7 @@ + + AM_CFLAGS = $(DRIVER_MODULE_CFLAGS) \ + $(LIBXML_CFLAGS) \ ++ $(LIBNL_CFLAGS) \ + $(WARN_CFLAGS) \ + $(LOCK_CHECKING_CFLAGS) \ + $(WIN32_EXTRA_CFLAGS) \ +diff -wbBur libvirt-0.9.12/src/util/virnetdevmacvlan.c libvirt-0.9.12.my/src/util/virnetdevmacvlan.c +--- libvirt-0.9.12/src/util/virnetdevmacvlan.c 2012-05-09 05:21:54.000000000 +0400 ++++ libvirt-0.9.12.my/src/util/virnetdevmacvlan.c 2012-05-17 13:25:21.000000000 +0400 +@@ -27,6 +27,10 @@ + + #include <config.h> + ++#include <netlink/msg.h> ++#include <linux/rtnetlink.h> ++#include <linux/if_link.h> ++ + #include "virnetdevmacvlan.h" + #include "virmacaddr.h" + #include "util.h" +diff -wbBur libvirt-0.9.12/src/util/virnetdevvportprofile.c libvirt-0.9.12.my/src/util/virnetdevvportprofile.c +--- libvirt-0.9.12/src/util/virnetdevvportprofile.c 2012-05-09 05:21:54.000000000 +0400 ++++ libvirt-0.9.12.my/src/util/virnetdevvportprofile.c 2012-05-17 13:27:54.000000000 +0400 +@@ -22,6 +22,10 @@ + + #include <config.h> + ++#include <netlink/msg.h> ++#include <linux/rtnetlink.h> ++#include <linux/if_link.h> ++ + #include "virnetdevvportprofile.h" + #include "virterror_internal.h" + +diff -wbBur libvirt-0.9.12/src/util/virnetlink.c libvirt-0.9.12.my/src/util/virnetlink.c +--- libvirt-0.9.12/src/util/virnetlink.c 2012-05-09 16:41:41.000000000 +0400 ++++ libvirt-0.9.12.my/src/util/virnetlink.c 2012-05-17 13:38:08.000000000 +0400 +@@ -49,7 +49,7 @@ + + #define NETLINK_ACK_TIMEOUT_S 2 + +-#if defined(__linux__) && defined(HAVE_LIBNL) ++#if defined(__linux__) && defined(HAVE_LIBNL3) + /* State for a single netlink event handle */ + struct virNetlinkEventHandle { + int watch; +diff -wbBur libvirt-0.9.12/src/util/virnetlink.h libvirt-0.9.12.my/src/util/virnetlink.h +--- libvirt-0.9.12/src/util/virnetlink.h 2012-05-09 05:21:54.000000000 +0400 ++++ libvirt-0.9.12.my/src/util/virnetlink.h 2012-05-17 13:27:37.000000000 +0400 +@@ -23,9 +23,10 @@ + # include "config.h" + # include "internal.h" + +-# if defined(__linux__) && defined(HAVE_LIBNL) ++# if defined(__linux__) && defined(HAVE_LIBNL3) + + # include <netlink/msg.h> ++# include <stdint.h> + + # else + diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD index 088b2800e..32ad0c148 100644 --- a/community/libwapcaplet/PKGBUILD +++ b/community/libwapcaplet/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 64868 2012-02-18 18:47:16Z arodseth $ +# $Id: PKGBUILD 70913 2012-05-18 23:56:14Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libwapcaplet -pkgver=0.1.0 -pkgrel=3 +pkgver=0.1.1 +pkgrel=1 pkgdesc="String internment library with rapid string comparison" arch=('i686' 'x86_64' 'mips64el') url="http://www.netsurf-browser.org/projects/libwapcaplet/" license=('MIT') source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz") -sha256sums=('e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7') +sha256sums=('cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258') build() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make PREFIX=/usr COMPONENT_TYPE="lib-shared" make PREFIX=/usr COMPONENT_TYPE="lib-static" } package() { - cd "$srcdir/$pkgname-$pkgver-src" + cd "$srcdir/$pkgname-$pkgver" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static" diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index 6e55b0794..d933da1aa 100644 --- a/community/myodbc/PKGBUILD +++ b/community/myodbc/PKGBUILD @@ -1,38 +1,33 @@ -# $Id: PKGBUILD 70531 2012-05-10 15:58:32Z spupykin $ +# $Id: PKGBUILD 70836 2012-05-17 14:29:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=myodbc pkgver=5.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64 'mips64el') url="http://dev.mysql.com/downloads/connector/odbc/" depends=('unixodbc' 'libmysqlclient') +makedepends=('cmake') license=('GPL') options=('libtool') -source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz" - myconf.h.in) -md5sums=('1d868f404038bbce6623a28255c8a9f7' - '6c99c83e309b18d15ef0f07f0b461241') +source=("http://mysql.skynet.be/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-$pkgver-src.tar.gz") +md5sums=('1d868f404038bbce6623a28255c8a9f7') build() { cd $srcdir/mysql-connector-odbc-${pkgver}-src - cp $srcdir/myconf.h.in driver/myconf.h.in - patch driver/Makefile.am <<EOF -55c55,56 -< driver.h ---- -> driver.h \\ -> my_stmt.c -EOF - [ -x configure ] || { aclocal; libtoolize; automake --add-missing; autoreconf; } - [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \ - ./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \ - --with-mysql-path=/usr --without-x --disable-gui --disable-test + unset LDFLAGS + cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_UNIXODBC=1 . make } package() { cd $srcdir/mysql-connector-odbc-${pkgver}-src make DESTDIR=$pkgdir install + pushd $pkgdir/usr + rm -rf test + install -dm0755 share/mysql-connector-odbc + mv ChangeLog COPYING INSTALL Licenses_for_Third-Party_Components.txt README README.debug \ + share/mysql-connector-odbc/ + popd } diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index c01c7e4f1..47a5061e5 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70349 2012-05-04 23:55:01Z allan $ +# $Id: PKGBUILD 70830 2012-05-17 10:51:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools pkgver=2012.03.13 _pkgsubver=651368 -pkgrel=4 +pkgrel=5 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" @@ -45,6 +45,7 @@ package() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" make install DESTDIR="$pkgdir" + install -Dm0644 vmware-user-suid-wrapper/vmware-user.desktop $pkgdir/usr/share/applications/vmware-user.desktop install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper @@ -52,11 +53,11 @@ package() { patch -p1 -i "$srcdir"/scripts-network.patch etc/vmware-tools/scripts/vmware/network patch -p1 -i "$srcdir"/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network - install -D -m 755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools - install -D -m 644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools - install -D -m 644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf - install -D -m 644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf - install -D -m 644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd + install -Dm0755 "$srcdir"/open-vm-tools.rc.d "$pkgdir"/etc/rc.d/open-vm-tools + install -Dm0644 "$srcdir"/open-vm-tools.conf.d "$pkgdir"/etc/conf.d/open-vm-tools + install -Dm0644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf + install -Dm0644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf + install -Dm0644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd rm -rf "$pkgdir"/usr/etc ln -fs /usr/sbin/mount.vmhgfs "$pkgdir"/sbin/mount.vmhgfs diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 220375dc6..38fa509ea 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 67809 2012-03-14 13:50:13Z spupykin $ +# $Id: PKGBUILD 70838 2012-05-17 15:56:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=3.0.11 -pkgrel=2 -_pkgdlnr=75548 +pkgver=3.0.12 +pkgrel=1 +_pkgdlnr=76005 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64' 'mips64el') url="http://www.modrails.com" license=('GPL') -depends=('apache' 'ruby' 'ruby-rack' 'curl') +depends=('ruby' 'ruby-rack' 'curl') +makedepends=('apache') install=passenger.install options=('!emptydirs') source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz - passenger-install-apache2-module.patch) -md5sums=('9186d799e065ccad803cbc0289954f40' - '3d04eba10c55a955c378678d5df8497f') + passenger-install-apache2-module.patch + build-fix-git-2012-05-17.diff) +md5sums=('fedcf948a46b76e00ddd25527dac4b6d' + '3d04eba10c55a955c378678d5df8497f' + 'e2d3409bae3676232f411f03abac440c') build(){ cd $srcdir/passenger-$pkgver - patch bin/passenger-install-apache2-module <$srcdir/passenger-install-apache2-module.patch - ./bin/passenger-install-apache2-module +# patch bin/passenger-install-apache2-module <$srcdir/passenger-install-apache2-module.patch + patch -p1 <$srcdir/build-fix-git-2012-05-17.diff + ./bin/passenger-install-apache2-module -a rake nginx mkdir -p $pkgdir/usr/lib/passenger/ diff --git a/community/passenger/build-fix-git-2012-05-17.diff b/community/passenger/build-fix-git-2012-05-17.diff new file mode 100644 index 000000000..b9aa6b538 --- /dev/null +++ b/community/passenger/build-fix-git-2012-05-17.diff @@ -0,0 +1,547 @@ +diff -wbBur passenger-3.0.12/bin/passenger-install-nginx-module passenger.git/bin/passenger-install-nginx-module +--- passenger-3.0.12/bin/passenger-install-nginx-module 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/bin/passenger-install-nginx-module 2012-05-17 19:35:01.000000000 +0400 +@@ -162,7 +162,7 @@ + new_screen + color_puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>" + +- url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz" ++ url = "http://downloads.sourceforge.net/project/pcre/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz" + dirname = "pcre-#{PREFERRED_PCRE_VERSION}" + tarball = "#{@working_dir}/pcre.tar.gz" + +diff -wbBur passenger-3.0.12/build/basics.rb passenger.git/build/basics.rb +--- passenger-3.0.12/build/basics.rb 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/build/basics.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -33,7 +33,6 @@ + require 'phusion_passenger/platform_info/curl' + require 'phusion_passenger/platform_info/zlib' + require 'phusion_passenger/platform_info/compiler' +-require 'phusion_passenger/platform_info/documentation_tools' + + include PhusionPassenger + include PhusionPassenger::PlatformInfo +diff -wbBur passenger-3.0.12/build/documentation.rb passenger.git/build/documentation.rb +--- passenger-3.0.12/build/documentation.rb 2012-02-04 02:25:41.000000000 +0400 ++++ passenger.git/build/documentation.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,5 +1,5 @@ + # Phusion Passenger - http://www.modrails.com/ +-# Copyright (c) 2010 Phusion ++# Copyright (c) 2010, 2011, 2012 Phusion + # + # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. + # +@@ -21,25 +21,34 @@ + # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + # THE SOFTWARE. + +-ASCIIDOC_FLAGS = "-b html5 -a toc -a theme=flask -a numbered -a toclevels=3 -a icons" +- + desc "Generate all documentation" + task :doc => Packaging::ASCII_DOCS + + Packaging::ASCII_DOCS.each do |target| + source = target.sub(/\.html$/, '.txt') + file target => [source] + Dir["doc/users_guide_snippets/**/*"] do +- if PlatformInfo.asciidoc ++ if PlatformInfo.find_command('mizuho') + if target =~ /apache/i +- type = "-a apache" ++ type = "apache" ++ juvia_site_key = "5jpmkyjqlml8rktsfldfpbwth8ig7w9" + elsif target =~ /nginx/i +- type = "-a nginx" ++ type = "nginx" ++ juvia_site_key = "q0ptarhn8o9xanwomq8zkgewbtwffyz" ++ elsif target =~ /standalone/i ++ type = nil ++ juvia_site_key = "amggdy0k65hb4hbjg3dh7pnb9zd8dwy" + else + type = nil ++ juvia_site_key = nil ++ end ++ command = "mizuho '#{source}'" ++ command << " -a #{type}" if type ++ if juvia_site_key ++ command << " -c juvia --juvia-url http://juvia.phusion.nl --juvia-site-key #{juvia_site_key}" + end +- sh "#{PlatformInfo.asciidoc} #{ASCIIDOC_FLAGS} #{type} '#{source}'" ++ sh(command) + else +- sh "echo 'asciidoc required to build docs' > '#{target}'" ++ sh "echo 'Mizuho required to build docs' > '#{target}'" + end + end + +diff -wbBur passenger-3.0.12/build/packaging.rb passenger.git/build/packaging.rb +--- passenger-3.0.12/build/packaging.rb 2012-02-04 02:25:41.000000000 +0400 ++++ passenger.git/build/packaging.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,5 +1,5 @@ + # Phusion Passenger - http://www.modrails.com/ +-# Copyright (c) 2010 Phusion ++# Copyright (c) 2010, 2011, 2012 Phusion + # + # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. + # +@@ -42,7 +42,7 @@ + s.require_paths = ["lib"] + s.add_dependency 'rake', '>= 0.8.1' + s.add_dependency 'fastthread', '>= 1.0.1' +- s.add_dependency 'daemon_controller', '>= 0.2.5' ++ s.add_dependency 'daemon_controller', '>= 1.0.0' + s.add_dependency 'rack' + s.files = FileList[*Packaging::GLOB] - FileList[*Packaging::EXCLUDE_GLOB] + s.executables = Packaging::USER_EXECUTABLES + Packaging::SUPER_USER_EXECUTABLES +diff -wbBur passenger-3.0.12/DEVELOPERS.TXT passenger.git/DEVELOPERS.TXT +--- passenger-3.0.12/DEVELOPERS.TXT 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/DEVELOPERS.TXT 2012-05-17 19:35:01.000000000 +0400 +@@ -13,6 +13,7 @@ + * rspec >= 1.1.2 + * mime-types >= 1.15 + * sqlite3-ruby ++* daemon_controller >= 1.0.0 + + The following software is optional: + +diff -wbBur passenger-3.0.12/doc/Users guide Apache.txt passenger.git/doc/Users guide Apache.txt +--- passenger-3.0.12/doc/Users guide Apache.txt 2012-02-04 02:25:41.000000000 +0400 ++++ passenger.git/doc/Users guide Apache.txt 2012-05-17 19:35:01.000000000 +0400 +@@ -203,15 +203,7 @@ + + ==== Installing via a native Linux package ==== + +-John Leach from Brightbox has kindly provided an Ubuntu Hardy package for Phusion Passenger. The package is available from the link:http://apt.brightbox.net[Brightbox repository]. +- +-Please install the native Linux package, e.g.: +------------------------------------------------------- +-sudo sh -c 'echo "deb http://apt.brightbox.net hardy main" > /etc/apt/sources.list.d/brightbox.list' +-sudo sh -c 'wget -q -O - http://apt.brightbox.net/release.asc | apt-key add -' +-sudo apt-get update +-sudo apt-get install libapache2-mod-passenger +------------------------------------------------------- ++John Leach from Brightbox has kindly provided a Ubuntu packages for Phusion Passenger. The package is available from the link:http://wiki.brightbox.co.uk/docs:phusion-passenger[Brightbox repository]. + + ==== What does the installer do? ==== + +@@ -635,7 +627,7 @@ + Allow from all + </Directory> + +- RackBaseURI /rails # <-- These lines have ++ RackBaseURI /rack # <-- These lines have + <Directory /websites/phusion/rails> # <-- been added. + Options -MultiViews # <-- + </Directory> # <-- +diff -wbBur passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp +--- passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp 2012-02-04 02:25:42.000000000 +0400 ++++ passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp 2012-05-17 19:35:01.000000000 +0400 +@@ -31,7 +31,8 @@ + + #ifdef __GLIBCXX__ // gcc 3.4 and greater: + # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ +- || defined(_GLIBCXX__PTHREADS) ++ || defined(_GLIBCXX__PTHREADS) \ ++ || defined(_GLIBCXX_HAS_GTHREADS) + // + // If the std lib has thread support turned on, then turn it on in Boost + // as well. We do this because some gcc-3.4 std lib headers define _REENTANT +diff -wbBur passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp passenger.git/ext/boost/exception/detail/error_info_impl.hpp +--- passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp 2012-02-04 02:25:42.000000000 +0400 ++++ passenger.git/ext/boost/exception/detail/error_info_impl.hpp 2012-05-17 19:35:01.000000000 +0400 +@@ -30,7 +30,7 @@ + + protected: + +- ~error_info_base() throw() ++ virtual ~error_info_base() throw() + { + } + }; +diff -wbBur passenger-3.0.12/ext/common/StaticString.h passenger.git/ext/common/StaticString.h +--- passenger-3.0.12/ext/common/StaticString.h 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/ext/common/StaticString.h 2012-05-17 19:35:01.000000000 +0400 +@@ -25,6 +25,7 @@ + #ifndef _PASSENGER_STATIC_STRING_H_ + #define _PASSENGER_STATIC_STRING_H_ + ++#include <sys/types.h> + #include <string> + #include <cstring> + #include <cstddef> +diff -wbBur passenger-3.0.12/ext/common/Watchdog.cpp passenger.git/ext/common/Watchdog.cpp +--- passenger-3.0.12/ext/common/Watchdog.cpp 2012-04-13 12:09:57.000000000 +0400 ++++ passenger.git/ext/common/Watchdog.cpp 2012-05-17 19:35:01.000000000 +0400 +@@ -975,7 +975,7 @@ + } else if (pid == -1) { + // Error + e = errno; +- throw SystemException("fork() failed", errno); ++ throw SystemException("fork() failed", e); + + } else { + // Parent +diff -wbBur passenger-3.0.12/ext/nginx/Configuration.c passenger.git/ext/nginx/Configuration.c +--- passenger-3.0.12/ext/nginx/Configuration.c 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/ext/nginx/Configuration.c 2012-05-17 19:35:01.000000000 +0400 +@@ -1,7 +1,7 @@ + /* + * Copyright (C) Igor Sysoev + * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com) +- * Copyright (C) 2010 Phusion ++ * Copyright (C) 2010, 2011, 2012 Phusion + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -335,6 +335,14 @@ + conf->upstream_config.pass_request_headers = NGX_CONF_UNSET; + conf->upstream_config.pass_request_body = NGX_CONF_UNSET; + ++#if (NGX_HTTP_CACHE) ++ conf->upstream_config.cache = NGX_CONF_UNSET_PTR; ++ conf->upstream_config.cache_min_uses = NGX_CONF_UNSET_UINT; ++ conf->upstream_config.cache_bypass = NGX_CONF_UNSET_PTR; ++ conf->upstream_config.no_cache = NGX_CONF_UNSET_PTR; ++ conf->upstream_config.cache_valid = NGX_CONF_UNSET_PTR; ++#endif ++ + conf->upstream_config.intercept_errors = NGX_CONF_UNSET; + + conf->upstream_config.cyclic_temp_file = 0; +@@ -511,8 +519,8 @@ + + if (conf->upstream_config.busy_buffers_size < size) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, +- "\"passenger_busy_buffers_size\" must be equal or bigger than " +- "maximum of the value of \"passenger_buffer_size\" and " ++ "\"passenger_busy_buffers_size\" must be equal to or greater " ++ "than the maximum of the value of \"passenger_buffer_size\" and " + "one of the \"passenger_buffers\""); + + return NGX_CONF_ERROR; +@@ -542,8 +550,8 @@ + + if (conf->upstream_config.temp_file_write_size < size) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, +- "\"passenger_temp_file_write_size\" must be equal or bigger than " +- "maximum of the value of \"passenger_buffer_size\" and " ++ "\"passenger_temp_file_write_size\" must be equal to or greater than " ++ "the maximum of the value of \"passenger_buffer_size\" and " + "one of the \"passenger_buffers\""); + + return NGX_CONF_ERROR; +@@ -566,8 +574,8 @@ + { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "\"passenger_max_temp_file_size\" must be equal to zero to disable " +- "the temporary files usage or must be equal or bigger than " +- "maximum of the value of \"passenger_buffer_size\" and " ++ "temporary files usage or must be equal to or greater than " ++ "the maximum of the value of \"passenger_buffer_size\" and " + "one of the \"passenger_buffers\""); + + return NGX_CONF_ERROR; +@@ -639,6 +647,14 @@ + conf->cache_key = prev->cache_key; + } + ++ #if NGINX_VERSION_NUM >= 1002000 ++ ngx_conf_merge_value(conf->upstream_config.cache_lock, ++ prev->upstream_config.cache_lock, 0); ++ ++ ngx_conf_merge_msec_value(conf->upstream_config.cache_lock_timeout, ++ prev->upstream_config.cache_lock_timeout, 5000); ++ #endif ++ + #endif + + ngx_conf_merge_value(conf->upstream_config.pass_request_headers, +@@ -1273,7 +1289,7 @@ + NULL }, + + { ngx_string("passenger_pass_header"), +- NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG, ++ NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1, + ngx_conf_set_str_array_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(passenger_loc_conf_t, upstream_config.pass_headers), +diff -wbBur passenger-3.0.12/ext/nginx/ContentHandler.c passenger.git/ext/nginx/ContentHandler.c +--- passenger-3.0.12/ext/nginx/ContentHandler.c 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/ext/nginx/ContentHandler.c 2012-05-17 19:35:01.000000000 +0400 +@@ -1,7 +1,7 @@ + /* + * Copyright (C) Igor Sysoev + * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com) +- * Copyright (C) 2010 Phusion ++ * Copyright (C) 2010, 2011, 2012 Phusion + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions +@@ -387,8 +387,8 @@ + app_type_string_len = sizeof("wsgi"); + break; + default: +- app_type_string = (const u_char *) "rails"; +- app_type_string_len = sizeof("rails"); ++ app_type_string = (const u_char *) "rack"; ++ app_type_string_len = sizeof("rack"); + break; + } + +@@ -931,7 +931,7 @@ + context = ngx_http_get_module_ctx(r, ngx_http_passenger_module); + + if (context == NULL) { +- return NGX_HTTP_INTERNAL_SERVER_ERROR; ++ return NGX_ERROR; + } + + rc = parse_status_line(r, context); +@@ -952,7 +952,6 @@ + } + #endif + +- r->http_version = NGX_HTTP_VERSION_9; + u->headers_in.status_n = NGX_HTTP_OK; + u->state->status = NGX_HTTP_OK; + +@@ -966,7 +965,7 @@ + u->headers_in.status_line.data = ngx_palloc(r->pool, + u->headers_in.status_line.len); + if (u->headers_in.status_line.data == NULL) { +- return NGX_HTTP_INTERNAL_SERVER_ERROR; ++ return NGX_ERROR; + } + + ngx_memcpy(u->headers_in.status_line.data, context->status_start, +diff -wbBur passenger-3.0.12/lib/phusion_passenger/dependencies.rb passenger.git/lib/phusion_passenger/dependencies.rb +--- passenger-3.0.12/lib/phusion_passenger/dependencies.rb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/dependencies.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,5 +1,5 @@ + # Phusion Passenger - http://www.modrails.com/ +-# Copyright (c) 2010 Phusion ++# Copyright (c) 2010, 2011, 2012 Phusion + # + # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. + # +@@ -29,7 +29,6 @@ + require 'phusion_passenger/platform_info/ruby' + require 'phusion_passenger/platform_info/linux' + require 'phusion_passenger/platform_info/curl' +-require 'phusion_passenger/platform_info/documentation_tools' + + module PhusionPassenger + +@@ -110,9 +109,9 @@ + return (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7" + end + +- # Returns whether asciidoc is required in order to be able to package all files ++ # Returns whether Mizuho is required in order to be able to package all files + # in the packaging list. +- def self.asciidoc_required? ++ def self.mizuho_required? + return Packaging::ASCII_DOCS.any? do |fn| + !File.exist?("#{SOURCE_ROOT}/#{fn}") + end +@@ -579,7 +578,7 @@ + end + + Daemon_Controller = Dependency.new do |dep| +- dep.name = "daemon_controller >= 0.2.5" ++ dep.name = "daemon_controller >= 1.0.0" + dep.install_instructions = "Please install RubyGems first, then run " << + "<b>#{PlatformInfo.gem_command || "gem"} install daemon_controller</b>" + dep.define_checker do |result| +@@ -591,7 +590,7 @@ + require 'daemon_controller' + begin + require 'daemon_controller/version' +- too_old = DaemonController::VERSION_STRING < '0.2.5' ++ too_old = DaemonController::VERSION_STRING < '1.0.0' + rescue LoadError + too_old = true + end +@@ -610,23 +609,18 @@ + end + end + +- AsciiDoc = Dependency.new do |dep| +- dep.name = "Asciidoc" ++ Mizuho = Dependency.new do |dep| ++ dep.name = "Mizuho" + dep.define_checker do |result| +- if PlatformInfo.asciidoc.nil? ++ mizuho = PlatformInfo.find_command('mizuho') ++ if mizuho.nil? + result.not_found + else +- result.found(PlatformInfo.asciidoc) ++ result.found(mizuho) + end + end +- if RUBY_PLATFORM =~ /darwin/ +- # Installing asciidoc with source-highlight is too much of a pain on OS X, +- # so recommend Mizuho instead. + dep.website = "http://github.com/FooBarWidget/mizuho" + dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install mizuho</b>" +- else +- dep.website = "http://www.methods.co.nz/asciidoc/" +- end + end + end + +diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/command.rb passenger.git/lib/phusion_passenger/standalone/command.rb +--- passenger-3.0.12/lib/phusion_passenger/standalone/command.rb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/standalone/command.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,5 +1,5 @@ + # Phusion Passenger - http://www.modrails.com/ +-# Copyright (c) 2010 Phusion ++# Copyright (c) 2010, 2011, 2012 Phusion + # + # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. + # +@@ -61,13 +61,13 @@ + require 'daemon_controller' + begin + require 'daemon_controller/version' +- too_old = DaemonController::VERSION_STRING < '0.2.5' ++ too_old = DaemonController::VERSION_STRING < '1.0.0' + rescue LoadError + too_old = true + end + if too_old + error "Your version of daemon_controller is too old. " << +- "You must install 0.2.5 or later. Please upgrade:\n\n" << ++ "You must install 1.0.0 or later. Please upgrade:\n\n" << + + " sudo gem uninstall FooBarWidget-daemon_controller\n" << + " sudo gem install daemon_controller" +@@ -210,24 +210,21 @@ + end + end + +- def ping_nginx +- require 'socket' unless defined?(UNIXSocket) +- if @options[:socket_file] +- UNIXSocket.new(@options[:socket_file]) +- else +- TCPSocket.new(@options[:address], nginx_ping_port) +- end +- end +- + def create_nginx_controller(extra_options = {}) + require_daemon_controller ++ require 'socket' unless defined?(UNIXSocket) + @temp_dir = "/tmp/passenger-standalone.#{$$}" + @config_filename = "#{@temp_dir}/config" ++ if @options[:socket_file] ++ ping_spec = [:unix, @options[:socket_file]] ++ else ++ ping_spec = [:tcp, @options[:address], nginx_ping_port] ++ end + opts = { + :identifier => 'Nginx', + :before_start => method(:write_nginx_config_file), + :start_command => method(:determine_nginx_start_command), +- :ping_command => method(:ping_nginx), ++ :ping_command => ping_spec, + :pid_file => @options[:pid_file], + :log_file => @options[:log_file], + :timeout => 25 +diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb +--- passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -91,8 +91,8 @@ + if Dependencies.fastthread_required? + result << Dependencies::FastThread + end +- if Dependencies.asciidoc_required? +- result << Dependencies::AsciiDoc ++ if Dependencies.mizuho_required? ++ result << Dependencies::Mizuho + end + return result + end +diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb passenger.git/lib/phusion_passenger/standalone/start_command.rb +--- passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/standalone/start_command.rb 2012-05-17 19:35:01.000000000 +0400 +@@ -243,15 +243,32 @@ + end + end + +- def check_port_availability +- if !@options[:socket_file] ++ def check_port(address, port) ++ begin ++ socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0) ++ sockaddr = Socket.pack_sockaddr_in(port, address) ++ begin ++ socket.connect_nonblock(sockaddr) ++ rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK ++ if select(nil, [socket], nil, 0.1) + begin +- TCPSocket.new(@options[:address], @options[:port]).close +- port_taken = true +- rescue SystemCallError +- port_taken = false ++ socket.connect_nonblock(sockaddr) ++ rescue Errno::EISCONN ++ end ++ else ++ raise Errno::ECONNREFUSED ++ end + end +- if port_taken ++ return true ++ rescue Errno::ECONNREFUSED ++ return false ++ ensure ++ socket.close if socket ++ end ++ end ++ ++ def check_port_availability ++ if !@options[:socket_file] && check_port(@options[:address], @options[:port]) + error "The address #{@options[:address]}:#{@options[:port]} is already " << + "in use by another process, perhaps another Phusion Passenger " << + "Standalone instance.\n\n" << +@@ -261,7 +278,6 @@ + exit 1 + end + end +- end + + def should_watch_logs? + return !@options[:daemonize] && @options[:log_file] != "/dev/null" +diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb +--- passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb 2012-05-17 19:35:01.000000000 +0400 +@@ -1,7 +1,7 @@ + <red>WARNING:</red> <yellow>Apache doesn't seem to be compiled with the 'prefork', 'worker' or 'event' MPM</yellow> + + Phusion Passenger has only been tested on Apache with the 'prefork', the +-'worker' and the 'worker' MPM. Your Apache installation is compiled with ++'worker' and the 'event' MPM. Your Apache installation is compiled with + the '<%= @current_mpm %>' MPM. We recommend you to abort this installer and to recompile + Apache with either the 'prefork', the 'worker' or the 'event' MPM. + +diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb passenger.git/lib/phusion_passenger/templates/standalone/config.erb +--- passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb 2012-04-13 12:09:58.000000000 +0400 ++++ passenger.git/lib/phusion_passenger/templates/standalone/config.erb 2012-05-17 19:35:01.000000000 +0400 +@@ -27,7 +27,7 @@ + master_process on; + worker_processes 1; + daemon on; +-error_log '<%= @options[:log_file] %>'; ++error_log '<%= @options[:log_file] %>' info; + pid '<%= @options[:pid_file] %>'; + <% if @options[:user] %>user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;<% end %> + +@@ -36,6 +36,7 @@ + } + + http { ++ log_format debug '[$time_local] $msec "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent'; + include '<%= PhusionPassenger::RESOURCES_DIR %>/mime.types'; + passenger_ruby <%= PlatformInfo.ruby_command %>; + passenger_root '<%= passenger_root %>'; diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 994cf84fa..9dc7f4f2a 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 66166 2012-02-23 02:25:30Z spupykin $ +# $Id: PKGBUILD 70828 2012-05-17 10:16: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=2 +pkgrel=3 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64' 'mips64el') url="http://prosody.im/" @@ -20,11 +20,13 @@ backup=('etc/logrotate.d/prosody' source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz" 'prosody.rcd' 'prosody.logrotated' - 'fix-config.patch') + 'fix-config.patch' + 'prosody.tmpfile.d') md5sums=('6e907bf0d0acf24f1011083020ba6ffb' 'd2b5f9c8e42bb31819e715eb1756ee53' '26466fdbea87963a3ca6f48f76fe4a29' - '59a1bf2dfd0bd386cef6fa646e2a3752') + '59a1bf2dfd0bd386cef6fa646e2a3752' + 'e2f5a1df410b05696a30dcb058841084') build() { cd "$srcdir/prosody-$pkgver" @@ -50,5 +52,6 @@ package() { install -o root -g root -m 644 "$srcdir/prosody.logrotated" \ "$pkgdir/etc/logrotate.d/prosody" - install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf } diff --git a/community/prosody/prosody.tmpfile.d b/community/prosody/prosody.tmpfile.d new file mode 100644 index 000000000..5f6de657d --- /dev/null +++ b/community/prosody/prosody.tmpfile.d @@ -0,0 +1 @@ +d /run/prosody 0755 412 412 diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD index 8475ae2aa..c34f660cc 100644 --- a/community/r8168-lts/PKGBUILD +++ b/community/r8168-lts/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70550 2012-05-11 07:05:32Z mtorromeo $ +# $Id: PKGBUILD 70870 2012-05-18 08:29:14Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=r8168-lts _pkgname=r8168 -pkgver=8.029.00 -pkgrel=1 -pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts" +pkgver=8.030.00 +pkgrel=2 +pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" url="http://www.realtek.com.tw" license=("GPL") arch=('i686' 'x86_64') @@ -28,5 +28,5 @@ package() { find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; } -md5sums=('5dc15a976950250b7b543876cc3350a8') -sha256sums=('211a2994c9caf57321dafdb3acdfaa877f0b3f447798dc2abd2e417db3b0e515') +md5sums=('3205d895dbdc7564ba60b71acb308417') +sha256sums=('1b2267703c83f1709cad115cc39b11e8c4b64e7944452c684ef2bd86c626d6c4') diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index d27f6865f..9a5e4bcc7 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69276 2012-04-11 23:23:45Z lfleischer $ +# $Id: PKGBUILD 70868 2012-05-18 06:19:27Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> @@ -6,7 +6,7 @@ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=snort -pkgver=2.9.2.2 +pkgver=2.9.2.3 pkgrel=1 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ install='snort.install' source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz" 'snort' 'snort.conf.d') -md5sums=('4254389550e3be31afebc70e64e6002f' +md5sums=('9ddb26005d864577fca66a9a1cdfdc8a' '361b8b9e40b9af0164f6b3e3da2e8277' 'b4fb8a68490589cd34df93de7609bfac') diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index 8e63fd069..7c6210b0c 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70458 2012-05-08 13:27:24Z seblu $ +# $Id: PKGBUILD 70896 2012-05-18 22:00:49Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> # Contributor: Jason Rodriguez <jason-aur@catloaf.net> pkgname=sslh -pkgver=1.12 +pkgver=1.13b pkgrel=1 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('i686' 'x86_64' 'mips64el') @@ -14,38 +14,37 @@ depends=('libconfig') backup=('etc/conf.d/sslh' 'etc/sslh.conf') source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" 'sslh.rc' - 'sslh.conf' - 'sslh.service') -md5sums=('265014ecdae4512eacca91aaff0b9a81' - 'e1c44f8160b7fef397f81db63eec8421' - 'c51c63d2b28080bae4c1c7a0c469bab7' - 'ee8a4fcfc1f6839f7c93deb6f59f7fd6') + 'sslh.conf') +md5sums=('fbd8934e6f799437c562866f09afee5b' + 'c2a0c7c58d091acf5b4672f58066ee8f' + 'c51c63d2b28080bae4c1c7a0c469bab7') build() { - cd $pkgname-$pkgver + #cd $pkgname-$pkgver + cd $pkgname-1.13 # fix archlinux path in manpage sed -i 's/init.d/rc.d/' sslh.pod sed -i 's+/etc/default+/etc/conf.d+' sslh.pod - # remove default pidfile in example - sed -i '/pidfile:/d' example.cfg - # daemon mode by default (as not overridable in command line) - sed -i 's/foreground: true;/foreground: false;/' example.cfg - make + make VERSION=\"v$pkgver\" } package() { # install initscripts install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh" install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh" - # install systemd service - install -Dm 644 sslh.service "$pkgdir/usr/lib/systemd/system/sslh.service" # manually install to have both ssl-fork and ssl-select - cd $pkgname-$pkgver + #cd $pkgname-$pkgver + cd $pkgname-1.13 install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork" install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select" ln -s sslh-fork "$pkgdir/usr/bin/sslh" + # install manpage install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz" + # install example file install -Dm 0644 example.cfg "$pkgdir/etc/sslh.conf" + # install systemd service + install -Dm 644 scripts/systemd.sslh.service \ + "$pkgdir/usr/lib/systemd/system/sslh.service" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc index cd5397cad..456e122f4 100644 --- a/community/sslh/sslh.rc +++ b/community/sslh/sslh.rc @@ -6,6 +6,7 @@ DAEMON=/usr/bin/sslh PID=$(pidof -o %PPID $DAEMON) +DAEMON_OPTS="--background $DAEMON_OPTS" case "$1" in start) diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index a8c10e9ed..d8580657e 100644 --- a/community/sysstat/PKGBUILD +++ b/community/sysstat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67591 2012-03-13 12:49:15Z spupykin $ +# $Id: PKGBUILD 70821 2012-05-17 08:59:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Martin Devera <devik@cdi.cz> pkgname=sysstat -pkgver=10.0.4 +pkgver=10.0.5 pkgrel=1 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ backup=('etc/conf.d/sysstat' 'etc/conf.d/sysstat.ioconf') source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz sysstat) -md5sums=('c84fd7774080dae34f47257175a0b187' +md5sums=('208dd236d726d20591d53d3a20124dd4' '3ce41ebf7330aba01e70b38658afed1f') build() { |