From 5d334c7470b5851fbacd4545c8ee0ea676a21ccc Mon Sep 17 00:00:00 2001 From: root Date: Sat, 19 May 2012 00:02:33 +0000 Subject: Sat May 19 00:02:33 UTC 2012 --- community/doublecmd/PKGBUILD | 4 +- community/fpc/PKGBUILD | 8 +- community/iperf/PKGBUILD | 47 ++ community/iperf/client.cpp.patch | 17 + community/iperf/iperf.conf | 7 + community/iperf/iperf.rc | 52 ++ community/iperf/iperf.service | 8 + community/lazarus/PKGBUILD | 4 +- community/libvirt/PKGBUILD | 23 +- community/libvirt/libvirt-libnl3.patch | 111 +++++ community/myodbc/PKGBUILD | 31 +- community/open-vm-tools/PKGBUILD | 15 +- community/passenger/PKGBUILD | 24 +- community/passenger/build-fix-git-2012-05-17.diff | 547 ++++++++++++++++++++++ community/prosody/PKGBUILD | 13 +- community/prosody/prosody.tmpfile.d | 1 + community/r8168-lts/PKGBUILD | 8 +- community/sysstat/PKGBUILD | 6 +- 18 files changed, 865 insertions(+), 61 deletions(-) create mode 100644 community/iperf/PKGBUILD create mode 100644 community/iperf/client.cpp.patch create mode 100644 community/iperf/iperf.conf create mode 100644 community/iperf/iperf.rc create mode 100644 community/iperf/iperf.service create mode 100644 community/libvirt/libvirt-libnl3.patch create mode 100644 community/passenger/build-fix-git-2012-05-17.diff create mode 100644 community/prosody/prosody.tmpfile.d (limited to 'community') 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 # 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 e48fffec7..554fedb39 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 # Contributor: Valeriy Lyasotskiy # Contributor: Jan Willemson # Contributor: Hugo Ideler +# Contributor: BlackIkeEagle # Original PKGBUILD: Andre Naumann # 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') 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/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 +# Contributor: Giovanni Scafora +# Contributor: Dale Blount + +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 & } && + 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 fb9993062..a488b7e06 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 70843 2012-05-17 18:23:03Z idevolder $ # Maintainer: Sergej Pupykin # Contributor: Jens Adam (byte/jra) # Contributor: BlackIkeEagle @@ -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') diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 1289ba305..51502fc16 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 # Contributor: Jonathan Wiersma 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') 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 + ++#include ++#include ++#include ++ + #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 + ++#include ++#include ++#include ++ + #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 ++# include + + # else + diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD index f7431306e..88c327e25 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 pkgname=myodbc pkgver=5.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="ODBC driver/connector for MySQL" arch=(i686 x86_64) 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 < 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 # Contributor: Krzysztof Raczkowski 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 8c9684bc3..a6ba60993 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 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') 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 "PCRE (required by Nginx) not installed, downloading it..." + +- 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 + + +- RackBaseURI /rails # <-- These lines have ++ RackBaseURI /rack # <-- These lines have + # <-- been added. + Options -MultiViews # <-- + # <-- +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 + #include + #include + #include +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 " << + "#{PlatformInfo.gem_command || "gem"} install daemon_controller" + 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 #{PlatformInfo.gem_command || "gem"} install mizuho" +- 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 @@ + WARNING: Apache doesn't seem to be compiled with the 'prefork', 'worker' or 'event' MPM + + 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 59c5a2c9c..1955b7069 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 # Maintainer: Dwayne Bent # Contributor: Paul-Sebastian Manole pkgname=prosody pkgver=0.8.2 -pkgrel=2 +pkgrel=3 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." arch=('i686' 'x86_64') 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..cb5c70e38 100644 --- a/community/r8168-lts/PKGBUILD +++ b/community/r8168-lts/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70550 2012-05-11 07:05:32Z mtorromeo $ +# $Id: PKGBUILD 70815 2012-05-17 08:00:37Z mtorromeo $ # Maintainer: Massimiliano Torromeo pkgname=r8168-lts _pkgname=r8168 -pkgver=8.029.00 +pkgver=8.030.00 pkgrel=1 pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts" url="http://www.realtek.com.tw" @@ -28,5 +28,5 @@ package() { find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; } -md5sums=('5dc15a976950250b7b543876cc3350a8') -sha256sums=('211a2994c9caf57321dafdb3acdfaa877f0b3f447798dc2abd2e417db3b0e515') +md5sums=('3205d895dbdc7564ba60b71acb308417') +sha256sums=('1b2267703c83f1709cad115cc39b11e8c4b64e7944452c684ef2bd86c626d6c4') diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD index da9ed099b..abb7dbe6b 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 # Contributor: Martin Devera 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') @@ -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() { -- cgit v1.2.3-54-g00ecf