diff options
| author | root <root@rshg054.dnsready.net> | 2011-11-23 23:15:26 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-11-23 23:15:26 +0000 |
| commit | 1e1e4927b05d9b242bfe83794e3a98ab2c8f79ef (patch) | |
| tree | 070846cb6770ab17d394d88c3f0cd3ad3eb89842 | |
| parent | 851ab9aa99e9bda38f88b5f5ade096c9137e11c8 (diff) | |
Wed Nov 23 23:15:26 UTC 2011
144 files changed, 3174 insertions, 633 deletions
diff --git a/community-staging/courier-authlib/PKGBUILD b/community-staging/courier-authlib/PKGBUILD new file mode 100644 index 000000000..99e43c8c3 --- /dev/null +++ b/community-staging/courier-authlib/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 53167 2009-09-26 09:48:47Z allan $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=courier-authlib +pkgver=0.63.0 +pkgrel=5 +pkgdesc="Authentification library for the courier mailserver(s)" +arch=(i686 x86_64) +license=('GPL2') +url="http://courier-mta.org/authlib/" +backup=('etc/authlib/authdaemonrc' 'etc/authlib/authldaprc' \ + 'etc/authlib/authmysqlrc' 'etc/authlib/authpgsqlrc') +depends=('openssl' 'gdbm' 'perl' 'libtool' 'expect') +makedepends=('pam' 'expect' 'libldap' 'libmysqlclient' 'postgresql-libs>=8.3.0') +optdepends=('libmysqlclient' 'libldap' 'postgresql-libs') +conflicts=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') +provides=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') +options=(!libtool) +install=${pkgname}.install +source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + authdaemond.rc.d) +md5sums=('411a927d178f783a1e8fab9964ce0dd2' + '911ee9f40d70fafc6bb4cc636c5ad531') + +build() { + #export MAKEFLAGS="-j1" + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --with-db=gdbm \ + --with-mailuser=courier --with-mailgroup=courier \ + --with-authpam --with-authpwd --with-authshadow \ + --with-authldap --with-authmysql --with-authpgsql \ + --with-authuserdb --with-authcram --with-authdaemon + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + ############################################################################### + # post_installation ---- rename the config file and change ownerschip + for distfile in ${pkgdir}/etc/authlib/*.dist; do + chown 72:72 ${distfile} + mv ${distfile} ${pkgdir}/etc/authlib/`basename ${distfile} .dist` + done + # copy the .schema; mostly refered to as courier.schema -> rename it + install -Dm 444 authldap.schema \ + ${pkgdir}/etc/openldap/schema/courier.schema + ############################################################################### + # Install daemon, that wraps couriers bashscript + install -Dm 755 ${srcdir}/authdaemond.rc.d ${pkgdir}/etc/rc.d/authdaemond + chown -R 72:72 ${pkgdir}/var/spool/authdaemon + mkdir ${pkgdir}/var/spool/courier + chown -R 72:72 ${pkgdir}/var/spool/courier + # docs say we can remove .a files after make + find ${pkgdir} -name '*\.a' -exec rm -f {} \; +} diff --git a/community-staging/courier-authlib/authdaemond.rc.d b/community-staging/courier-authlib/authdaemond.rc.d new file mode 100644 index 000000000..ff4abb182 --- /dev/null +++ b/community-staging/courier-authlib/authdaemond.rc.d @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +start() { + stat_busy "Starting Authdaemond" + /usr/sbin/authdaemond start &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + ln -s /var/spool/authdaemon/pid /var/run/authdaemond.pid + add_daemon authdaemond + stat_done + fi +} + +stop() { + stat_busy "Stopping Authdaemond" + /usr/sbin/authdaemond stop &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/authdaemond.pid + rm_daemon authdaemond + # housecleaning; just like kids'n toys - don't care when it's needed anymore + rm -f /var/spool/authdaemon/{pid.lock,pid,socket} &> /dev/null + stat_done + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + # calling 'stop' and 'start' without the $0 fails... + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-authlib/courier-authlib.install b/community-staging/courier-authlib/courier-authlib.install new file mode 100644 index 000000000..cbccc636b --- /dev/null +++ b/community-staging/courier-authlib/courier-authlib.install @@ -0,0 +1,32 @@ +# arg 1: the new package version +post_install() { + # creates group and user on virgin systems + if [ -z "`grep '^courier::' /etc/group`" ]; then + groupadd -g 72 courier >& /dev/null + fi + if [ -z "`grep '^courier:' /etc/passwd`" ]; then + useradd -u 72 -d /var/spool/courier -g courier -s /bin/false courier &>/dev/null + fi +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + userdel courier &> /dev/null + groupdel courier &> /dev/null +} + + +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/community-staging/courier-imap/PKGBUILD b/community-staging/courier-imap/PKGBUILD new file mode 100644 index 000000000..f11205e2f --- /dev/null +++ b/community-staging/courier-imap/PKGBUILD @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 59060 2011-11-21 06:43:48Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Committer: Manolis Tzanidakis <manolis@archlinux.org> + +pkgname=courier-imap +pkgver=4.9.3 +pkgrel=5 +pkgdesc="IMAP(s)/POP3(s) Server" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.courier-mta.org/imap/" +depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'gamin' 'gdbm' 'openssl') +backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \ + 'etc/courier-imap/imapd' 'etc/courier-imap/imapd-ssl' \ + 'etc/courier-imap/pop3d' 'etc/courier-imap/pop3d-ssl'\ + 'etc/conf.d/courier-imap') +conflicts=('courier-mta') +provides=('imap-server' 'pop3-server') +options=('!libtool') +install=$pkgname.install +source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + courier-imap.conf.d + courier-imap.rc.d + imapd.rc.d + imapd-ssl.rc.d + pop3d.rc.d + pop3d-ssl.rc.d) +md5sums=('703ddbb090569436dbda61d0d62b1eb8' + '3e08f017f6c5a52dea28f6f0dbd50b86' + '500c37831974f4676b67e650c67a59f6' + '6574c8046e44698efa7452c4b445d88e' + '437167a58efddc523f25180df284da20' + '1be23fb224bde93b23da6e771bd1cf01' + 'a326309b02fed3d7226d9aac88add7f2') + +# MIGRATION NOTE: +# In 2012, support for courier-imap.conf.d and courier-imap.rc.d will be removed. +# Remove those files and this note and also courier-imap.install + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # fix a tiny bug + sed -i -e \ + 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ + configure && chmod 755 configure + + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier-imap \ + --libexecdir=/usr/lib/courier-imap \ + --localstatedir=/var/spool/courier-imap \ + --disable-root-check \ + --enable-unicode \ + --enable-workarounds-for-imap-client-bugs \ + --with-piddir=/var/run/courier \ + --with-trashquota \ + --with-db=gdbm \ + --with-trashquota \ + --with-mailuser=courier --with-mailgroup=courier + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + # cleanup - provided by courier-maildrop + rm ${pkgdir}/usr/bin/{deliverquota,maildirmake} + rm ${pkgdir}/usr/share/man/man1/maildirmake* + rm ${pkgdir}/usr/share/man/man8/deliverquota* + find ${pkgdir} -name '*\.a' -exec -rm -f {} \; + ############################################################################### + # this is what usually "make install-configure" does + # *.dist files get rid of "dist" + for distfile in ${pkgdir}/etc/courier-imap/*.dist; do + mv ${distfile} ${pkgdir}/etc/courier-imap/$(basename ${distfile} .dist) + done + sed -i 's|TLS_CERTFILE=/usr/share/|TLS_CERTFILE=/etc/courier-imap/|' \ + ${pkgdir}/etc/courier-imap/*-ssl + for pamfile in imap/*.pam; do + sed -i "s|/lib/security/||;s|pam_pwdb|pam_unix|" ${pamfile} + install -Dm 644 ${pamfile} \ + ${pkgdir}/etc/pam.d/$(basename ${pamfile} .pam | sed "s/d$//") + done + # install thingies + install -D -m 755 ${srcdir}/courier-imap.rc.d ${pkgdir}/etc/rc.d/courier-imap + 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 644 ${srcdir}/courier-imap.conf.d ${pkgdir}/etc/conf.d/courier-imap +} diff --git a/community-staging/courier-imap/courier-imap.conf.d b/community-staging/courier-imap/courier-imap.conf.d new file mode 100644 index 000000000..66049470d --- /dev/null +++ b/community-staging/courier-imap/courier-imap.conf.d @@ -0,0 +1,18 @@ +# +# Parameters to be passed to courier-imap +# +# +# Select the service you want started with courier-imap +# +# Available options : +# imapd pop3d imapd-ssl pop3d-ssl +# +CI_DAEMONS="imapd pop3d imapd-ssl pop3d-ssl" + +# 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-imap/courier-imap.install b/community-staging/courier-imap/courier-imap.install new file mode 100644 index 000000000..9046777a7 --- /dev/null +++ b/community-staging/courier-imap/courier-imap.install @@ -0,0 +1,16 @@ +post_upgrade() { + echo "Please migrate to the new daemon format:" + echo "/etc/rc.d/courier-imap has been split into separate daemons:" + echo " imapd, imads-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-imap ...)" + echo "Example after this change:" + echo " DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl ... )" + 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." +} diff --git a/community-staging/courier-imap/courier-imap.pam b/community-staging/courier-imap/courier-imap.pam new file mode 100644 index 000000000..fa52db541 --- /dev/null +++ b/community-staging/courier-imap/courier-imap.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_unix.so nullok +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so diff --git a/community-staging/courier-imap/courier-imap.rc.d b/community-staging/courier-imap/courier-imap.rc.d new file mode 100644 index 000000000..8876fe401 --- /dev/null +++ b/community-staging/courier-imap/courier-imap.rc.d @@ -0,0 +1,62 @@ +#!/bin/bash + +CI_DAEMONS= +[ -f /etc/conf.d/courier-imap ] && . /etc/conf.d/courier-imap +[ -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/lib/courier-imap/${daemon}.rc 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/lib/courier-imap/$daemon.rc 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-imap/imapd-ssl.rc.d b/community-staging/courier-imap/imapd-ssl.rc.d new file mode 100644 index 000000000..6730d452c --- /dev/null +++ b/community-staging/courier-imap/imapd-ssl.rc.d @@ -0,0 +1,47 @@ +#!/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/lib/courier-imap/imapd-ssl.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd-ssl" + /usr/lib/courier-imap/imapd-ssl.rc 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-imap/imapd.rc.d b/community-staging/courier-imap/imapd.rc.d new file mode 100644 index 000000000..867b52b78 --- /dev/null +++ b/community-staging/courier-imap/imapd.rc.d @@ -0,0 +1,47 @@ +#!/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/lib/courier-imap/imapd.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd" + /usr/lib/courier-imap/imapd.rc 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-imap/pop3d-ssl.rc.d b/community-staging/courier-imap/pop3d-ssl.rc.d new file mode 100644 index 000000000..aab0f6a95 --- /dev/null +++ b/community-staging/courier-imap/pop3d-ssl.rc.d @@ -0,0 +1,47 @@ +#!/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/lib/courier-imap/pop3d-ssl.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d-ssl" + /usr/lib/courier-imap/pop3d-ssl.rc 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-imap/pop3d.rc.d b/community-staging/courier-imap/pop3d.rc.d new file mode 100644 index 000000000..7b73c5a7a --- /dev/null +++ b/community-staging/courier-imap/pop3d.rc.d @@ -0,0 +1,47 @@ +#!/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/lib/courier-imap/pop3d.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d" + /usr/lib/courier-imap/pop3d.rc 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-maildrop/PKGBUILD b/community-staging/courier-maildrop/PKGBUILD new file mode 100644 index 000000000..a2cd7edb0 --- /dev/null +++ b/community-staging/courier-maildrop/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 57086 2009-10-31 13:13:36Z allan $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=courier-maildrop +_srcname=maildrop +pkgver=2.5.4 +pkgrel=3 +pkgdesc="mail delivery agent - procmail like but nicer syntax" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://courier-mta.org/maildrop/" +depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm') +conflicts=('courier-mta') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) +md5sums=('5770345cdceae28bdc24809e7adb3426') + +build() { + cd ${srcdir}/${_srcname}-${pkgver} + + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --with-db=gdbm \ + --with-devel + make LDFLAGS+=-lstdc++ +} + +package() { + cd ${srcdir}/${_srcname}-${pkgver} + + make DESTDIR=${pkgdir} install + chmod u+s ${pkgdir}/usr/bin/maildrop + cd ${pkgdir}/usr/share/maildrop/html + for files in *; do + install -Dm644 ${files} ${pkgdir}/usr/share/htmldoc/${files} + done + rm -rf ${pkgdir}/usr/share/maildrop + + # docs say we can remove .a files after make + cd ${pkgdir} + find ${pkgdir} -name '*\.a' -exec rm -f {} \; +} diff --git a/community-staging/courier-mta/PKGBUILD b/community-staging/courier-mta/PKGBUILD new file mode 100644 index 000000000..82df2e28f --- /dev/null +++ b/community-staging/courier-mta/PKGBUILD @@ -0,0 +1,143 @@ +# $Id: PKGBUILD 75460 2010-04-01 16:56:22Z giovanni $ +# 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.66.3 +pkgrel=5 +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>=2.2.9-3' 'pam>=1.0.1-2' '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=('3b28f14afe3db09b74b4845323c3e982' + '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 + + # 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..e835e3efd --- /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, imads-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/ntop/PKGBUILD b/community-staging/ntop/PKGBUILD new file mode 100644 index 000000000..cb921ba4f --- /dev/null +++ b/community-staging/ntop/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 59280 2011-11-22 10:19:42Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=ntop +pkgver=4.1.0 +pkgrel=2 +pkgdesc='A network traffic probe that shows the network usage.' +arch=('i686' 'x86_64') +url='http://www.ntop.org/' +license=('GPL') +depends=('libevent' 'libpcap' 'gd' 'glib' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua') +options=('!libtool' '!makeflags') +install='ntop.install' +source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz" + 'ntop' + 'ntop.conf.d') +md5sums=('116df99cf548431393991ea15443c52f' + '7b0d7bb57432e768ff387e9f7236f87c' + '6a9371de1dcf31d8ef13a4cf349c02b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install-recursive + + install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop" + install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop/rrd" + + install -Dm0755 "${srcdir}/ntop" "${pkgdir}/etc/rc.d/ntop" + install -Dm0644 "${srcdir}/ntop.conf.d" "${pkgdir}/etc/conf.d/ntop" + + for _f in "${pkgdir}/usr/lib/ntop/plugins/"*.so; do + _plug="$(basename ${_f})" + ln -sf "../../lib${_plug}" "${_f}" + done +} diff --git a/community-staging/ntop/ntop b/community-staging/ntop/ntop new file mode 100755 index 000000000..2f0dbcbdd --- /dev/null +++ b/community-staging/ntop/ntop @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/ntop ] && . /etc/conf.d/ntop + +case "$1" in + start) + stat_busy "Starting ntop daemon" + /usr/bin/ntop -d ${NTOP_ARGS} 2>&1 >> ${NTOP_LOG} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ntop + stat_done + fi + ;; + stop) + stat_busy "Stopping ntop daemon" + killall /usr/bin/ntop &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ntop + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/ntop/ntop.conf.d b/community-staging/ntop/ntop.conf.d new file mode 100644 index 000000000..28e2a3166 --- /dev/null +++ b/community-staging/ntop/ntop.conf.d @@ -0,0 +1,5 @@ +# Parameters to be passed to ntop. +NTOP_ARGS="-i eth0 -w 3000" + +# Location of the log file. +NTOP_LOG="/var/log/ntop.log" diff --git a/community-staging/ntop/ntop.install b/community-staging/ntop/ntop.install new file mode 100644 index 000000000..8d8063751 --- /dev/null +++ b/community-staging/ntop/ntop.install @@ -0,0 +1,8 @@ +post_install() { + /bin/cat <<EOF +==> Before running the daemon script for the first time, you need to run + ntop as the root user to set an administrator password. +==> If you attempt to run ntop as a daemon without setting a password, a + FATAL ERROR message is generated and ntop stops. +EOF +} diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD index 51cd9aa07..398840a63 100644 --- a/community/augeas/PKGBUILD +++ b/community/augeas/PKGBUILD @@ -1,18 +1,18 @@ +# $Id: PKGBUILD 59250 2011-11-22 01:03:57Z ebelanger $ # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=augeas -pkgver=0.8.0 +pkgver=0.9.0 pkgrel=1 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree" arch=('i686' 'x86_64') -license=('LGPL') url="http://augeas.net" -depends=('readline') -makedepends=('gcc' 'bison' 'flex') -options=(!libtool) +license=('LGPL') +depends=('readline' 'gcc-libs') +options=('!libtool') source=(http://augeas.net/download/$pkgname-$pkgver.tar.gz) -md5sums=('e425bcfc46fd5b18473a4ff47c2878d3') +md5sums=('5ef0ce53ce4c75f59ab2523506731084') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,5 +22,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install } diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD index 29ce3b0f0..35115de84 100644 --- a/community/bacula/PKGBUILD +++ b/community/bacula/PKGBUILD @@ -5,7 +5,7 @@ pkgname=bacula pkgver=5.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)" arch=("i686" "x86_64") url="http://www.${pkgname}.org" @@ -15,7 +15,7 @@ makedepends=("qt" "wxgtk" "gtk2") optdepends=("qt: for bat" "wxgtk: for bwx console" "gtk2: for tray monitor") -options=(!buildflags) +options=(!buildflags !libtool) conflicts=("${pkgname}-sqlite" "${pkgname}-postgresql" "${pkgname}-client") backup=("etc/${pkgname}/bconsole.conf" "etc/${pkgname}/${pkgname}-dir.conf" @@ -64,5 +64,9 @@ package() { # Logs install -D -m644 ${srcdir}/${pkgname}-${pkgver}/scripts/logrotate ${pkgdir}/etc/logrotate.d/${pkgname} sed -i "s|/var/cache/${pkgname}/working/log|/var/log/${pkgname}.log|g" ${pkgdir}/etc/{${pkgname}/${pkgname}-dir.conf,logrotate.d/${pkgname}} + + # Temporary fix for 5.2.1 symlink mishap + cd ${pkgdir}/usr/lib + ln -sf libbaccats-mysql-5.2.1.so libbaccats-5.2.1.so } diff --git a/community/btanks/PKGBUILD b/community/btanks/PKGBUILD index 1cb857a22..530c3bd98 100644 --- a/community/btanks/PKGBUILD +++ b/community/btanks/PKGBUILD @@ -1,40 +1,47 @@ +# $Id: PKGBUILD 59272 2011-11-22 09:39:15Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nick B <Shirakawasuna at gmail _dot_ com> + pkgname=btanks pkgver=0.9.8083 -pkgrel=1 +pkgrel=3 pkgdesc="Fast 2d tank arcade game with multiplayer and split-screen modes." arch=('i686' 'x86_64') url="http://btanks.sourceforge.net" license=('GPL') -depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image' 'smpeg' 'btanks-data') -makedepends=('scons' 'chrpath') +depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image' + 'smpeg' "btanks-data=$pkgver") +makedepends=('scons' 'chrpath' 'mesa') source=(http://downloads.sourceforge.net/btanks/btanks-$pkgver.tar.bz2 btanks_desktop btanks_script - bted_script) + bted_script + gcc-4.6.patch) install=btanks.install md5sums=('49cb95c0eec47d3436c4fdf65e7c9d12' 'a2ddeb1e79dff8d3fd702984c8d3aab5' '07657cfa71b1de1d008cc5e3ade9749b' - '91a61c0f581ea27281bdaecb7a3cd58b') + '91a61c0f581ea27281bdaecb7a3cd58b' + '173f0ffe46bb1bab2c8aa240fe5331f3') build() { - # Compile with scons cd $srcdir/$pkgname-$pkgver - scons || return 1 + patch -p1 <$srcdir/gcc-4.6.patch + python2 engine/sl08/sl08.py >engine/sl08/sl08.h + scons mkdir -p $pkgdir/usr/share/btanks - cp *.so btanks bted $pkgdir/usr/share/btanks/ || return 1 + cp *.so btanks bted $pkgdir/usr/share/btanks/ # Install script - install -D -m755 $srcdir/bted_script $pkgdir/usr/bin/bted && \ - install -D -m755 $srcdir/btanks_script $pkgdir/usr/bin/btanks || return 1 + install -D -m755 $srcdir/bted_script $pkgdir/usr/bin/bted + install -D -m755 $srcdir/btanks_script $pkgdir/usr/bin/btanks # Install desktop file - install -D -m644 $srcdir/btanks_desktop $pkgdir/usr/share/applications/btanks.desktop || return 1 + install -D -m644 $srcdir/btanks_desktop $pkgdir/usr/share/applications/btanks.desktop # Install icon - install -D -m644 $srcdir/$pkgname-$pkgver/data/tiles/icon.png $pkgdir/usr/share/pixmaps/btanks.png || return 1 + install -D -m644 $srcdir/$pkgname-$pkgver/data/tiles/icon.png $pkgdir/usr/share/pixmaps/btanks.png # Make settings saveable touch $pkgdir/usr/share/btanks/bt.xml @@ -45,18 +52,18 @@ build() { cd $pkgdir/usr/share/btanks mkdir -p $pkgdir/usr/bin $pkgdir/usr/lib/btanks - mv btanks $pkgdir/usr/bin/btanks-bin && \ - mv bted $pkgdir/usr/bin/bted-bin && \ - mv *.so $pkgdir/usr/lib/btanks/ || return 1 + mv btanks $pkgdir/usr/bin/btanks-bin + mv bted $pkgdir/usr/bin/bted-bin + mv *.so $pkgdir/usr/lib/btanks/ - ln -s /usr/bin/btanks-bin ./btanks && \ - ln -s /usr/bin/bted-bin ./bted || return 1 + ln -s /usr/bin/btanks-bin ./btanks + ln -s /usr/bin/bted-bin ./bted ls -1 $pkgdir/usr/lib/btanks/ | while read A; do - ln -s /usr/lib/btanks/$A ./$A || return 1 + ln -s /usr/lib/btanks/$A ./$A done - chrpath -d $pkgdir/usr/bin/bted-bin && \ - chrpath -d $pkgdir/usr/bin/btanks-bin && \ + chrpath -d $pkgdir/usr/bin/bted-bin + chrpath -d $pkgdir/usr/bin/btanks-bin chrpath -d $pkgdir/usr/lib/btanks/*.so } diff --git a/community/btanks/btanks.install b/community/btanks/btanks.install index b05ede359..f9ac8fce7 100644 --- a/community/btanks/btanks.install +++ b/community/btanks/btanks.install @@ -1,36 +1,7 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - /bin/true -} - -# arg 1: the new package version post_install() { - /bin/echo "In order to be able to change game preferences, you must be in the 'games' group." -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/true + echo "In order to be able to change game preferences, you must be in the 'games' group." } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { - /bin/echo "In order to be able to change game preferences, you must be in the 'games' group." + echo "In order to be able to change game preferences, you must be in the 'games' group." } - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -# vim:set ts=2 sw=2 et: diff --git a/community/btanks/gcc-4.6.patch b/community/btanks/gcc-4.6.patch new file mode 100644 index 000000000..d371abd53 --- /dev/null +++ b/community/btanks/gcc-4.6.patch @@ -0,0 +1,26 @@ +From: Ansgar Burchardt <ansgar@debian.org> +Bug-Debian: http://bugs.debian.org/624916 +Subject: Fix FTBFS with gcc-4.6 + +--- btanks-0.9.8083.orig/engine/sl08/sl08.py ++++ btanks-0.9.8083/engine/sl08/sl08.py +@@ -152,8 +152,8 @@ class Generator(object): + typedef base_signalXXX %s signal_type; + typedef return_type (object_type::*func_t) %s; + +- inline slotXXX () : object(NULL), func(NULL) {} +- inline slotXXX(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} ++ inline slotXXX () : object(0), func(0) {} ++ inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {} + + inline void assign(object_type *o, func_t f) { object = o; func = f; } + inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } +@@ -187,7 +187,7 @@ class Generator(object): + typedef base_signalXXX %s signal_type; + typedef void (object_type::*func_t) %s ; + +- inline slotXXX () : object(NULL), func(NULL) {} ++ inline slotXXX () : object(0), func(0) {} + inline slotXXX (object_type *object, func_t func) : object(object), func(func) {} + inline void assign(object_type *o, func_t f) { object = o; func = f; } + inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } diff --git a/community/bwbar/PKGBUILD b/community/bwbar/PKGBUILD index 9e26b7e68..72b3810c2 100644 --- a/community/bwbar/PKGBUILD +++ b/community/bwbar/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 59215 2011-11-21 15:20:03Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=bwbar @@ -8,12 +10,13 @@ pkgdesc="Generates text and graphical readout of the current bandwidth usage." url="http://www.kernel.org/pub/software/web/bwbar/" license=("GPL") depends=('libpng') -source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.gz) +#source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.gz) md5sums=('766265ddf0615b552ff19d12f78be719') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure - make || return 1 - install -D -m755 bwbar $startdir/pkg/usr/bin/bwbar + make + install -D -m755 bwbar $pkgdir/usr/bin/bwbar } diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index 9888ffd92..aaa13e93f 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57177 2011-10-23 13:23:24Z giovanni $ +# $Id: PKGBUILD 59246 2011-11-21 21:28:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid pkgver=1.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64') url="http://pcsclite.alioth.debian.org/ccid.html" @@ -29,5 +29,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 src/92_pcscd_ccid.rules "${pkgdir}/lib/udev/rules.d/85-pcscd-ccid.rules" } diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index edc48fe55..f2b6800c1 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 53245 2011-08-02 14:54:02Z spupykin $ +# $Id: PKGBUILD 59218 2011-11-21 15:21:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -8,7 +8,7 @@ pkgname=cgit pkgver=0.9.0.2 _gitver=1.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64') url="http://hjemli.net/git/cgit" @@ -16,8 +16,9 @@ license=('GPL') depends=('openssl') makedepends=('git' 'zlib' 'curl' 'asciidoc') install=cgit.install +# "http://www.kernel.org/pub/software/scm/git/git-${_gitver}.tar.bz2" source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2" - "http://www.kernel.org/pub/software/scm/git/git-${_gitver}.tar.bz2" + "http://arch.p5n.pp.ru/~sergej/dl/2011/git-${_gitver}.tar.bz2" "apache.example.conf") md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2' 'fa24dc1ef0b663327ea0fe1981365b39' diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 843123ca0..e349fab6f 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58590 2011-11-16 07:31:56Z lcarlier $ +# $Id: PKGBUILD 59248 2011-11-21 23:02:41Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.99.05 -pkgrel=3 +pkgver=1.99.06 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" @@ -15,11 +15,11 @@ makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) install=chmsee.install -md5sums=('accef6baba2842ad13c59db3627c05f1' +md5sums=('fb11a4492795635bda843064f5b7f261' '4999362b0c89c24764cbd25173610a38') build() { - cd ${srcdir}/jungleji-chmsee-370f906/src + cd ${srcdir}/jungleji-chmsee-dd9130e/src cp Makefile.arch Makefile sed -i -e 's/5.0/8.0/g' Makefile @@ -28,7 +28,7 @@ build() { } package() { - cd ${srcdir}/jungleji-chmsee-370f906 + cd ${srcdir}/jungleji-chmsee-dd9130e install -d ${pkgdir}/usr/share/chmsee cp -a * ${pkgdir}/usr/share/chmsee diff --git a/community/clipgrab/PKGBUILD b/community/clipgrab/PKGBUILD index 52618ef13..d173f4ef5 100644 --- a/community/clipgrab/PKGBUILD +++ b/community/clipgrab/PKGBUILD @@ -1,28 +1,31 @@ -# Contributor: thacrazze <thacrazze|googlemail|com> +# $Id: PKGBUILD 59252 2011-11-22 02:19:48Z ebelanger $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: thacrazze <thacrazze|googlemail|com> + pkgname=clipgrab -pkgver=3.1.0.2 +pkgver=3.1.3.0 pkgrel=1 pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...' arch=('i686' 'x86_64') url='http://clipgrab.de/' -license=('GPL') +license=('GPL3') depends=('qt') optdepends=('ffmpeg: for some encodings') -source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop) -md5sums=('1250e1fb29cd88b7ce1a37d937de0146' - 'ef030502ae0922e632742f47283313f4' +source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 + ${pkgname}.desktop) +md5sums=('3e8f5ab9ef0144fa234cf3b725797123' '9a141791f6952917c441050c3dac81ce') build() { - cd $srcdir/$pkgname-$pkgver - qmake && make + cd "$srcdir/$pkgname-$pkgver" + qmake + make } + package() { - cd $srcdir/$pkgname-$pkgver - install -Dm755 ${pkgname} $pkgdir/usr/bin/${pkgname} - install -Dm644 $srcdir/${pkgname}.png \ - $pkgdir/usr/share/pixmaps/${pkgname}.png - install -Dm644 $srcdir/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + cd "$srcdir/$pkgname-$pkgver" + install -Dm755 ${pkgname} "$pkgdir/usr/bin/${pkgname}" + install -Dm644 icon.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" + install -Dm644 "$srcdir/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" } diff --git a/community/cupsddk/PKGBUILD b/community/cupsddk/PKGBUILD index 7c39b38da..3eb2dfc7a 100644 --- a/community/cupsddk/PKGBUILD +++ b/community/cupsddk/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 59197 2011-11-21 14:56:56Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Georg Grabler (STiAT) <ggrabler@gmail.com> # Contributor: Georg Grabler (STiAT) <ggrabler@gmail.com> @@ -6,27 +8,29 @@ pkgver=1.2.3 pkgrel=3 pkgdesc="CUPSD Development Kit" url="http://cups.org" -license="GPL" +license=("GPL") depends=('libcups') -makedepends=('libcups') +makedepends=('libcups' 'cups') arch=('i686' 'x86_64') options=('!emptydirs') source=(http://ftp.easysw.com/pub/cupsddk/$pkgver/$pkgname-$pkgver-source.tar.bz2) md5sums=('3ec52813bf12bf9b34d34f8a81bab508') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 - make bindir=$startdir/pkg/usr/bin \ - datadir=$startdir/pkg/usr/share \ - docdir=$startdir/pkg/usr/share/cupsddk \ - mandir=$startdir/pkg/usr/share/man \ - prefix=$startdir/pkg/usr \ - CUPS_DATADIR=$startdir/pkg/`cups-config --datadir` \ - CUPS_SERVERBIN=$startdir/pkg/`cups-config --serverbin` \ - install || return 1 + sed -i '1,1i#include <cups/ppd.h>' ppdc/ppdmerge.cxx + sed -i 's|mkdir images|mkdir -p images|' cups/Makefile* + make + make bindir=$pkgdir/usr/bin \ + datadir=$pkgdir/usr/share \ + docdir=$pkgdir/usr/share/cupsddk \ + mandir=$pkgdir/usr/share/man \ + prefix=$pkgdir/usr \ + CUPS_DATADIR=$pkgdir/`cups-config --datadir` \ + CUPS_SERVERBIN=$pkgdir/`cups-config --serverbin` \ + install rm -f $pkgdir/usr/include/cups/driver.h rm -f $pkgdir/usr/bin/ppdc diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index 4d4e547f3..21e58a30b 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,19 +1,36 @@ -# $Id: PKGBUILD 55808 2011-09-21 20:41:16Z spupykin $ +# $Id: PKGBUILD 59192 2011-11-21 14:39:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> -pkgname=cython +pkgname=('cython' 'cython2') +pkgbase=cython pkgver=0.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="C-Extensions for Python " arch=(i686 x86_64) url="http://www.cython.org" license=('APACHE') -depends=('python2') +makedepends=('python-distribute' 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") md5sums=('171021b3845c9ca8bd6d8185b3cde664') build() { + true +} + +package_cython() { + depends=('python') + + cd $srcdir/Cython-$pkgver + python setup.py install --root=$pkgdir +} + +package_cython2() { + depends=('python2') + cd $srcdir/Cython-$pkgver python2 setup.py install --root=$pkgdir + + mv $pkgdir/usr/bin/cygdb $pkgdir/usr/bin/cygdb2 + mv $pkgdir/usr/bin/cython $pkgdir/usr/bin/cython2 } diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD index 6ba4d9331..7ea29eab2 100644 --- a/community/dietlibc/PKGBUILD +++ b/community/dietlibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17510 2010-05-24 14:18:16Z spupykin $ +# $Id: PKGBUILD 59221 2011-11-21 15:22:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de> @@ -9,12 +9,13 @@ pkgdesc="a libc optimized for small size" arch=('i686' 'x86_64') url="http://www.fefe.de/dietlibc/" license=("GPL") -source=(http://www.kernel.org/pub/linux/libs/dietlibc/$pkgname-$pkgver.tar.bz2) +#source=(http://www.kernel.org/pub/linux/libs/dietlibc/$pkgname-$pkgver.tar.bz2) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.bz2) md5sums=('0098761c17924c15e21d25acdda4a8b5') build() { - cd $startdir/src/$pkgname-$pkgver - make -j1 all dyn || return 1 - mkdir -p $startdir/pkg/etc - make DESTDIR=$startdir/pkg install || return 1 + cd $srcdir/$pkgname-$pkgver + make -j1 all dyn + mkdir -p $pkgdir/etc + make DESTDIR=$pkgdir install } diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index efa4b5a35..86e92123e 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,31 +1,26 @@ +# $Id: PKGBUILD 59254 2011-11-22 03:06:06Z ebelanger $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> + pkgname=fotoxx -pkgver=11.10 -pkgrel=1 +pkgver=11.11.1 +pkgrel=3 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" arch=('i686' 'x86_64') license=('GPL3') -depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils') +depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') -source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('c312f980dab199f50fc76374d062135a') install=fotoxx.install +source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") +md5sums=('c51f6682639bd7d2e5f1df4d03f09e53') build() { - cd $srcdir/$pkgname-$pkgver - sed -i 's+xdg-deskto+#xdg-deskto+' Makefile - make PREFIX=/usr \ - CFLAGS+="-c `pkg-config --cflags gtk+-2.0`" \ - LFLAGS+="`pkg-config --libs gtk+-2.0 gthread-2.0`" - sed -i 's+^# ++' data/desktop - sed -i 's+@PREFIX@+/usr+' data/desktop + cd "$srcdir/$pkgname-$pkgver" + sed -e 's+xdg-deskto+#xdg-deskto+' -e 's/kornelix-//' -i Makefile + make PREFIX=/usr } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir PREFIX=/usr install - rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop - install -Dm644 data/desktop \ - $pkgdir/usr/share/applications/$pkgname.desktop + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" PREFIX=/usr install } diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 1b0a27fbe..24eda6252 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -6,7 +6,7 @@ pkgname=go pkgver=r60.3 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Google Go compiler and tools (release version)' arch=('i686' 'x86_64') @@ -45,7 +45,6 @@ build() { export GOOS=linux export GOBIN="$GOROOT/bin" export PATH="$GOBIN:$PATH" - export CGO_ENABLED=0 # disable building net against libc, not needed on arch linux(?) mkdir -p "$GOROOT/bin" cd "$GOROOT/src" diff --git a/community/gtk2+extra/PKGBUILD b/community/gtk2+extra/PKGBUILD index 022689753..0ade4d067 100644 --- a/community/gtk2+extra/PKGBUILD +++ b/community/gtk2+extra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 27873 2010-09-29 08:19:27Z spupykin $ +# $Id: PKGBUILD 59120 2011-11-21 11:35:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -11,14 +11,15 @@ url="http://gtkextra.sourceforge.net/" depends=('gtk2') license=('LGPL') options=('!libtool') -source=(http://downloads.sourceforge.net/project/gtkextra/$pkgver/gtk%2Bextra-$pkgver.tar.gz) -md5sums=('10779394f39d39115fa3fd0f3dea4436') +source=(http://downloads.sourceforge.net/project/gtkextra/$pkgver/gtk%2Bextra-$pkgver.tar.gz + build-fix.patch) +md5sums=('10779394f39d39115fa3fd0f3dea4436' + '114c10e7dc14dc78fc38189ee82fa225') build() { cd $srcdir/gtk+extra-$pkgver -# patch -Np0 -i ../gtksheet_unref.patch -# patch -Np1 -i ../gtk2-2.18.3-build-fix.patch + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/gtk2+extra/build-fix.patch b/community/gtk2+extra/build-fix.patch new file mode 100644 index 000000000..fe44f6ad8 --- /dev/null +++ b/community/gtk2+extra/build-fix.patch @@ -0,0 +1,85 @@ +diff -ur gtk+extra-2.1.2/gtkextra/gtkextra-marshal.list gtk+extra-2.1.2.my/gtkextra/gtkextra-marshal.list +--- gtk+extra-2.1.2/gtkextra/gtkextra-marshal.list 2002-06-14 22:36:36.000000000 +0400 ++++ gtk+extra-2.1.2.my/gtkextra/gtkextra-marshal.list 2011-11-21 15:30:00.000000000 +0400 +@@ -10,6 +10,7 @@ + BOOL:BOXED + BOOL:INT,INT + VOID:INT ++VOID:INT,BOXED + VOID:INT,STRING + VOID:BOXED + VOID:VOID +diff -ur gtk+extra-2.1.2/gtkextra/gtkitementry.c gtk+extra-2.1.2.my/gtkextra/gtkitementry.c +--- gtk+extra-2.1.2/gtkextra/gtkitementry.c 2010-03-13 08:49:00.000000000 +0300 ++++ gtk+extra-2.1.2.my/gtkextra/gtkitementry.c 2011-11-21 15:25:18.000000000 +0400 +@@ -131,7 +131,6 @@ + static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry, + gboolean include_preedit); + static void gtk_entry_queue_draw (GtkEntry *entry); +-static void gtk_entry_reset_im_context (GtkEntry *entry); + static void gtk_entry_recompute (GtkEntry *entry); + static void gtk_entry_get_cursor_locations (GtkEntry *entry, + CursorType type, +@@ -1755,16 +1754,6 @@ + } + + static void +-gtk_entry_reset_im_context (GtkEntry *entry) +-{ +- if (entry->need_im_reset) +- { +- entry->need_im_reset = 0; +- gtk_im_context_reset (entry->im_context); +- } +-} +- +-static void + gtk_entry_get_cursor_locations (GtkEntry *entry, + CursorType type, + gint *strong_x, +diff -ur gtk+extra-2.1.2/gtkextra/Makefile.am gtk+extra-2.1.2.my/gtkextra/Makefile.am +--- gtk+extra-2.1.2/gtkextra/Makefile.am 2005-06-16 02:54:34.000000000 +0400 ++++ gtk+extra-2.1.2.my/gtkextra/Makefile.am 2011-11-21 15:25:18.000000000 +0400 +@@ -197,13 +197,13 @@ + $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers} + + $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ +- && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ +- || ( rm -f gtkextra-marshal.tmp && exit 1 ) ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ ++ && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ ++ || ( rm -f gtkextra-marshal.tmp && exit 1 ) + $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ +- && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ +- || ( rm -f gtkextra-marshal.tmp && exit 1 ) ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ ++ && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ ++ || ( rm -f gtkextra-marshal.tmp && exit 1 ) + + + $(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources) +diff -ur gtk+extra-2.1.2/gtkextra/Makefile.in gtk+extra-2.1.2.my/gtkextra/Makefile.in +--- gtk+extra-2.1.2/gtkextra/Makefile.in 2010-03-21 03:05:56.000000000 +0300 ++++ gtk+extra-2.1.2.my/gtkextra/Makefile.in 2011-11-21 15:25:18.000000000 +0400 +@@ -1028,13 +1028,13 @@ + $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers} + + $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ +- && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ +- || ( rm -f gtkextra-marshal.tmp && exit 1 ) ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ ++ && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ ++ || ( rm -f gtkextra-marshal.tmp && exit 1 ) + $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ +- && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ +- || ( rm -f gtkextra-marshal.tmp && exit 1 ) ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ ++ && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ ++ || ( rm -f gtkextra-marshal.tmp && exit 1 ) + + $(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources) + ( cd $(srcdir) && glib-mkenums \ diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index c9263a8b2..92b3bec3e 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58668 2011-11-17 12:39:33Z arodseth $ +# $Id: PKGBUILD 59136 2011-11-21 12:20:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haddock pkgver=2.9.2 -pkgrel=3 +pkgrel=4 pkgdesc="Tool for generating documentation for Haskell libraries" url="http://hackage.haskell.org/package/$pkgname" license=('custom:BSD3') diff --git a/community/haddock/haddock.install b/community/haddock/haddock.install index 97cdaefdc..24e27a074 100644 --- a/community/haddock/haddock.install +++ b/community/haddock/haddock.install @@ -3,7 +3,7 @@ HS_DIR=usr/share/haskell/haddock post_upgrade() { ${HS_DIR}/register.sh &> /dev/null - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null + post_remove } post_remove() { diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD index 0e6211808..b8eb90516 100644 --- a/community/inputattach/PKGBUILD +++ b/community/inputattach/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48320 2011-05-31 10:23:41Z spupykin $ +# $Id: PKGBUILD 59224 2011-11-21 15:24:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> @@ -13,10 +13,14 @@ depends=('bash') makedepends=('gcc') backup=(etc/conf.d/inputattach) install=inputattach.install -source=('http://kernel.org/pub/linux/kernel/people/dtor/inputattach.c' - 'http://kernel.org/pub/linux/kernel/people/dtor/serio-ids.h' - 'inputattach.conf.d' 'inputattach.rc.d' - '0001-Add-w8001-flag.patch' '0002-Allow-for-custom-baud-rates.patch') +#source=('http://kernel.org/pub/linux/kernel/people/dtor/inputattach.c' +# 'http://kernel.org/pub/linux/kernel/people/dtor/serio-ids.h' +source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c' + 'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h' + 'inputattach.conf.d' + 'inputattach.rc.d' + '0001-Add-w8001-flag.patch' + '0002-Allow-for-custom-baud-rates.patch') md5sums=('eb595a766ca363edb3b14c25404596ce' '93d34d96cd3ad19ea1aeca7f68a66b4a' '7ca903e54829764c8241233af5069216' @@ -26,23 +30,15 @@ md5sums=('eb595a766ca363edb3b14c25404596ce' build() { cd "$srcdir" - # Add support for serial wacom tablets patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch" patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch" - cc $CFLAGS inputattach.c -o inputattach } package() { cd "$srcdir" - - install -Dm755 inputattach \ - "$pkgdir/usr/sbin/inputattach" - - install -Dm644 $srcdir/inputattach.conf.d \ - "$pkgdir/etc/conf.d/inputattach" - - install -Dm755 $srcdir/inputattach.rc.d \ - "$pkgdir/etc/rc.d/inputattach" + install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach" + install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" + install -Dm755 $srcdir/inputattach.rc.d "$pkgdir/etc/rc.d/inputattach" } diff --git a/community/kleansweep/PKGBUILD b/community/kleansweep/PKGBUILD index b16dfc337..04142c8eb 100644 --- a/community/kleansweep/PKGBUILD +++ b/community/kleansweep/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40230 2011-02-22 02:27:36Z stephane $ +# $Id: PKGBUILD 59212 2011-11-21 15:18:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Guillermo A. Amaral <me@guillermoamaral.com> @@ -12,16 +12,16 @@ arch=(i686 x86_64) depends=('kdelibs3' 'python') makedepends=('scons') options=('libtool') -source=(http://linux-projects.net/d/kleansweep-$pkgver.tar.gz +#source=(http://linux-projects.net/d/kleansweep-$pkgver.tar.gz +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/kleansweep-$pkgver.tar.gz kubuntu_03_fix_scons_chmod_error.patch) md5sums=('25fea364644590acd23fe766506e0b92' 'bebb833313fc184848b5fef77a7cb310') -build() -{ +build() { cd $srcdir/$pkgname-$pkgver [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/kubuntu_03_fix_scons_chmod_error.patch [ $NOEXTRACT -eq 1 ] || ./configure - scons + scons scons install DESTDIR=$pkgdir } diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 36ad9a5fe..11fe6c362 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58117 2011-11-06 17:51:08Z spupykin $ +# $Id: PKGBUILD 59260 2011-11-22 06:42:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.16 +pkgver=0.9.17 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('e1240c6ae383b5be89431932f181898a') +md5sums=('d6802049c806e903ef1fa9c5b847e555') build() { cd ${pkgname}-${pkgver} diff --git a/community/libpqxx/PKGBUILD b/community/libpqxx/PKGBUILD index 24d52cc41..c66e1ff07 100644 --- a/community/libpqxx/PKGBUILD +++ b/community/libpqxx/PKGBUILD @@ -10,13 +10,16 @@ license=('custom') url="http://pqxx.org/development/libpqxx/" depends=('postgresql-libs>=8.4.1') options=('!libtool') -source=("http://pqxx.org/download/software/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('4993a516eb88d8a51125607db30ad2ef') +source=("http://pqxx.org/download/software/${pkgname}/${pkgname}-${pkgver}.tar.gz" + build-fix.patch) +md5sums=('4993a516eb88d8a51125607db30ad2ef' + 'e59f5f63e1800406bf494e19cea479a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr --enable-shared - make || return 1 + make make prefix="${pkgdir}/usr" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/libpqxx/build-fix.patch b/community/libpqxx/build-fix.patch new file mode 100644 index 000000000..12795e517 --- /dev/null +++ b/community/libpqxx/build-fix.patch @@ -0,0 +1,11 @@ +diff -wbBur libpqxx-3.1/include/pqxx/compiler-internal.hxx libpqxx-3.1.my/include/pqxx/compiler-internal.hxx +--- libpqxx-3.1/include/pqxx/compiler-internal.hxx 2010-02-16 02:21:36.000000000 +0300 ++++ libpqxx-3.1.my/include/pqxx/compiler-internal.hxx 2011-11-21 15:56:00.000000000 +0400 +@@ -18,6 +18,7 @@ + #ifndef PQXX_H_COMPILER_INTERNAL + #define PQXX_H_COMPILER_INTERNAL + ++#include <cstddef> + + // Workarounds & definitions needed to compile libpqxx into a library + #include "pqxx/config-internal-compiler.h" diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD index 893559266..9cf2f5118 100644 --- a/community/luasec/PKGBUILD +++ b/community/luasec/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 59126 2011-11-21 11:54:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.1@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> @@ -14,17 +14,17 @@ depends=('openssl>=0.9.7' 'lua>=5.1' 'luasocket>=2.0.2') source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/$pkgname-$pkgver.tar.gz" 'luasec.patch') md5sums=('712158d60207bdbb6215fc7e07d8db24' - '6f607af3351454754762421b27afe7f6') + '25e48c1115225d9884cdb7f5ca4949a9') build() { - install -d "$pkgdir/usr/share/lua/5.1" || return 1 - install -d "$pkgdir/usr/lib/lua/5.1" || return 1 - install -d "$pkgdir/usr/share/licenses/$pkgname" || return 1 + install -d "$pkgdir/usr/share/lua/5.1" + install -d "$pkgdir/usr/lib/lua/5.1" + install -d "$pkgdir/usr/share/licenses/$pkgname" cd "$srcdir/$pkgname-$pkgver" - patch -p1 Makefile "$startdir/luasec.patch" || return 1 - make linux || return 1 - make DESTDIR=$pkgdir install || return 1 + patch -p1 Makefile "$srcdir/luasec.patch" + make linux + make DESTDIR=$pkgdir install - install -m644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1 + install -m644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/luasec/luasec.patch b/community/luasec/luasec.patch index 96035df7a..7b0c9d6cc 100644 --- a/community/luasec/luasec.patch +++ b/community/luasec/luasec.patch @@ -12,7 +12,7 @@ -#INCDIR=-I/usr/local/lua-5.1/include -I/usr/local/openssl-0.9.8/include -#LIBDIR=-L/usr/local/openssl-0.9.8/lib -R/usr/local/openssl-0.9.8/lib +INCDIR=-I/usr/include -I/usr/include/openssl -+LIBDIR=-L/usr/lib -R/usr/lib ++LIBDIR=-L/usr/lib # For Mac OS X: set the system version MACOSX_VERSION=10.4 diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD index 33eb36008..cfd72dee2 100644 --- a/community/mashup/PKGBUILD +++ b/community/mashup/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mashup -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="Adjusting images on a sheet of paper for printing" url="http://kornelix.squarespace.com/$pkgname" @@ -11,7 +11,7 @@ license=('GPL3') depends=('gtk2') replaces=('printoxx') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('517555734dac1d9298f4c36e91b9e122') +md5sums=('0d8286747d5cd1a65907c7d70c7a99e5') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/mg/PKGBUILD b/community/mg/PKGBUILD index cdb1b05e2..fccdab16a 100644 --- a/community/mg/PKGBUILD +++ b/community/mg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 39953 2011-02-18 23:29:32Z spupykin $ +# $Id: PKGBUILD 59123 2011-11-21 11:46:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hannes Rist <hrist@phreeknet.org> @@ -12,15 +12,16 @@ depends=('ncurses') license=('custom') options=(!libtool) source=(http://homepage.boetes.org/software/mg/mg-$pkgver.tar.gz - README) + README + cleanup.patch) md5sums=('f2fa8016a491aa2a9d4c5698c593f31b' - '8cc5195ad4fabcf7c6782764f9617748') + '8cc5195ad4fabcf7c6782764f9617748' + 'e009afe0d249593f3436b2fea110f72e') build() { cd $srcdir/$pkgname-$pkgver - - sed -i 's|KEYMAP\t\*curmap;|KEYMAP *curmap = NULL;|' extend.c - + unset CFLAGS + patch -p1 <$srcdir/cleanup.patch ./configure make prefix=/usr diff --git a/community/mg/cleanup.patch b/community/mg/cleanup.patch new file mode 100644 index 000000000..5a8e761cb --- /dev/null +++ b/community/mg/cleanup.patch @@ -0,0 +1,163 @@ +Only in mg-20110120.my: autoexec.o +Only in mg-20110120.my: basename.o +Only in mg-20110120.my: basic.o +Only in mg-20110120.my: buffer.o +Only in mg-20110120.my: cinfo.o +diff -wbBur mg-20110120/cmode.c mg-20110120.my/cmode.c +--- mg-20110120/cmode.c 2011-01-20 07:36:13.000000000 +0300 ++++ mg-20110120.my/cmode.c 2011-11-21 15:40:11.000000000 +0400 +@@ -158,7 +158,7 @@ + cc_indent(int f, int n) + { + int pi, mi; /* Previous indents */ +- int ci, dci; /* current indent, don't care */ ++ int ci; /* current indent, don't care */ + struct line *lp; + int ret; + +@@ -181,7 +181,7 @@ + /* Strip leading space on current line */ + delleadwhite(FFRAND, 1); + /* current indent is computed only to current position */ +- dci = getindent(curwp->w_dotp, &ci); ++ getindent(curwp->w_dotp, &ci); + + if (pi + ci < 0) + ret = indent(FFOTHARG, 0); +@@ -217,7 +217,6 @@ + { + int lo, co; /* leading space, current offset*/ + int nicol = 0; /* position count */ +- int ccol = 0; /* current column */ + int c = '\0'; /* current char */ + int newind = 0; /* new index value */ + int stringp = FALSE; /* in string? */ +@@ -226,7 +225,6 @@ + int nparen = 0; /* paren count */ + int obrace = 0; /* open brace count */ + int cbrace = 0; /* close brace count */ +- int contp = FALSE; /* Continue? */ + int firstnwsp = FALSE; /* First nonspace encountered? */ + int colonp = FALSE; /* Did we see a colon? */ + int questionp = FALSE; /* Did we see a question mark? */ +@@ -256,13 +254,11 @@ + nicol = 0; + + newind = 0; +- ccol = nicol; /* current column */ + /* Compute modifiers */ + for (co = lo; co < llength(lp); co++) { + c = lgetc(lp, co); + /* We have a non-whitespace char */ + if (!firstnwsp && !isspace(c)) { +- contp = TRUE; + if (c == '#') + cppp = TRUE; + firstnwsp = TRUE; +@@ -285,7 +281,6 @@ + } else if (c == '{') { + obrace++; + firstnwsp = FALSE; +- contp = FALSE; + } else if (c == '}') { + cbrace++; + } else if (c == '?') { +@@ -294,9 +289,6 @@ + /* ignore (foo ? bar : baz) construct */ + if (!questionp) + colonp = TRUE; +- } else if (c == ';') { +- if (nparen > 0) +- contp = FALSE; + } else if (c == '/') { + /* first nonwhitespace? -> indent */ + if (firstnwsp) { +Only in mg-20110120.my: cmode.o +diff -wbBur mg-20110120/config.h mg-20110120.my/config.h +--- mg-20110120/config.h 2011-01-20 07:37:40.000000000 +0300 ++++ mg-20110120.my/config.h 2011-11-21 15:39:43.000000000 +0400 +@@ -7,4 +7,8 @@ + #ifndef MAXLOGNAME + #define MAXLOGNAME LOGIN_NAME_MAX + #endif +-#define HAVE_ARC4RANDOM ++#define HAVE_NOSTRTONUM ++#define HAVE_NOSTRLCPY ++#define HAVE_NOSTRLCAT ++#define HAVE_NOFGETLN ++#define GNU_LS +Only in mg-20110120.my: config.log +Only in mg-20110120.my: dired.o +Only in mg-20110120.my: dirname.o +Only in mg-20110120.my: dir.o +Only in mg-20110120.my: display.o +Only in mg-20110120.my: echo.o +Only in mg-20110120.my: extend.o +Only in mg-20110120.my: fgetln.o +diff -wbBur mg-20110120/fileio.c mg-20110120.my/fileio.c +--- mg-20110120/fileio.c 2008-12-30 19:04:23.000000000 +0300 ++++ mg-20110120.my/fileio.c 2011-11-21 15:43:12.000000000 +0400 +@@ -121,10 +121,8 @@ + * future writes will do the same thing. + */ + if (bp && bp->b_fi.fi_mode) { +- int ret; +- + fchmod(fd, bp->b_fi.fi_mode & 07777); +- ret = fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid); ++ (void)fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid); + } + return (FIOSUC); + } +Only in mg-20110120.my: fileio.o +Only in mg-20110120.my: file.o +Only in mg-20110120.my: funmap.o +Only in mg-20110120.my: grep.o +Only in mg-20110120.my: help.o +Only in mg-20110120.my: kbd.o +Only in mg-20110120.my: keymap.o +Only in mg-20110120.my: line.o +Only in mg-20110120.my: macro.o +Only in mg-20110120.my: main.o +Only in mg-20110120.my: Makefile +Only in mg-20110120.my: match.o +Only in mg-20110120.my: mg +Only in mg-20110120.my: modes.o +Only in mg-20110120.my: paragraph.o +Only in mg-20110120.my: random.o +Only in mg-20110120.my: region.o +Only in mg-20110120.my: re_search.o +Only in mg-20110120.my: search.o +Only in mg-20110120.my: spawn.o +Only in mg-20110120.my: strlcat.o +Only in mg-20110120.my: strlcpy.o +Only in mg-20110120.my: strtonum.o +Only in mg-20110120.my: theo.o +Only in mg-20110120.my: ttyio.o +Only in mg-20110120.my: ttykbd.o +Only in mg-20110120.my: tty.o +diff -wbBur mg-20110120/undo.c mg-20110120.my/undo.c +--- mg-20110120/undo.c 2011-01-03 01:57:57.000000000 +0300 ++++ mg-20110120.my/undo.c 2011-11-21 15:41:05.000000000 +0400 +@@ -464,14 +464,14 @@ + struct undo_rec *ptr, *nptr; + int done, rval; + struct line *lp; +- int offset, save, dot; ++ int offset, save; + static int nulled = FALSE; + int lineno; + + if (n < 0) + return (FALSE); + +- dot = find_dot(curwp->w_dotp, curwp->w_doto); ++ find_dot(curwp->w_dotp, curwp->w_doto); + + ptr = curbp->b_undoptr; + +Only in mg-20110120.my: undo.o +Only in mg-20110120.my: version.o +Only in mg-20110120.my: window.o +Only in mg-20110120.my: word.o +Only in mg-20110120.my: yank.o diff --git a/community/mimetex/PKGBUILD b/community/mimetex/PKGBUILD index 6a1b71b20..e6ceb75de 100644 --- a/community/mimetex/PKGBUILD +++ b/community/mimetex/PKGBUILD @@ -1,3 +1,6 @@ +# $Id: PKGBUILD 59132 2011-11-21 12:05:32Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + pkgname=mimetex pkgver=1.70 pkgrel=2 @@ -5,13 +8,12 @@ pkgdesc="tex to gif converter" arch=(i686 x86_64) url="http://www.forkosh.com/mimetex.html" license=('GPL') -depends=(glibc) -source=(http://arch.pp.ru/~sergej/dl/mimetex.zip) +depends=() +source=(ftp://ftp.archlinux.org/other/community/mimetex/mimetex.zip) md5sums=('c73b1dde70526edb137daaf72189024b') build() { cd $srcdir - - gcc -DAA mimetex.c gifsave.c -lm -o mimetex.cgi && \ + gcc -DAA mimetex.c gifsave.c -lm -o mimetex.cgi install -D -m0755 mimetex.cgi $pkgdir/usr/bin/mimetex.cgi } diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index f69a94afa..ae678386f 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 31503 2010-11-01 10:29:17Z spupykin $ +# $Id: PKGBUILD 59154 2011-11-21 12:39:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo @@ -9,7 +9,9 @@ arch=('i686' 'x86_64') url="http://www.remlab.net/miredo/" license=('GPL') depends=(judy iproute2) -backup=('etc/miredo/miredo.conf' 'etc/miredo/miredo-server.conf' 'etc/miredo/isatapd.conf') +backup=('etc/miredo/miredo.conf' + 'etc/miredo/miredo-server.conf' + 'etc/miredo/isatapd.conf') source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2 isatapd.rc.d miredo.install @@ -28,8 +30,8 @@ build() { make make DESTDIR="$pkgdir" install - install -D -m755 $startdir/miredo.rc.d $pkgdir/etc/rc.d/miredo - install -D -m755 $startdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server - install -D -m755 $startdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd + install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo + install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server + install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook } diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD new file mode 100644 index 000000000..2fb3842b7 --- /dev/null +++ b/community/mksh/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 59301 2011-11-22 22:07:16Z ttopper $ +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +# Contributor: Daniel Hommel <dhommel@gmail.com> + +pkgname=mksh +pkgver=R40c +pkgrel=2 +pkgdesc="The MirOS KornShell - an enhanced version of the public domain ksh" +url="http://mirbsd.de/mksh" +license=("custom") +makedepends=('cpio') +arch=('i686' 'x86_64') +install=mksh.install +source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.cpio.gz" + "https://www.mirbsd.org/TaC-mksh.txt") +md5sums=('43a79f721091833bdab3d00fbfe54a14' + '6baf6a174d89c47cac86118dc9e93faa') + +build() { + cd "$srcdir" + # makepkg can't extract cpio files + cpio -mid < "$pkgname-$pkgver.cpio" + + cd "$srcdir/$pkgname" + sh Build.sh -r -c lto + ./test.sh + gzip mksh.1 +} + +package() { + cd "$srcdir/$pkgname" + install -D -m 755 mksh "$pkgdir/bin/mksh" + install -D -m 644 mksh.1.gz "$pkgdir/usr/share/man/man1/mksh.1.gz" + install -D -m 644 dot.mkshrc "$pkgdir/etc/skel/.mkshrc" + install -D -m 644 "$srcdir/TaC-mksh.txt" "$pkgdir/usr/share/licenses/mksh/TaC-mksh.txt" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mksh/mksh.install b/community/mksh/mksh.install new file mode 100644 index 000000000..859fa51c2 --- /dev/null +++ b/community/mksh/mksh.install @@ -0,0 +1,13 @@ +post_install() { + grep -x /bin/mksh /etc/shells >/dev/null || echo /bin/mksh >>/etc/shells +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + sed -i "/\/bin\/mksh/d" /etc/shells +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD index cc4d4f85b..bdb479906 100644 --- a/community/mypaint/PKGBUILD +++ b/community/mypaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51725 2011-07-13 14:26:16Z spupykin $ +# $Id: PKGBUILD 59299 2011-11-22 22:00:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=mypaint -pkgver=0.9.1 -pkgrel=3 +pkgver=1.0.0 +pkgrel=1 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" arch=('i686' 'x86_64') url="http://mypaint.intilinux.com/" @@ -13,7 +13,7 @@ depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2') makedepends=('scons>=0.97' 'swig>=1.3.39') install=mypaint.install source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('6249a16359a438d6dc658f5765b35515') +md5sums=('dcd43933746a4579e7994f506e097823') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/nbtscan/PKGBUILD b/community/nbtscan/PKGBUILD index f7b093267..f7c2fd2be 100755 --- a/community/nbtscan/PKGBUILD +++ b/community/nbtscan/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 59205 2011-11-21 15:02:49Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergio Rubio <rubiojr@biondofu.net> pkgname=nbtscan @@ -8,19 +10,21 @@ arch=('i686' 'x86_64') license=('GPL') depends=(glibc) url="http://www.inetcat.net/software/nbtscan.html" -source=(http://www.sourcefiles.org/Networking/Tools/Miscellanenous/nbtscan-1.5.1.tar.gz) -md5sums=('85bb085077c380b82a6ff73e0de0c154') +source=(http://www.sourcefiles.org/Networking/Tools/Miscellanenous/nbtscan-1.5.1.tar.gz + nbtscan.1.gz) +md5sums=('85bb085077c380b82a6ff73e0de0c154' + 'c9b7f61d2be12af5edc120142341c5f7') build() { cd $srcdir/$pkgname-${pkgver}a ./configure --prefix=/usr - make || return 1 + make # Copy the binary mkdir -p $pkgdir/usr/bin cp nbtscan $pkgdir/usr/bin - cd $startdir + cd $srcdir # Include the nbtscan debian man page mkdir -p $pkgdir/usr/share/man/man1 cp nbtscan.1.gz $pkgdir/usr/share/man/man1 diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD index abee474a9..f0ebc38e4 100644 --- a/community/net6/PKGBUILD +++ b/community/net6/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 54475 2011-08-18 15:08:16Z bluewind $ -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 59157 2011-11-21 12:41:35Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -15,11 +16,11 @@ options=('!libtool') source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz build-fix.patch) md5sums=('506776416d8aea2b9ea13a81f9145383' - '18ac67590d6bce0a0a4a6a21af8da429') + 'a200e6f132839782e3e5cfdf438e79d3') build() { cd ${srcdir}/$pkgname-$pkgver - patch -Rp1 <$srcdir/build-fix.patch + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr make make DESTDIR=${pkgdir} install diff --git a/community/net6/build-fix.patch b/community/net6/build-fix.patch index 7e932bce6..cfe79afeb 100644 --- a/community/net6/build-fix.patch +++ b/community/net6/build-fix.patch @@ -1,24 +1,33 @@ -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp ---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp 2011-08-09 00:19:29.000000000 +0400 -+++ net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 +diff -wbBur net6-1.3.12/inc/encrypt.hpp net6-1.3.12.my/inc/encrypt.hpp +--- net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 ++++ net6-1.3.12.my/inc/encrypt.hpp 2011-11-21 16:39:32.000000000 +0400 @@ -34,7 +34,7 @@ typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t; typedef gnutls_transport_ptr gnutls_transport_ptr_t; typedef gnutls_dh_params gnutls_dh_params_t; --//typedef gnutls_connection_end gnutls_connection_end_t; -+typedef gnutls_connection_end gnutls_connection_end_t; +-typedef gnutls_connection_end gnutls_connection_end_t; ++//typedef gnutls_connection_end gnutls_connection_end_t; class dh_params: private net6::non_copyable { -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp ---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp 2011-08-09 00:20:12.000000000 +0400 -+++ net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 +diff -wbBur net6-1.3.12/src/encrypt.cpp net6-1.3.12.my/src/encrypt.cpp +--- net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 ++++ net6-1.3.12.my/src/encrypt.cpp 2011-11-21 16:39:49.000000000 +0400 @@ -25,7 +25,7 @@ { const unsigned int DH_BITS = 1024; -- net6::gnutls_session_t create_session(gnutls_connection_end_t end) -+ net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) +- net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) ++ net6::gnutls_session_t create_session(gnutls_connection_end_t end) { net6::gnutls_session_t session; gnutls_init(&session, end); +@@ -201,8 +201,6 @@ + net6_unix_send_func + ); + #endif +- +- gnutls_transport_set_lowat(session, 0); + } + + net6::tcp_encrypted_socket_base::~tcp_encrypted_socket_base() diff --git a/community/netwatch/PKGBUILD b/community/netwatch/PKGBUILD index 8078c2af7..13953b968 100644 --- a/community/netwatch/PKGBUILD +++ b/community/netwatch/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17608 2010-05-24 15:34:28Z spupykin $ +# $Id: PKGBUILD 59160 2011-11-21 12:43:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=netwatch @@ -16,10 +16,11 @@ md5sums=('9168c20c1984e9d126d1a0ec1eb0c1d3') build() { cd "$srcdir/$pkgname-$pkgver" + unset CFLAGS ./configure --prefix=/usr - make || return 1 + make - install -D -m0755 netwatch $pkgdir/usr/bin/netwatch && \ - install -D -m0755 netresolv $pkgdir/usr/bin/netresolv && \ + install -D -m0755 netwatch $pkgdir/usr/bin/netwatch + install -D -m0755 netresolv $pkgdir/usr/bin/netresolv install -D -m0644 netwatch.1 $pkgdir/usr/share/man/man1/netwatch.1 } diff --git a/community/ngrep/PKGBUILD b/community/ngrep/PKGBUILD index e6bc0d3d1..085b842b3 100644 --- a/community/ngrep/PKGBUILD +++ b/community/ngrep/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 44742 2011-04-11 13:48:14Z lfleischer $ +# $Id: PKGBUILD 59191 2011-11-21 14:35:44Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=ngrep pkgver=1.45 -pkgrel=6 +pkgrel=7 pkgdesc='A grep-like utility that allows you to search for network packets on an interface.' arch=('i686' 'x86_64') url='http://ngrep.sourceforge.net/' license=('custom') depends=('libpcap>=1.0.0') +# Fix build failure when using "-j" (FS#27091). +options=(!makeflags) source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('bc8150331601f3b869549c94866b4f1c') diff --git a/community/openmotif/PKGBUILD b/community/openmotif/PKGBUILD index 7f6be420e..de442f87d 100644 --- a/community/openmotif/PKGBUILD +++ b/community/openmotif/PKGBUILD @@ -1,8 +1,7 @@ -# $Id: PKGBUILD 16932 2010-05-13 22:21:25Z spupykin $ +# $Id: PKGBUILD 59163 2011-11-21 12:54:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> -_automakever=`pacman -Q automake | cut -f 2 -d \ | cut -f 1 -d -` pkgname=openmotif pkgver=2.3.3 @@ -11,7 +10,7 @@ pkgdesc="Open Motif" arch=('i686' 'x86_64') url="http://www.motifzone.org/" license=('GPL') -depends=(libxext libxp libxft libxt) +depends=(libxext libxp libxft libxt libxmu libpng libjpeg) makedepends=(xbitmaps xproto printproto xextproto automake) conflicts=(lesstif) options=('!libtool') @@ -19,7 +18,9 @@ source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/op md5sums=('fd27cd3369d6c7d5ef79eccba524f7be') build() { - cd $startdir/src/openmotif-$pkgver +_automakever=`pacman -Q automake | cut -f 2 -d \ | cut -f 1 -d -` + + cd $srcdir/openmotif-$pkgver [ $NOEXTRACT -eq 1 ] || patch -p0 Makefile.in <<EOF --- Makefile.in.org 2007-06-11 09:32:01.000000000 +0400 @@ -31,7 +32,7 @@ build() { - doc \\ - demos + doc - + AUTOMAKE_OPTIONS = 1.4 all: all-recursive EOF @@ -45,15 +46,16 @@ EOF ln -s -f /usr/share/automake-${_automakever}/install-sh install-sh ln -s -f /usr/share/automake-${_automakever}/missing missing ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh + touch NEWS AUTHORS - [ $NOEXTRACT -eq 1 ] || autoreconf -i + [ $NOEXTRACT -eq 1 ] || autoreconf -i; [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr - make -j1 || return 1 + make -j1 - make DESTDIR=$startdir/pkg install || return 1 + make DESTDIR=$pkgdir install # cleanup - (cd $startdir/pkg/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3) + (cd $pkgdir/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3) } diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD index 93c7a5653..86d456678 100644 --- a/community/optipng/PKGBUILD +++ b/community/optipng/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 39226 2011-02-07 17:56:51Z shusmann $ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# $Id: PKGBUILD 59287 2011-11-22 15:27:27Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=optipng pkgver=0.6.5 -pkgrel=1 -pkgdesc='A PNG optimizer that recompresses image files to a smaller size, without losing any information' +pkgrel=2 +pkgdesc='Compresses PNG files to a smaller size, without losing any information.' arch=('i686' 'x86_64') url='http://optipng.sourceforge.net/' license=('ZLIB') @@ -15,11 +16,13 @@ md5sums=('9df5fa7bb45ae096ed6c6e0d8dc43dc7') build() { cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm0644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index 7ce3b4ea5..d47dd7c94 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 14260 2010-04-02 09:55:31Z spupykin $ +# $Id: PKGBUILD 59237 2011-11-21 15:30:37Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: jlvsimoes pkgname=osiris @@ -10,31 +11,31 @@ url="http://osiris.shmoo.com/" license=('custom') depends=('openssl' 'readline') install=$pkgname.install -source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz \ - osirismd.init \ +#source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz + osirismd.init osirisd.init) md5sums=('1951c7dc0fe729af9ffaf58910340d12' '44281b8fc30ab3d452c6f35d3539d7ff' 'b859445803e4df59a4f82d7f411e1297') -build() -{ - cd $startdir/src/$pkgname-$pkgver - mkdir -p $startdir/pkg/usr/share/licenses/$pkgname/ - install -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/license.txt - mkdir -p $startdir/pkg/etc/rc.d +build() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/licenses/$pkgname/ + install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt + mkdir -p $pkgdir/etc/rc.d ./configure --prefix=/usr --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname - make all || return 1 + make all # Arch-ify install locations sed -i "s|^INSTALL_OSIRISM=0|INSTALL_OSIRISM=1|" src/install/install.sh sed -i "s|^INSTALL_OSIRISD=0|INSTALL_OSIRISD=1|" src/install/install.sh sed -i "s|^ROOT_GROUP=wheel|ROOT_GROUP=root|" src/install/install.sh - make DESTDIR=$startdir/pkg install || return 1 + make DESTDIR=$pkgdir install - install -D -m755 $startdir/src/osirismd.init $startdir/pkg/etc/rc.d/osirismd && \ - install -D -m755 $startdir/src/osirisd.init $startdir/pkg/etc/rc.d/osirisd && \ - rm -rf $startdir/pkg/usr/osiris + install -D -m755 $srcdir/osirismd.init $pkgdir/etc/rc.d/osirismd + install -D -m755 $srcdir/osirisd.init $pkgdir/etc/rc.d/osirisd + rm -rf $pkgdir/usr/osiris } diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD index 67dd6ca21..407feff1b 100644 --- a/community/p3scan/PKGBUILD +++ b/community/p3scan/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44195 2011-04-04 13:08:48Z spupykin $ +# $Id: PKGBUILD 59176 2011-11-21 13:12:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: v01d <phreakuencies@gmail.com> @@ -20,13 +20,14 @@ build() { cd $srcdir/$pkgname-$pkgver # Fix CFLAGS and other options hardcoded in Makefiles + unset CFLAGS sed -ri "s|^CFLAGS=-Wall( -g)? -O2|CFLAGS=-Wall $CFLAGS|" Makefile ripmime/Makefile ripmime/tnef/Makefile ripmime/ripOLE/Makefile sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile make # Create base dirs, the Makefile assumes they're there - install -d $pkgdir/usr/sbin $startdir/pkg/etc/rc.d $startdir/pkg/usr/man/man8 + install -d $pkgdir/usr/sbin $pkgdir/etc/rc.d $pkgdir/usr/man/man8 # install with root set on $pkgdir make DESTDIR=$pkgdir install diff --git a/community/pawm/PKGBUILD b/community/pawm/PKGBUILD index 0755f70ee..af37c7df9 100644 --- a/community/pawm/PKGBUILD +++ b/community/pawm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 19617 2010-06-26 08:01:18Z spupykin $ +# $Id: PKGBUILD 59172 2011-11-21 13:08:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pawm @@ -8,14 +8,14 @@ pkgdesc="Puto Amo Window Manager is a full featured window manager, but without arch=('i686' 'x86_64') url="http://www.pleyades.net/pawm/" license=("GPL") -depends=(libxft libxpm libxrandr) +depends=('libxft' 'libxpm' 'libxrandr') +makedepends=('cmake') source=(http://www.pleyades.net/pawm/files/pawm-$pkgver.tar.gz) md5sums=('cc004865f5b5d8118e68154857b913a2') build() { cd $srcdir/$pkgname-$pkgver - cmake -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 + make make install DESTDIR=$pkgdir } diff --git a/community/pcb/PKGBUILD b/community/pcb/PKGBUILD index 57651f7d7..cb0b68aeb 100644 --- a/community/pcb/PKGBUILD +++ b/community/pcb/PKGBUILD @@ -1,36 +1,43 @@ +# $Id$ + +# Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jared Casper <jaredcasper@gmail.com> -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=pcb pkgver=20110918 -pkgrel=1 -pkgdesc="An interactive printed circuit board editor for the X11 window system." -url="http://pcb.gpleda.org/" +pkgrel=2 +pkgdesc='Interactive printed circuit board editor' +url='http://pcb.gpleda.org/' license=('GPL') arch=('i686' 'x86_64') -depends=('tcl' 'gtkglext' 'gd' 'perlxml' 'hicolor-icon-theme' 'desktop-file-utils') -optdepends=('tk: for the graphical QFP footprint builder') -install=$pkgname.install -changelog=Changelog -source=(http://downloads.sourceforge.net/pcb/$pkgname-$pkgver.tar.gz) -md5sums=('54bbc997eeb22b85cf21fed54cb8e181') +depends=('gtkglext' 'gd' 'hicolor-icon-theme') +optdepends=('tk: additional tools' + 'tcl: additional tools' + 'perl: additional tools') +makedepends=('intltool' 'tk') +source=("http://downloads.sourceforge.net/pcb/${pkgname}-${pkgver}.tar.gz") +sha1sums=('53ca27797d4db65a068b56f157e3ea6c5c29051f') + +install=install build() { - cd $srcdir/$pkgname-$pkgver/ - if [ ! -x /usr/bin/wish ]; then - config="env WISH=/usr/bin/true ./configure --enable-dbus" - else - config="./configure --enable-dbus" - fi - $config --prefix=/usr \ - --disable-update-mime-database \ - --disable-update-desktop-database - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --enable-dbus \ + --disable-update-mime-database \ + --disable-update-desktop-database + make } package() { - cd $srcdir/$pkgname-$pkgver/ - make -j1 prefix=$pkgdir/usr install - rm $pkgdir/usr/share/info/dir -} + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 prefix="${pkgdir}"/usr install + rm "${pkgdir}"/usr/share/info/dir + rm "${pkgdir}"/usr/include/gts.h + rm "${pkgdir}"/usr/lib/libgts.a + rmdir "${pkgdir}"/usr/include + rmdir "${pkgdir}"/usr/lib +} diff --git a/community/pcb/install b/community/pcb/install new file mode 100644 index 000000000..62ce80440 --- /dev/null +++ b/community/pcb/install @@ -0,0 +1,37 @@ +infodir=/usr/share/info +filelist=(pcb.info pcb.info-1 pcb.info-2) + +post_install() { + if [ -x /usr/bin/update-mime-database ]; then + echo Updating mime database... + /usr/bin/update-mime-database /usr/share/mime + fi + if [ -x /usr/bin/update-desktop-database ]; then + echo Updating desktop database.. + /usr/bin/update-desktop-database /usr/share/applications + fi + if [ -x /usr/bin/install-info ]; then + echo Updating info directory... + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done + fi + /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + if [ -x /usr/bin/install-info ]; then + echo Updating info directory... + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done + fi +} + +post_remove() { + /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor +} diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 71929e1d7..908181c19 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55381 2011-09-10 23:32:12Z dreisner $ +# $Id: PKGBUILD 59244 2011-11-21 19:29:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.7.4 -pkgrel=3 +pkgver=1.8.0 +pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/pcsclite/" @@ -12,9 +12,9 @@ license=('BSD') depends=('udev') makedepends=('pkgconfig') options=('!libtool' '!docs') -source=(https://alioth.debian.org/frs/download.php/3598/pcsc-lite-${pkgver}.tar.bz2 - pcscd) -md5sums=('1caf0b8ca2ecbf82fe3b035b3fff22dd' +source=("https://alioth.debian.org/frs/download.php/3684/pcsc-lite-${pkgver}.tar.bz2" + 'pcscd') +md5sums=('8af937240126a4afdcf235e98a6d861a' 'c97b6bce695222efb0f003d8e8369010') build() { diff --git a/community/pdmenu/PKGBUILD b/community/pdmenu/PKGBUILD index b201d9381..bbd53cee0 100644 --- a/community/pdmenu/PKGBUILD +++ b/community/pdmenu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 46707 2011-05-10 20:39:33Z spupykin $ +# $Id: PKGBUILD 59165 2011-11-21 13:00:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pdmenu -pkgver=1.3.0 +pkgver=1.3.2 pkgrel=1 pkgdesc="simple full screen menu program" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('gpm' 'slang') optdepends=('perl') source=(http://ftp.debian.org/debian/pool/main/p/pdmenu/pdmenu_$pkgver.tar.gz) -md5sums=('2530237cb0dca94905e03f12a320d78a') +md5sums=('a7d5315119fd18a81cc3d1e578f8d3f8') build() { cd $srcdir/pdmenu diff --git a/community/pmtools/PKGBUILD b/community/pmtools/PKGBUILD index d03108426..a8cecf535 100644 --- a/community/pmtools/PKGBUILD +++ b/community/pmtools/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 33452 2010-11-24 16:48:38Z spupykin $ +# $Id: PKGBUILD 59227 2011-11-21 15:25:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Andrea Scarpino <bash.lnx@gmail.com> # Contributor: Sebastian Pohle <naitsabes@imapmail.org> pkgname=pmtools @@ -11,7 +10,8 @@ arch=('i686' 'x86_64') url="http://acpi.sourceforge.net/dsdt/index.php" license=('GPL2') depends=('perl') -source=(http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/$pkgname-$pkgver.tar.bz2) +#source=(http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/$pkgname-$pkgver.tar.bz2) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.bz2) md5sums=('45e62eae9aca4fce84cb102c117f5796') build() { diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index 814a776b7..5f4ff16ec 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52100 2011-07-20 08:15:14Z lfleischer $ +# $Id: PKGBUILD 59194 2011-11-21 14:53:22Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy -pkgver=3.0.17 -pkgrel=3 +pkgver=3.0.18 +pkgrel=1 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64') url='http://www.privoxy.org' @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src 'privoxy' 'privoxy.logrotate.d' 'privoxy.conf.d') -md5sums=('9d363d738a3f3d73e774d6dfeafdb15f' +md5sums=('baf0b13bb591ec6e1ba15b720ddea65c' '1b4ed8c4e7e5b04b10ef41b597dc3f3b' '79480f311313cc43974f6cbe6b672927' '27830ef79418e277b90c1c1fa933f876') diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD index cee7bf35b..75060d618 100644 --- a/community/rapidsvn/PKGBUILD +++ b/community/rapidsvn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 34181 2010-12-04 13:42:17Z spupykin $ +# $Id: PKGBUILD 59187 2011-11-21 14:15:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: AqD <aquila.deus@gmail.com> @@ -8,11 +8,12 @@ pkgname=rapidsvn pkgver=0.12.0 pkgrel=3 pkgdesc="A cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework." -depends=('subversion' 'wxgtk') url='http://rapidsvn.tigris.org/' arch=('i686' 'x86_64') license=('GPL') options=('!libtool') +depends=('subversion' 'wxgtk') +makedepends=('python2') source=(http://www.rapidsvn.org/download/release/0.12/rapidsvn-$pkgver-1.tar.gz $pkgname.desktop) md5sums=('8ec54104fca32d81e396a68e25324263' diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 0e13a1e1a..513e190b1 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 52459 2011-07-25 20:06:11Z jelle $ +# $Id: PKGBUILD 59179 2011-11-21 13:59:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot pkgver=1.4.23 -pkgrel=1 -pkgdesc="Allows users to execute shell commands under different root filesystems. \ - (Successor to dchroot)." +pkgrel=2 +pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') depends=('pam' 'lockdev' 'boost' 'e2fsprogs') @@ -16,62 +15,56 @@ conflicts=('dchroot') replaces=('dchroot') provides=('schroot' 'sbuild' 'dchroot') backup=('etc/schroot/schroot.conf' - 'etc/schroot/script-arch32' - 'etc/schroot/mount-arch32' - 'etc/schroot/copyfiles-arch32') + 'etc/schroot/arch32/config' + 'etc/schroot/arch32/copyfiles' + 'etc/schroot/arch32/mount' + 'etc/schroot/arch32/nssdatabases') options=(!libtool) source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2" - 'script-arch32' - 'copyfiles-arch32' - 'mount-arch32') + 'pam.d.schroot.patch' + 'arch32-example' + 'arch32-config' + 'arch32-copyfiles' + 'arch32-mount' + 'arch32-nssdatabases') md5sums=('73873e0fee83a45655ed8efa246a1e26' - '8e86445e188129232e1782d978dfc967' - 'd4558d5691fbdaa46ce669e8f327133b' - 'f0d5d5b5e34a860f6f90b5628c680f46') + 'a8d77cac806a0a9adef3f93cdbeb280a' + '1e34db5387c4e5de911e15d8a9208bdb' + '5a3f7b839c7e0b8933748da7c5b6385b' + '06db41d42f9fce5449a28feb76ded556' + 'f0d5d5b5e34a860f6f90b5628c680f46' + 'af1da6edd8c8c0dafeeb2c2c4e0c840b') build() { - cd ${pkgname}-${pkgver} - - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - - ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --localstatedir=/var \ - --enable-dchroot --enable-lvm-snapshot --enable-btrfs-snapshot \ - BTRFS=/sbin/btrfs \ - BTRFSCTL=/sbin/btrfsctl \ - LVCREATE=/sbin/lvcreate \ - LVREMOVE=/sbin/lvremove -# --enable-csbuild - - make + cd ${pkgname}-${pkgver} + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-dchroot \ + --enable-lvm-snapshot \ + --enable-btrfs-snapshot \ + BTRFS=/sbin/btrfs \ + BTRFSCTL=/sbin/btrfsctl \ + LVCREATE=/sbin/lvcreate \ + LVREMOVE=/sbin/lvremove + # --enable-csbuild + make } check() { - cd ${pkgname}-${pkgver} - - make -k check + cd ${pkgname}-${pkgver} + make -k check } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=$pkgdir install - - install -m 644 ${srcdir}/script-arch32 ${pkgdir}/etc/schroot - install -m 644 ${srcdir}/mount-arch32 ${pkgdir}/etc/schroot - install -m 644 ${srcdir}/copyfiles-arch32 ${pkgdir}/etc/schroot - cat >> $pkgdir/etc/schroot/schroot.conf << EOF - -[Arch32] -description=Arch32 -type=directory -directory=/opt/arch32 -priority=1 -#users=username -groups=users -root-groups=root -script-config=script-arch32 -personality=linux32 -aliases=32,default - -EOF + cd ${pkgname}-${pkgver} + make DESTDIR=$pkgdir install + install -dm 755 ${pkgdir}/etc/schroot/arch32 + install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32 + rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/* + install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example + patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot } diff --git a/community/schroot/arch32-config b/community/schroot/arch32-config new file mode 100644 index 000000000..0ee72d522 --- /dev/null +++ b/community/schroot/arch32-config @@ -0,0 +1,11 @@ +# Default settings for chroot setup and exec scripts. +# See schroot-script-config(5) for further details. + +# Filesystems to mount inside the chroot. +FSTAB="/etc/schroot/arch32/mount" + +# Files to copy from the host system into the chroot. +COPYFILES="/etc/schroot/arch32/copyfiles" + +# System databases to copy into the chroot +NSSDATABASES="/etc/schroot/arch32/nssdatabases" diff --git a/community/schroot/arch32-copyfiles b/community/schroot/arch32-copyfiles new file mode 100644 index 000000000..88f093ceb --- /dev/null +++ b/community/schroot/arch32-copyfiles @@ -0,0 +1,7 @@ +/etc/group +/etc/hosts +/etc/passwd +/etc/resolv.conf +/etc/rc.conf +/etc/localtime +/etc/locale.gen diff --git a/community/schroot/arch32-example b/community/schroot/arch32-example new file mode 100644 index 000000000..3f059e3c0 --- /dev/null +++ b/community/schroot/arch32-example @@ -0,0 +1,10 @@ +[arch32] +description=Arch32 +type=directory +directory=/opt/arch32 +#users=username +groups=users +root-groups=root +script-config=arch32/config +personality=linux32 +#aliases=32,i686 diff --git a/community/schroot/arch32-mount b/community/schroot/arch32-mount new file mode 100644 index 000000000..075d6e451 --- /dev/null +++ b/community/schroot/arch32-mount @@ -0,0 +1,12 @@ +# mount.defaults: static file system information for chroots. +# Note that the mount point will be prefixed by the chroot path +# (CHROOT_PATH) +# +# <file system> <mount point> <type> <options> <dump> <pass> +proc /proc proc defaults 0 0 +/dev /dev none rw,bind 0 0 +#/dev/pts /dev/pts none rw,bind 0 0 +tmpfs /dev/shm tmpfs defaults 0 0 +/sys /sys none rw,bind 0 0 +/tmp /tmp none rw,bind 0 0 +/home /home none rw,bind 0 0 diff --git a/community/schroot/arch32-nssdatabases b/community/schroot/arch32-nssdatabases new file mode 100644 index 000000000..815ddce3f --- /dev/null +++ b/community/schroot/arch32-nssdatabases @@ -0,0 +1,6 @@ +# System databases to copy into the chroot from the host system. +# +# <database name> +passwd +shadow +group diff --git a/community/schroot/pam.d.schroot.patch b/community/schroot/pam.d.schroot.patch new file mode 100644 index 000000000..528acb5f7 --- /dev/null +++ b/community/schroot/pam.d.schroot.patch @@ -0,0 +1,15 @@ +@@ -23,13 +23,6 @@ + # time restrainst on schroot usage. + # account requisite pam_time.so + +-# The standard Unix authentication modules, used with +-# NIS (man nsswitch) as well as normal /etc/passwd and +-# /etc/shadow entries. +-@include common-auth +-@include common-account +-@include common-session +- + # Sets up user limits, please uncomment and read /etc/security/limits.conf + # to enable this functionality. + # session required pam_limits.so + diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 8a5cdc1ed..61fd279d6 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,21 +1,21 @@ +# $Id: PKGBUILD 59256 2011-11-22 03:57:15Z ebelanger $ # Maintainer: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Jochem Kossen <j.kossen@home.nl> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=2.29 +pkgver=3.0.1 pkgrel=1 pkgdesc='A generally useful editor with facilities for building and running programs.' arch=('i686' 'x86_64') url='http://www.scintilla.org/SciTE.html' license=('custom:scite') -depends=('desktop-file-utils' 'gtk2' 'glib2') -backup=(usr/share/scite/SciTEGlobal.properties) +depends=('desktop-file-utils' 'gtk2') +backup=('usr/share/scite/SciTEGlobal.properties') install=scite.install -source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver/\./}.tgz" - 'SciTE.desktop' - 'makefile.patch') +source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") +md5sums=('e2ed3190ebf714f037d05cde7b9591de') build() { sed "s/CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)/CXXTFLAGS=-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)/" -i scite/gtk/makefile @@ -24,24 +24,22 @@ build() { sed "s/CXXFLAGS=-DNDEBUG -Os \$(CXXBASEFLAGS) \$(THREADFLAGS)/CXXFLAGS=-DNDEBUG ${CXXFLAGS} \$(CXXBASEFLAGS) \$(THREADFLAGS)/" -i scintilla/gtk/makefile - cd scintilla/gtk + cd "${srcdir}/scintilla/gtk" make - install -Dm644 ../License.txt \ - ${pkgdir}/usr/share/licenses/scintilla/LICENSE - cd ${srcdir}/${pkgname}/gtk + cd "${srcdir}/${pkgname}/gtk" make +} - make DESTDIR=${pkgdir} install +package() { + cd "${srcdir}/${pkgname}/gtk" - install -D -m644 ../License.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + make DESTDIR="${pkgdir}" install - install -D -m644 ${srcdir}/SciTE.desktop \ - ${pkgdir}/usr/share/applications/ + install -D -m644 ../License.txt \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-scite" + install -D -m644 "${srcdir}/scintilla/License.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-scintilla" ln -sf SciTE ${pkgdir}/usr/bin/scite } -md5sums=('55858b96c4ad64b38503682ff49d184e' - '48526532ef677982a4b156ae90f25b6f' - '87005d4c7262a1a698cde0628dc7e2a2') diff --git a/community/scite/scite.install b/community/scite/scite.install index 49135f547..686b22022 100644 --- a/community/scite/scite.install +++ b/community/scite/scite.install @@ -1,11 +1,13 @@ post_install() { - echo "Updating desktop and mime database..." update-desktop-database -q } +post_upgrade() { + post_install $1 +} + post_remove() { - echo "Updating desktop and mime database..." - update-desktop-database -q + post_install $1 } # vim:set ts=2 sw=2 et: diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index 970dbf82b..4db428d90 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $ +# $Id: PKGBUILD 59088 2011-11-21 09:41:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> @@ -14,20 +14,18 @@ license=("GPL") #url="http://www.simgear.org" url="https://gitorious.org/fg" options=('!makeflags') -source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver" - build-fix.patch) -md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde' - '905a05cc1364c067b3b9574d41cef7fa') +#source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") +source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2") +md5sums=('31f4ce7254a43229f050a8f86d6966ef') build() { - cd $srcdir/fg-simgear -# patch -p1 <$srcdir/build-fix.patch + cd $srcdir/simgear-$pkgver [ -x configure ] || ./autogen.sh [ -f Makefile ] || ./configure --prefix=/usr make } package() { - cd $srcdir/fg-simgear + cd $srcdir/simgear-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/simh/PKGBUILD b/community/simh/PKGBUILD index 737b69e8f..d3590dcd4 100644 --- a/community/simh/PKGBUILD +++ b/community/simh/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 20494 2010-07-08 14:10:57Z spupykin $ +# $Id: PKGBUILD 59085 2011-11-21 09:31:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: waterbear <st92.at.freeshell.org> @@ -13,7 +13,7 @@ license=("BSD") depends=("libpcap" "glibc") makedepends=("unzip") install=simh.install -source=("http://simh.trailing-edge.com/sources/simhv${_pkgver}.zip" \ +source=("http://simh.trailing-edge.com/sources/simhv${_pkgver}.zip" "LICENSE") md5sums=('e15f65a82e21ea49e14b438326d93d5c' 'd56eefa5d020ee2b77d21280fef80e3d') @@ -23,7 +23,7 @@ build() { mkdir BIN || true find ./VAX -type f -exec sed -i 's#SIM_INLINE##' {} \; - make USE_NETWORK=1 NETWORK_OPT='-DUSE_NETWORK -isystem /usr/include /usr/lib/libpcap.a -lnl' || exit 1 + make USE_NETWORK=1 NETWORK_OPT='-DUSE_NETWORK -isystem /usr/include -lpcap -lnl' || exit 1 mkdir -p $pkgdir/usr/bin cd BIN diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD index e5a3a5a39..d80b89ce7 100644 --- a/community/sqlitebrowser/PKGBUILD +++ b/community/sqlitebrowser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 24584 2010-08-26 14:46:36Z lcarlier $ +# $Id: PKGBUILD 59079 2011-11-21 09:21:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> # Contributor: Michael Fellinger <m.fellinger@gmail.com> @@ -17,15 +17,14 @@ md5sums=('5ca3d41cca454235b93ce72cd585dfe3') build() { cd $srcdir/trunk/$pkgname - sed -i 's|getline|xgetline|' sqlitebrowser/sqlbrowser_util.c + sed -i 's|: name( 0 ) { }|: name( ) { }|' sqlitebrowser/sqlitedb.h qmake make } package() { cd $srcdir/trunk/$pkgname - mkdir -p $pkgdir/usr/bin cp $pkgname/$pkgname $pkgdir/usr/bin/ } diff --git a/community/taglib-rcc/PKGBUILD b/community/taglib-rcc/PKGBUILD index b79180cd3..673927582 100644 --- a/community/taglib-rcc/PKGBUILD +++ b/community/taglib-rcc/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 17761 2010-05-25 09:16:05Z spupykin $ +# $Id: PKGBUILD 59135 2011-11-21 12:15:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=taglib-rcc -pkgver=1.6.3 +pkgver=1.7 pkgrel=1 pkgdesc="taglib with librcc patch" arch=('i686' 'x86_64') -url="http://ktown.kde.org/~wheeler/taglib.html" -depends=('gcc-libs' 'zlib' 'bash' libxml2 db librcc) -makedepends=(patch) +url="http://developer.kde.org/~wheeler/taglib.html" +depends=('gcc-libs' 'zlib' 'bash' 'libxml2' 'db' 'librcc') +makedepends=('patch' 'cmake') license=('GPL') provides=("taglib=$pkgver") conflicts=("taglib") options=('!libtool') -source=(http://ktown.kde.org/~wheeler/files/src/taglib-$pkgver.tar.gz \ +source=(http://developer.kde.org/~wheeler/files/src/taglib-$pkgver.tar.gz http://downloads.sourceforge.net/rusxmms/taglib-csa6.tar.bz2) -md5sums=('ddf02f4e1d2dc30f76734df806e613eb' +md5sums=('6a7e312668f153fa905a81714aebc257' '0868d633843ecd87526c77d788b3d3b6') build() { cd $srcdir/taglib-$pkgver - [ $NOEXTRACT -eq 1 ] || patch -Np1 <$srcdir/taglib/taglib-1.5-ds-rusxmms.patch || return 1 + [ $NOEXTRACT -eq 1 ] || patch -Np1 <$srcdir/taglib/taglib-1.5-ds-rusxmms.patch || true [ $NOEXTRACT -eq 1 ] || sed -i 's|#include <string>|#include <string.h>|' $srcdir/taglib-$pkgver/taglib/toolkit/rccpatch.cpp cd .. @@ -33,6 +33,6 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DWITH_MP4=ON \ -DWITH_ASF=ON - make VERBOSE=1 || return 1 - make DESTDIR=${pkgdir} install || return 1 + make VERBOSE=1 + make DESTDIR=${pkgdir} install } diff --git a/community/tasks/PKGBUILD b/community/tasks/PKGBUILD index 3204bd603..00540cce8 100644 --- a/community/tasks/PKGBUILD +++ b/community/tasks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56135 2011-10-02 08:11:48Z spupykin $ +# $Id: PKGBUILD 59230 2011-11-21 15:27:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: lp76 <l.peduto@gmail.com> @@ -13,7 +13,8 @@ license=('GPL') depends=('evolution-data-server>=3.2.0' 'xdg-utils' 'gtk2') makedepends=('intltool') install=tasks.install -source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) +#source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.gz) md5sums=('0afd969758561599fd782e1effb39c08') build() { diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD index 11fd3b848..c228c1ca5 100644 --- a/community/tesseract/PKGBUILD +++ b/community/tesseract/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57295 2011-10-25 11:18:06Z spupykin $ +# $Id: PKGBUILD 59081 2011-11-21 09:28:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Hauser <andy-aur@splashground.de> @@ -9,7 +9,7 @@ pkgdesc="An OCR programm" arch=(x86_64 i686) url="http://code.google.com/p/tesseract-ocr" license=("APACHE") -depends=(libpng libtiff libjpeg zlib gcc-libs leptonica) +depends=(libpng libtiff libjpeg zlib giflib gcc-libs leptonica) source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz http://tesseract-ocr.googlecode.com/files/chi_sim.traineddata.gz diff --git a/community/tksystray/PKGBUILD b/community/tksystray/PKGBUILD index 73c901237..a5ee12746 100644 --- a/community/tksystray/PKGBUILD +++ b/community/tksystray/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 9452 2010-01-25 14:27:29Z spupykin $ +# $Id: PKGBUILD 59200 2011-11-21 14:59:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Pavel Borzenkov <pavel.borzenkov@gmail.com> @@ -10,14 +10,14 @@ arch=('i686' 'x86_64') url="http://tkabber.jabber.ru/tksystray" license=("GPL") depends=(tcl tk imlib) -source=(http://arch.pp.ru/~sergej/dl/tksystray_$pkgver.orig.tar.gz) +source=(ftp://ftp.archlinux.org/other/community/tksystray/tksystray_$pkgver.orig.tar.gz) md5sums=('d1784d2f786304bd6eaa82512fd5cf1c') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --with-tcl=/usr/lib --with-tk=/usr/lib - make || return 1 - mkdir -p $startdir/pkg/usr/lib/$pkgname-$pkgver - cp -rf libtray.so $startdir/pkg/usr/lib/$pkgname-$pkgver - cp -rf pkgIndex.tcl $startdir/pkg/usr/lib/$pkgname-$pkgver + make + mkdir -p $pkgdir/usr/lib/$pkgname-$pkgver + cp -rf libtray.so $pkgdir/usr/lib/$pkgname-$pkgver + cp -rf pkgIndex.tcl $pkgdir/usr/lib/$pkgname-$pkgver } diff --git a/community/tuxguitar/PKGBUILD b/community/tuxguitar/PKGBUILD index fc9c018b9..c5f297b2c 100644 --- a/community/tuxguitar/PKGBUILD +++ b/community/tuxguitar/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 6777 2009-12-21 17:50:48Z spupykin $ +# $Id: PKGBUILD 59148 2011-11-21 12:35:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: |AhIoRoS| < ahioros@gmail.com > pkgname=tuxguitar pkgver=1.2 pkgrel=4 +_jdk=java-7-openjdk pkgdesc="multitrack guitar tablature editor and player" arch=('i686' 'x86_64') #url="http://www.herac.com.ar/contenidos/tuxguitar.html" url="http://sourceforge.net/projects/tuxguitar" license=('LGPL') depends=('java-runtime' 'swt' 'alsa-lib') -makedepends=('unzip' 'zip' 'apache-ant' 'jack-audio-connection-kit' 'fluidsynth') +makedepends=('unzip' 'zip' 'apache-ant' 'jack' 'fluidsynth' 'java-environment') +optdepends=('fluidsynth') install=tuxguitar.install source=(tuxguitar-src-$pkgver.tar.gz::http://sourceforge.net/projects/tuxguitar/files/TuxGuitar/TuxGuitar-$pkgver/tuxguitar-src-$pkgver.tar.gz/download - tuxguitar.desktop \ + tuxguitar.desktop tuxguitar.xml) md5sums=('f41ed20e77c6c3d8968991a29c71b912' 'eea5247daa70ce6fc15e95b1080af486' @@ -22,80 +24,80 @@ md5sums=('f41ed20e77c6c3d8968991a29c71b912' build() { cd $srcdir/tuxguitar-src-$pkgver - mkdir -p $pkgdir/usr/share/tuxguitar && \ + mkdir -p $pkgdir/usr/share/tuxguitar mkdir -p $pkgdir/usr/bin export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH - (cd TuxGuitar/ && ant) || return 1 - (cd TuxGuitar-alsa/ && ant) || return 1 - (cd TuxGuitar-fluidsynth/ && ant) || return 1 - (cd TuxGuitar-jack/ && ant) || return 1 - (cd TuxGuitar-oss/ && ant) || return 1 - (cd TuxGuitar-compat/ && ant) || return 1 - (cd TuxGuitar-gtp/ && ant) || return 1 - (cd TuxGuitar-ptb/ && ant) || return 1 - (cd TuxGuitar-tef/ && ant) || return 1 - (cd TuxGuitar-midi/ && ant) || return 1 - (cd TuxGuitar-lilypond/ && ant) || return 1 - (cd TuxGuitar-musicxml/ && ant) || return 1 - (cd TuxGuitar-ascii/ && ant) || return 1 - (cd TuxGuitar-converter/ && ant) || return 1 - (cd TuxGuitar-tray/ && ant) || return 1 - (cd TuxGuitar-community/ && ant) || return 1 - (cd TuxGuitar-gervill/ && ant) || return 1 - (cd TuxGuitar-jsa/ && ant) || return 1 + (cd TuxGuitar/ && ant) + (cd TuxGuitar-alsa/ && ant) + (cd TuxGuitar-fluidsynth/ && ant) + (cd TuxGuitar-jack/ && ant) + (cd TuxGuitar-oss/ && ant) + (cd TuxGuitar-compat/ && ant) + (cd TuxGuitar-gtp/ && ant) + (cd TuxGuitar-ptb/ && ant) + (cd TuxGuitar-tef/ && ant) + (cd TuxGuitar-midi/ && ant) + (cd TuxGuitar-lilypond/ && ant) + (cd TuxGuitar-musicxml/ && ant) + (cd TuxGuitar-ascii/ && ant) + (cd TuxGuitar-converter/ && ant) + (cd TuxGuitar-tray/ && ant) + (cd TuxGuitar-community/ && ant) + (cd TuxGuitar-gervill/ && ant) + (cd TuxGuitar-jsa/ && ant) - cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/ && \ - find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \; && \ - mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/ && \ - cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/ || return 1 + cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/ + find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \; + mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/ + cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/ # alsa pushd TuxGuitar-alsa/jni - gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \ + gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \ -c -o org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o \ - org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c && \ - gcc -shared -o libtuxguitar-alsa-jni.so org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o -L/usr/lib -lasound && \ - install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so && \ - mkdir -p $pkgdir/usr/share/tuxguitar/lib && \ - ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so || return 1 + org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c + gcc -shared -o libtuxguitar-alsa-jni.so org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o -L/usr/lib -lasound + install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so + mkdir -p $pkgdir/usr/share/tuxguitar/lib + ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so popd # oss pushd TuxGuitar-oss/jni - gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \ + gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \ -c -o org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o \ - org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c && \ - gcc -shared -o libtuxguitar-oss-jni.so org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o -L/usr/lib && \ - install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so && \ - mkdir -p $pkgdir/usr/share/tuxguitar/lib && \ - ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so || return 1 + org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c + gcc -shared -o libtuxguitar-oss-jni.so org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o -L/usr/lib + install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so + mkdir -p $pkgdir/usr/share/tuxguitar/lib + ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so popd # jack pushd TuxGuitar-jack/jni - gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \ + gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \ -c -o org_herac_tuxguitar_jack_JackClient.o \ - org_herac_tuxguitar_jack_JackClient.c && \ - gcc -shared -o libtuxguitar-jack-jni.so org_herac_tuxguitar_jack_JackClient.o -L/usr/lib -ljack && \ - install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so && \ - mkdir -p $pkgdir/usr/share/tuxguitar/lib && \ - ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so || return 1 + org_herac_tuxguitar_jack_JackClient.c + gcc -shared -o libtuxguitar-jack-jni.so org_herac_tuxguitar_jack_JackClient.o -L/usr/lib -ljack + install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so + mkdir -p $pkgdir/usr/share/tuxguitar/lib + ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so popd # fluidsynth pushd TuxGuitar-fluidsynth/jni - gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \ + gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \ -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o \ - org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c && \ - gcc -shared -o libtuxguitar-fluidsynth-jni.so org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o -L/usr/lib -lfluidsynth && \ - install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so && \ - mkdir -p $pkgdir/usr/share/tuxguitar/lib && \ - ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so || return 1 + org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c + gcc -shared -o libtuxguitar-fluidsynth-jni.so org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o -L/usr/lib -lfluidsynth + install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so + mkdir -p $pkgdir/usr/share/tuxguitar/lib + ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so popd - cd $startdir/pkg/usr/bin + cd $pkgdir/usr/bin cat >tuxguitar << EOF #!/bin/sh export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH @@ -104,8 +106,7 @@ cd /usr/share/$pkgname exec /usr/share/$pkgname/tuxguitar "\$1" "\$2" "\$3" "\$4" "\$5" "\$6" "\$7" "\$8" "\$9" EOF - chmod 755 tuxguitar && \ - install -D -m0644 $srcdir/tuxguitar.xml $pkgdir/usr/share/mime/packages/tuxguitar.xml && \ + chmod 755 tuxguitar + install -D -m0644 $srcdir/tuxguitar.xml $pkgdir/usr/share/mime/packages/tuxguitar.xml install -D -m0644 $srcdir/tuxguitar.desktop $pkgdir/usr/share/applications/tuxguitar.desktop } - diff --git a/community/tvtime/PKGBUILD b/community/tvtime/PKGBUILD index 32ccec0c5..59a5792c6 100644 --- a/community/tvtime/PKGBUILD +++ b/community/tvtime/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 59091 2011-11-21 09:46:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:thefatprecious <marty@loomar.com> @@ -9,20 +9,25 @@ pkgdesc="A high quality television application for use with video capture cards" arch=('i686' 'x86_64') url='http://tvtime.sourceforge.net/' license=('GPL' 'LGPL') -depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv' 'libsm' 'libxxf86vm') -makedepends=('libxt') -source=(http://downloads.sourceforge.net/sourceforge/tvtime/$pkgname-$pkgver.tar.gz \ - tvtime-1.0.2+linux-headers-2.6.18.patch tvtime-1.0.2-gcc41.patch tvtime-1.0.2-locale_t.patch) -md5sums=('4b3d03afe61be239b08b5e522cd8afed' '29b0aefd80fddae68613854b627e044a'\ - 'c782789825dfa664e1f6fcc96ac7246c' '1069dc5b47bba8456cbf48e34cb5c0b6') +depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv' + 'libsm' 'libxxf86vm') +makedepends=('libxt' 'v4l-utils') +source=(http://downloads.sourceforge.net/sourceforge/tvtime/$pkgname-$pkgver.tar.gz + tvtime-1.0.2+linux-headers-2.6.18.patch + tvtime-1.0.2-gcc41.patch + tvtime-1.0.2-locale_t.patch) +md5sums=('4b3d03afe61be239b08b5e522cd8afed' + 'e956821745686b5b3a784f7471996ade' + 'c782789825dfa664e1f6fcc96ac7246c' + '1069dc5b47bba8456cbf48e34cb5c0b6') build() { cd $srcdir/$pkgname-$pkgver - patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch || return 1 - patch -p1 < ../tvtime-1.0.2-gcc41.patch || return 1 - patch -p1 < ../tvtime-1.0.2-locale_t.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml || return 1 + patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch + patch -p1 < ../tvtime-1.0.2-gcc41.patch + patch -p1 < ../tvtime-1.0.2-locale_t.patch + [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc + make + make DESTDIR=$pkgdir install + install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml } diff --git a/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch b/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch index b1cfd49f1..d0772783d 100644 --- a/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch +++ b/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch @@ -2,14 +2,15 @@ Index: tvtime-1.0.2/src/videoinput.c =================================================================== --- tvtime-1.0.2.orig/src/videoinput.c +++ tvtime-1.0.2/src/videoinput.c -@@ -35,8 +35,8 @@ +@@ -35,8 +35,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "videodev.h" -#include "videodev2.h" -+#include <linux/videodev.h> ++#include <libv4l1-videodev.h> +#include <linux/videodev2.h> ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ #include "videoinput.h" #include "mixer.h" diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD index 67cd4e1d6..9ec06bf34 100644 --- a/community/twin/PKGBUILD +++ b/community/twin/PKGBUILD @@ -1,4 +1,7 @@ +# $Id: PKGBUILD 59233 2011-11-21 15:28:15Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> + pkgname=twin pkgver=0.6.2 pkgrel=1 @@ -9,17 +12,15 @@ license=('GPL' 'LGPL') depends=('ncurses' 'gpm' 'zlib' 'libtool' 'libxpm') optdepends=('gtk') #source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -source=(http://linuz.sns.it/~max/twin/twin-$pkgver.tar.gz) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/twin-$pkgver.tar.gz) md5sums=('6211c8b2e655003eb96b1fc5dc37e7d9') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver LDFLAGS="-lX11" ./configure --prefix=/usr \ --enable-tt=yes \ --enable-tt-hw-twin=yes --enable-tt-hw-twin-tunnel=yes --enable-tt-hw-twin-detunnel=yes \ - --enable-tt-hw-xml=yes \ - || return 1 - - make -j1 || return 1 - make DESTDIR=$startdir/pkg install || return 1 + --enable-tt-hw-xml=yes + make -j1 + make DESTDIR=$pkgdir install } diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD index 1d8defbb9..73bef5e46 100644 --- a/community/uriparser/PKGBUILD +++ b/community/uriparser/PKGBUILD @@ -1,21 +1,25 @@ +# $Id: PKGBUILD 59139 2011-11-21 12:26:27Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> - pkgname=uriparser - pkgver=0.7.5 - pkgrel=1 - pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" - url="http://sourceforge.net/projects/uriparser/" - depends=(glibc) - makedepends=(doxygen) - source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) - md5sums=('4f4349085fe5de33bcae8d0f26649593') - arch=('i686' 'x86_64') - license="CUSTOM" - build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --disable-test - ln -s ${srcdir}/$pkgname-$pkgver/doc/Doxyfile.in ${srcdir}/$pkgname-$pkgver/doc/Doxyfile - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -D -m644 "${srcdir}/$pkgname-$pkgver/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 -} -
\ No newline at end of file + +pkgname=uriparser +pkgver=0.7.5 +pkgrel=1 +pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" +url="http://sourceforge.net/projects/uriparser/" +depends=(glibc) +makedepends=(doxygen) +arch=('i686' 'x86_64') +license=("custom") +source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) +md5sums=('4f4349085fe5de33bcae8d0f26649593') + +build() { + cd ${srcdir}/$pkgname-$pkgver + [ -f Makefile ] || ./configure --prefix=/usr --disable-test + ln -s ${srcdir}/$pkgname-$pkgver/doc/Doxyfile.in ${srcdir}/$pkgname-$pkgver/doc/Doxyfile + sed -i 's|{css,gif,html,png}|{css,html,png}|' doc/Makefile + make + make DESTDIR=$pkgdir install + install -D -m644 "${srcdir}/$pkgname-$pkgver/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/vmoviedb/PKGBUILD b/community/vmoviedb/PKGBUILD index cff7ee14d..59466e33a 100644 --- a/community/vmoviedb/PKGBUILD +++ b/community/vmoviedb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 20044 2010-07-02 09:21:29Z spupykin $ +# $Id: PKGBUILD 59169 2011-11-21 13:06:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> @@ -11,7 +11,7 @@ arch=('i686' 'x86_64') url="http://vmoviedb.sourceforge.net" license=('GPL') depends=('libgnomeui' 'gconf>=2.18.0.1-4' 'desktop-file-utils') -makedepends=('gnome-doc-utils>=0.11.2') +makedepends=('gnome-doc-utils>=0.11.2' 'intltool') install=$pkgname.install options=('!libtool' '!emptydirs') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) @@ -20,8 +20,8 @@ md5sums=('7bfc10573bb890f3924755f2446dd3b6') build() { cd $srcdir/vmoviedb-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install || return 1 + make + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install mkdir -p $pkgdir/usr/share/gconf/schemas gconf-merge-schema $pkgdir/usr/share/gconf/schemas/${pkgname}.schemas \ diff --git a/community/w3cam/PKGBUILD b/community/w3cam/PKGBUILD index a0b3016c4..5d85e2d99 100644 --- a/community/w3cam/PKGBUILD +++ b/community/w3cam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 9021 2010-01-23 03:31:31Z dgriffiths $ +# $Id: PKGBUILD 59116 2011-11-21 11:03:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Christian Schmidt <mucknert@gmx.net> @@ -9,18 +9,24 @@ pkgdesc="a small and fast CGI program to retrieve images from a video4linux devi arch=('i686' 'x86_64') url="http://mpx.freeshell.net/" license=('GPL') -depends=(libpng libjpeg) +depends=('libpng' 'libjpeg') +makedepends=('v4l-utils') source=(http://mpx.freeshell.net/$pkgname-$pkgver.tar.gz) md5sums=('eec0b301b32bc8e9f65a4e54248c9868') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver + sed -i 's|#include <linux/videodev.h>|#include <libv4l1-videodev.h>|' v4l.c vidcat.c w3cam.c w3camd/w3v4l.c ./configure --prefix=/usr --with-device=/dev/video0 --with-ttf-inc=/usr/include/freetype - make || return 1 - mkdir -p $startdir/pkg/usr/cgi-bin $startdir/pkg/usr/bin $startdir/pkg/usr/man/man1 $startdir/pkg/usr/share/ - make prefix=$startdir/pkg/usr/ install && \ - mkdir -p $startdir/pkg/usr/lib/w3cam/ && \ - mv $startdir/pkg/usr/cgi-bin/* $startdir/pkg/usr/lib/w3cam/ && \ - mv $startdir/pkg/usr/man $startdir/pkg/usr/share/man || return 1 - rm -rf $startdir/pkg/usr/cgi-bin + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/cgi-bin $pkgdir/usr/bin $pkgdir/usr/man/man1 $pkgdir/usr/share/ + make prefix=$pkgdir/usr/ install + mkdir -p $pkgdir/usr/lib/w3cam/ + mv $pkgdir/usr/cgi-bin/* $pkgdir/usr/lib/w3cam/ + mv $pkgdir/usr/man $pkgdir/usr/share/man + rm -rf $pkgdir/usr/cgi-bin } diff --git a/community/wmctrl/PKGBUILD b/community/wmctrl/PKGBUILD index a4cb2b48f..92cb2c484 100644 --- a/community/wmctrl/PKGBUILD +++ b/community/wmctrl/PKGBUILD @@ -1,26 +1,24 @@ -# $Id: PKGBUILD 37711 2011-01-16 22:48:09Z andrea $ +# $Id: PKGBUILD 59113 2011-11-21 10:53:55Z spupykin $ # Maintainer: # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Dalius <dagis@takas.lt> pkgname=wmctrl pkgver=1.07 -pkgrel=2 +pkgrel=3 pkgdesc="Control your EWMH compliant window manager from command line" url="http://sweb.cz/tripie/utils/wmctrl/" arch=('i686' 'x86_64') license=('GPL') depends=(libxmu glib2) source=(http://sweb.cz/tripie/utils/wmctrl/dist/$pkgname-$pkgver.tar.gz - get_property-x86_64.patch::http://patch-tracking.debian.net/patch/misc/dl/wmctrl/1.07-6/main.c) + http://ftp.de.debian.org/debian/pool/main/w/wmctrl/wmctrl_$pkgver-6.diff.gz) md5sums=('1fe3c7a2caa6071e071ba34f587e1555' - '0d0173fa96e8ff318ea391dffa51235a') + '7ddf2aadc48f4300c16160b3c9a7e141') build() { cd "$srcdir/$pkgname-$pkgver" - - patch -p1 -i "$srcdir/get_property-x86_64.patch" - + patch -p1 -i "$srcdir/wmctrl_$pkgver-6.diff" ./configure --prefix=/usr --mandir=$pkgdir/usr/share/man make } diff --git a/community/xkeycaps/PKGBUILD b/community/xkeycaps/PKGBUILD index 8c9a1c9f5..1fade9a45 100644 --- a/community/xkeycaps/PKGBUILD +++ b/community/xkeycaps/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 20050 2010-07-02 09:22:39Z spupykin $ +# $Id: PKGBUILD 59110 2011-11-21 10:43:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> @@ -11,7 +11,7 @@ pkgdesc="XKeyCaps is a graphical front-end to xmodmap." url="http://www.jwz.org/xkeycaps/" license=('custom') depends=('libxaw') -makedepends=('imake') +makedepends=('imake' 'xbitmaps') source=(http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.Z license.txt) md5sums=('6792f828db6538f44f7696a8783b44ac' @@ -19,10 +19,10 @@ md5sums=('6792f828db6538f44f7696a8783b44ac' build() { cd $srcdir/$pkgname-$pkgver - xmkmf || return 1 - make MANPATH=/usr/share/man || return 1 - make DESTDIR=$pkgdir install || return 1 - make DESTDIR=$pkgdir MANPATH=/usr/share/man install.man || return 1 + xmkmf + make MANPATH=/usr/share/man + make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir MANPATH=/usr/share/man install.man install -Dm644 ../license.txt \ $pkgdir/usr/share/licenses/$pkgname/license.txt } diff --git a/community/xloadimage/PKGBUILD b/community/xloadimage/PKGBUILD index b1a2a4aaf..edff1665e 100644 --- a/community/xloadimage/PKGBUILD +++ b/community/xloadimage/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 39571 2011-02-11 16:14:42Z spupykin $ +# $Id: PKGBUILD 59105 2011-11-21 10:35:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Link Dupont <link@subpop.net> @@ -12,13 +12,13 @@ arch=(i686 x86_64) url="http://sioseis.ucsd.edu/xloadimage.html" license=("MIT") depends=('libtiff' 'libpng' 'libx11' 'libxext') -makedepends=('patch') +makedepends=('patch' 'imake') source=(http://archlinux-stuff.googlecode.com/files/xloadimage.$pkgver-1.tar.gz license.txt enable-image-types.patch) md5sums=('86b42b1b628a9c00008b7deec21e1175' 'cc16a51aeb5083b8ff07939dfe244130' - '33eadf10ce627cc1bf0db351a49e6cca') + '3a2703925011276fd2d2bd139b676487') build() { cd $srcdir/$pkgname.$pkgver diff --git a/community/xloadimage/enable-image-types.patch b/community/xloadimage/enable-image-types.patch index c720c7dd1..b61e36b87 100644 --- a/community/xloadimage/enable-image-types.patch +++ b/community/xloadimage/enable-image-types.patch @@ -61,3 +61,14 @@ diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c #include "image.h" /* xloadimage declarations */ #ifdef HAVE_LIBPNG +diff -wbBur xloadimage.4.1/jpeg.c xloadimage.4.1.my/jpeg.c +--- xloadimage.4.1/jpeg.c 2011-02-11 14:47:37.000000000 +0300 ++++ xloadimage.4.1.my/jpeg.c 2011-11-21 14:32:30.000000000 +0400 +@@ -319,6 +319,7 @@ + if (verbose) + printf(" Using arithmetic coding.\n"); + cinfo->arith_code = TRUE; ++ } + #else + fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n"); + } diff --git a/community/xpad/PKGBUILD b/community/xpad/PKGBUILD index b16213f4a..c2e718502 100644 --- a/community/xpad/PKGBUILD +++ b/community/xpad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 15560 2010-04-12 15:32:43Z spupykin $ +# $Id: PKGBUILD 59076 2011-11-21 09:10:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> @@ -9,6 +9,7 @@ pkgrel=5 pkgdesc="Stickies-like notes program" arch=(i686 x86_64) depends=('gtk2' 'libsm' 'librsvg') +makedepends=('intltool') url="http://mterry.name/xpad/" license=('GPL') install=xpad.install @@ -18,9 +19,9 @@ md5sums=('a77bbabb4917c7da9b5d097d9a4e59a7' '6a3d2952b469d65ec333714991ba8284') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/xpad-gtk-2.20.patch ./configure --prefix=/usr - /usr/bin/make || return 1 - /usr/bin/make DESTDIR=$startdir/pkg install + /usr/bin/make + /usr/bin/make DESTDIR=$pkgdir install } diff --git a/community/xsel/PKGBUILD b/community/xsel/PKGBUILD index 5961b7fb0..d1de1aed8 100644 --- a/community/xsel/PKGBUILD +++ b/community/xsel/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 44722 2011-04-11 12:24:43Z spupykin $ +# $Id: PKGBUILD 59067 2011-11-21 08:59:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xsel pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="XSel is a command-line program for getting and setting the contents of the X selection" arch=(i686 x86_64) url="http://www.vergenet.net/~conrad/software/xsel/" license=("custom") -depends=(libx11) +depends=('libx11') +makedepends=('libxt') source=(http://www.vergenet.net/~conrad/software/xsel/download/$pkgname-$pkgver.tar.gz) md5sums=('75983f143ce83dc259796c6eaf85c8f5') @@ -19,14 +20,5 @@ build() { make make DESTDIR=$pkgdir install mkdir -p $pkgdir/usr/share/licenses/xsel/ - cat >$pkgdir/usr/share/licenses/xsel/LICENSE <<EOF -Copyright (C) 2001 Conrad Parker <conrad@vergenet.net> - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation. No -representations are made about the suitability of this software for any purpose. -It is provided "as is" without express or implied warranty. -EOF + install -D -m0644 COPYING $pkgdir/usr/share/licenses/xsel/COPYING } diff --git a/community/xsensors/PKGBUILD b/community/xsensors/PKGBUILD index 012474a55..16a329b5e 100644 --- a/community/xsensors/PKGBUILD +++ b/community/xsensors/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 21366 2010-07-16 09:09:09Z lcarlier $ +# $Id: PKGBUILD 59264 2011-11-22 07:31:16Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Ray Rashif <schivmeister@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=xsensors pkgver=0.70 -pkgrel=2 +pkgrel=3 pkgdesc="X11 interface to lm_sensors" arch=('i686' 'x86_64') url="http://www.linuxhardware.org/xsensors/" @@ -14,16 +14,20 @@ license=('GPL') depends=('gtk2' 'lm_sensors') changelog=$pkgname.changelog source=(http://www.linuxhardware.org/xsensors/$pkgname-$pkgver.tar.gz - fix-deprecated-GTK_WIDGET_STATE-call.diff + remove-unused-variables.patch + replace-deprecated-gtk.patch xsensors.desktop) md5sums=('4f8fb83cfd03c0cc34967a73c6021531' - 'e5ac8e58f0dd27501234692587c01b76' + '8ca558b7f7e4a5f83f63498668c4ad8f' + 'd9ee6799d45adc7c62273f32085bec5f' 'fe1369d2b61eed1a25002e2247617357') build() { cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i ${srcdir}/fix-deprecated-GTK_WIDGET_STATE-call.diff + # patches from debian + patch -Np1 -i ${srcdir}/remove-unused-variables.patch + patch -Np1 -i ${srcdir}/replace-deprecated-gtk.patch ./configure --prefix=/usr make diff --git a/community/xsensors/remove-unused-variables.patch b/community/xsensors/remove-unused-variables.patch new file mode 100644 index 000000000..7da97a0e5 --- /dev/null +++ b/community/xsensors/remove-unused-variables.patch @@ -0,0 +1,39 @@ +Author: Nanley Chery <nanleychery@gmail.com> +From: Jean Delvare <khali@linux-fr.org> +Subject: Remove declared, but unused variables +Bug-Debian: http://bugs.debian.org/625435 +--- +--- a/src/gui.c ++++ b/src/gui.c +@@ -257,10 +257,9 @@ + + /* Start the sensor info update timer. */ + gint start_timer( GtkWidget *widget, gpointer data ) { +- gint timer; + + /* Setup timer for updates. */ +- timer = g_timeout_add( update_time * 1000, ++ g_timeout_add( update_time * 1000, + (GtkFunction) update_sensor_data, + (gpointer) data ); + +@@ -287,7 +286,7 @@ + + /* feature data */ + updates *head = NULL; +- updates *current = NULL, *prev = NULL; ++ updates *current = NULL; + + const sensors_feature *feature; + +@@ -347,10 +346,8 @@ + new_node->pbar = featpbar; + + if ( head == NULL ) { +- prev = head; + head = current = new_node; + } else { +- prev = current; + current = current->next = new_node; + } + diff --git a/community/xsensors/replace-deprecated-gtk.patch b/community/xsensors/replace-deprecated-gtk.patch new file mode 100644 index 000000000..fed4c7dc4 --- /dev/null +++ b/community/xsensors/replace-deprecated-gtk.patch @@ -0,0 +1,168 @@ +Author: Nanley Chery <nanleychery@gmail.com> +Subject: Update deprecated gtk casts and replace deprecated function calls with their analogous cairo counterparts. +Bug-Debian: http://bugs.debian.org/622005 +Bug-Debian: http://bugs.debian.org/610321 +--- +--- a/src/gui.c ++++ b/src/gui.c +@@ -27,10 +27,10 @@ + GtkWidget *mainwindow = NULL; + + GdkColor colorWhite = { 0, 0xFFFF, 0xFFFF, 0xFFFF }; +- +-GdkColormap *cmap = NULL; + +-GdkPixmap *theme = NULL; ++GdkPixbuf *theme = NULL; ++ ++cairo_surface_t *surface = NULL; + + /* Destroy the main window. */ + gint destroy_gui( GtkWidget *widget, gpointer data ) { +@@ -76,17 +76,16 @@ + } + } + +-static void draw_digits( GtkWidget *widget, const gchar *digits, int highLow ) ++static void draw_digits( GtkWidget *widget, cairo_t *cr, const gchar *digits, int highLow ) + { + const gchar *digit = digits; + int pos = 0, x = 0, y = 0, w = 0; + + while ( *digit ) { + get_pm_location( *digit, &x, &y, &w ); +- gdk_draw_drawable( widget->window, +- widget->style->fg_gc[ GTK_WIDGET_STATE +- (widget) ], theme, x, y + highLow, +- pos, 0, w, 30 ); ++ cairo_set_source_surface (cr, surface, pos-x, 0-(y + highLow)); ++ cairo_rectangle(cr, pos, 0, w, 30); ++ cairo_fill(cr); + pos += w; + digit++; + } +@@ -102,6 +101,8 @@ + + gchar result[7]; + ++ cairo_t *cr = gdk_cairo_create(widget->window); ++ + #ifdef DEBUG_XSENSORS + printf( "area.width = %d, area.height = %d\n", event->area.width, + event->area.height ); +@@ -117,13 +118,11 @@ + + /* Display the digits */ + if ( g_snprintf( result, 6, "%5.0f", current->curvalue ) >= 0 ) +- draw_digits( widget, result, highLow ); ++ draw_digits( widget, cr, result, highLow ); + + /* Display RPM */ +- gdk_draw_drawable( widget->window, +- widget->style->fg_gc[ GTK_WIDGET_STATE +- (widget) ], theme, 0, 120 + highLow, +- 90, 0, 57, 30 ); ++ cairo_set_source_surface (cr, surface, 90-0, 0-(120 + highLow)); ++ cairo_rectangle(cr, 90, 0, 57, 30); + break; + case TEMP: + if ( current->curvalue > current->curmax ) +@@ -134,17 +133,15 @@ + + /* Display the digits */ + if ( g_snprintf( result, 7, "%6.1f", current->curvalue ) >= 0 ) +- draw_digits( widget, result, highLow ); ++ draw_digits( widget, cr, result, highLow ); + + /* Display degree symbol */ + if ( tf == FALSE ) + x = 0; + else + x = 57; +- gdk_draw_drawable( widget->window, +- widget->style->fg_gc[ GTK_WIDGET_STATE +- (widget) ], theme, x, 60 + highLow, +- 96, 0, 57, 30 ); ++ cairo_set_source_surface (cr, surface, 96-x, 0-(60 + highLow)); ++ cairo_rectangle(cr, 96, 0, 57, 30); + + break; + case VOLT: +@@ -154,20 +151,17 @@ + + /* Display the digits */ + if ( g_snprintf( result, 7, "%6.2f", current->curvalue ) >= 0 ) +- draw_digits( widget, result, highLow ); ++ draw_digits( widget, cr, result, highLow ); + + /* Display V */ +- gdk_draw_drawable( widget->window, +- widget->style->fg_gc[ GTK_WIDGET_STATE +- (widget) ], theme, 114, 60 + highLow, +- 96, 0, 57, 30 ); +- +- ++ cairo_set_source_surface (cr, surface, 96-114, 0-(60 + highLow)); ++ cairo_rectangle(cr, 96, 0, 57, 30); + break; + default: + break; + } +- ++ cairo_fill(cr); ++ cairo_destroy(cr); + return TRUE; + } + +@@ -260,7 +254,7 @@ + + /* Setup timer for updates. */ + g_timeout_add( update_time * 1000, +- (GtkFunction) update_sensor_data, ++ (GSourceFunc) update_sensor_data, + (gpointer) data ); + + return SUCCESS; +@@ -460,8 +454,6 @@ + g_signal_connect( G_OBJECT (mainwindow), "delete_event", + G_CALLBACK (destroy_gui), NULL ); + +- /* Graphics needed for drawing info. */ +- cmap = gtk_widget_get_colormap( mainwindow ); + + /* Set up the image file used for displaying characters. */ + if ( imagefile == NULL ) { +@@ -481,12 +473,10 @@ + "Image file not found in either location! Exiting!\n" ); + exit( 1 ); + } else { +- theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap, +- NULL, NULL, "./images/default.xpm" ); ++ theme = gdk_pixbuf_new_from_file("./images/default.xpm", NULL ); + } + } else { +- theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap, +- NULL, NULL, imagefile ); ++ theme = gdk_pixbuf_new_from_file(imagefile, NULL ); + } + } else { + if ( stat( imagefile, &sbuf ) != 0 ) { +@@ -495,11 +485,15 @@ + "Image file not found in specified location! Exiting!\n" ); + exit( 1 ); + } else { +- theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap, +- NULL, NULL, imagefile ); ++ theme = gdk_pixbuf_new_from_file(imagefile, NULL ); + } + } +- ++ surface = cairo_image_surface_create_for_data(gdk_pixbuf_get_pixels(theme), ++ CAIRO_FORMAT_RGB24, ++ gdk_pixbuf_get_width(theme), ++ gdk_pixbuf_get_height(theme), ++ gdk_pixbuf_get_rowstride(theme)); ++ + /* Create notebook for sensors. */ + notebook = gtk_notebook_new( ); + gtk_widget_modify_bg( notebook, GTK_STATE_NORMAL, &colorWhite ); diff --git a/community/xsettings-client/PKGBUILD b/community/xsettings-client/PKGBUILD index ec8a667f2..fd84e061c 100644 --- a/community/xsettings-client/PKGBUILD +++ b/community/xsettings-client/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17719 2010-05-24 20:48:07Z spupykin $ +# $Id: PKGBUILD 59102 2011-11-21 10:29:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alois Belaska <lloyd@centrum.cz> @@ -8,15 +8,15 @@ pkgrel=5 pkgdesc="Provides cross toolkit configuration settings such as theme parameters" arch=('i686' 'x86_64') license=('GPL') -url="http://projects.o-hand.com/matchbox/sources" -depends=(glibc) +url="http://matchbox-project.org" +depends=('libx11') options=('!libtool') -source=(http://projects.o-hand.com/matchbox/sources/optional-dependencies/Xsettings-client-$pkgver.tar.gz) +source=(http://matchbox-project.org/sources/optional-dependencies/Xsettings-client-$pkgver.tar.gz) md5sums=('c14aa9db6c097e0306dac97fb7da1add') build() { cd $srcdir/Xsettings-client-$pkgver ./configure --prefix=/usr - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD index 51438b1a5..cb397f498 100644 --- a/community/yagf/PKGBUILD +++ b/community/yagf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54990 2011-08-29 13:12:11Z spupykin $ +# $Id: PKGBUILD 59071 2011-11-21 09:04:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: das-ich <das-ich@yandex.ru> @@ -14,7 +14,7 @@ optdepends=('xsane: acquire images from a scanner into YAGF directly') makedepends=('cmake') install=yagf.install source=(http://symmetrica.net/cuneiform-linux/${pkgname}-${pkgver}.tar.gz) -md5sums=('a05635b4d50058b18891dbb5b3ff09ab') +md5sums=('e77716d1d96a6c120b340539af448195') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index dafb0b22d..e39cc6cf3 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143006 2011-11-20 14:43:34Z dreisner $ +# $Id: PKGBUILD 143109 2011-11-23 02:58:17Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,7 +7,7 @@ pkgname=curl pkgver=7.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -16,9 +16,11 @@ depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') makedepends=('perl-libwww') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + fix-J-with-O-regression.patch curlbuild.h) md5sums=('8e23151f569fb54afef093ac0695077d' '5d8eb7e2e38be0fb00a043f714f6d49f' + 'aa4539ec4f4a2dad1663dc22dd3ab0a1' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') @@ -33,6 +35,10 @@ esac build() { cd "$srcdir/$pkgname-$pkgver" + # upstream bugfix + # http://curl.haxx.se/mail/archive-2011-11/0030.html + patch -Np1 < "$srcdir/fix-J-with-O-regression.patch" + ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ diff --git a/core/curl/fix-J-with-O-regression.patch b/core/curl/fix-J-with-O-regression.patch new file mode 100644 index 000000000..4b7de1a23 --- /dev/null +++ b/core/curl/fix-J-with-O-regression.patch @@ -0,0 +1,142 @@ +From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Sun, 20 Nov 2011 23:33:46 +0100 +Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes! + +A regression between 7.22.0 and 7.23.0 -- downloading a file with the +flags -O and -J results in the content being written to stdout if and +only if there was no Content-Disposition header in the http response. If +there is a C-D header with a filename attribute, the output is correctly +written. + +Reported by: Dave Reisner +Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html +--- + src/tool_cb_hdr.c | 3 +- + src/tool_operate.c | 59 ++++++++++++++++++++++---------------------- + src/tool_operhlp.c | 18 +++++++++++++ + tests/data/Makefile.am | 2 +- + tests/data/test1210 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 112 insertions(+), 33 deletions(-) + create mode 100644 tests/data/test1210 + +diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c +index fb24b45..dea7338 100644 +--- a/src/tool_cb_hdr.c ++++ b/src/tool_cb_hdr.c +@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata) + } + #endif + +- if(!outs->filename && (cb > 20) && +- checkprefix("Content-disposition:", str)) { ++ if((cb > 20) && checkprefix("Content-disposition:", str)) { + const char *p = str + 20; + + /* look for the 'filename=' parameter +diff --git a/src/tool_operate.c b/src/tool_operate.c +index 7ab815f..1e88120 100644 +--- a/src/tool_operate.c ++++ b/src/tool_operate.c +@@ -576,41 +576,40 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) + + if((urlnode->flags & GETOUT_USEREMOTE) + && config->content_disposition) { +- /* Our header callback sets the filename */ ++ /* Our header callback MIGHT set the filename */ + DEBUGASSERT(!outs.filename); + } +- else { +- if(config->resume_from_current) { +- /* We're told to continue from where we are now. Get the size +- of the file as it is now and open it for append instead */ +- struct_stat fileinfo; +- /* VMS -- Danger, the filesize is only valid for stream files */ +- if(0 == stat(outfile, &fileinfo)) +- /* set offset to current file size: */ +- config->resume_from = fileinfo.st_size; +- else +- /* let offset be 0 */ +- config->resume_from = 0; +- } + +- if(config->resume_from) { +- /* open file for output: */ +- FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); +- if(!file) { +- helpf(config->errors, "Can't open '%s'!\n", outfile); +- res = CURLE_WRITE_ERROR; +- goto quit_urls; +- } +- outs.fopened = TRUE; +- outs.stream = file; +- outs.init = config->resume_from; +- } +- else { +- outs.stream = NULL; /* open when needed */ ++ if(config->resume_from_current) { ++ /* We're told to continue from where we are now. Get the size ++ of the file as it is now and open it for append instead */ ++ struct_stat fileinfo; ++ /* VMS -- Danger, the filesize is only valid for stream files */ ++ if(0 == stat(outfile, &fileinfo)) ++ /* set offset to current file size: */ ++ config->resume_from = fileinfo.st_size; ++ else ++ /* let offset be 0 */ ++ config->resume_from = 0; ++ } ++ ++ if(config->resume_from) { ++ /* open file for output: */ ++ FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); ++ if(!file) { ++ helpf(config->errors, "Can't open '%s'!\n", outfile); ++ res = CURLE_WRITE_ERROR; ++ goto quit_urls; + } +- outs.filename = outfile; +- outs.s_isreg = TRUE; ++ outs.fopened = TRUE; ++ outs.stream = file; ++ outs.init = config->resume_from; ++ } ++ else { ++ outs.stream = NULL; /* open when needed */ + } ++ outs.filename = outfile; ++ outs.s_isreg = TRUE; + } + + if(uploadfile && !stdin_upload(uploadfile)) { +diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c +index 808d2d5..4c1697b 100644 +--- a/src/tool_operhlp.c ++++ b/src/tool_operhlp.c +@@ -178,6 +178,24 @@ CURLcode get_url_file_name(char **filename, const char *url) + return CURLE_OUT_OF_MEMORY; + } + } ++ ++ /* in case we built debug enabled, we allow an environment variable ++ * named CURL_TESTDIR to prefix the given file name to put it into a ++ * specific directory ++ */ ++#ifdef DEBUGBUILD ++ { ++ char *tdir = curlx_getenv("CURL_TESTDIR"); ++ if(tdir) { ++ char buffer[512]; /* suitably large */ ++ snprintf(buffer, sizeof(buffer), "%s/%s", tdir, *filename); ++ Curl_safefree(*filename); ++ *filename = strdup(buffer); /* clone the buffer */ ++ curl_free(tdir); ++ } ++ } ++#endif ++ + return CURLE_OK; + } + +-- +1.7.7.3 diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD index 5a4c97dfc..5fdaa650e 100644 --- a/core/syslog-ng/PKGBUILD +++ b/core/syslog-ng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142836 2011-11-16 14:19:52Z dreisner $ +# $Id: PKGBUILD 143107 2011-11-23 02:58:14Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=syslog-ng pkgver=3.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') @@ -24,7 +24,7 @@ source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source syslog-ng.rc) sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638' '98074e0facfc6ef036202662cc86d04b38a2c142' - 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' + '949128fe3d7f77a7aab99048061f885bc758000c' 'a6ad26912b5bcbe1b47b003309945d733613b98f') build() { diff --git a/core/syslog-ng/syslog-ng.logrotate b/core/syslog-ng/syslog-ng.logrotate index e0e6929f2..3509f2970 100644 --- a/core/syslog-ng/syslog-ng.logrotate +++ b/core/syslog-ng/syslog-ng.logrotate @@ -2,6 +2,6 @@ missingok sharedscripts postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP $(cat /run/syslog-ng.pid 2>/dev/null) 2>/dev/null || true endscript } diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index a86846f68..3353e15d4 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142567 2011-11-12 08:25:22Z giovanni $ +# $Id: PKGBUILD 143076 2011-11-22 12:47:07Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10674 +pkgver=10683 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('3557fb22e7ca7d973414d7eedfbbb79f') +md5sums=('c9adbecbbec7831fc42b177c8b548e05') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD index d16d11ce9..45643af78 100644 --- a/extra/c-ares/PKGBUILD +++ b/extra/c-ares/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 104396 2011-01-02 08:09:16Z dgriffiths $ +# $Id: PKGBUILD 143105 2011-11-23 02:52:51Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=c-ares -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 pkgdesc='C library that performs DNS requests and name resolves asynchronously' arch=('i686' 'x86_64') @@ -12,22 +13,22 @@ url='http://c-ares.haxx.se/' license=('custom') depends=('glibc') options=('!libtool') -source=(http://c-ares.haxx.se/${pkgname}-${pkgver}.tar.gz - LICENSE) -md5sums=('dd71e8f07d9f3c837e12a5416d1b7f73' +source=("http://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + 'LICENSE') +md5sums=('800875fc23cd8e1924d8af9172ed33e7' + '593129fa3c0612b78594adbe4ee48ca1' 'c69f2042941b708ce3e7121424d0b7e6') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --enable-shared || return 1 - make || return 1 + ./configure --prefix=/usr --enable-shared + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "$srcdir/$pkgname-$pkgver" - install -Dm644 ${srcdir}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD index 65d1420c2..c7c556c27 100644 --- a/extra/di/PKGBUILD +++ b/extra/di/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140256 2011-10-11 02:47:40Z eric $ +# $Id: PKGBUILD 143044 2011-11-21 22:39:45Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=di -pkgver=4.30 +pkgver=4.31 pkgrel=1 pkgdesc="A disk information utility, displaying everything (and more) that your df command does" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.gentoo.com/di/" license=('ZLIB') depends=('glibc') source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz) -sha1sums=('45fae9dd34df9f5f2c391237fb316c056d4854fe') +sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 60914c319..74e60403b 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 140977 2011-10-20 11:11:57Z heftig $ +# $Id: PKGBUILD 143098 2011-11-22 18:39:54Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64') url="http://www.gnome.org/" license=('GPL2') -depends=('eog' 'libpeas' 'libchamplain' 'libexif' 'libgdata') +depends=('eog' 'libchamplain' 'libgdata') makedepends=('intltool') install=eog-plugins.install options=('!libtool') groups=(gnome-extra) -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('f78ac3e72a6f04d9fa4b1a9f973967ae9530b3265abd4b78180730d23c295d9c') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('123e50be69c33bddc5d6def0a1f618970e01207c2e959edbaf0afc56717d8975') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 9f2dc994e..cdbe94d39 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142690 2011-11-12 18:51:16Z ibiru $ +# $Id: PKGBUILD 143028 2011-11-21 05:59:12Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GTK+ is a multi-platform toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -14,12 +14,15 @@ options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz - settings.ini) + settings.ini + fix_crash_treeview.patch) sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' + 'eb187ef05f3735b24b58cd4c533dc3d4f616103cafba399c009ea3eb519be0b9') build() { cd "$srcdir/gtk+-$pkgver" + patch -Np1 -R -i "$srcdir/fix_crash_treeview.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk3/fix_crash_treeview.patch b/extra/gtk3/fix_crash_treeview.patch new file mode 100644 index 000000000..12c6372f1 --- /dev/null +++ b/extra/gtk3/fix_crash_treeview.patch @@ -0,0 +1,55 @@ +From 456b19a35adbdc4b098e6da020c3a87cb62ae7f4 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Thu, 10 Nov 2011 15:52:44 +0000 +Subject: a11y: Fix gcc warning + +--- +diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c +index 663bb51..b2ca9ba 100644 +--- a/gtk/a11y/gtktreeviewaccessible.c ++++ b/gtk/a11y/gtktreeviewaccessible.c +@@ -238,7 +238,7 @@ gtk_tree_view_accessible_initialize (AtkObject *obj, + accessible->n_children_deleted = 0; + + accessible->cell_info_by_index = g_hash_table_new_full (g_int_hash, +- g_int_equal, NULL, cell_info_free); ++ g_int_equal, NULL, (GDestroyNotify) cell_info_free); + + widget = GTK_WIDGET (data); + tree_view = GTK_TREE_VIEW (widget); +-- +cgit v0.9.0.2 +From b25621173734ad1c9cee83802f7ac32ab7df20e7 Mon Sep 17 00:00:00 2001 +From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> +Date: Wed, 09 Nov 2011 13:32:32 +0000 +Subject: gtktreeviewaccessible: use a value_destroy_func with the cell_info_by_index hash + +This ensures that we don't leak any GtkTreeViewAccessibleCellInfo when +re-inserting a new one with the same key. + +https://bugzilla.gnome.org/show_bug.cgi?id=663694 +--- +diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c +index 046e253..4ad323c 100644 +--- a/gtk/a11y/gtktreeviewaccessible.c ++++ b/gtk/a11y/gtktreeviewaccessible.c +@@ -237,7 +237,8 @@ gtk_tree_view_accessible_initialize (AtkObject *obj, + accessible->idle_expand_path = NULL; + accessible->n_children_deleted = 0; + +- accessible->cell_info_by_index = g_hash_table_new (g_int_hash, g_int_equal); ++ accessible->cell_info_by_index = g_hash_table_new_full (g_int_hash, ++ g_int_equal, NULL, cell_info_free); + + widget = GTK_WIDGET (data); + tree_view = GTK_TREE_VIEW (widget); +@@ -2845,7 +2846,6 @@ garbage_collect_cell_data (gpointer data) + { + if (!cell_info->in_use) + { +- cell_info_free (cell_info); + g_hash_table_iter_remove (&iter); + } + } +-- +cgit v0.9.0.2 diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index 25445be95..13f086340 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 139869 2011-10-05 15:17:09Z stephane $ +# $Id: PKGBUILD 143086 2011-11-22 17:32:42Z stephane $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.2.2 +pkgver=1.3 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64') url="http://www.open-mpi.org/projects/hwloc/" license=('BSD') -depends=('sh') +depends=('sh' 'pciutils') makedepends=('pkg-config') optdepends=('cairo: Graphical output' 'libxml2: XML export') options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.2/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9805effb53a69199bcaf86efaf349fee684cb0a6') +source=(http://www.open-mpi.org/software/hwloc/v1.3/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('4d4de0f48f8b9a1eaf75d55bc93e0e624f6194eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD index 280870dd8..9ac9fc40a 100644 --- a/extra/libdvbpsi/PKGBUILD +++ b/extra/libdvbpsi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136933 2011-09-03 00:24:33Z giovanni $ +# $Id: PKGBUILD 143078 2011-11-22 13:07:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=libdvbpsi -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5') conflicts=('libdvbpsi4' 'libdvbpsi5') url="http://developers.videolan.org/libdvbpsi/" source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c8582dc18fc7ea1f76016d78a76ea5dd') +md5sums=('b387e07ffd844b61c7a050c47307c0f7') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,5 +25,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install } diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD index 66ab46ea6..b4cdf8f55 100644 --- a/extra/libepc/PKGBUILD +++ b/extra/libepc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140436 2011-10-14 09:44:47Z ibiru $ +# $Id: PKGBUILD 143091 2011-11-22 18:13:16Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libepc -pkgver=0.4.2 +pkgver=0.4.3 pkgrel=1 pkgdesc="Easy Publish and Consume Library" arch=(i686 x86_64) @@ -10,20 +10,18 @@ license=('LGPL') url="http://live.gnome.org/libepc" depends=('gtk3' 'avahi' 'libsoup') makedepends=('intltool') -options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3dff25a7f2f0d024b7609389f13664789b0ab45a0e5740908395e3d49cceefc2') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) +sha256sums=('57303bc180ef1447e060a64590fd359365390e14a90dddc8b8af8d3a6551e454') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } - - diff --git a/extra/libmsn/PKGBUILD b/extra/libmsn/PKGBUILD index e9473d02e..8bbac76e2 100644 --- a/extra/libmsn/PKGBUILD +++ b/extra/libmsn/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 142434 2011-11-09 18:49:42Z andrea $ +# $Id: PKGBUILD 143093 2011-11-22 18:18:21Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Charly Ghislain <charlyghislain@gmail.com> pkgname=libmsn pkgver=4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A reusable, open-source, fully documented library for connecting to Microsoft's MSN" url="http://sourceforge.net/projects/libmsn/" arch=('i686' 'x86_64') license=('GPL2') depends=('openssl') makedepends=('cmake') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('8887196051d2960a9279a5e00c8416a4') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" + 'fix-header.patch') +md5sums=('8887196051d2960a9279a5e00c8416a4' + '918b4fc89910118c63b2147eacc2c3f3') build() { cd "${srcdir}" + + patch -p0 -i "${srcdir}"/fix-header.patch + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/extra/libmsn/fix-header.patch b/extra/libmsn/fix-header.patch new file mode 100644 index 000000000..82fae6fc4 --- /dev/null +++ b/extra/libmsn/fix-header.patch @@ -0,0 +1,12 @@ +diff -up libmsn-4.2/msn/CMakeLists.txt.xmlParser_h libmsn-4.2/msn/CMakeLists.txt +--- libmsn-4.2/msn/CMakeLists.txt.xmlParser_h 2010-01-05 06:07:08.000000000 -0600 ++++ libmsn-4.2/msn/CMakeLists.txt 2011-11-18 17:00:37.758298054 -0600 +@@ -37,7 +37,7 @@ set(msn_HEADERS + buddy.h + passport.h + sstream_fix.h +- soap.h ++ soap.h xmlParser.h + p2p.h + msnobject.h + libmsn_export.h) diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD index 20c1c66c9..82623f37a 100644 --- a/extra/libupnp/PKGBUILD +++ b/extra/libupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 116007 2011-03-22 15:41:57Z giovanni $ +# $Id: PKGBUILD 143080 2011-11-22 13:19:50Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: kastor <kastor@fobos.org.ar> pkgname=libupnp -pkgver=1.6.13 +pkgver=1.6.14 pkgrel=1 pkgdesc="Portable Open Source UPnP Development Kit" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glibc') makedepends=('pkgconfig') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2") -md5sums=('71476b1781ad179bfc9bead640be5f54') +md5sums=('a0497cf15b3e15f7e7ede88b3d04861b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 1ce809241..215af532e 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142561 2011-11-12 07:58:37Z giovanni $ +# $Id: PKGBUILD 143082 2011-11-22 13:27:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.11.08 +pkgver=2011.11.20 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('962ff6b036247e2abac091a6047eb822') +md5sums=('8e5ebefdf7d12ca9cfd7175ff3d7eef2') build() { cd ${srcdir}/live diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index a0aba50c9..4673b26a6 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139875 2011-10-05 16:57:34Z stephane $ +# $Id: PKGBUILD 143088 2011-11-22 17:32:55Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi pkgver=1.5.4 -pkgrel=1 +pkgrel=2 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64') url="http://www.open-mpi.org" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 5ee2371a4..ce915ae53 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140328 2011-10-11 21:29:11Z jgc $ +# $Id: PKGBUILD 143035 2011-11-21 15:50:17Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.16.0 +pkgver=2.17.0 pkgrel=1 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy' options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf') +sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/multilib/lib32-freetype2/PKGBUILD b/multilib/lib32-freetype2/PKGBUILD index 73a59381b..434785cd9 100644 --- a/multilib/lib32-freetype2/PKGBUILD +++ b/multilib/lib32-freetype2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 53420 2011-08-03 14:38:19Z ibiru $ +# $Id: PKGBUILD 59294 2011-11-22 20:49:51Z bluewind $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgbasename=freetype2 pkgname=lib32-$_pkgbasename -pkgver=2.4.6 -pkgrel=2 +pkgver=2.4.8 +pkgrel=1 pkgdesc="TrueType font rendering library (32-bit)" arch=(x86_64) license=('GPL') @@ -16,7 +16,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.3.0-enable-spr.patch freetype-2.2.1-enable-valid.patch) -md5sums=('5e6510613f612809d2d7862592b92ab7' +md5sums=('dbf2caca1d3afd410a29217a9809d397' '816dc8619a6904a7385769433c0a8653' '214119610444c9b02766ccee5e220680') diff --git a/staging/avahi/PKGBUILD b/staging/avahi/PKGBUILD new file mode 100644 index 000000000..ef93bd3be --- /dev/null +++ b/staging/avahi/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 143032 2011-11-21 14:01:14Z bisson $ +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=avahi +pkgver=0.6.30 +pkgrel=6 +pkgdesc='A multicast/unicast DNS-SD framework' +arch=('i686' 'x86_64') +url='http://www.avahi.org/' +license=('LGPL') +depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' + 'gtk2: gtk2 bindings' + 'qt3: qt3 bindings' + 'qt: qt bindings' + 'pygtk: avahi-bookmarks, avahi-discover' + 'twisted: avahi-bookmarks' + 'mono: mono bindings' + 'dbus-python: avahi-discover' + 'nss-mdns: NSS support for mDNS') +makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' + 'gtk-sharp-2' 'gobject-introspection' 'gtk3') +backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) +install=install +conflicts=('howl' 'mdnsresponder') +provides=('howl' 'mdnsresponder') +replaces=('howl' 'mdnsresponder') +options=('!libtool') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" + 'gnome-nettool.png' + 'rc.d.patch') +sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -p1 -i "../rc.d.patch" + + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 + PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png + + cd "${pkgdir}" + sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + # howl and mdnsresponder compatability + (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) + (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) +} diff --git a/staging/avahi/gnome-nettool.png b/staging/avahi/gnome-nettool.png Binary files differnew file mode 100644 index 000000000..227d0678a --- /dev/null +++ b/staging/avahi/gnome-nettool.png diff --git a/staging/avahi/install b/staging/avahi/install new file mode 100644 index 000000000..7c75c3dd4 --- /dev/null +++ b/staging/avahi/install @@ -0,0 +1,21 @@ +post_install() { + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + + cat <<EOF +==> The following daemons may be added to DAEMONS in /etc/rc.conf: +==> avahi-daemon: the mdns responder, you probably want this. +==> dbus needs to be running when you start it. +==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns +==> configuration on dhcp-less networks. + +==> To use some of the client applications you will have to install python. +==> In addition, pygtk is required for the graphical ones and +==> twisted for avahi-bookmarks. +EOF +} + +post_remove() { + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null +} diff --git a/staging/avahi/rc.d.patch b/staging/avahi/rc.d.patch new file mode 100644 index 000000000..fd735734b --- /dev/null +++ b/staging/avahi/rc.d.patch @@ -0,0 +1,11 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 +@@ -33,6 +33,7 @@ + + case "$1" in + start) ++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then diff --git a/staging/python/PKGBUILD b/staging/python/PKGBUILD new file mode 100644 index 000000000..544b2ea51 --- /dev/null +++ b/staging/python/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 143041 2011-11-21 17:38:43Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=python +pkgver=3.2.2 +pkgrel=2 +_pybasever=3.2 +pkgdesc="Next generation of the python high-level scripting language" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.python.org/" +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') +makedepends=('tk' 'sqlite3' 'valgrind') +optdepends=('tk: for tkinter' 'sqlite3') +provides=('python3') +replaces=('python3') +options=('!makeflags') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz + gdbm-magic-values.patch) +sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769' + '43bfbe3e23360f412b95cb284ff29b2cbe338be9') + +build() { + cd "${srcdir}/Python-${pkgver}" + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + + # gdbm has new magic that whichdb does not recognize + # http://bugs.python.org/issue13007 + patch -Np1 -i ../gdbm-magic-values.patch + + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-valgrind \ + --with-wide-unicode \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --with-system-ffi + + make +} + +check() { + cd "${srcdir}/Python-${pkgver}" + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site test_uuid +} + +package() { + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" install maninstall + + # Why are these not done by default... + ln -sf python3 "${pkgdir}/usr/bin/python" + ln -sf python3-config "${pkgdir}/usr/bin/python-config" + ln -sf idle3 "${pkgdir}/usr/bin/idle" + ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" + + # Fix FS#22552 + ln -sf ../../libpython${_pybasever}mu.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so" + + # Clean-up reference to build directory + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile" + + # License + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/python/gdbm-magic-values.patch b/staging/python/gdbm-magic-values.patch new file mode 100644 index 000000000..e8ce828cf --- /dev/null +++ b/staging/python/gdbm-magic-values.patch @@ -0,0 +1,13 @@ +diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic Python-3.2.2/Lib/dbm/__init__.py +--- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic 2011-09-03 12:16:40.000000000 -0400 ++++ Python-3.2.2/Lib/dbm/__init__.py 2011-09-30 15:47:27.488863694 -0400 +@@ -166,7 +166,7 @@ def whichdb(filename): + return "" + + # Check for GNU dbm +- if magic == 0x13579ace: ++ if magic in (0x13579ace, 0x13579acd, 0x13579acf): + return "dbm.gnu" + + # Later versions of Berkeley db hash file have a 12-byte pad in +diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS diff --git a/testing/htop/ChangeLog b/testing/htop/ChangeLog new file mode 100644 index 000000000..df71cf644 --- /dev/null +++ b/testing/htop/ChangeLog @@ -0,0 +1,22 @@ +2011-10-19 Andrea Scarpino <andrea@archlinux.org> + * Enable cgroup support (FS#26155) + * Add lsof and strace optional depends (FS#25778) + * Fix crash when column is less than 40 (closes FS#25823) + +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Added patch to fix --sort-key (closes FS#23224) + +2009-09-21 Eric Belanger <eric@archlinux.org> + + * htop 0.8.3-1 + * Upstream update + * Built with vserver and openvz support (close FS#12755) + +2008-12-09 Alexander Fehr <pizzapunk gmail com> + + * htop-0.8.1-1: + * New upstream release + * New maintainer + * Added patch to fix FS#12235 + * Enabled Unicode support + * Added ChangeLog diff --git a/testing/htop/PKGBUILD b/testing/htop/PKGBUILD new file mode 100644 index 000000000..8457c8f5a --- /dev/null +++ b/testing/htop/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 143084 2011-11-22 15:51:43Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=htop +pkgver=1.0 +pkgrel=1 +pkgdesc="Interactive process viewer" +arch=('i686' 'x86_64') +url="http://htop.sourceforge.net/" +license=('GPL') +depends=('ncurses') +makedepends=('python2') +optdepends=('lsof' 'strace') +options=('!emptydirs') +changelog=ChangeLog +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('325112ca7947ea1f6d6441f631e00384') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure + sed -i 's|python|python2|' scripts/MakeHeader.py + + ./configure --prefix=/usr \ + --enable-unicode \ + --enable-openvz \ + --enable-vserver \ + --enable-cgroup + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} |
