diff options
82 files changed, 2983 insertions, 119 deletions
diff --git a/community-staging/courier-mta/PKGBUILD b/community-staging/courier-mta/PKGBUILD new file mode 100644 index 000000000..792b3de7a --- /dev/null +++ b/community-staging/courier-mta/PKGBUILD @@ -0,0 +1,145 @@ +# $Id: PKGBUILD 71214 2012-05-25 05:02:06Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +# ----------- NOTE TO ALL USERS ------------ +# Go read http://www.courier-mta.org/install.html b4 running or building courier + +pkgname=courier-mta +pkgver=0.68.0 +pkgrel=2 +pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" +arch=(i686 x86_64) +license=('GPL2') +backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ + 'etc/courier/imapd' 'etc/courier/imapd-ssl' \ + 'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \ + 'etc/courier/courierd' 'etc/courier/sqwebmaild' \ + 'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \ + 'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \ + 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ + 'etc/conf.d/courier-mta') +url="http://courier-mta.org" +depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') +optdepends=('libldap') +makedepends=('apache' 'pam' 'expect' 'gnupg' 'libldap' 'gamin') +provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') +conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') +options=('!libtool') +install=courier-mta.install +source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 + courier.rc.d + courier-mta.rc.d + courier-mta.conf.d + esmtpd.rc.d + esmtpd-ssl.rc.d + esmtpd-msa.rc.d + imapd.rc.d + imapd-ssl.rc.d + pop3d.rc.d + pop3d-ssl.rc.d + webmaild.rc.d) +md5sums=('5bd56150ed7c75cc8378c443742c632e' + '9055ba622efd37603186ce1f37277224' + '5cbeb5c323706058e545f74ad7752ebe' + 'f3ff70b40c7a1f7a017e8c4cc4d92f4f' + 'caabce8c7b66296b602316aa5af5d4c5' + '1c8b1b66ebafa4ff09ffc0106a9dc82c' + 'dae6c7d5ff0cce0fba5729fedf2a9051' + 'd0cc5eab5d3e0ec33dadd0392421f63e' + '5873a96aa149edda281730010fb4db34' + 'faa09e06a5dc41ee89ab1f8fa6886b63' + '520501daa66c0a94f2e9844ce4919a09' + '33a93f400c3e87bcd207295b7d7333ca') + +# MIGRATION NOTE: +# In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed. +# Remove those files and this note and also courier-mta.install + +build() { + cd ${srcdir}/courier-${pkgver} + + # fix a tiny bug + sed -i -e \ + 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ + configure && chmod 755 configure + + LDFLAGS+=",-L /usr/lib/courier-authlib -lcourierauth" + echo $LDFLAGS + # courier is more about configuring than compiling :-), lets start the mess + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var/spool/courier \ + --disable-root-check \ + --enable-unicode \ + --enable-workarounds-for-imap-client-bugs \ + --enable-mimetypes=/etc/mime.types \ + --with-piddir=/var/run/courier \ + --with-locking-method=lockf \ + --with-trashquota \ + --with-db=gdbm \ + --with-trashquota \ + --with-random=/dev/urandom --without-ispell \ + --with-mailuser=courier --with-mailgroup=courier \ + --with-certdb=/etc/ssl/certs/ + make +} + +package() { + cd ${srcdir}/courier-${pkgver} + + #chown mail.mail ${pkgdir}/var/spool/courier + make DESTDIR=${pkgdir} install + # docs say we can get rid of those after make + find ${pkgdir} -name '*\.a' -exec -rm -f {} \; + # install the perftest-script for testings + install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1 + ############################################################################### + # this is what usually "make install-configure" does + # *.dist files get rid of "dist" + for distfile in ${pkgdir}/etc/courier/*.dist; do + mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist) + done + # install pam files according to the layout used in Archlinux + for pamfile in ${pkgdir}/etc/courier/*.authpam; do + sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile} + #echo "password required pam_unix.so" >> $pamfile + install -Dm 644 ${pamfile} \ + ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//") + rm -f ${pamfile} + done + + ############################################################################### + # Arch Linux specific tweaks to make things easier for the user + # create passwordfile for webadmin -> standard archwebadmin + sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile + yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password + # arch specific scripts + install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta + install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta + install -D -m 755 ${srcdir}/courier.rc.d ${pkgdir}/etc/rc.d/courier + install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd + install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl + install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d + install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl + install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/esmtpd + install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/esmtpd-ssl + install -D -m 755 ${srcdir}/esmtpd-msa.rc.d ${pkgdir}/etc/rc.d/esmtpd-msa + install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/webmaild + #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ + # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache + # bug http://bugs.archlinux.org/task/5154 + find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \; + # fixing some permissions + chown -R courier:courier ${pkgdir}/usr/lib/courier/modules + rm -r ${pkgdir}/var/run + #chown -R courier:courier ${pkgdir}/var/run/courier + chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share} + # make a link to /usr/sbin/sendmail + install -dm 755 ${pkgdir}/usr/sbin + cd ${pkgdir}/usr/sbin + ln -s ../bin/sendmail ./sendmail +} diff --git a/community-staging/courier-mta/courier-mta.conf.d b/community-staging/courier-mta/courier-mta.conf.d new file mode 100644 index 000000000..5856a5cda --- /dev/null +++ b/community-staging/courier-mta/courier-mta.conf.d @@ -0,0 +1,18 @@ +# +# Parameters to be passed to courier-imap +# +# +# Select the service you want started with courier-imap +# +# Available options : +# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild +# +CI_DAEMONS="courier esmtpd imapd pop3d" + +# If you want authdaemond to be automatically started and +# stopped by courier-imap, set this to "true" +AUTO_AUTHDAEMON="false" + +# Courier will start this many seconds after autodaemond if +# AUTO_AUTHDAEMON is set to "true" +AUTO_AUTHDAEMON_LAG=2 diff --git a/community-staging/courier-mta/courier-mta.install b/community-staging/courier-mta/courier-mta.install new file mode 100644 index 000000000..b0d827e43 --- /dev/null +++ b/community-staging/courier-mta/courier-mta.install @@ -0,0 +1,61 @@ +# arg 1: the new package version +post_install() { + cat << EOM + --> if you are using LDAP services to provide lookup in sqwebmail or aliases + --> then you have to install: + libldap +EOM + # create the *.dat files + makealiases + makesmtpaccess +} + +pre_upgrade() { + pre_remove $1 +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 + echo "Please migrate to the new daemon format:" + echo "/etc/rc.d/courier-imap has been split into separate daemons:" + echo " imapd, imapd-ssl, pop3d, pop3d-ssl" + echo "This elimates the need for /etc/conf.d/courier-imap" + echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" + echo "you first start authdaemond before any other of these daemons." + echo "Example prior to this change:" + echo " DAEMONS=( ... courier-mta ...)" + echo "Example after this change:" + echo " DAEMONS=( ... authdaemond courier esmtpd esmtpd-ssl imapd imapd-ssl" + echo " pop3d pop3d-ssl webmaild ... )" + echo "This allows better control over the daemons and will generate" + echo "correct entries in /run/daemons" + echo "An old configuration will keep working but please do migrate in time" + echo "as support for this will be removed some time in 2012." +} + + +pre_remove() { + # manual backup, since courier is always processing the whole directory + # - so it would process "system" AND "system.pacsave" -> bad + [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup + cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system + cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default + cat << EOM + --> the /etc/courier/aliases/system and the /etc/courier/smtpaccess/default + --> files have been backed up to /etc/courier/_backup since the *.pacsave + --> files cannot stay in place. Read about couriers alias handling from the + --> documentation! +EOM +} + +# arg 1: the old package version +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/community-staging/courier-mta/courier-mta.rc.d b/community-staging/courier-mta/courier-mta.rc.d new file mode 100644 index 000000000..416946a5a --- /dev/null +++ b/community-staging/courier-mta/courier-mta.rc.d @@ -0,0 +1,60 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta +[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 +[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond start + sleep ${AUTO_AUTHDAEMON_LAG} + fi + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + for daemon in $CI_DAEMONS; do + stat_busy "Starting Courier ${daemon}" + /usr/sbin/${daemon} start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $daemon + stat_done + fi + done + ;; + stop) + for daemon in $CI_DAEMONS; do + stat_busy "Stopping Courier ${daemon}" + /usr/sbin/${daemon} stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $daemon + stat_done + fi + done + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond stop + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly b/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly new file mode 100644 index 000000000..6c541321e --- /dev/null +++ b/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly @@ -0,0 +1,6 @@ +#!/bin/sh + +# Cleans the cache of the sqwebmail server +if [ -x /usr/share/sqwebmail/cleancache.pl ]; then + su -c "/usr/share/sqwebmail/cleancache.pl" bin +fi diff --git a/community-staging/courier-mta/courier.rc.d b/community-staging/courier-mta/courier.rc.d new file mode 100644 index 000000000..7c581a24a --- /dev/null +++ b/community-staging/courier-mta/courier.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier daemon" + /usr/sbin/courier start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon courier + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier daemon" + /usr/sbin/courier stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon courier + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/esmtpd-msa.rc.d b/community-staging/courier-mta/esmtpd-msa.rc.d new file mode 100644 index 000000000..31458aca8 --- /dev/null +++ b/community-staging/courier-mta/esmtpd-msa.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd-msa" + /usr/sbin/esmtpd-msa start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd-msa + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd-msa" + /usr/sbin/esmtpd-msa stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd-msa + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/esmtpd-ssl.rc.d b/community-staging/courier-mta/esmtpd-ssl.rc.d new file mode 100644 index 000000000..2a13be03f --- /dev/null +++ b/community-staging/courier-mta/esmtpd-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd-ssl" + /usr/sbin/esmtpd-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd-ssl" + /usr/sbin/esmtpd-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/esmtpd.rc.d b/community-staging/courier-mta/esmtpd.rc.d new file mode 100644 index 000000000..dbaa9d680 --- /dev/null +++ b/community-staging/courier-mta/esmtpd.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd" + /usr/sbin/esmtpd start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd" + /usr/sbin/esmtpd stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/imapd-ssl.rc.d b/community-staging/courier-mta/imapd-ssl.rc.d new file mode 100644 index 000000000..3dc74cfdf --- /dev/null +++ b/community-staging/courier-mta/imapd-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd-ssl" + /usr/sbin/imapd-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd-ssl" + /usr/sbin/imapd-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/imapd.rc.d b/community-staging/courier-mta/imapd.rc.d new file mode 100644 index 000000000..8bce59f6c --- /dev/null +++ b/community-staging/courier-mta/imapd.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd" + /usr/sbin/imapd start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd" + /usr/sbin/imapd stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/pop3d-ssl.rc.d b/community-staging/courier-mta/pop3d-ssl.rc.d new file mode 100644 index 000000000..6e7ae4e12 --- /dev/null +++ b/community-staging/courier-mta/pop3d-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d-ssl" + /usr/sbin/pop3d-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d-ssl" + /usr/sbin/pop3d-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/pop3d.rc.d b/community-staging/courier-mta/pop3d.rc.d new file mode 100644 index 000000000..25f8379ba --- /dev/null +++ b/community-staging/courier-mta/pop3d.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d" + /usr/sbin/pop3d start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d" + /usr/sbin/pop3d stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/webmaild.rc.d b/community-staging/courier-mta/webmaild.rc.d new file mode 100644 index 000000000..835cc2bf0 --- /dev/null +++ b/community-staging/courier-mta/webmaild.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier webmaild" + /usr/sbin/webmaild start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon webmaild + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier webmaild" + /usr/sbin/webmaild stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon webmaild + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/ekg2/PKGBUILD b/community-staging/ekg2/PKGBUILD new file mode 100644 index 000000000..72f248855 --- /dev/null +++ b/community-staging/ekg2/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 71220 2012-05-25 05:24:20Z tdziedzic $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Mateusz Herych <heniekk@gmail.com> + +pkgname=ekg2 +pkgver=0.3.1 +pkgrel=3 +pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" +arch=('i686' 'x86_64') +url="http://ekg2.org/" +license=('GPL') +depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib') +optdepends=('xosd: xosd support' + 'sqlite: sqlite support' + 'gtk2: gtk support') +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('68fc05b432c34622df6561eaabef5a40') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-libgadu \ + --with-xosd \ + --enable-unicode \ + --enable-shared \ + --without-gpg + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod + mv "$pkgdir"/usr/libexec/ioctld "$pkgdir"/usr/lib/ekg2/ioctld + rm -rf "$pkgdir"/usr/libexec + chmod -R 755 "$pkgdir"/usr/lib/perl5 +} diff --git a/community-staging/flightgear/PKGBUILD b/community-staging/flightgear/PKGBUILD new file mode 100644 index 000000000..04e3247af --- /dev/null +++ b/community-staging/flightgear/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 71245 2012-05-26 03:39:52Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: William Rea <sillywilly@gmail.com> +# Contributor: Hans Janssen <hans@janserv.xs4all.nl> + +pkgname=flightgear +pkgver=2.6.0 +pkgrel=5 +pkgdesc="An open-source, multi-platform flight simulator" +arch=(i686 x86_64) +depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') +makedepends=('boost' 'cmake') +license=("GPL") +url="http://www.flightgear.org" +options=('!makeflags') +#source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") +#source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") +source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") +md5sums=('943f784f55c7e11ddce6082d2d1dbba4') + +build() { + cd $srcdir/flightgear-$pkgver + sed -i '1,1i#include <unistd.h>' utils/TerraSync/terrasync.cxx + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" . + make + sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/flightgear.desktop +} + +package() { + depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data') + cd $srcdir/flightgear-$pkgver + make DESTDIR=$pkgdir install + install -Dm0644 package/flightgear.desktop $pkgdir//usr/share/applications/flightgear.desktop + install -Dm0644 package/RedHat/flightgear.48.png $pkgdir/usr/share/icons/flightgear.png + ln -sf flightgear $pkgdir/usr/share/FlightGear +} diff --git a/community-staging/libvirt/PKGBUILD b/community-staging/libvirt/PKGBUILD new file mode 100644 index 000000000..881952915 --- /dev/null +++ b/community-staging/libvirt/PKGBUILD @@ -0,0 +1,84 @@ +# $Id: PKGBUILD 71247 2012-05-26 03:42:33Z tdziedzic $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jonathan Wiersma <archaur at jonw dot org> + +pkgname=libvirt +pkgver=0.9.12 +pkgrel=4 +pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" +arch=('i686' 'x86_64') +url="http://libvirt.org/" +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' 'libnl') +makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') +optdepends=('bridge-utils: for briged networking (default)' + 'dnsmasq: for NAT/DHCP for guests' + 'kvm' + 'openbsd-netcat: for remote management over ssh' + 'qemu' + 'radvd' + 'dmidecode') +options=('emptydirs' '!libtool') +backup=('etc/conf.d/libvirtd' + 'etc/conf.d/libvirtd-guests' + 'etc/libvirt/libvirtd.conf' + 'etc/libvirt/libvirt.conf' + 'etc/libvirt/qemu.conf' + 'etc/sasl2/libvirt.conf') +install="libvirt.install" +source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" + libvirtd.rc.d + libvirtd.conf.d + libvirtd-guests.rc.d + libvirtd-guests.conf.d + openbsd-netcat-default.patch + libvirt-libnl3.patch) +md5sums=('5e842bc55733ceba60c64767580ff3e4' + 'c43244c40a0437038c82089618e7beaa' + '3ed0e24f5b5e25bf553f5427d64915e6' + '8297b1be794a24cc77f66af9380ace59' + 'bc2971dacdbac967fc3474e50affc345' + 'b0be50eb9dfe4d133decf23b60880f7d' + 'ba27fbcd989de8d84cfff98326f10c54') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + export PYTHON=`which python2` + for file in $(find . -name '*.py' -print); do + sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + [ $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" \ + --with-storage-lvm --without-xen --with-udev --without-hal --disable-static + find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \; + make -j1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd + install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd + + install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests + install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests + + rm -rf $pkgdir/var/run +} diff --git a/community-staging/libvirt/libvirt-libnl3.patch b/community-staging/libvirt/libvirt-libnl3.patch new file mode 100644 index 000000000..1e5f141b9 --- /dev/null +++ b/community-staging/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-staging/libvirt/libvirt.install b/community-staging/libvirt/libvirt.install new file mode 100644 index 000000000..3881386d2 --- /dev/null +++ b/community-staging/libvirt/libvirt.install @@ -0,0 +1,38 @@ +_libvirt_setup() { + rm -f /usr/lib/python?.?/site-packages/libvirt.pyc + echo ">>> To use libvirt as a non-root user:" + echo ">>> Use polkit to grant access." + echo ">>> ...or change the access model in /etc/libvirt/libvirtd.conf." + echo ">>> (see unixperms.patch in PKGBUILD for help)" + echo "" +} + +post_install() { + _libvirt_setup || return 1 + echo ">>> Be sure to see optdepends as you may find some of them helpfull." + echo ">>> Especially: bridge-utils, dnsmasq, and hal." + echo "" + echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root." + echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon" + echo ">>> booting." + echo "" + /bin/true +} + +post_upgrade() { + _libvirt_setup || return 1 + echo ">>> To finish the upgrade, restart libvirtd by running the command:" + echo ">>> '/etc/rc.d/libvirtd restart' as root or rebooting." + echo ">>> You may also need to run 'rm -rf ~/.libvirt'" + echo "" + /bin/true +} + +post_remove() { + rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc + echo ">>> You may wish to delete the group 'libvirt' if it still exists." + echo ">>> It can be removed by running 'groupdel libvirt' as root." + echo "" + depmod -a + /bin/true +} diff --git a/community-staging/libvirt/libvirtd-guests.conf.d b/community-staging/libvirt/libvirtd-guests.conf.d new file mode 100644 index 000000000..02a933715 --- /dev/null +++ b/community-staging/libvirt/libvirtd-guests.conf.d @@ -0,0 +1,11 @@ +LIBVIRTD_STOP_ACTION=suspend + +#LIBVIRTD_URI="-c qemu+ssh://user@host/system" +LIBVIRTD_URI="" + +#LIBVIRTD_BYPASS_CACHE="--bypass-cache" +LIBVIRTD_BYPASS_CACHE="" + +LIBVIRTD_START_DELAY=0 + +LIBVIRTD_SHUTDOWN_TIMEOUT=3 diff --git a/community-staging/libvirt/libvirtd-guests.rc.d b/community-staging/libvirt/libvirtd-guests.rc.d new file mode 100644 index 000000000..670b5431a --- /dev/null +++ b/community-staging/libvirt/libvirtd-guests.rc.d @@ -0,0 +1,137 @@ +#!/bin/bash + +. /etc/conf.d/libvirtd-guests +. /etc/rc.conf +. /etc/rc.d/functions + +LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list" + +# get guest state by name +libvirt_get_guest_state() +{ + virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}' +} + +# list IDs of running guests +libvirt_list() +{ + + list=$(virsh $LIBVIRTD_URI list) + + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + fi + + uuids= + for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do + uuid=$(virsh $LIBVIRTD_UTI dominfo $id | awk '/^UUID:/{print $2}') + if [ -z "$uuid" ]; then + RETVAL=1 + return 1 + fi + uuids="$uuids $uuid" + done + + echo $uuids + +} + +libvirt_domname() +{ + uuid=$1 + name=$(virsh $LIBVIRTD_URI dominfo $uuid | awk 'NR == 2 {$1=""; print}') + + echo $name +} + +# suspend guest by name +libvirt_suspend() +{ + virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null + timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT + while [ "$timeout" -gt 0 ]; do + sleep 1 + timeout=$((timeout - 1)) + state=`libvirt_get_guest_state "$1"` + [ "x$state" == "xshut" ] && return 0 + done + return 1 +} + +# shutdown guest by name +libvirt_shutdown() +{ + virsh $LIBVIRTD_URI shutdown "$1" >/dev/null + timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT + while [ "$timeout" -gt 0 ]; do + sleep 1 + timeout=$((timeout - 1)) + state=`libvirt_get_guest_state "$1"` + [ "x$state" == "xshut" ] && return 0 + done + return 1 +} + +# start guest by name +libvirt_start() +{ + virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null +} + +# stop all guests +libvirt_stop_all() +{ + mkdir -p `dirname $LIBVIRTD_LISTFILE` + echo -n >$LIBVIRTD_LISTFILE + + for i in `libvirt_list`; do + name=`libvirt_domname $i` + if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then + stat_busy "Suspending libvirtd/$name guest" + libvirt_suspend "$i" + else + stat_busy "Shutting libvirtd/$i guest down" + libvirt_shutdown "$i" + fi + [ $? -eq 0 ] && stat_done || stat_fail + echo $i >>$LIBVIRTD_LISTFILE + done +} + +# start all guests +libvirt_start_all() +{ + if [ -f $LIBVIRTD_LISTFILE ]; then + for i in `cat $LIBVIRTD_LISTFILE`; do + name='libvirt_domname $i' + stat_busy "Starting/resuming libvirtd/$name guest" + libvirt_start "$i" + [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail + done + fi + rm -f $LIBVIRTD_LISTFILE +} + +# main +LC_ALL=C +LANG=C +case "$1" in + start) + libvirt_start_all + add_daemon libvirtd-guests + ;; + stop) + libvirt_stop_all + rm_daemon libvirtd-guests + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/community-staging/libvirt/libvirtd.conf.d b/community-staging/libvirt/libvirtd.conf.d new file mode 100644 index 000000000..d4d25b47a --- /dev/null +++ b/community-staging/libvirt/libvirtd.conf.d @@ -0,0 +1,3 @@ +LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" +LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" +KRB5_KTNAME="/etc/libvirt/krb5.tab" diff --git a/community-staging/libvirt/libvirtd.rc.d b/community-staging/libvirt/libvirtd.rc.d new file mode 100644 index 000000000..193bffa9c --- /dev/null +++ b/community-staging/libvirt/libvirtd.rc.d @@ -0,0 +1,66 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/conf.d/libvirtd +. /etc/rc.d/functions + +LIBVIRTD_CONFIG_ARGS= +if [ -n "$LIBVIRTD_CONFIG" ] +then + LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" +fi + +PID=`pidof -o %PPID /usr/sbin/libvirtd` +case "$1" in + start) + stat_busy "Starting libvirtd" + export RADVD=/usr/sbin/radvd + for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do + [ -d $i ] || mkdir -p $i + done + [ -z "$PID" ] && ( + mkdir -p /var/{cache,run}/libvirt + rm -rf /var/cache/libvirt/* + KRB5_KTNAME=$KRB5_KTNAME \ + /usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS + ) + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon libvirtd + stat_done + fi + ;; + stop) + stat_busy "Stopping libvirtd" + [ ! -z "$PID" ] && ( + kill $PID &> /dev/null + rm -rf /var/cache/libvirt/* + rm -f /var/run/libvirtd.pid + ) + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon libvirtd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading libvirtd configuration" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo $"Usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 diff --git a/community-staging/libvirt/openbsd-netcat-default.patch b/community-staging/libvirt/openbsd-netcat-default.patch new file mode 100644 index 000000000..a01b4f14e --- /dev/null +++ b/community-staging/libvirt/openbsd-netcat-default.patch @@ -0,0 +1,36 @@ +diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c +--- libvirt-0.9.7/src/qemu/qemu_migration.c 2011-10-31 07:46:04.000000000 +0400 ++++ libvirt-0.9.7.my/src/qemu/qemu_migration.c 2011-11-08 15:46:10.000000000 +0400 +@@ -1589,7 +1589,7 @@ + spec->dest.unix_socket.file); + } else { + const char *args[] = { +- "nc", "-U", spec->dest.unix_socket.file, NULL ++ "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL + }; + ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args); + } +diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c +--- libvirt-0.9.7/src/remote/remote_driver.c 2011-11-08 07:53:30.000000000 +0400 ++++ libvirt-0.9.7.my/src/remote/remote_driver.c 2011-11-08 15:46:10.000000000 +0400 +@@ -614,7 +614,7 @@ + username, + !tty, + !verify, +- netcat ? netcat : "nc", ++ netcat ? netcat : "nc.openbsd", + keyfile, + sockname))) + goto failed; +diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c +--- libvirt-0.9.7/src/rpc/virnetsocket.c 2011-11-08 07:53:30.000000000 +0400 ++++ libvirt-0.9.7.my/src/rpc/virnetsocket.c 2011-11-08 15:46:31.000000000 +0400 +@@ -642,7 +642,7 @@ + virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); + + if (!netcat) +- netcat = "nc"; ++ netcat = "nc.openbsd"; + + virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); + diff --git a/community-staging/perl-dbd-odbc/PKGBUILD b/community-staging/perl-dbd-odbc/PKGBUILD new file mode 100644 index 000000000..49cc66ac4 --- /dev/null +++ b/community-staging/perl-dbd-odbc/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 71222 2012-05-25 09:48:35Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-dbd-odbc +pkgver=1.37 +pkgrel=2 +pkgdesc="ODBC Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-ODBC/" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi' 'perl' 'unixodbc') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") +md5sums=('0c294f8e3365c841dcee8a0ba4671c99') + +build() { + cd DBD-ODBC-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd DBD-ODBC-${pkgver} + make install DESTDIR=${pkgdir} + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-dbd-pg/PKGBUILD b/community-staging/perl-dbd-pg/PKGBUILD new file mode 100644 index 000000000..561621a19 --- /dev/null +++ b/community-staging/perl-dbd-pg/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 71224 2012-05-25 09:49:12Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: François Charette <firmicus ατ gmx δοτ net> + +pkgname=perl-dbd-pg +pkgver=2.19.2 +pkgrel=2 +pkgdesc="Postgres Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-Pg" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi>=1.52' 'postgresql-libs') +options=('!emptydirs') +source=("http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-${pkgver}.tar.gz") +md5sums=('67c859593e40959b42b3ef23ce6b581e') + +build() { + cd DBD-Pg-${pkgver} + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd DBD-Pg-${pkgver} + make install DESTDIR=${pkgdir} + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-dbd-sqlite2/PKGBUILD b/community-staging/perl-dbd-sqlite2/PKGBUILD new file mode 100644 index 000000000..4a081e33b --- /dev/null +++ b/community-staging/perl-dbd-sqlite2/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 71226 2012-05-25 09:49:51Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Charles Mauch <cmauch@gmail.com> + +pkgname=perl-dbd-sqlite2 +pkgver=0.33 +pkgrel=9 +pkgdesc="Perl/CPAN Module DBD::SQLite2" +arch=("i686" "x86_64") +url="http://search.cpan.org/dist/DBD-SQLite2" +license=("GPL" "PerlArtistic") +depends=("perl-dbi") +source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-${pkgver}.tar.gz") +md5sums=('babd83fd5eb9ba7560ad4bab4c76c0eb') + +build() { + cd DBD-SQLite2-${pkgver} + + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + + make +} + +package() { + cd DBD-SQLite2-${pkgver} + + make install DESTDIR=${pkgdir} + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community-staging/perl-dbd-sybase/PKGBUILD b/community-staging/perl-dbd-sybase/PKGBUILD new file mode 100644 index 000000000..60d018ef8 --- /dev/null +++ b/community-staging/perl-dbd-sybase/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 71228 2012-05-25 09:50:37Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=perl-dbd-sybase +pkgver=1.14 +pkgrel=2 +pkgdesc="Sybase Driver for DBI" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/DBD-Sybase/" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds') +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz") +md5sums=('db6662d710b3adffe37bd8aec8060eda') + +build() { + cd $srcdir/DBD-Sybase-${pkgver} + export SYBASE=/usr + echo -e "\n\n\n\n\n\n" | PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +package() { + cd $srcdir/DBD-Sybase-${pkgver} + make install DESTDIR=${pkgdir} + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index f194892b5..781870857 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70027 2012-04-28 09:24:17Z allan $ +# $Id: PKGBUILD 71230 2012-05-25 11:31:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.3.0 -_rel=stable -#_rel=devel +pkgver=4.4.0 +#_rel=stable +_rel=devel pkgrel=1 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686') @@ -17,6 +17,8 @@ optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) sha256sums=('5c3f5ba2de06f6adb53b7835374a4f3e0601ec63e8a1d1dba6c6a07e12cc2990') +sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d') +sha256sums=('348ce13fc136afc74a7b50b094f64d8cb00f83f0cd3d59acc6fa4e63c824fa4d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,14 +28,14 @@ build() { perl Configure.pl --prefix=/usr \ --parrot_is_shared \ - --disable-rpath - - find -type f -name Makefile | while read F; do - grep "$srcdir" $F && sed -i \ - "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F - grep "$srcdir" $F && sed -i \ - "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F - done + --disable-rpath || true + +# find -type f -name Makefile | while read F; do +# grep "$srcdir" $F && sed -i \ +# "s#-Wl,-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F +# grep "$srcdir" $F && sed -i \ +# "s#-rpath=$srcdir/$pkgname-$pkgver/blib/lib##" $F +# done export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib" make all parrot_utils docs html diff --git a/community/python-pyproj/PKGBUILD b/community/python-pyproj/PKGBUILD new file mode 100644 index 000000000..c066a372d --- /dev/null +++ b/community/python-pyproj/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 71233 2012-05-25 14:39:53Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgbase=python-pyproj +pkgname=('python-pyproj' 'python2-pyproj') +pkgver=1.9.0 +pkgrel=1 +pkgdesc="Python interfaces to PROJ.4 library" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pyproj" +license=('custom') +source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz) +makedepends=('python' 'python2') +sha1sums=('9a49ff24dbf88d725adddd1ba255609b558e6b03') + +build() { + cd "${srcdir}" + + cp -a pyproj-${pkgver}{,-python2} + + # Build python 3 module + cd pyproj-${pkgver} + python setup.py build + + # Build python 2 module + cd ../pyproj-${pkgver}-python2 + python2 setup.py build +} + +package_python-pyproj() { + depends=('proj' 'python>=3.2') + + cd "${srcdir}"/pyproj-${pkgver} + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_python2-pyproj() { + depends=('proj' 'python2>=2.7') + replaces=('pyproj') + + cd "${srcdir}"/pyproj-${pkgver}-python2 + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD index a3ed20691..a8bec2b63 100644 --- a/community/ubuntuone-client/PKGBUILD +++ b/community/ubuntuone-client/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 71102 2012-05-24 05:37:26Z bgyorgy $ +# $Id: PKGBUILD 71237 2012-05-25 20:12:24Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ubuntuone-client pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Ubuntu One helps you store, sync and share files between your computers" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client" license=('GPL') -depends=('dbus-glib' 'python2-distribute' 'python2-pyinotify' 'python2-ubuntuone-storageprotocol' 'python2-gobject' 'libnotify' 'python2-configglue' 'ubuntu-sso-client' 'hicolor-icon-theme' 'xdg-utils') +depends=('dbus-glib' 'python2-distribute' 'python2-pyinotify' 'python2-ubuntuone-storageprotocol' 'python2-gobject' 'libnotify' 'python2-gobject2' 'python2-configglue' 'ubuntu-sso-client' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool' 'imake' 'gobject-introspection' 'vala') optdepends=('ubuntu-sso-client-qt: required for first-time log in') options=('!libtool') diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD index 1eb194e74..2ff3f497d 100644 --- a/community/wesnoth/PKGBUILD +++ b/community/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69014 2012-04-08 01:45:27Z svenstaro $ +# $Id: PKGBUILD 71216 2012-05-25 05:03:12Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=wesnoth -pkgver=1.10.2 +pkgver=1.10.3 pkgrel=1 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ options=(!emptydirs) source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 wesnoth.tmpfiles.conf wesnothd.rc.d) -md5sums=('61f93437ba13a27a048e5ee2ee63736a' +md5sums=('b25354c71d58f82c2c60cc12c6f09c36' 'b8122f5054e3895c9c054e87460869dc' '85659b47d22dfdf4e4d046556973fc3e') diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD index f7281d31f..3f9dcece9 100644 --- a/extra/ecl/PKGBUILD +++ b/extra/ecl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150709 2012-02-20 22:31:08Z juergen $ +# $Id: PKGBUILD 159616 2012-05-25 22:32:35Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Maintainer: juergen <juergen@archlinux.org> pkgname=ecl pkgver=12.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Embeddable Common Lisp" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/ecls/" @@ -19,20 +19,21 @@ md5sums=('1a54b733e7cd07af2b1cb6d7f8b716d2') build() { cd $srcdir/$pkgname-$pkgver sed -i 's|-Wl,--rpath,~A|-Wl,--rpath,/usr/lib/ecl|' src/configure - ./configure --build=$CHOST \ - --prefix=/usr \ - --with-tcp \ - --with-clos-streams \ - --enable-shared \ - --enable-boehm=included \ - --with-system-gmp \ - --without-x \ - --without-clx \ - --disable-threads + ./configure \ + --build=$CHOST \ + --prefix=/usr \ + --with-tcp \ + --with-clos-streams \ + --enable-shared \ + --enable-boehm=included \ + --with-system-gmp \ + --without-x \ + --enable-threads \ + --without-clx make } package() { make -C $srcdir/$pkgname-$pkgver DESTDIR=$pkgdir install -}
\ No newline at end of file +} diff --git a/extra/herqq/PKGBUILD b/extra/herqq/PKGBUILD new file mode 100644 index 000000000..98f705a1f --- /dev/null +++ b/extra/herqq/PKGBUILD @@ -0,0 +1,24 @@ +# $Id$ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=herqq +pkgver=1.0.0 +pkgrel=1 +pkgdesc="A software library for building UPnP devices (HUPnP)" +arch=('i686' 'x86_64') +url="http://www.herqq.org/" +license=('GPL') +depends=('qt') +source=("http://downloads.sourceforge.net/hupnp/${pkgname}-${pkgver}.zip") +md5sums=('45a0632f7c7b64bc0fdab852d36c1e61') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + qmake PREFIX=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/extra/libkgoogle/PKGBUILD b/extra/libkgoogle/PKGBUILD new file mode 100644 index 000000000..f5daa1aeb --- /dev/null +++ b/extra/libkgoogle/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 159516 2012-05-25 18:26:22Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkgoogle +pkgver=0.3.1 +pkgrel=1 +pkgdesc="A KDE-based library for accessing various Google services via their public API" +url='https://projects.kde.org/projects/kdereview/libkgoogle' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdepimlibs' 'qjson') +makedepends=('cmake' 'automoc4' 'boost') +replaces=('akonadi-google') +conflicts=('akonadi-google') +source=("http://www.progdan.cz/wp-content/uploads/akonadi-google-${pkgver}.tar.gz") +md5sums=('fed8d9082547835ab916edd219831cf6') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../akonadi-google-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index 8215d4d59..5424c938b 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146475 2012-01-11 15:22:23Z stephane $ +# $Id: PKGBUILD 159610 2012-05-25 20:35:43Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc -pkgver=20110528 -pkgrel=5 +pkgver=20120224 +pkgrel=1 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64') url="http://moc.daper.net/" @@ -17,19 +17,31 @@ optdepends=('speex: for using the speex plugin' 'wavpack: for using the wavpack plugin' 'libmodplug: for using the modplug plugin') options=('!libtool') -source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \ - gcc-undefined-symbols.diff moc-ffmpeg.patch) -sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf' - 'a811a4ac7e049914aab528d3f06a6be6634c2720' - 'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d') +source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha1sums=('8ad3521d99fe6f2514907088c70e50c84ec09b46' + 'e8b2396d99692b0c4f85971d3fa6f5aecb1eb9d3') + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) + _svnver=2412 + _svntrunk="svn://daper.net/moc/trunk" + _svnmod="${pkgname}-${pkgver}" + mkdir ${pkgname}-${pkgver} + pushd ${pkgname}-${pkgver} + svn co ${_svntrunk} --config-dir ./ -r ${_svnver} ${_svnmod} + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* + popd + rm -r ${pkgname}-${pkgver} + gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz +} build() { - cd "${srcdir}/${pkgname}" - patch -p0 -i ../gcc-undefined-symbols.diff - patch -p0 -i ../moc-ffmpeg.patch + cd "${srcdir}/${pkgname}-${pkgver}" # Disabling aac to use the external ffmpeg to play them (FS#13164) - ./autogen.sh + autoreconf -i ./configure --prefix=/usr --without-rcc --without-aac \ --with-oss --with-alsa --with-jack --with-mp3 \ --with-musepack --with-vorbis --with-flac --with-wavpack \ @@ -39,6 +51,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD index 3af2cc4c0..13cc2eb7d 100644 --- a/extra/v86d/PKGBUILD +++ b/extra/v86d/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156008 2012-04-11 12:26:27Z tomegun $ +# $Id: PKGBUILD 159626 2012-05-25 23:57:39Z dreisner $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=v86d pkgver=0.1.10 -pkgrel=3 +pkgrel=4 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" arch=('i686' 'x86_64') url="http://dev.gentoo.org/~spock/projects/uvesafb/" @@ -14,6 +14,10 @@ source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.b v86d v86d_hook modprobe.uvesafb) +md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' + '66ab32602ab29cc5635eaac7f3e42283' + '5f75b8bc4a7ddf595014591e5db263cb' + '2d7cc8dc6a41916a13869212d0191147') build() { cd "$srcdir/v86d-$pkgver" @@ -30,7 +34,3 @@ package() { install -D -m644 "$srcdir/v86d_hook" "$pkgdir/usr/lib/initcpio/hooks/v86d" install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/usr/lib/modprobe.d/uvesafb.conf" } -md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' - 'b20042d1e5354958b62d4944998d68aa' - '5f75b8bc4a7ddf595014591e5db263cb' - '2d7cc8dc6a41916a13869212d0191147') diff --git a/extra/v86d/v86d b/extra/v86d/v86d index 81735816e..840b34eec 100644 --- a/extra/v86d/v86d +++ b/extra/v86d/v86d @@ -1,8 +1,10 @@ build() { - add_binary "/sbin/v86d" + add_module 'uvesafb' + + add_binary "v86d" add_file "/usr/lib/modprobe.d/uvesafb.conf" - MODULES="uvesafb" - SCRIPT="v86d" + + add_runscript } help() { diff --git a/kde-unstable/libkgoogle/PKGBUILD b/kde-unstable/libkgoogle/PKGBUILD new file mode 100644 index 000000000..1748fc7b6 --- /dev/null +++ b/kde-unstable/libkgoogle/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 159612 2012-05-25 20:44:23Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=libkgoogle +pkgver=0.3.2 +pkgrel=1 +pkgdesc="A KDE-based library for accessing various Google services via their public API" +url='https://projects.kde.org/projects/kdereview/libkgoogle' +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL') +depends=('kdepimlibs' 'qjson') +makedepends=('cmake' 'automoc4' 'boost') +replaces=('akonadi-google') +conflicts=('akonadi-google') +source=("http://www.progdan.cz/wp-content/uploads/${pkgname}-${pkgver}.tar.gz") +md5sums=('faa3af3bd402827b229c697b95865d1a') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/kde-unstable/soprano/PKGBUILD b/kde-unstable/soprano/PKGBUILD new file mode 100644 index 000000000..77b8d6fb9 --- /dev/null +++ b/kde-unstable/soprano/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 159614 2012-05-25 21:30:09Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=soprano +pkgver=2.7.6.git20120525 +pkgrel=1 +pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' +arch=('i686' 'x86_64') +url='http://soprano.sourceforge.net/' +license=('GPL' 'LGPL') +depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso') +makedepends=('cmake' 'openjdk6' 'doxygen') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('fe2e81a54ed8e22e06e0bf4b394b4960') + +build() { + cd "${srcdir}" + mkdir build + cd build + . /etc/profile.d/openjdk6.sh + # we need the rpath + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSOPRANO_DISABLE_CLUCENE_INDEX=ON + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/claws-mail-extra-plugins/PKGBUILD b/staging/claws-mail-extra-plugins/PKGBUILD new file mode 100644 index 000000000..04657c451 --- /dev/null +++ b/staging/claws-mail-extra-plugins/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 159502 2012-05-25 16:03:35Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Mildred <mildred593 at online dot fr> + +pkgname=claws-mail-extra-plugins +pkgver=3.8.0 +pkgrel=3 +pkgdesc="Extra plugins for claws-mail" +url="http://www.claws-mail.org/plugins.php?branch=EXT" +license=('GPL3') +arch=('i686' 'x86_64') +depends=('claws-mail>=3.8.0') +makedepends=('make' 'bc' 'perl>=5.16.0' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' + 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' + 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') +optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' + 'perl: for perl plugin' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus-core: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin' + 'libytnef: for tnef_parse plugin' + 'libwebkit: for the fancy webkit html plugin' + 'libsoup-gnome: for the fancy webkit html plugin' + 'python2: for python plugin' + 'libgdata: for gdata plugin') +conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' + 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' + 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' + 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') +replaces=('sylpheed-claws-extra-plugins') +options=('!libtool' '!strip') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2) +md5sums=('4776f6e0357a694f384349ac73b6da52') + +build() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + + # fix for python2 + export PYTHON="/usr/bin/python2" + + # fix gdata plugin build + sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure + + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && ( + cd $dir + + ./configure --prefix=/usr --disable-static + make + ) + done +} + +package() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && + make -C $dir DESTDIR="$pkgdir" install + done + + # fix fileconflict with libical, #11485 + rm -f "$pkgdir/usr/include/ical.h" +} diff --git a/staging/lvm2/11-dm-initramfs.rules b/staging/lvm2/11-dm-initramfs.rules new file mode 100644 index 000000000..d2c167324 --- /dev/null +++ b/staging/lvm2/11-dm-initramfs.rules @@ -0,0 +1,3 @@ +# needed with new udev/mkinitcpio and as implemented in dracut: +# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> +SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/staging/lvm2/PKGBUILD b/staging/lvm2/PKGBUILD new file mode 100644 index 000000000..496a40266 --- /dev/null +++ b/staging/lvm2/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 159668 2012-05-26 01:03:13Z dreisner $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgbase=lvm2 +pkgname=('lvm2' 'device-mapper') +pkgver=2.02.95 +pkgrel=6 +arch=('i686' 'x86_64') +url="http://sourceware.org/lvm2/" +license=('GPL2' 'LGPL2.1') +groups=('base') +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} + lvm2_install + lvm2_hook + 11-dm-initramfs.rules) +sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' + '45f5e31045065e7bdf5d6f2e21c857b4978024b4' + '3e1680f9b76ce9150d08865d99db90fd15532271' + 'cedc9948123c870f9c5aa3357d0075b41a9c8135' + 'f6a554eea9557c3c236df2943bb6e7e723945c41') + +build() { + cd "${srcdir}/LVM2.${pkgver}" + unset LDFLAGS + + # libudev.so.1.0.0 compat + sed -i 's,udev_get_dev_path([^)]\+),"/dev",' \ + tools/dmsetup.c \ + lib/misc/lvm-wrappers.c + + ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ + --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ + --enable-udev_sync --enable-udev_rules + make +} + +package_device-mapper() { + pkgdesc="Device mapper userspace library and tools" + url="http://sourceware.org/dm/" + depends=('glibc' 'udev') + + cd "${srcdir}/LVM2.${pkgver}" + make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" +} + +package_lvm2() { + pkgdesc="Logical Volume Manager 2 utilities" + depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') + conflicts=('lvm' 'mkinitcpio<0.7') + backup=('etc/lvm/lvm.conf') + options=('!makeflags') + + cd "${srcdir}/LVM2.${pkgver}" + make DESTDIR="${pkgdir}" install_lvm2 + # install applib + make -C liblvm DESTDIR="${pkgdir}" install + # /etc directories + install -d "${pkgdir}"/etc/lvm/{archive,backup} + # mkinitcpio hook + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" +} diff --git a/staging/lvm2/lvm2_hook b/staging/lvm2/lvm2_hook new file mode 100644 index 000000000..e69b3349a --- /dev/null +++ b/staging/lvm2/lvm2_hook @@ -0,0 +1,24 @@ +#!/usr/bin/ash + +run_hook() { + local pvdev + + modprobe -q dm-mod >/dev/null 2>&1 + + # If the lvmwait= parameter has been specified on the command line + # wait for the device(s) before trying to activate the volume group(s) + for pvdev in ${lvmwait//,/ }; do + poll_device ${pvdev} ${rootdelay} + done + + msg "Activating logical volumes..." + [ -d /etc/lvm ] && lvm vgscan + + if [ -n "$quiet" ]; then + lvm vgchange --sysinit -a y >/dev/null + else + lvm vgchange --sysinit -a y + fi +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/lvm2/lvm2_install b/staging/lvm2/lvm2_install new file mode 100644 index 000000000..145ce49b2 --- /dev/null +++ b/staging/lvm2/lvm2_install @@ -0,0 +1,31 @@ +#!/bin/bash + +build() { + local mod + for mod in dm-mod dm-snapshot dm-mirror; do + add_module "$mod" + done + + add_binary "/sbin/lvm" + add_binary "/sbin/dmsetup" + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + + add_runscript +} + +help() { + cat <<HELPEOF +This hook loads the necessary modules for an LVM2 root device. + +The optional lvmwait= parameter followed by a comma-separated +list of device names can be given on the command line. +It will cause the hook to wait until all given devices exist +before trying to scan and activate any volume groups. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/perl-dbd-sqlite/PKGBUILD b/staging/perl-dbd-sqlite/PKGBUILD new file mode 100644 index 000000000..7da3b506d --- /dev/null +++ b/staging/perl-dbd-sqlite/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 159652 2012-05-26 00:23:42Z eric $ +# Contributor: Tom Killian <tomk@runbox.com> +# Contributor: francois at archlinux dot org + +pkgname=perl-dbd-sqlite +_cpanname=DBD-SQLite +pkgver=1.35 +pkgrel=2 +pkgdesc="Self-contained RDBMS in a DBI driver" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/${_cpanname}" +license=('GPL' 'PerlArtistic') +depends=('perl-dbi>=1.61' 'sqlite') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) +md5sums=('d9752e4a26fa54e74aa893dafd02ceda') + +build() { + cd "${srcdir}/${_cpanname}-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_cpanname}-${pkgver}" + make test +} + +package() { + cd "${srcdir}/${_cpanname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-digest-nilsimsa/PKGBUILD b/staging/perl-digest-nilsimsa/PKGBUILD new file mode 100644 index 000000000..02e3165f2 --- /dev/null +++ b/staging/perl-digest-nilsimsa/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 159656 2012-05-26 00:30:32Z eric $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-digest-nilsimsa +_realname=Digest-Nilsimsa +pkgver=0.06 +pkgrel=8 +pkgdesc="Perl version of Nilsimsa code" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl') +replaces=('digest-nilsimsa') +provides=('digest-nilsimsa') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) +md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-digest-sha1/PKGBUILD b/staging/perl-digest-sha1/PKGBUILD new file mode 100644 index 000000000..4ae6ec164 --- /dev/null +++ b/staging/perl-digest-sha1/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 159658 2012-05-26 00:37:46Z eric $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-digest-sha1 +_realname=Digest-SHA1 +pkgver=2.13 +pkgrel=3 +pkgdesc="Perl interface to the SHA-1 Algorithm" +arch=(i686 x86_64) +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) +replaces=('digest-sha1') +provides=('digest-sha1') +md5sums=('bd22388f268434f2b24f64e28bf1aa35') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-event/PKGBUILD b/staging/perl-event/PKGBUILD new file mode 100644 index 000000000..f12acdbfc --- /dev/null +++ b/staging/perl-event/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 159660 2012-05-26 00:45:46Z eric $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Contributor: François Charette <francois.archlinux.org> + +pkgname=perl-event +_srcname=Event +pkgver=1.20 +pkgrel=2 +pkgdesc="Framework for GUI events" +arch=('i686' 'x86_64') +license=('PerlArtistic' 'GPL') +url="http://search.cpan.org/dist/${_srcname}/" +depends=('perl') +options=('!emptydirs') +source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz) +md5sums=('bdbdf6c1b235c3e13c25f3b0491c5134') + +build() { + cd "${srcdir}/${_srcname}-${pkgver}" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_srcname}-${pkgver}" + make test +} + +package() { + cd "${srcdir}/${_srcname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-html-parser/PKGBUILD b/staging/perl-html-parser/PKGBUILD new file mode 100644 index 000000000..e6c38d52f --- /dev/null +++ b/staging/perl-html-parser/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 159662 2012-05-26 00:49:53Z eric $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis +# Contributor: Firmicus <francois.archlinux.org> + +pkgname=perl-html-parser +_realname=HTML-Parser +pkgver=3.69 +pkgrel=2 +pkgdesc="Perl HTML parser class" +arch=('i686' 'x86_64') +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl-html-tagset' 'perl>=5.12.1') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) +md5sums=('d22cc6468ce670a56034be907e4e7c54') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-libintl-perl/PKGBUILD b/staging/perl-libintl-perl/PKGBUILD new file mode 100644 index 000000000..9eaec27d6 --- /dev/null +++ b/staging/perl-libintl-perl/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 159666 2012-05-26 01:00:46Z eric $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=perl-libintl-perl +_realname=libintl-perl +pkgver=1.20 +pkgrel=4 +pkgdesc="Perl Module: Localization support" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://search.cpan.org/dist/${_realname}/" +depends=('gettext' 'perl') +options=(!emptydirs) +source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz) +md5sums=('cb36f58a7d2e15974f25b35381548b1b') + +build() { + cd "${srcdir}/${_realname}-$pkgver" + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-$pkgver" + make test +} + +package() { + cd "${srcdir}/${_realname}-$pkgver" + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-net-dns/PKGBUILD b/staging/perl-net-dns/PKGBUILD new file mode 100644 index 000000000..aba8a4e5a --- /dev/null +++ b/staging/perl-net-dns/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 159670 2012-05-26 01:09:03Z eric $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Manolis Tzanidakis + +pkgname=perl-net-dns +_realname=Net-DNS +pkgver=0.68 +pkgrel=2 +pkgdesc="Perl Module: Interface to the DNS resolver." +arch=('i686' 'x86_64') +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl-digest-hmac' 'perl-net-ip' 'perl') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/O/OL/OLAF/${_realname}-$pkgver.tar.gz) +md5sums=('05c0f6955747758bb5c9578d9bc6c3a5') + +build() { + cd "$srcdir/${_realname}-${pkgver}" + # install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "$srcdir/${_realname}-${pkgver}" + make test +} + +package() { + cd "$srcdir/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-netaddr-ip/PKGBUILD b/staging/perl-netaddr-ip/PKGBUILD new file mode 100644 index 000000000..39df34775 --- /dev/null +++ b/staging/perl-netaddr-ip/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 159676 2012-05-26 01:15:09Z eric $ +# Maintainer: +# Contributor: Dale Blount <dale@archlinux.org> +# Contributor: Francois Charette <francois.archlinux.org> + +pkgname=perl-netaddr-ip +_realname=NetAddr-IP +pkgver=4.058 +pkgrel=2 +pkgdesc="Perl module to manage IP addresses and subnets" +arch=(i686 x86_64) +license=('PerlArtistic' 'GPL') +depends=('perl') +options=('!emptydirs') +url="http://search.cpan.org/dist/${_realname}/" +source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz) +md5sums=('8829958dd84a8b36e3cd10347564739d') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/perl-sdl/PKGBUILD b/staging/perl-sdl/PKGBUILD new file mode 100644 index 000000000..5acdbbc4e --- /dev/null +++ b/staging/perl-sdl/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 159674 2012-05-26 01:12:57Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> + +pkgname=perl-sdl +pkgver=2.536 +pkgrel=1 +pkgdesc="Simple DirectMedia Layer for Perl" +arch=(i686 x86_64) +license=(LGPL) +url="http://sdl.perl.org" +depends=(perl-alien-sdl perl-tie-simple + sdl_{net,ttf,image,mixer,gfx,pango} mesa smpeg) +#makedepends=(perl-yaml) +options=('!emptydirs') +replaces=(sdl_perl) +conflicts=(sdl_perl) +provides=("sdl_perl=$pkgver") +# http://search.cpan.org/dist/SDL/ +_author=FROGGS +source=(http://search.cpan.org/CPAN/authors/id/${_author:0:1}/${_author:0:2}/$_author/SDL-$pkgver.tar.gz) +md5sums=('5c682e8a96cd655e959497b034b978ce') + +build() { + cd "$srcdir/SDL-$pkgver" + # Perl selects the proper CFLAGS set for binary modules + unset CFLAGS + # install module in vendor directories + perl Build.PL installdirs=vendor + perl Build +} + +check() { + cd "$srcdir/SDL-$pkgver" + perl Build test || true +} + +package() { + cd "$srcdir/SDL-$pkgver" + perl Build install destdir="$pkgdir" +} diff --git a/staging/perl-term-readkey/PKGBUILD b/staging/perl-term-readkey/PKGBUILD new file mode 100644 index 000000000..9de54dc1a --- /dev/null +++ b/staging/perl-term-readkey/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 159678 2012-05-26 01:25:20Z eric $ +# Maintainer: kevin <kevin@archlinux.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Francois Charette <francois.archlinux.org> + +pkgname=perl-term-readkey +_realname=TermReadKey +pkgver=2.30.02 +pkgrel=2 +pkgdesc="Provides simple control over terminal driver modes" +arch=('i686' 'x86_64') +license=('custom') +depends=('perl' 'glibc') +url="http://search.cpan.org/~stsi/${_realname}/" +options=('!emptydirs') +source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) +md5sums=('69b92c8ddca8691c83823c683cd9838a') + +build() { + cd "${srcdir}/TermReadKey-$pkgver" + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/TermReadKey-$pkgver" + make test +} + +package() { + cd "${srcdir}/TermReadKey-$pkgver" + make DESTDIR="${pkgdir}" install + chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Term/ReadKey/ReadKey.so" + install -d "${pkgdir}/usr/share/licenses/$pkgname/" + head -7 README > "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/staging/perl-text-iconv/PKGBUILD b/staging/perl-text-iconv/PKGBUILD new file mode 100644 index 000000000..9fa7def9d --- /dev/null +++ b/staging/perl-text-iconv/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 159683 2012-05-26 01:29:23Z eric $ +# Maintainer: +# Contributor: Francois Charette <firmicus@gmx.net> + +pkgname=perl-text-iconv +_realname=Text-Iconv +pkgver=1.7 +pkgrel=7 +pkgdesc="Interface to iconv codeset conversion" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/${_realname}/" +license=('GPL' 'PerlArtistic') +depends=('perl') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/M/MP/MPIOTR/${_realname}-${pkgver}.tar.gz) +md5sums=('81b26e069eaebb084e91ea3c009b67ae') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/perl-tk/PKGBUILD b/staging/perl-tk/PKGBUILD new file mode 100644 index 000000000..0396f4bb2 --- /dev/null +++ b/staging/perl-tk/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 159686 2012-05-26 02:00:46Z eric $ +# Maintainer: François Charette <francois ατ archlinux δοτ org> +# Contributor: Jason Chu <jchu@xentac.net> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> + +pkgname=perl-tk +_cpanname=Tk +pkgver=804.030 +pkgrel=3 +pkgdesc="A graphical user interface toolkit for Perl" +arch=('i686' 'x86_64') +url="http://search.cpan.org/dist/${_cpanname}" +license=('PerlArtistic' 'GPL' 'custom') +depends=('libpng' 'libjpeg' 'tk' 'perl') +options=('!emptydirs') +replaces=('perltk') +provides=('perltk') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) +md5sums=('13275e85f99ee467a86d9598a437abff') + +build() { + cd "$srcdir/${_cpanname}-$pkgver" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +#check() { +# cd "$srcdir/${_cpanname}-$pkgver" +# make test +#} + +package() { + cd "$srcdir/${_cpanname}-$pkgver" + make install DESTDIR="$pkgdir" + + # license + install -D -m644 pTk/license.terms \ + "${pkgdir}/usr/share/licenses/${pkgname}/tk.license" + install -D -m644 pTk/Tix.license \ + "${pkgdir}/usr/share/licenses/${pkgname}/tix.license" +} diff --git a/staging/perl-unicode-string/PKGBUILD b/staging/perl-unicode-string/PKGBUILD new file mode 100644 index 000000000..b08464be7 --- /dev/null +++ b/staging/perl-unicode-string/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 159688 2012-05-26 02:19:07Z eric $ +# Maintainer: James Rayner <iphitus@gmail.com> +# Contributor: Andrew Simmons <andrew.simmons@gmail.com> + +pkgname=perl-unicode-string +_realname=Unicode-String +pkgver=2.09 +pkgrel=7 +pkgdesc="String of Unicode characters for perl (UCS2/UTF16)" +arch=('i686' 'x86_64') +license=('PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl') +options=(!emptydirs) +source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) +md5sums=('553e68e603723bf7c631f8701ab0d678') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + # in stall module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" +} diff --git a/staging/perl-xml-parser/PKGBUILD b/staging/perl-xml-parser/PKGBUILD new file mode 100644 index 000000000..e46bfce2e --- /dev/null +++ b/staging/perl-xml-parser/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 159672 2012-05-26 01:11:32Z heftig $ +# Maintainer: +# Contributor: firmicus <francois@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: herb <hrose@archlinux.org> + +pkgname=perl-xml-parser +_realname=XML-Parser +pkgver=2.41 +pkgrel=3 +pkgdesc="Expat-based XML parser module for perl" +arch=('i686' 'x86_64') +license=('GPL' 'PerlArtistic') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl' 'expat') +replaces=('perlxml') +provides=("perlxml=${pkgver}") +options=('!emptydirs') +source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/${_realname}-${pkgver}.tar.gz") +md5sums=('c320d2ffa459e6cdc6f9f59c1185855e') + +build() { + cd "${srcdir}/${_realname}-${pkgver}" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-${pkgver}" + make test +} + +package() { + cd "${srcdir}/${_realname}-${pkgver}" + make install DESTDIR="${pkgdir}" + + # remove perllocal.pod and .packlist. + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete +} diff --git a/staging/perl-yaml-syck/PKGBUILD b/staging/perl-yaml-syck/PKGBUILD new file mode 100644 index 000000000..045509ca5 --- /dev/null +++ b/staging/perl-yaml-syck/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 159692 2012-05-26 02:34:17Z eric $ +# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman +# Maintainer: kevin <kevin@archlinux.org> + +pkgname=perl-yaml-syck +_realname=YAML-Syck +pkgver=1.20 +pkgrel=2 +pkgdesc="Fast, lightweight YAML loader and dumper" +arch=('i686' 'x86_64') +license=('custom') +url="http://search.cpan.org/dist/${_realname}/" +depends=('perl') +options=('!emptydirs') +source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) +md5sums=('8f6d04ee5817b8479e1234264a8d458d') + +build() { + cd "${srcdir}/${_realname}-$pkgver" + + # install module in vendor directories. + perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "${srcdir}/${_realname}-$pkgver" + make test +} + +package() { + cd "${srcdir}/${_realname}-$pkgver" + make install DESTDIR="${pkgdir}" + + # license. + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/staging/pidgin/PKGBUILD b/staging/pidgin/PKGBUILD new file mode 100644 index 000000000..acc50a562 --- /dev/null +++ b/staging/pidgin/PKGBUILD @@ -0,0 +1,100 @@ +# $Id: PKGBUILD 159680 2012-05-26 01:28:13Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> + +pkgname=('pidgin' 'libpurple' 'finch') +pkgver=2.10.4 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://pidgin.im/" +license=('GPL') +makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' + 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' + 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' + 'networkmanager') +options=('!libtool') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Use Python 2 + sed -i 's/env python$/&2/' */plugins/*.py \ + libpurple/purple-{remote,notifications-example,url-handler} + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-schemas-install \ + --disable-meanwhile \ + --disable-gnutls \ + --enable-cyrus-sasl \ + --disable-doxygen \ + --enable-nm \ + --with-python=/usr/bin/python2 \ + --with-system-ssl-certs=/etc/ssl/certs + make +} + +package_pidgin(){ + pkgdesc="Multi-protocol instant messaging client" + depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' + 'gstreamer0.10' 'hicolor-icon-theme') + optdepends=('aspell: for spelling correction' + 'gstreamer0.10-good-plugins: video and voice support') + install=pidgin.install + + cd "$srcdir/pidgin-$pkgver" + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C pidgin DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop + + rm "$pkgdir/usr/share/man/man1/finch.1" +} + +package_libpurple(){ + pkgdesc="IM library extracted from Pidgin" + depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') + optdepends=('avahi: Bonjour protocol support' + 'ca-certificates: SSL CA certificates' + 'dbus-python: for purple-remote and purple-url-handler' + 'tk: Tcl/Tk scripting support') + + cd "$srcdir/pidgin-$pkgver" + + for _dir in libpurple share/sounds share/ca-certs m4macros po; do + make -C "$_dir" DESTDIR="$pkgdir" install + done +} + +package_finch(){ + pkgdesc="A ncurses-based messaging client" + depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10') + + cd "$srcdir/pidgin-$pkgver" + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C finch DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir"/usr/share/man/man1/pidgin.1 +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/pidgin/pidgin.install b/staging/pidgin/pidgin.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/staging/pidgin/pidgin.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch b/staging/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch new file mode 100644 index 000000000..93167b79b --- /dev/null +++ b/staging/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch @@ -0,0 +1,80 @@ +From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Sat, 26 May 2012 02:58:11 +0200 +Subject: [PATCH] Remove usage of deprecated udev_get_*_path + +These symbols were removed in libudev.so.1.0.0. Replace them with +hardcoded strings. + +Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +--- + src/modules/module-udev-detect.c | 9 +++------ + src/modules/udev-util.c | 4 ++-- + 2 files changed, 5 insertions(+), 8 deletions(-) + +diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c +index 1192194..31416bd 100644 +--- a/src/modules/module-udev-detect.c ++++ b/src/modules/module-udev-detect.c +@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) { + pa_assert(u); + pa_assert(d); + +- cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path)); ++ cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path)); + accessible = access(cd, R_OK|W_OK) >= 0; + pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); + +@@ -621,7 +621,6 @@ fail: + } + + static int setup_inotify(struct userdata *u) { +- char *dev_snd; + int r; + + if (u->inotify_fd >= 0) +@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) { + return -1; + } + +- dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); +- r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); +- pa_xfree(dev_snd); ++ r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); + + if (r < 0) { + int saved_errno = errno; +diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c +index 2f18bc4..b0bb17d 100644 +--- a/src/modules/udev-util.c ++++ b/src/modules/udev-util.c +@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) { + goto finish; + } + +- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); ++ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); + card = udev_device_new_from_syspath(udev, t); + pa_xfree(t); + +-- +1.7.10.2 + diff --git a/staging/pulseaudio/PKGBUILD b/staging/pulseaudio/PKGBUILD new file mode 100644 index 000000000..52965bfa8 --- /dev/null +++ b/staging/pulseaudio/PKGBUILD @@ -0,0 +1,115 @@ +# $Id: PKGBUILD 159684 2012-05-26 01:31:15Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgbase=pulseaudio +pkgname=(pulseaudio libpulse) +pkgdesc="A featureful, general-purpose sound server" +pkgver=2.0 +pkgrel=2 +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/PulseAudio" +license=(GPL LGPL) +makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit + speex tdb udev dbus-core avahi bluez gconf intltool jack + lirc-utils openssl fftw orc json-c gtk2 webrtc-audio-processing + libsystemd) +options=(!emptydirs !libtool) +source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz + pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch) +sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061' + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' + '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803') + +build() { + cd $pkgbase-$pkgver + + # libudev.so.1.0.0 + patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --with-udev-rules-dir=/usr/lib/udev/rules.d \ + --with-database=tdb \ + --disable-hal \ + --disable-tcpwrap \ + --disable-rpath \ + --disable-default-build-tests + + # fight unused direct deps + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package_pulseaudio() { + depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc + libsamplerate webrtc-audio-processing libsystemd) + optdepends=('avahi: zeroconf support' + 'bluez: bluetooth support' + 'gconf: configuration through gconf (paprefs)' + 'jack: jack support' + 'lirc-utils: infra-red support' + 'openssl: RAOP support' + 'python2-pyqt: Equalizer GUI (qpaeq)') + backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) + install=pulseaudio.install + + cd $pkgbase-$pkgver + make -j1 DESTDIR="$pkgdir" install + + # Lower resample quality, saves CPU + sed -e '/resample-method/iresample-method=speex-float-0' \ + -i "$pkgdir/etc/pulse/daemon.conf" + + # Disable cork-request module, can result in e.g. media players unpausing + # when there's a Skype call incoming + sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ + -i "$pkgdir/usr/bin/start-pulseaudio-x11" + + # Make ConsoleKit optional + sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ + -i "$pkgdir/etc/pulse/default.pa" + + # Python fix + sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" + + install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" + + rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" + +### Split libpulse + + mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib/pulseaudio,share/man/man5}} + + mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf + + mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \ + "$srcdir/libpulse/usr/lib" + + mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \ + "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \ + "$srcdir/libpulse/usr/lib/pulseaudio" + + mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake + mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig + + mv {"$pkgdir","$srcdir/libpulse"}/usr/include + + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 + mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala +} + +package_libpulse() { + pkgdesc="$pkgdesc (client library)" + depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c) + optdepends=('alsa-plugins: ALSA support' + 'avahi: zeroconf support') + backup=(etc/pulse/client.conf) + + mv "$srcdir"/libpulse/* "$pkgdir" +} diff --git a/staging/pulseaudio/pulseaudio.install b/staging/pulseaudio/pulseaudio.install new file mode 100644 index 000000000..1dc4cefb3 --- /dev/null +++ b/staging/pulseaudio/pulseaudio.install @@ -0,0 +1,19 @@ +post_install() { + cat << MES +>>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details + on configuring your system for PulseAudio. + +>>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. +MES +} + +post_upgrade() { + cat << MES +>>> If you have per-user copies of configuration files (such as client.conf, + daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync + with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio + may refuse to start due to configuration errors. +MES +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/pulseaudio/pulseaudio.xinit b/staging/pulseaudio/pulseaudio.xinit new file mode 100644 index 000000000..2d30c0943 --- /dev/null +++ b/staging/pulseaudio/pulseaudio.xinit @@ -0,0 +1,12 @@ +#!/bin/bash + +case "$DESKTOP_SESSION" in + gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart + ;; + *) + # Extra checks in case DESKTOP_SESSION is not set correctly + if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then + /usr/bin/start-pulseaudio-x11 + fi + ;; +esac diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD new file mode 100644 index 000000000..9a0ccd998 --- /dev/null +++ b/testing/btrfs-progs/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 159628 2012-05-26 00:01:32Z dreisner $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +pkgname=btrfs-progs +pkgver=0.19.20120328 +pkgrel=3 +pkgdesc="btrfs filesystem utilities" +arch=(i686 x86_64) +depends=('glibc' 'e2fsprogs') +url="http://btrfs.wiki.kernel.org/" +replaces=('btrfs-progs-unstable') +conflicts=('btrfs-progs-unstable') +provides=('btrfs-progs-unstable') +license=('GPL2') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz + initcpio-install-btrfs + initcpio-hook-btrfs) +md5sums=('f4504e73cf9254779b78d5b2318ac570' + '3eae9bf1541e297fa72aa40ebf7320c6' + 'b09688a915a0ec8f40e2f5aacbabc9ad') + +build() { + cd $srcdir/$pkgname-$pkgver + make CFLAGS="$CFLAGS" +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr install + # fix manpage + mkdir -p $pkgdir/usr/share/ + mv $pkgdir/usr/man $pkgdir/usr/share/man + mkdir -p ${pkgdir}/sbin + ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs + + # install mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-btrfs" \ + "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 "$srcdir/initcpio-hook-btrfs" \ + "$pkgdir/usr/lib/initcpio/hooks/btrfs" +} diff --git a/testing/btrfs-progs/initcpio-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs new file mode 100644 index 000000000..7965d0a8a --- /dev/null +++ b/testing/btrfs-progs/initcpio-hook-btrfs @@ -0,0 +1,7 @@ +#!/usr/bin/ash + +run_hook() { + btrfs device scan +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs new file mode 100644 index 000000000..a70a324ed --- /dev/null +++ b/testing/btrfs-progs/initcpio-install-btrfs @@ -0,0 +1,15 @@ +#!/bin/bash + +build() { + add_all_modules btrfs + add_binary btrfs + add_runscript +} + +help() { + cat <<HELPEOF +This hook provides support for multi-device btrfs volumes. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD index e2292ebc6..4f2269db3 100644 --- a/testing/cryptsetup/PKGBUILD +++ b/testing/cryptsetup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158938 2012-05-13 13:45:53Z thomas $ +# $Id: PKGBUILD 159622 2012-05-25 23:50:39Z dreisner $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -17,8 +17,8 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_install) sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7' '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed' - 'e4c00e2da274bf4cab3f72a0de779790a11a946d36b83144e74d3791e230b262' - 'cba1dc38ff6cc4d3740d0badfb2b151bb03d19e8e9fa497569ac2fb6f4196e0e') + 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' + 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') build() { cd "${srcdir}"/$pkgname-${pkgver} diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook index 0f35782c6..372b7ba57 100644 --- a/testing/cryptsetup/encrypt_hook +++ b/testing/cryptsetup/encrypt_hook @@ -10,20 +10,21 @@ run_hook() { IFS=: read ckdev ckarg1 ckarg2 <<EOF $cryptkey EOF - if poll_device "${ckdev}" ${rootdelay}; then + + if resolved=$(resolve_device "${ckdev}" ${rootdelay}); then case ${ckarg1} in *[!0-9]*) # Use a file on the device # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path mkdir /ckey - mount -r -t "$ckarg1" "$ckdev" /ckey + mount -r -t "$ckarg1" "$resolved" /ckey dd if="/ckey/$ckarg2" of="$ckeyfile" >/dev/null 2>&1 umount /ckey ;; *) # Read raw data from the block device # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if="$ckdev" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 + dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 ;; esac fi @@ -58,13 +59,13 @@ EOF esac done - if poll_device "${cryptdev}" ${rootdelay}; then - if cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then + if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then + if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then - if eval cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then + if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -76,7 +77,7 @@ EOF echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password - while ! eval cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do + while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -96,7 +97,7 @@ EOF err "Non-LUKS decryption not attempted..." return 1 fi - exe="cryptsetup create $cryptname $cryptdev $cryptargs" + exe="cryptsetup create $cryptname $resolved $cryptargs" IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF $crypto EOF diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install index 79d2f3e4b..38e5ddc57 100644 --- a/testing/cryptsetup/encrypt_install +++ b/testing/cryptsetup/encrypt_install @@ -1,13 +1,16 @@ #!/bin/bash build() { - if [ -z "${CRYPTO_MODULES}" ]; then - MODULES=" dm-crypt $(all_modules "/crypto/")" + local mod + + add_module dm-crypt + if [[ $CRYPTO_MODULES ]]; then + for mod in $CRYPTO_MODULES; do + add_module "$mod" + done else - MODULES=" dm-crypt $CRYPTO_MODULES" + add_all_modules '/crypto/' fi - FILES="" - SCRIPT="encrypt" add_binary "cryptsetup" add_binary "dmsetup" @@ -15,10 +18,12 @@ build() { add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + + add_runscript } help() { - cat <<HELPEOF + cat <<HELPEOF This hook allows for an encrypted root device. Users should specify the device to be unlocked using 'cryptdevice=device:dmname' on the kernel command line, where 'device' is the path to the raw device, and 'dmname' is the name given to diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD new file mode 100644 index 000000000..c709b306c --- /dev/null +++ b/testing/curl/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 159498 2012-05-25 14:33:21Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=curl +pkgver=7.26.0 +pkgrel=1 +pkgdesc="An URL retrival utility and library" +arch=('i686' 'x86_64') +url="http://curl.haxx.se" +license=('MIT') +depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +options=('!libtool') +source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + curlbuild.h) +md5sums=('3fa4d5236f2a36ca5c3af6715e837691' + '61b594830d5acba3c99e4af0ba39a14e' + '751bd433ede935c8fae727377625a8ae') + +ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') +case $ptrsize in + 8) _curlbuild=curlbuild-64.h ;; + 4) _curlbuild=curlbuild-32.h ;; + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" + exit 1 + ;; +esac + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --disable-dependency-tracking \ + --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ + --enable-manual \ + --enable-versioned-symbols \ + --enable-threaded-resolver \ + --without-libidn \ + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # license + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel + install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" + mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" + install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" +} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h new file mode 100644 index 000000000..b48862696 --- /dev/null +++ b/testing/curl/curlbuild.h @@ -0,0 +1,9 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "curlbuild-32.h" +#elif __WORDSIZE == 64 +#include "curlbuild-64.h" +#else +#error "Unknown word size" +#endif diff --git a/testing/dmraid/PKGBUILD b/testing/dmraid/PKGBUILD index 71dfb914b..a3c1db830 100644 --- a/testing/dmraid/PKGBUILD +++ b/testing/dmraid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157738 2012-04-29 05:29:44Z dreisner $ +# $Id: PKGBUILD 159630 2012-05-26 00:03:09Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid pkgver=1.0.0.rc16.3 -pkgrel=4 +pkgrel=5 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" conflicts=('mkinitcpio<0.7') @@ -17,7 +17,7 @@ source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 dmraid_hook) install=dmraid.install md5sums=('819338fcef98e8e25819f0516722beeb' - '832ed57a0f7ca6ba72adebcba2b17f87' + '2297d23cee1aef23ec6ad8d6d1870356' 'faec669dc85f87187b45b5d3968efe2c') build() { diff --git a/testing/dmraid/dmraid_install b/testing/dmraid/dmraid_install index c48e6ceaf..d3238c1f7 100644 --- a/testing/dmraid/dmraid_install +++ b/testing/dmraid/dmraid_install @@ -1,17 +1,20 @@ #!/bin/bash build() { - MODULES=" dm-mod dm-mirror " - BINARIES="dmraid dmsetup" - SCRIPT="dmraid" + add_module 'dm-mod' + add_module 'dm-mirror' + add_binary 'dmraid' + add_binary 'dmsetup' add_file "/usr/lib/udev/rules.d/10-dm.rules" add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + + add_runscript } help() { - cat <<HELPEOF + cat <<HELPEOF This hook loads the necessary modules for a dmraid root device. HELPEOF } diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD index 7c389cc51..1043e191b 100644 --- a/testing/mdadm/PKGBUILD +++ b/testing/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159371 2012-05-22 19:21:43Z tpowa $ +# $Id: PKGBUILD 159624 2012-05-25 23:53:03Z dreisner $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.5 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -24,9 +24,9 @@ replaces=('raidtools') md5sums=('83ba4a6249ae24677e915e44c9cfcc58' '8333d405f550317c2bacd5510bf1cb60' '00cbed931db4f15b6ce49e3e7d433966' - '9b01e96b6c3c218fb61628c9281fe688' + '609d10888727710cb20db7ac3e096116' 'fbb5542d9bdf87441a11dd7e7a0a17f8' - '2318b99701dba9b01a6891c62be7bc1c' + 'd1d8e9eb81ce9347de74f3c84a9db09e' 'aafb5f9ac8437a284cbf948b9b13b179' '4ad87b74a4bc9a34621280abe0e0c3e4') diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install index b53258676..cf6159e40 100644 --- a/testing/mdadm/mdadm_install +++ b/testing/mdadm/mdadm_install @@ -1,45 +1,45 @@ -# vim: set ft=sh: - -build() -{ - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " - BINARIES="" - FILES="" - SCRIPT="mdadm" +#!/bin/bash + +build() { + add_checked_modules -f 'dm-' 'drivers/md/*' + # check if a custom mdadm.conf exists if grep -q ^ARRAY /etc/mdadm.conf; then echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." add_file "/etc/mdadm.conf" fi add_binary "/sbin/mdassemble" + + add_runscript } -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for any raid root device, - and assembles the raid device when run. - - If arrays are defined in /etc/mdadm.conf, the file will be used instead - of command line assembling. - - Command Line Setup: - - for raid arrays with persistent superblocks: - md=<md device no.>,dev0,dev1,...,devn - md=<md device no.>,uuid - - for partitionable raid arrays with persistent superblocks: - md=d<md device no.>,dev0,dev1,...,devn - md=d<md device no.>,uuid - - Parameters: - - <md device no.> = the number of the md device: - 0 means md0, 1 means md1, ... - - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 - or 0900878d:f95f6057:c39a36e9:55efa60a - Examples: - - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 - This will setup 2 md partitionable arrays. - - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 - This will setup 2 md arrays with persistent superblocks. +help() { + cat <<HELPEOF +This hook loads the necessary modules for any raid root device, +and assembles the raid device when run. + +If arrays are defined in /etc/mdadm.conf, the file will be used instead +of command line assembling. + +Command Line Setup: +- for raid arrays with persistent superblocks: + md=<md device no.>,dev0,dev1,...,devn + md=<md device no.>,uuid +- for partitionable raid arrays with persistent superblocks: + md=d<md device no.>,dev0,dev1,...,devn + md=d<md device no.>,uuid + +Parameters: +- <md device no.> = the number of the md device: + 0 means md0, 1 means md1, ... +- <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 + or 0900878d:f95f6057:c39a36e9:55efa60a +Examples: +- md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 + This will setup 2 md partitionable arrays. +- md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 + This will setup 2 md arrays with persistent superblocks. HELPEOF } + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/mdadm/mdadm_udev_install b/testing/mdadm/mdadm_udev_install index be653fc74..f6f5de4ad 100644 --- a/testing/mdadm/mdadm_udev_install +++ b/testing/mdadm/mdadm_udev_install @@ -1,7 +1,7 @@ #!/bin/bash build() { - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-")" + add_checked_modules -f 'dm-' 'drivers/md/*' # check if a custom mdadm.conf exists if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then @@ -15,7 +15,9 @@ build() { help() { cat <<HELPEOF - This hook loads raid arrays with udev. +This hook loads the necessary modules for a RAID array and uses incremental +assembly via udev at runtime to create the devices. This hook with NOT work +without the udev hook included on the image. HELPEOF } diff --git a/testing/pinentry/PKGBUILD b/testing/pinentry/PKGBUILD new file mode 100644 index 000000000..f94d9342d --- /dev/null +++ b/testing/pinentry/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 159496 2012-05-25 12:44:10Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=pinentry +pkgver=0.8.1 +pkgrel=4 +pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnupg.org/aegypten2" +depends=('ncurses' 'libcap>=2.16') +makedepends=('gtk2' 'qt') +optdepends=('gtk2: for gtk2 backend' + 'qt: for qt4 backend') +source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.gz + qt4-pinentry-window.patch) +install=pinentry.install + +build() { + cd $srcdir/$pkgname-$pkgver + #fix: https://bugs.archlinux.org/task/29998 + patch -Np1 -i ../qt4-pinentry-window.patch + for file in qt4/*.moc; do + /usr/bin/moc ${file/.moc/.h} > ${file} + done + ./configure --prefix=/usr \ + --enable-pinentry-curses \ + --disable-pinentry-gtk \ + --disable-pinentry-qt \ + --enable-pinentry-gtk2 \ + --enable-pinentry-qt4 \ + --enable-fallback-curses + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=${pkgdir} install +} +md5sums=('81f99904daee5331eb6738408bb024b6' + '450b8713fe42f1bd93311ef84767c3d8') diff --git a/testing/pinentry/pinentry.install b/testing/pinentry/pinentry.install new file mode 100644 index 000000000..eed2c7124 --- /dev/null +++ b/testing/pinentry/pinentry.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(pinentry.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/testing/pinentry/qt4-pinentry-window.patch b/testing/pinentry/qt4-pinentry-window.patch new file mode 100644 index 000000000..8f9faae11 --- /dev/null +++ b/testing/pinentry/qt4-pinentry-window.patch @@ -0,0 +1,28 @@ +From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky@redhat.com> +Date: Tue, 1 Feb 2011 14:42:27 +0100 +Subject: [PATCH] Fix qt4 pinentry window created in the background + +This is probably just a workaround. Proper fix is being investigated. +See: +https://bugzilla.redhat.com/show_bug.cgi?id=589532 +http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background +--- + qt4/pinentrydialog.cpp | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp +index 541baf4..d634eb6 100644 +--- a/qt4/pinentrydialog.cpp ++++ b/qt4/pinentrydialog.cpp +@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w ) + SetForegroundWindow( w->winId() ); + #endif + w->raise(); +- w->activateWindow(); + } + + QPixmap icon( QStyle::StandardPixmap which ) +-- +1.7.3.5 + |