diff options
60 files changed, 1343 insertions, 151 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 1c212359e..97392ffb7 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44077 2011-04-01 22:22:26Z giovanni $ +# $Id: PKGBUILD 44597 2011-04-09 12:11:31Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.7.53 +pkgver=0.7.54 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('1b0ce46a0d7088bbc32383f1be212c16' +md5sums=('6d6f7b13cb94b66ae413737eb6b7e6a5' 'bcc538a3b004429bf8f5a0ac1d89a37f') build() { diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD index 272064aeb..fda3f16a5 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 38484 2011-01-27 17:01:24Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 44627 2011-04-09 15:52:17Z andrea $ +# Maintainer: Peter Lewis <plewis@aur.archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Emanuele Rossi <newdna1510@yahoo.it> # Contributor: Bram Schoenmakers <me@bramschoenmakers.nl> pkgname=choqok -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="A Twitter/identi.ca/laconica client for KDE" url="http://choqok.gnufolks.org/" license=('GPL') arch=('i686' 'x86_64') depends=('kdebase-runtime' 'qjson' 'qoauth' 'qca-ossl') -makedepends=('cmake' 'automoc4' 'docbook-xsl') +makedepends=('cmake' 'automoc4') optdepends=('kdebase-konqueror: proxy support') install="${pkgname}.install" -source=("http://choqok.gnufolks.org/pkgs/${pkgname}-${pkgver}.tar.bz2") -md5sums=('536e05d26dd5cea43c6d8dc17c283104') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('5006404ce250d4a75d4bb762c747962d') build() { cd ${srcdir} diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD index 98715fa81..4e6e36b1f 100644 --- a/community/clanlib/PKGBUILD +++ b/community/clanlib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 42869 2011-03-22 00:50:22Z svenstaro $ +# $Id: PKGBUILD 44605 2011-04-09 12:36:14Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=clanlib -pkgver=2.2.7 +pkgver=2.2.8 pkgrel=1 pkgdesc="A multi-platform game development library." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' makedepends=('doxygen' 'graphviz') options=('!libtool') source=(http://clanlib.org/download/releases-2.0/ClanLib-${pkgver}.tgz) -md5sums=('a6207ce394e60151c61aa5ad99de336d') +md5sums=('b4184ea1535bbda52c2eea7523f332e4') build() { cd ${srcdir}/ClanLib-${pkgver} diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD index 1ebc4d91d..544edc1c2 100644 --- a/community/courier-imap/PKGBUILD +++ b/community/courier-imap/PKGBUILD @@ -4,8 +4,8 @@ # Committer: Manolis Tzanidakis <manolis@archlinux.org> pkgname=courier-imap -pkgver=4.8.1 -pkgrel=2 +pkgver=4.9.0 +pkgrel=1 pkgdesc="IMAP(s)/POP3(s) Server" arch=('i686' 'x86_64') license=('GPL2') @@ -21,9 +21,9 @@ options=('!libtool') source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 courier-imap.conf.d courier-imap.rc.d) -md5sums=('67dbd0e698f03d1a50db906318af8db9' +md5sums=('5623b98b7fb5cf5595eeb0c18c0c2807' '3e08f017f6c5a52dea28f6f0dbd50b86' - '16153138a5a784abe45e97131f9f809d') + '3e4910c5a34af68dfdeed932e573a9f9') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/courier-imap/courier-imap.rc.d b/community/courier-imap/courier-imap.rc.d index 03b9e0183..1389221f8 100644 --- a/community/courier-imap/courier-imap.rc.d +++ b/community/courier-imap/courier-imap.rc.d @@ -1,3 +1,5 @@ +#!/bin/bash + CI_DAEMONS= [ -f /etc/conf.d/courier-imap ] && . /etc/conf.d/courier-imap [ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD index c6dd433bb..8ef4db6f5 100644 --- a/community/courier-maildrop/PKGBUILD +++ b/community/courier-maildrop/PKGBUILD @@ -5,7 +5,7 @@ pkgname=courier-maildrop _srcname=maildrop -pkgver=2.5.2 +pkgver=2.5.3 pkgrel=1 pkgdesc="mail delivery agent - procmail like but nicer syntax" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('courier-authlib>=0.63.0' 'fam' 'pcre' 'gdbm') conflicts=('courier-mta') options=(!libtool) source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) -md5sums=('3edb56534ae442a494255db6c8aaab99') +md5sums=('5ba52236cec2947e75fafcd6146fd8cd') build() { cd ${srcdir}/${_srcname}-${pkgver} diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD index 4d57566d9..3127ce984 100644 --- a/community/courier-mta/PKGBUILD +++ b/community/courier-mta/PKGBUILD @@ -8,8 +8,8 @@ pkgname=courier-mta -pkgver=0.65.3 -pkgrel=2 +pkgver=0.66.0 +pkgrel=1 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" arch=(i686 x86_64) license=('GPL2') @@ -32,7 +32,7 @@ install=courier-mta.install source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 courier-mta.rc.d courier-mta.conf.d) -md5sums=('581f73ffad17e0a106177ff1209b042d' +md5sums=('5d5ed1ae407ee4ffcf1302e5cbac661f' 'e140f320968e57cfe459cd7a3b4017e0' 'f3ff70b40c7a1f7a017e8c4cc4d92f4f') diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD index ddc286ee0..6b5d3069d 100644 --- a/community/murmur/PKGBUILD +++ b/community/murmur/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 44559 2011-04-08 22:50:52Z svenstaro $ +# $Id: PKGBUILD 44592 2011-04-09 11:22:35Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Otto Allmendinger <otto.allmendinger@googlemail.com> # Contributor: Malte Rabenseifner <malte@zearan.de> pkgname=murmur pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc="The voice chat application server for Mumble" arch=('i686' 'x86_64') url="http://mumble.sourceforge.net" @@ -23,7 +23,7 @@ source=("http://downloads.sourceforge.net/mumble/mumble-$pkgver.tar.gz" "murmur.dbus.conf" "murmur.logrotate.d") md5sums=('55804e3dfe98b16eeb40abca6c254625' - 'eec4ac14524be18738f7caf8140a3611' + 'a4f6fc515f258eb4db437a226e16de5d' '11c1cc875e8021739ec2087252cf0533' 'eddea4cdbd0bde4b960a67e16b5d5478' 'c56726cb267ead68f37f35c28e36e6fa') diff --git a/community/murmur/murmur.install b/community/murmur/murmur.install index 9e1446d2e..1f49aa53b 100644 --- a/community/murmur/murmur.install +++ b/community/murmur/murmur.install @@ -9,7 +9,6 @@ post_install() { /usr/sbin/useradd -d /var/lib/murmur -g murmur -s /bin/false murmur chown -R murmur:murmur /var/lib/murmur - chown -R murmur:murmur /var/run/murmur chown -R murmur:murmur /var/log/murmur echo diff --git a/community/murmur/murmur.rc.d b/community/murmur/murmur.rc.d index c4307f406..e26a2a3db 100644 --- a/community/murmur/murmur.rc.d +++ b/community/murmur/murmur.rc.d @@ -13,6 +13,7 @@ case "$1" in stat_busy "Starting murmur" [ -d /var/run/murmur ] || mkdir -p /var/run/murmur + chown murmur:murmur /var/run/murmur [ -z "$PID" ] && /usr/sbin/murmurd $PARAMS if [ $? -gt 0 ]; then diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD index 20314f945..99dae87f7 100644 --- a/community/qtfm/PKGBUILD +++ b/community/qtfm/PKGBUILD @@ -2,15 +2,15 @@ # Contributor: Wittfella <wittfella@wittfella.com> pkgname=qtfm -pkgver=4.8 -pkgrel=2 +pkgver=4.9 +pkgrel=1 pkgdesc="A lightweight file manager" arch=('i686' 'x86_64') url="http://www.qtfm.org" license=('GPL') depends=('qt') source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz) -md5sums=('af419b8681f8031620259e0ac2957e46') +md5sums=('09e4e09f4d18c9967e65249f8b509522') build() { cd "$startdir/src/$pkgname-$pkgver" diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 7d308f872..388001cf4 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 34315 2010-12-06 10:11:27Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 44632 2011-04-09 15:53:51Z andrea $ +# Maintainer: Peter Lewis <plewis@aur.archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net> pkgname=rekonq -pkgver=0.6.1 -pkgrel=3 +pkgver=0.7.0 +pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') -url='http://rekonq.sourceforge.net/' +url='http://rekonq.kde.org/' license=('GPL') depends=('kdebase-keditbookmarks') -makedepends=('cmake' 'automoc4' 'docbook-xsl') +makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('3c67de04fe21bb3cd52509e45c821da5') +md5sums=('73de712f71ea4caf2e66a92c77505da8') build(){ cd ${srcdir} diff --git a/community/udunits/PKGBUILD b/community/udunits/PKGBUILD index b4bdcbfe4..6e9bc02e5 100644 --- a/community/udunits/PKGBUILD +++ b/community/udunits/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 37949 2011-01-19 05:42:10Z kchen $ +# $Id: PKGBUILD 44587 2011-04-09 04:53:44Z kchen $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> pkgname=udunits -pkgver=2.1.20 +pkgver=2.1.22 pkgrel=1 pkgdesc='A tool for calculations of physical quantities' arch=('i686' 'x86_64') @@ -14,14 +14,17 @@ depends=('glibc') provides=('udunits2') install=udunits.install source=("ftp://ftp.unidata.ucar.edu/pub/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('e3282ad8c055dece9d48723d58d4d4c5') +md5sums=('9a1972a1389a9a613beacd9b05aef6ed') build() { + # stupid workaround for broken make install + install -dm755 $pkgdir/usr/share/doc/$pkgname + cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make; make DESTDIR=$pkgdir install - for x in a so so.0 so.0.0.0; do + for x in so so.0 so.0.1.0; do ln -s libudunits2.$x \ $pkgdir/usr/lib/libudunits.$x done diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index e4fb4b8cd..1eb7dc82a 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111279 2011-02-25 16:37:08Z ronald $ +# $Id: PKGBUILD 118799 2011-04-07 19:53:44Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.2.11 +pkgver=5.2.12 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" @@ -16,8 +16,9 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ 'dhcpcd.conf.d') -sha1sums=('3b170b45af314f84008650bb7447320655969241' +sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5' 'b67b9ce6a2faaca75fea356966a16be2283b7db0') + build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD index 4161a74b1..118b43474 100644 --- a/core/dmraid/PKGBUILD +++ b/core/dmraid/PKGBUILD @@ -1,30 +1,33 @@ -# $Id: PKGBUILD 77425 2010-04-12 20:48:57Z thomas $ +# $Id: PKGBUILD 116764 2011-03-25 20:30:44Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=dmraid -pkgver=1.0.0.rc16+CVS -pkgrel=2 +pkgver=1.0.0.rc16.3 +pkgrel=1 pkgdesc="Device mapper RAID interface" url="http://people.redhat.com/~heinzm/sw/dmraid/" depends=('device-mapper>=2.0.54') arch=('i686' 'x86_64') license=('GPL') -source=(ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 - #http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-$pkgver.tar.bz2 +source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2 + http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2 dmraid_install dmraid_hook) install=dmraid.install -md5sums=('c0de87073de96b311d26ab0170b2a753' +md5sums=('819338fcef98e8e25819f0516722beeb' 'd01908b414e1686c0f3233ff37de78a5' '0a748b6e78b156f2f9dda45fc629651f') build() { - cd "$srcdir"/$pkgname/$pkgver - + cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname ./configure --enable-led --enable-intel_led - make || return 1 - make DESTDIR="$pkgdir" mandir=/usr/share/man includedir=/usr/include install || return 1 + make +} + +package() { + cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname + make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install mkdir -p "$pkgdir"/var/lock/dmraid chmod 1777 "$pkgdir"/var/lock/ install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/lib/initcpio/install/dmraid diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index c26270001..c55847667 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 85547 2010-07-15 21:16:57Z andyrtr $ +# $Id: PKGBUILD 117849 2011-04-04 18:49:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libgcrypt pkgver=1.4.6 -pkgrel=1 +pkgrel=2 pkgdesc="a general purpose crypto library based on the code used" arch=(i686 x86_64) url="http://www.gnupg.org" license=('LGPL') -depends=('libgpg-error>=1.7') +depends=('libgpg-error>=1.9') options=(!libtool) source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 @@ -17,17 +17,23 @@ md5sums=('dbf99425a4fe9217c84ce3a35d938634') build() { cd ${srcdir}/${pkgname}-${pkgver} - # keep static library for , needed for cryptsetup - ./configure --prefix=/usr --disable-padlock-support + ./configure --prefix=/usr \ + --disable-static \ + --disable-padlock-support make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install # Move dynamic libraries to /lib - install -d -m755 "${pkgdir}"/lib/ || return 1 - mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/ || return 1 - ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so || return 1 + install -d -m755 "${pkgdir}"/lib/ + mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/ + ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so } diff --git a/core/libgcrypt/libgcrypt.install b/core/libgcrypt/libgcrypt.install index 81547f57f..83e0dcb27 100644 --- a/core/libgcrypt/libgcrypt.install +++ b/core/libgcrypt/libgcrypt.install @@ -1,5 +1,5 @@ infodir=/usr/share/info -filelist=(gcrypt.info) +filelist=(gcrypt.info.gz) post_install() { [ -x usr/bin/install-info ] || return 0 @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD index ed2a30da9..cbc32f7b5 100644 --- a/core/libgpg-error/PKGBUILD +++ b/core/libgpg-error/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87301 2010-08-12 05:22:29Z andyrtr $ +# $Id: PKGBUILD 117845 2011-04-04 18:42:53Z andyrtr $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=libgpg-error pkgver=1.9 -pkgrel=2 +pkgrel=3 pkgdesc="Support library for libgcrypt" arch=(i686 x86_64) url="http://www.gnupg.org" @@ -21,6 +21,11 @@ build() { make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}/" install diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 15d0d5ae2..6f63f350a 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 113245 2011-03-08 11:01:22Z bisson $ +# $Id: PKGBUILD 118945 2011-04-09 14:35:19Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,7 +7,7 @@ pkgname=bitlbee pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64') url='http://www.bitlbee.org/' @@ -15,11 +15,11 @@ license=('GPL') depends=('gnutls' 'glib2' 'libotr') optdepends=('xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" - 'bitlbee.xinetd' - 'bitlbee.rcd') + 'xinetd' + 'rc.d') sha1sums=('59113b1dc440ebd775e6cf324d1cfb698fb20cfc' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' - '299776783902cc2e20be49e2fe729572ca656383') + 'be09d29af3853825778331df451f16ca9e452d03') backup=('etc/bitlbee/bitlbee.conf' 'etc/bitlbee/motd.txt' 'etc/xinetd.d/bitlbee') install=install @@ -40,11 +40,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -dm755 "${pkgdir}"/var/{lib,run} install -o65 -g65 -dm770 "${pkgdir}"/var/lib/bitlbee - install -o65 -g65 -dm755 "${pkgdir}"/var/run/bitlbee - install -Dm644 "${srcdir}"/bitlbee.xinetd "${pkgdir}"/etc/xinetd.d/bitlbee - install -Dm755 "${srcdir}"/bitlbee.rcd "${pkgdir}"/etc/rc.d/bitlbee + install -Dm644 "${srcdir}"/xinetd "${pkgdir}"/etc/xinetd.d/bitlbee + install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/bitlbee make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install-etc diff --git a/extra/bitlbee/rc.d b/extra/bitlbee/rc.d new file mode 100644 index 000000000..bd9248173 --- /dev/null +++ b/extra/bitlbee/rc.d @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=bitlbee +PID=$(pidof -o %PPID /usr/sbin/bitlbee) +install -o bitlbee -g bitlbee -d -m 755 /var/run/bitlbee + +case "$1" in +start) + stat_busy "Starting $name daemon" + [[ -z "$PID" ]] && { + rm -f /var/run/bitlbee/bitlbee.pid + su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee + } && { + add_daemon $name + stat_done + } || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && { + kill $PID &>/dev/null + } && { + rm -f /var/run/bitlbee/bitlbee.pid + rm_daemon $name + stat_done + } || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 3 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/extra/bitlbee/xinetd b/extra/bitlbee/xinetd new file mode 100644 index 000000000..d671a8cfc --- /dev/null +++ b/extra/bitlbee/xinetd @@ -0,0 +1,12 @@ +service bitlbee +{ + type = UNLISTED + socket_type = stream + protocol = tcp + wait = no + user = bitlbee + group = bitlbee + server = /usr/sbin/bitlbee + port = 6667 + disable = yes +} diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index b9468817f..6ae24ea26 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 102220 2010-12-06 21:41:49Z bisson $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $ +# Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: James Rayner <james@archlinux.org> -# Contributor: Partha Chowdhury <kira.laucas@gmail.com> +# Contributor: Partha Chowdhury <kira.laucas@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=conky pkgver=1.8.1 -pkgrel=2 +pkgrel=3 pkgdesc='An advanced, highly configurable system monitor for X based on torsmo' arch=('i686' 'x86_64') url='http://conky.sourceforge.net/' license=('custom') replaces=('torsmo') -depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') makedepends=('pkg-config') +depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'current-power.patch') @@ -28,11 +29,14 @@ build() { ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --enable-wlan \ - --enable-rss \ --enable-ibm \ + --enable-curl \ + --enable-rss \ + --enable-weather-xoap \ --enable-imlib2 \ - --disable-lua + --disable-lua \ + --enable-wlan \ + make } diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 5eaa97b02..592a9b246 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,30 +1,41 @@ -# $Id: PKGBUILD 114396 2011-03-13 09:54:42Z andyrtr $ +# $Id: PKGBUILD 118880 2011-04-09 09:00:43Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=2.10.5 +pkgver=2.12.2 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install -options=('!libtool') +options=('!libtool' '!zipman') depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1b032e07ccd22f71a5df78aa73bd91f2') +md5sums=('ca6903d99b2aca2a6a326bc8df805b61') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # Nettle is the default crypto back end. Use --with-libgcrypt to use the libgcrypt back end. + # we stay with libgcrypt for now. nettle would need to be moved from AUR to extra. ./configure --prefix=/usr \ --with-zlib \ + --with-libgcrypt \ --disable-static \ --disable-guile make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" make check # passes all || /bin/true } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman + # gzip -9 all files in infodir and manpages manually + find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \; + find "$pkgdir/usr/share/man" -exec gzip -9 {} \; } diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD index 62a20d6e4..ff62d9b6e 100644 --- a/extra/kaffeine/PKGBUILD +++ b/extra/kaffeine/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 89600 2010-09-02 12:51:01Z tpowa $ +# $Id: PKGBUILD 118974 2011-04-09 21:02:09Z tpowa $ # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kaffeine -pkgver=1.1 +pkgver=1.2.1 pkgrel=1 pkgdesc='KDE media player' license=('GPL') @@ -23,4 +23,4 @@ build() { make make DESTDIR=$pkgdir install } -md5sums=('72284197b1c90adf75149311e4422efe') +md5sums=('e65a8558836f0aa0d173d76e51ad065f') diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index d72800913..2239619e9 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118455 2011-04-07 06:55:14Z jgc $ +# $Id: PKGBUILD 118889 2011-04-09 09:47:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 pkgver=1.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="X11 client-side library" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD index f8c7e2b44..d713582b6 100644 --- a/extra/lighttpd/PKGBUILD +++ b/extra/lighttpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115072 2011-03-16 17:59:33Z pierre $ +# $Id: PKGBUILD 118904 2011-04-09 11:33:06Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=lighttpd pkgver=1.4.28 -pkgrel=4 +pkgrel=5 pkgdesc='a secure, fast, compliant and very flexible web-server' license=('custom') arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ options=('!libtool' 'emptydirs') source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf') md5sums=('586eb535d31ac299652495b058dd87c4' - 'f110637c56d360ecaecb3bf6f7918229' + 'eadffcda24d0d996032f8555ce9623c2' '913e2157fa78d990c32146f387d44c2b' '2803a9ee7f20409c69f1566d2d90720e') @@ -43,6 +43,11 @@ build() { make } +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install @@ -50,7 +55,7 @@ package() { install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf - install -d -m755 -o http -g http $pkgdir/var/{run,log,cache}/lighttpd/ + install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/ pushd doc/config >/dev/null find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \; diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d index 5f851d63e..32fdd0d08 100644 --- a/extra/lighttpd/lighttpd.rc.d +++ b/extra/lighttpd/lighttpd.rc.d @@ -5,7 +5,7 @@ get_pid_file() { - /usr/sbin/lighttpd -p -f /etc/lighttpd/lighttpd.conf 2>/dev/null | grep server.pid-file | cut -d= -f2 + /usr/sbin/lighttpd -p -f /etc/lighttpd/lighttpd.conf 2>/dev/null | grep server.pid-file | sed -E 's/.*"(.+)"/\1/' } get_pid() { @@ -37,20 +37,17 @@ test_config() { stat_die fi - local d - for d in /var/{run,log,cache}/lighttpd; do - if [ ! -d $d ]; then - stat_append "(directory $d not found)" - stat_die - fi - done - /usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1 if [ $? -gt 0 ]; then stat_append '(error in /etc/lighttpd/lighttpd.conf)' stat_die fi + local piddir=$(dirname "$(get_pid_file)") + if [ ! -d "{$piddir}" ]; then + install -d -m755 -o http -g http "${piddir}" + fi + stat_done } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 5c2531f8d..ee8e0a17c 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115705 2011-03-19 15:53:37Z pierre $ +# $Id: PKGBUILD 118966 2011-04-09 20:51:34Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -24,7 +24,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.3.6 -pkgrel=1 +pkgrel=2 _suhosinver=${pkgver}-0.9.10 arch=('i686' 'x86_64') license=('PHP') @@ -41,7 +41,7 @@ md5sums=('2286f5a82a6e8397955a0025c1c2ad98' 'fff1a38877142f3ae6036dbe5a85d0a6' '39eaa70d276fc3d45d6bcf6cd5ae1106' '96ca078be6729b665be8a865535a97bf' - 'b136a184dd055c559a03eb8bac562a3c' + 'b01be5f816988fcee7e78225836e5e27' 'd50ff349da08110a7cc8c691ce2d0423' '07c4e412909ac65a44ec90e7a2c4bade') @@ -261,7 +261,6 @@ package_php-fpm() { install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm - install -d -m755 ${pkgdir}/var/run/php-fpm install -d -m755 ${pkgdir}/etc/php/fpm.d } diff --git a/extra/php/rc.d.php-fpm b/extra/php/rc.d.php-fpm index 35cf35652..54bcf4d5b 100644 --- a/extra/php/rc.d.php-fpm +++ b/extra/php/rc.d.php-fpm @@ -6,9 +6,7 @@ wait_for_pid () { try=0 - while test $try -lt 35 ; do - case "$1" in 'created') if [ -f "$2" ] ; then @@ -16,7 +14,6 @@ wait_for_pid () { break fi ;; - 'removed') if [ ! -f "$2" ] ; then try='' @@ -28,15 +25,38 @@ wait_for_pid () { stat_append '.' try=`expr $try + 1` sleep 1 - done - } -[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm + + stat_done +} case "$1" in start) + test_config stat_busy 'Starting php-fpm' /usr/sbin/php-fpm @@ -58,6 +78,7 @@ case "$1" in ;; stop) + test_config stat_busy 'Gracefully shutting down php-fpm' if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then @@ -105,6 +126,7 @@ case "$1" in ;; reload) + test_config stat_busy 'Reload service php-fpm' if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD index 22fff627f..d4cd6d896 100644 --- a/extra/qtcurve-gtk2/PKGBUILD +++ b/extra/qtcurve-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115505 2011-03-18 09:05:13Z andrea $ +# $Id: PKGBUILD 118935 2011-04-09 13:48:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-gtk2 -pkgver=1.8.7 +pkgver=1.8.8 pkgrel=1 arch=('i686' 'x86_64') groups=('qtcurve') @@ -14,7 +14,7 @@ depends=('gtk2') makedepends=('pkgconfig' 'cmake') options=('!libtool') source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2") -md5sums=('da80db7f6a0b60e37ce14b918bc5e682') +md5sums=('2146fda49c8e078c985725db30228b9a') build() { cd $srcdir diff --git a/extra/qtcurve-kde3/PKGBUILD b/extra/qtcurve-kde3/PKGBUILD index afec99259..9aeadda41 100644 --- a/extra/qtcurve-kde3/PKGBUILD +++ b/extra/qtcurve-kde3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD,v 1.43 2008/07/14 01:06:07 Pierre Exp $ +# $Id: PKGBUILD 118940 2011-04-09 13:49:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-kde3 -pkgver=1.8.3 +pkgver=1.8.5 pkgrel=1 arch=('i686' 'x86_64') groups=('qtcurve') @@ -15,7 +15,7 @@ makedepends=('cmake' 'kdelibs') source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE3-${pkgver}.tar.bz2" 'kdeglobals' 'bypass-kde-config.patch') -md5sums=('ef0d682cafc2f1ada4939d3b43e2dc76' +md5sums=('d9cca99526079782f9fc7bd7ba432582' '05a6294c7f0e239e698e7e5224fc8e7f' 'e1ab2c0995e412b2cbfe804fba75517e') diff --git a/extra/qtcurve-kde4/PKGBUILD b/extra/qtcurve-kde4/PKGBUILD index 267f40eae..c9cd7c910 100644 --- a/extra/qtcurve-kde4/PKGBUILD +++ b/extra/qtcurve-kde4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115510 2011-03-18 09:08:27Z andrea $ +# $Id: PKGBUILD 118930 2011-04-09 13:46:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-kde4 -pkgver=1.8.6 +pkgver=1.8.7 pkgrel=1 arch=('i686' 'x86_64') groups=('qtcurve') @@ -14,7 +14,7 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2" 'bypass-kde-config.patch') -md5sums=('2c7a9ab5d71da48a3118c6859b2b38e6' +md5sums=('a874fade6bf67ee052dc656dd76ffe37' '3f6681147cc361bd2bfd4d7477f2a8d0') build() { diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD index c1732f1aa..8bc4d8721 100644 --- a/extra/taglib/PKGBUILD +++ b/extra/taglib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79406 2010-05-04 00:23:40Z andrea $ +# $Id: PKGBUILD 118894 2011-04-09 10:13:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=taglib -pkgver=1.6.3 +pkgver=1.7 pkgrel=1 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('sh' 'zlib' 'gcc-libs') makedepends=('cmake' 'pkgconfig') source=(http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz) options=('!libtool') -md5sums=('ddf02f4e1d2dc30f76734df806e613eb') +md5sums=('6a7e312668f153fa905a81714aebc257') build() { cd ${srcdir} @@ -24,10 +24,10 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DWITH_MP4=ON \ -DWITH_ASF=ON - make VERBOSE=1 || return 1 + make } package() { cd ${srcdir}/build - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index 98097f557..6e8cf2d01 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 104516 2011-01-03 20:59:12Z tpowa $ +# $Id: PKGBUILD 118950 2011-04-09 15:28:29Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.530 +pkgver=1.540 pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64) @@ -87,6 +87,7 @@ source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.t ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2 webmin.rc) +options=(!strip) build() { # NOTE: USE --asroot build option to avoid fakeroot error! @@ -209,7 +210,7 @@ build() { # install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE } -md5sums=('acf531f248bd575a0617472faa5013d3' +md5sums=('8086fc60419937c4b2844796cfd2aea1' 'da6bea412a5be8cf82a813078fec5847' 'bfebb75bb94029b48c46b7f1ba1aa811' '0673e51af0e81418b4a6c1e205f7e5cd') diff --git a/extra/xine-ui/PKGBUILD b/extra/xine-ui/PKGBUILD index 4c5471ffa..9cc134600 100644 --- a/extra/xine-ui/PKGBUILD +++ b/extra/xine-ui/PKGBUILD @@ -1,41 +1,43 @@ -# $Id: PKGBUILD 77076 2010-04-10 16:09:26Z andrea $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 118860 2011-04-09 04:40:36Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-ui pkgver=0.99.6 -pkgrel=1 +pkgrel=2 pkgdesc="A free video player for Unix" arch=('i686' 'x86_64') license=('GPL') url="http://www.xine-project.org" depends=('xine-lib' 'curl' 'libxtst' 'libxinerama' 'libxv' 'libpng' 'libxft' 'libxxf86vm' 'readline' 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme' - 'lirc-utils') + 'desktop-file-utils' 'lirc-utils') makedepends=('libxt') options=('!emptydirs' '!strip') -install=${pkgname}.install +install=xine-ui.install source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz - lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch fix_lirc.diff) + lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch + fix_lirc.diff xine-ui-xdg.diff) md5sums=('d468b4e7fe39ff19888261e1da9be914' '4f06f63f5fd55b08a648e5d63f881898' '9f5acaf14f3945aa2ce428631d09cd47' - '0174bd096756b9c6f47e9b8b5ff6e145') + '0174bd096756b9c6f47e9b8b5ff6e145' + '5972b4061acf3b553760de9ae2178d38') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" || return 1 - patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" || return 1 - patch -p1 < "${srcdir}/fix_lirc.diff" || return 1 - autoconf || return 1 - + patch -p1 < "${srcdir}/lirc-check-a89347673097.patch" + patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch" + patch -p1 < "${srcdir}/fix_lirc.diff" + patch -p1 < "${srcdir}/xine-ui-xdg.diff" + autoconf ./configure --prefix=/usr --mandir=/usr/share/man \ - --with-x --enable-lirc --without-aalib --enable-debug || return 1 - make || return 1 + --with-x --enable-lirc --without-aalib --enable-debug + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/applications" mv "${pkgdir}/usr/share/xine/desktop/xine.desktop" "${pkgdir}/usr/share/applications" } diff --git a/extra/xine-ui/xine-ui-xdg.diff b/extra/xine-ui/xine-ui-xdg.diff new file mode 100644 index 000000000..959d674b2 --- /dev/null +++ b/extra/xine-ui/xine-ui-xdg.diff @@ -0,0 +1,206 @@ +--- xine-ui-0.99.6.orig/src/xitk/common.h ++++ xine-ui-0.99.6/src/xitk/common.h +@@ -331,6 +331,5 @@ typedef struct { + int use_root_window; + + int ssaver_enabled; +- int ssaver_timeout; + + int skip_by_chapter; +--- xine-ui-0.99.6.orig/src/xitk/main.c ++++ xine-ui-0.99.6/src/xitk/main.c +@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) { + if (sigprocmask (SIG_BLOCK, &vo_mask, NULL)) + fprintf (stderr, "sigprocmask() failed.\n"); + ++ signal(SIGCHLD, SIG_IGN); ++ + gGui = (gGui_t *) calloc(1, sizeof(gGui_t)); + + gGui->stream = NULL; +--- xine-ui-0.99.6.orig/src/xitk/panel.c ++++ xine-ui-0.99.6/src/xitk/panel.c +@@ -356,7 +356,6 @@ void panel_update_runtime_display(void) + * Update slider thread. + */ + static void *slider_loop(void *dummy) { +- int screensaver_timer = 0; + int status, speed; + int pos, secs; + int i = 0; +@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) { + else + video_window_set_mrl((char *)gGui->mmk.mrl); + +- if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) { +- +- if(gGui->ssaver_timeout) { +- +- if(!(i % 2)) +- screensaver_timer++; +- +- if(screensaver_timer >= gGui->ssaver_timeout) { +- screensaver_timer = 0; +- video_window_reset_ssaver(); +- +- } +- } +- } ++ video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)); + + if(gGui->logo_mode == 0) { + +@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) { + stream_infos_update_infos(); + + } ++ } else { ++ video_window_suspend_ssaver(0); + } + } + +--- xine-ui-0.99.6.orig/src/xitk/videowin.c ++++ xine-ui-0.99.6/src/xitk/videowin.c +@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi + + /* The old window should be destroyed now */ + if(old_video_window != None) { ++ /* Screensaver control is tied to our window id */ ++ video_window_suspend_ssaver(0); ++ + XDestroyWindow(gGui->video_display, old_video_window); + + if(gGui->cursor_grabbed) +@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X + + } + +-void video_window_reset_ssaver(void) { ++void video_window_suspend_ssaver(int do_suspend) { ++ static int was_suspended; + +- if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) { ++ do_suspend = do_suspend && gGui->ssaver_enabled; + +-#ifdef HAVE_XTESTEXTENSION +- if(gVw.have_xtest == True) { +- +- gVw.fake_key_cur++; +- +- if(gVw.fake_key_cur >= 2) +- gVw.fake_key_cur = 0; +- +- XLockDisplay(gGui->video_display); +- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime); +- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime); +- XSync(gGui->video_display, False); +- XUnlockDisplay(gGui->video_display); ++ if(was_suspended != do_suspend) { ++ if(fork() == 0) { ++ char window_id[30]; ++ char *args[] = { "xdg-screensaver", NULL, window_id, NULL }; ++ int fd; ++ ++ for(fd = 3; fd < 256; fd++) ++ close(fd); ++ ++ args[1] = do_suspend ? "suspend" : "resume"; ++ sprintf(window_id, "%lu", (unsigned long)gGui->video_window); ++ execvp(args[0], args); ++ _exit(0); + } +- else +-#endif +- { +- /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */ +- /* assuming its location and permission will not change during run time of xine-ui. */ +- { +- static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL }; +- static char *gssaver_path = NULL; +- +- if(!gssaver_path) { +- char *path = getenv("PATH"); +- +- if(!path) +- path = "/usr/local/bin:/usr/bin"; +- do { +- char *p, *pbuf; +- int plen; +- +- for(p = path; *path && *path != ':'; path++) +- ; +- if(p == path) +- plen = 1, p = "."; +- else +- plen = path - p; +- asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]); +- if ( access(pbuf, X_OK) ) { +- free(pbuf); +- gssaver_path = ""; +- } else +- gssaver_path = pbuf; +- } while(!gssaver_path[0] && *path++); +- } +- if(gssaver_path[0] && (fork() == 0)) { +- execv(gssaver_path, gssaver_args); +- exit(0); +- } +- } + +- XLockDisplay(gGui->video_display); +- XResetScreenSaver(gGui->video_display); +- XUnlockDisplay(gGui->video_display); +- } ++ was_suspended = do_suspend; + } + } + ++void video_window_reset_ssaver(void) { ++ video_window_suspend_ssaver(1); ++} ++ + void video_window_get_frame_size(int *w, int *h) { + if(w) + *w = gVw.frame_width; +--- xine-ui-0.99.6.orig/src/xitk/videowin.h ++++ xine-ui-0.99.6/src/xitk/videowin.h +@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag, + void video_window_update_logo(void); + void video_window_change_skins(int); + ++void video_window_suspend_ssaver(int do_suspend); + void video_window_reset_ssaver(void); + + void video_window_get_frame_size(int *w, int *h); +--- xine-ui-0.99.6.orig/src/xitk/event.c ++++ xine-ui-0.99.6/src/xitk/event.c +@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat + gGui->skip_by_chapter = cfg->num_value; + panel_update_nextprev_tips(); + } +-static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) { +- gGui->ssaver_timeout = cfg->num_value; +-} + + static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) { + +@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam + snapshot_loc_cb, + CONFIG_NO_DATA); + +- gGui->ssaver_timeout = +- xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10, +- _("Screensaver reset interval (s)"), +- _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."), +- CONFIG_LEVEL_ADV, +- ssaver_timeout_cb, +- CONFIG_NO_DATA); +- + gGui->skip_by_chapter = + xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1, + _("Chapter hopping"), + + + + + diff --git a/extra/xine-ui/xine-ui.install b/extra/xine-ui/xine-ui.install index 8afc56658..3b3aff7d9 100644 --- a/extra/xine-ui/xine-ui.install +++ b/extra/xine-ui/xine-ui.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD new file mode 100644 index 000000000..e9d642574 --- /dev/null +++ b/testing/fakeroot/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 118918 2011-04-09 11:49:09Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Jochem Kossen <j.kossen@home.nl> + +pkgname=fakeroot +pkgver=1.15.1 +pkgrel=1 +pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" +arch=('i686' 'x86_64') +license=('GPL') +url="http://packages.debian.org/fakeroot" +groups=('base-devel') +install=fakeroot.install +depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') +options=('!libtool') +source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) +md5sums=('248c408b1e06e776c5739871b49bd968') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \ + --disable-static --with-ipc=sysv + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install + + install -dm755 ${pkgdir}/etc/ld.so.conf.d/ + echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf + + # install README for sysv/tcp usage + install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README +} diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install new file mode 100644 index 000000000..986c91b06 --- /dev/null +++ b/testing/fakeroot/fakeroot.install @@ -0,0 +1,14 @@ +post_install() { + sbin/ldconfig -r . +} + +post_upgrade() { + if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then + sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf + fi + sbin/ldconfig -r . +} + +pre_remove() { + sbin/ldconfig -r . +} diff --git a/testing/lilo/PKGBUILD b/testing/lilo/PKGBUILD new file mode 100644 index 000000000..216f1b91d --- /dev/null +++ b/testing/lilo/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 118988 2011-04-09 21:38:07Z tpowa $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=lilo +pkgver=23.2 +pkgrel=1 +pkgdesc="A bootloader for Linux" +arch=('i686' 'x86_64') +url="https://alioth.debian.org/projects/lilo/" +license=('BSD') +# While lilo should stay in the base category, +# it usually makes no sense if it is installed +# with pacman -S base, therefore, don't add +# the base group here. +#groups=('base') +backup=('etc/lilo.conf') +depends=('device-mapper' 'coreutils') +makedepends=('bin86' 'sharutils') +optdepends=('perl: to use keytab-lilo') +install=lilo.install +options=('!makeflags') +source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz" + 'lilo.conf') +md5sums=('51b9b9db665d3b8724919e3d46054d12' + 'a3a4c90bead3f9b8672bd384ff9f8db1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LC_ALL=C + make all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/lilo/lilo.conf b/testing/lilo/lilo.conf new file mode 100644 index 000000000..0e31e77a5 --- /dev/null +++ b/testing/lilo/lilo.conf @@ -0,0 +1,28 @@ +# +# /etc/lilo.conf +# + +boot=/dev/hda +# This line often fixes L40 errors on bootup +# disk=/dev/hda bios=0x80 + +default=arch +timeout=50 +lba32 +prompt + +image=/boot/vmlinuz26 + label=arch + root=/dev/hda3 + initrd=/boot/kernel26.img + read-only + +image=/boot/vmlinuz26 + label=arch-fallback + root=/dev/hda3 + initrd=/boot/kernel26-fallback.img + read-only + +#other=/dev/hda1 +# label=dos + diff --git a/testing/lilo/lilo.install b/testing/lilo/lilo.install new file mode 100644 index 000000000..7375fddf8 --- /dev/null +++ b/testing/lilo/lilo.install @@ -0,0 +1,5 @@ +post_upgrade() { + echo + echo "If you use the LILO bootloader, you should run 'lilo' after upgrading." + echo +} diff --git a/testing/mlocate/PKGBUILD b/testing/mlocate/PKGBUILD new file mode 100644 index 000000000..d6f1f0be4 --- /dev/null +++ b/testing/mlocate/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 118924 2011-04-09 12:46:47Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: lydgate + +pkgname=mlocate +pkgver=0.24 +pkgrel=1 +pkgdesc="Faster merging drop-in for slocate" +arch=('i686' 'x86_64') +url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate" +license=('GPL') +conflicts=('slocate') +provides=('slocate') +replaces=('slocate') +depends=('glibc' 'coreutils' 'sh') +backup=('etc/updatedb.conf' + 'etc/cron.daily/updatedb') +install=mlocate.install +source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz + updatedb.conf + updatedb.cron.daily) +md5sums=('a9c221e5bc489a2ed710c943990137bd' + 'c374ff223f2e07b5e602ba22359f2335' + 'cde5da81bebad2de556ef2e43d895e13') + +build() { + cd $srcdir/$pkgname-$pkgver + + sed -i '/^groupname /s/mlocate/locate/' Makefile.in + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib + make + +} + +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + +package() { + cd $srcdir/$pkgname-$pkgver + + # Set up a default updatedb.conf and a daily cronjob + install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf + install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb + + # Install Mlocate + make DESTDIR=$pkgdir install + + ln -sv locate $pkgdir/usr/bin/slocate + chgrp -v 21 $pkgdir/usr/bin/locate + chmod -v 2755 $pkgdir/usr/bin/locate + + install -dm755 $pkgdir/var/lib + install -d -m750 -g21 $pkgdir/var/lib/locate +} diff --git a/testing/mlocate/mlocate.install b/testing/mlocate/mlocate.install new file mode 100644 index 000000000..c7b7f9cf7 --- /dev/null +++ b/testing/mlocate/mlocate.install @@ -0,0 +1,18 @@ +post_install() { + post_upgrade "$1" "$1" + echo "mlocate command is technically locate, but slocate is symlinked and still works." + echo "You should run updatedb as root." +} + +post_upgrade() { + # This can be removed after {m,x}locate have both been updated + getent group slocate &>/dev/null && usr/sbin/groupdel slocate &>/dev/null + getent group mlocate &>/dev/null && usr/sbin/groupdel mlocate &>/dev/null + + getent group locate &>/dev/null || usr/sbin/groupadd -g 21 locate &>/dev/null + chown -R root:locate var/lib/mlocate +} + +pre_remove() { + getent group locate &>/dev/null && usr/sbin/groupdel locate &>/dev/null +} diff --git a/testing/mlocate/updatedb.conf b/testing/mlocate/updatedb.conf new file mode 100644 index 000000000..722b04205 --- /dev/null +++ b/testing/mlocate/updatedb.conf @@ -0,0 +1,5 @@ +# directories to exclude from the slocate database: +PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool" + +# filesystems to exclude from the slocate database: +PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs sshfs sysfs tmpfs udf usbfs vboxsf" diff --git a/testing/mlocate/updatedb.cron.daily b/testing/mlocate/updatedb.cron.daily new file mode 100755 index 000000000..cac9bb063 --- /dev/null +++ b/testing/mlocate/updatedb.cron.daily @@ -0,0 +1,29 @@ +#!/bin/sh + +# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable) +NICE=19 + +# 0 for none, 1 for real time, 2 for best-effort, 3 for idle +IONICE_CLASS=2 + +# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest +IONICE_PRIORITY=7 + +UPDATEDB="/usr/bin/updatedb" + +if [ -x /usr/bin/nice ]; then + UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}" +fi + +if [ -x /usr/bin/ionice ]; then + UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}" +fi + +# Update the "locate" database +if [ -x /usr/bin/updatedb ]; then + if [ -f /etc/updatedb.conf ]; then + ${UPDATEDB} + else + ${UPDATEDB} -f proc + fi +fi diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD new file mode 100644 index 000000000..7e1f4c1a3 --- /dev/null +++ b/testing/mpfr/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 118927 2011-04-09 13:01:31Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=mpfr +pkgver=3.0.1 +pkgrel=1 +pkgdesc="Multiple-precision floating-point library" +arch=('i686' 'x86_64') +url="http://www.mpfr.org/" +license=('LGPL') +depends=('gmp>=5.0') +options=('!libtool') +install=mpfr.install +source=(http://www.mpfr.org/mpfr-current/mpfr-${pkgver}.tar.xz) +md5sums=('645882d9d179113a70af84d27086ed9f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-thread-safe --enable-shared + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install new file mode 100644 index 000000000..d6dd0475b --- /dev/null +++ b/testing/mpfr/mpfr.install @@ -0,0 +1,20 @@ +info_dir=usr/share/info +info_files=(mpfr.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/testing/ncurses/PKGBUILD b/testing/ncurses/PKGBUILD new file mode 100644 index 000000000..1b387c6b1 --- /dev/null +++ b/testing/ncurses/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 118921 2011-04-09 12:39:04Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=ncurses +pkgver=5.9 +pkgrel=1 +pkgdesc="System V Release 4.0 curses emulation library" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/ncurses/" +license=('MIT') +depends=('glibc') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1') + +build() { + cd ${srcdir}/ + mkdir ncurses{,w}-build + + cd ${srcdir}/ncursesw-build + ../${pkgname}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \ + --with-shared --with-normal --without-debug --without-ada \ + --with-install-prefix=${pkgdir} --enable-widec + # add --enable-ext-colors with next soname bump + make + + # libncurses.so.5 for external binary support + cd ${srcdir}/ncurses-build + [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long" + ../${pkgname}-${pkgver}/configure --prefix=/usr \ + --with-shared --with-normal --without-debug --without-ada \ + --with-install-prefix=${pkgdir} $CONFIGFLAG + make +} + +package() { + cd ${srcdir}/ncursesw-build + make install + + # move libraries needed for boot to /lib (we call tput in initscripts) + install -dm755 ${pkgdir}/lib + mv ${pkgdir}/usr/lib/libncursesw.so.5* ${pkgdir}/lib + ln -sf ../../lib/libncursesw.so.5 ${pkgdir}/usr/lib/libncursesw.so + + # Fool packages looking to link to non-wide-character ncurses libraries + for lib in curses ncurses form panel menu; do + rm -f ${pkgdir}/usr/lib/lib${lib}.so + echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so + ln -sf lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a + done + ln -sf libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a + + # install tput to /bin + install -dm755 ${pkgdir}/bin/ + mv ${pkgdir}/usr/bin/tput ${pkgdir}/bin/tput + + # Some packages look for -lcurses during build + rm -f ${pkgdir}/usr/lib/libcursesw.so + echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so + ln -sf libncurses.so ${pkgdir}/usr/lib/libcurses.so + ln -sf libncursesw.a ${pkgdir}/usr/lib/libcursesw.a + ln -sf libncurses.a ${pkgdir}/usr/lib/libcurses.a + + # non-widec compatibility library + cd ${srcdir}/ncurses-build + install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.${pkgver} + ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib/libncurses.so.5 + + # install license, rip it from the readme + cd ${srcdir}/${pkgname}-${pkgver} + install -dm755 ${pkgdir}/usr/share/licenses/$pkgname + grep -B 100 '$Id' README > ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD new file mode 100644 index 000000000..185413419 --- /dev/null +++ b/testing/sudo/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 118993 2011-04-09 21:57:35Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=sudo +_ver=1.8.1 +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +pkgrel=1 +pkgdesc="Give certain users the ability to run some commands as root" +arch=('i686' 'x86_64') +url="http://www.sudo.ws/sudo/" +license=('custom') +depends=('glibc' 'pam') +backup=('etc/sudoers' 'etc/pam.d/sudo') +source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz + sudo.pam) +options=('!libtool' '!makeflags') +md5sums=('e4402f24cccc3c6697b1eeab496053dd' + '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') + +build() { + cd $srcdir/$pkgname-$_ver + + ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ + --with-env-editor --with-all-insults --with-logfac=auth + make +} + +package() { + cd $srcdir/$pkgname-$_ver + install -dm755 $pkgdir/var/lib + + make DESTDIR=$pkgdir install + install -Dm644 $srcdir/sudo.pam $pkgdir/etc/pam.d/sudo + + install -Dm644 doc/LICENSE $pkgdir/usr/share/licenses/sudo/LICENSE +} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam new file mode 100644 index 000000000..4e586cd22 --- /dev/null +++ b/testing/sudo/sudo.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so diff --git a/testing/udev/80-drivers.rules b/testing/udev/80-drivers.rules new file mode 100644 index 000000000..56ac06cb4 --- /dev/null +++ b/testing/udev/80-drivers.rules @@ -0,0 +1,14 @@ +# do not edit this file, it will be overwritten on update + +ACTION=="remove", GOTO="drivers_end" + +DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms" +SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block" +SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block" +SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block" +SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg" +SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev" + +LABEL="drivers_end" diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules new file mode 100644 index 000000000..21127a729 --- /dev/null +++ b/testing/udev/81-arch.rules @@ -0,0 +1,138 @@ +# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org> +# do not edit this file, it will be overwritten on update +# +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %k the kernel name for the device. +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute. +# %% the '%' char itself. +# +# There are a number of modifiers that are allowed to be used in some of the +# fields. See the udev man page for a full description of them. +# global stuff +# + +##################################### +###### Hotplug rules - begin +# Only additional modules, +# which are not detectable, +# are loaded here! +##################################### +# check if the device has already been claimed by a driver +ACTION!="add", GOTO="drivers_end" + +# SOUND addon modules +SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-pcm-oss" +SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-seq-oss" + +#PNP addon modules +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr" +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir" +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog" + +# PARPORT addon modules +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp" +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev" + +# fix ide cdrom detection on old proliant servers +SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic" + +LABEL="drivers_end" +##################################### +##### Hotplug rules - end +##################################### + +##################################### +###### CD/DVD symlinks - begin +##################################### +ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode" +ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode" +ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode" +ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" +ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" +ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" +ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b" +ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh" +ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" +ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" +ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh" +ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh" +ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh" +##################################### +###### CD/DVD symlinks - end +##################################### + +##################################### +# Additional Archlinux +# Permissions and Symlinks - begin +##################################### + +# permission for sg devices +KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" + +# permissions for IDE CD devices +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" + +# permissions for SCSI CD devices +SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical" +SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical" + +# permissions for removable devices like cardreaders or sticks +KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" + +# permissions for firewire external drives +KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" + +# permissions for usb to scsi external adapters +KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" + +# permissions for ide storage like pcmcia card readers +ACTION!="add", GOTO="pcmcia_end" +SUBSYSTEM!="block", GOTO="pcmcia_end" +KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" +KERNEL=="hd*", IMPORT{parent}=="ID_*" +KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" +LABEL="pcmcia_end" + +# permissions for SCSI scanners +SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" + +# mem +KERNEL=="ram0", SYMLINK+="ramdisk" +KERNEL=="ram1", SYMLINK+="ram" + +# video4linux + +KERNEL=="vbi0", SYMLINK+="vbi" +KERNEL=="radio0", SYMLINK+="radio" +KERNEL=="radio[0-9]*", GROUP="video" +KERNEL=="video0", SYMLINK+="video" +KERNEL=="vtx0", SYMLINK+="vtx" + +# video devices +### xorg resets those permissions, adjust your xorg.conf! +KERNEL=="3dfx*", GROUP="video" +KERNEL=="fb[0-9]*", GROUP="video" + +# misc +KERNEL=="sgi_fetchop", MODE="0666" +KERNEL=="sonypi", MODE="0666" + +# USB devices +KERNEL=="legousbtower*", MODE="0666" + +# kbd devices +KERNEL=="kbd", MODE="0664" + +# miscellaneous +KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664" +####################################### +# Permissions and Symlinks - end +####################################### diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD new file mode 100644 index 000000000..6011a9c26 --- /dev/null +++ b/testing/udev/PKGBUILD @@ -0,0 +1,112 @@ +# $Id: PKGBUILD 118985 2011-04-09 21:29:33Z tpowa $ +# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgbase="udev" +pkgname=('udev' 'udev-compat') +pkgver=167 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" +license=('GPL') +groups=('base') +# older initscripts versions required start_udev +options=(!makeflags !libtool) +makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') +source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 + 80-drivers.rules + 81-arch.rules + load-modules.sh + cdsymlinks.sh) + +build() { + cd $srcdir/$pkgbase-$pkgver + ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ + --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system + make +} + +package_udev() { + pkgdesc="The userspace dev tools (udev)" + depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' + 'module-init-tools>=3.11' 'pciutils') + install=udev.install + backup=(etc/udev/udev.conf + etc/modprobe.d/framebuffer_blacklist.conf) + conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') + replaces=('devfsd') + + cd $srcdir/$pkgbase-$pkgver + make DESTDIR=${pkgdir} install + # Replace original 80-drivers.rules with custom one. + install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules + # Install our rule for permissions and symlinks + install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules + # install our module loading subsystem + install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh + # install cdsymlinks.sh + install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh + # disable error logging to prevent startup failures printed to vc on boot + sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf + # disable persistent cdromsymlinks and network by default + # and move it to /etc/udev/rules.d + mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \ + $pkgdir/etc/udev/rules.d/75-persistent-net-generator.rules.optional + mv $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules \ + $pkgdir/etc/udev/rules.d/75-cd-aliases-generator.rules.optional + + # create framebuffer blacklist + mkdir -p $pkgdir/etc/modprobe.d/ + for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do + echo "blacklist $mod" + done | sort -u > $pkgdir/etc/modprobe.d/framebuffer_blacklist.conf + + # create static devices in /lib/udev/devices/ + mkdir ${pkgdir}/lib/udev/devices/pts + mkdir ${pkgdir}/lib/udev/devices/shm + + mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1 + mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3 + mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5 + mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 + + ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd + ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin + ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout + ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr + ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core + + # these static devices are created for convenience, to autoload the modules if necessary + # /dev/loop0 + mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 + chgrp disk ${pkgdir}/lib/udev/devices/loop0 + # /dev/net/tun + mkdir ${pkgdir}/lib/udev/devices/net + mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200 + # /dev/fuse + mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 + # /dev/ppp + mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + for i in $pkgdir/lib/udev/rules.d/*.rules; do + sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' $i + done +} + +package_udev-compat() { + pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" + depends=('udev') + groups=('') + cd $srcdir/$pkgbase-$pkgver + install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules +} +md5sums=('4b37e1222f06c14c24147de346aa0bad' + '4427855146513a4703ab5c7eb8a0156e' + 'f17c99779173ddc79f866cf3a5de5e68' + 'f91fddc67609b45b244a624977c4247b' + '2e808ee78d237c478b57af2a68d43769') diff --git a/testing/udev/cdsymlinks.sh b/testing/udev/cdsymlinks.sh new file mode 100755 index 000000000..498abda4a --- /dev/null +++ b/testing/udev/cdsymlinks.sh @@ -0,0 +1,44 @@ +#! /bin/sh +# Creates cdsymlinks in /dev +# for Archlinux by Tobias Powalowski <tpowa@archlinux.org> + +# check on cd/dvd drives and if persistant rules file is used +if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-persistent-cd.rules ]; then + # remove existing device files + rm /dev/cdrom* + rm /dev/cdrw* + rm /dev/dvd* + rm /dev/dvdrw* + # start creating symlinks + for i in /dev/cd/cdrom-*; do + if [ -h $i ]; then + [ "$CD_NUMBER" = "" ] && ln -s $i /dev/cdrom + [ "$CD_NUMBER" = "" ] && CD_NUMBER="-1" + ! [ "$CD_NUMBER" = "" ] && CD_NUMBER="$((CD_NUMBER+1))" && ln -s $i /dev/cdrom$CD_NUMBER + fi + done + + for i in /dev/cd/cdrw-*; do + if [ -h $i ]; then + [ "$CDRW_NUMBER" = "" ] && ln -s $i /dev/cdrw + [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="-1" + ! [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="$((CDRW_NUMBER+1))" && ln -s $i /dev/cdrw$CDRW_NUMBER + fi + done + + for i in /dev/cd/dvd-*; do + if [ -h $i ]; then + [ "$DVD_NUMBER" = "" ] && ln -s $i /dev/dvd + [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="-1" + ! [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="$((DVD_NUMBER+1))" && ln -s $i /dev/dvd$DVD_NUMBER + fi + done + + for i in /dev/cd/dvdrw-*; do + if [ -h $i ]; then + [ "$DVDRW_NUMBER" = "" ] && ln -s $i /dev/dvdrw + [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="-1" + ! [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="$((DVDRW_NUMBER+1))" && ln -s $i /dev/dvdrw$DVDRW_NUMBER + fi + done +fi diff --git a/testing/udev/load-modules.sh b/testing/udev/load-modules.sh new file mode 100755 index 000000000..1e2af913e --- /dev/null +++ b/testing/udev/load-modules.sh @@ -0,0 +1,80 @@ +#!/bin/bash +# Implement blacklisting for udev-loaded modules + +[ $# -ne 1 ] && exit 1 + +. /etc/rc.conf + +# grab modules from rc.conf +BLACKLIST="${MOD_BLACKLIST[@]}" +MODPROBE="/sbin/modprobe" +LOGGER="/usr/bin/logger" +RESOLVEALIAS="${MODPROBE} --resolve-alias" +USEBLACKLIST="--use-blacklist" + +if [ -f /proc/cmdline ]; then + for cmd in $(cat /proc/cmdline); do + case $cmd in + disablemodules=*) eval $cmd ;; + load_modules=off) exit ;; + esac + done + #parse cmdline entries of the form "disablemodules=x,y,z" + if [ -n "$disablemodules" ]; then + BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')" + fi +fi + +#MODULES entries in rc.conf that begin with ! are blacklisted +for mod in ${MODULES[@]}; do + if [ "${mod}" != "${mod#!}" ]; then + BLACKLIST="$BLACKLIST ${mod#!}" + fi +done + +if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then + if [ -n "${BLACKLIST}" ]; then + # If an alias name is on the blacklist, load no modules for this device + if echo "${BLACKLIST}" | /bin/grep -q -e " $1 " -e "^$1 " -e " $1\$"; then + $LOGGER -p info -t "$(basename $0)" "Not loading module alias '$1' because it is blacklisted" + exit + fi + #sanitize the blacklist + BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')" + # Try to find all modules for the alias + mods=$($RESOLVEALIAS $1) + # If no modules could be found, try if the alias name is a module name + # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour + [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST="" + [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name" + for mod in ${mods}; do + # Find the module and all its dependencies + deps="$($MODPROBE -i --show-depends ${mod})" + [ $? -ne 0 ] && continue + + #sanitize the module names + deps="$(echo "$deps" | sed \ + -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \ + -e 's|-|_|g')" + + # If the module or any of its dependencies is blacklisted, don't load it + for dep in $deps; do + if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then + if [ "${dep}" = "${mod}" ]; then + $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted" + else + $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted" + fi + continue 2 + fi + done + # modprobe usually uses the "blacklist" statements from modprobe.conf only to blacklist all aliases + # of a module, but not the module itself. We use --use-blacklist here so that modprobe also blacklists + # module names if we resolved alias names manually above + $MODPROBE $USEBLACKLIST ${mod} + done + else + $MODPROBE $USEBLACKLIST $1 + fi +fi +# vim: set et ts=4: diff --git a/testing/udev/udev.install b/testing/udev/udev.install new file mode 100644 index 000000000..e953ec743 --- /dev/null +++ b/testing/udev/udev.install @@ -0,0 +1,38 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 100)" -lt 0 ]; then + echo "ATTENTION UDEV:" + echo "----------" + echo "udev >=098 rules syntax has changed, please update your own rules." + echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules." + echo "Please read the instructions carefully before reboot." + echo "They are located in /etc/udev/readme-udev-arch.txt" + echo "----------" + fi +} + +post_install() { + # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist + # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible + ROOTDIR="" + [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) + [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR} + if [ ! -c ${ROOTDIR}/dev/console ]; then + rm -f ${ROOTDIR}/dev/console + mknod -m600 ${ROOTDIR}/dev/console c 5 1 + fi + if [ ! -c ${ROOTDIR}/dev/null ]; then + rm -f ${ROOTDIR}/dev/null + mknod -m644 ${ROOTDIR}/dev/null c 1 3 + fi + if [ ! -c ${ROOTDIR}/dev/zero ]; then + rm -f ${ROOTDIR}/dev/zero + mknod -m644 ${ROOTDIR}/dev/zero c 1 5 + fi + if [ -n "${ROOTDIR}" ]; then + umount ${ROOTDIR} + rmdir ${ROOTDIR} + fi +} diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD index 871bd2111..b03109219 100644 --- a/testing/usbutils/PKGBUILD +++ b/testing/usbutils/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 116702 2011-03-25 08:26:34Z tpowa $ +# $Id: PKGBUILD 118970 2011-04-09 20:52:11Z tpowa $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> pkgname=usbutils pkgver=002 -pkgrel=1 +pkgrel=2 pkgdesc="USB Device Utilities" arch=(i686 x86_64) license=('GPL') groups=('base') makedepends=('wget') depends=('glibc' 'libusb') +optdepends=('python2: for lsusb.py usage' + 'coreutils: for lsusb.py usage') url="http://linux-usb.sourceforge.net/" -source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('05610d15c3c8c8ada3d691c320ca784a') +source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz + fix-python2.patch) +md5sums=('05610d15c3c8c8ada3d691c320ca784a' + '45766196895b4cc50b53cd56e1bbf3d1') build() { cd $srcdir/$pkgname-$pkgver rm usb.ids wget http://www.linux-usb.org/usb.ids + # patch lsusb.py to use correct usb.ids file and python2 interpreter + patch -Np1 -i ../fix-python2.patch ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib make } diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch new file mode 100644 index 000000000..7e2875e99 --- /dev/null +++ b/testing/usbutils/fix-python2.patch @@ -0,0 +1,17 @@ +--- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 ++++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # lsusb.py + # Displays your USB devices in reasonable form. + # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. +@@ -16,7 +16,7 @@ + warnsort = False + + prefix = "/sys/bus/usb/devices/" +-usbids = "/usr/share/usb.ids" ++usbids = "/usr/share/hwdata/usb.ids" + + esc = chr(27) + norm = esc + "[0;0m" diff --git a/testing/xfsprogs/PKGBUILD b/testing/xfsprogs/PKGBUILD new file mode 100644 index 000000000..962f08b0f --- /dev/null +++ b/testing/xfsprogs/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 118982 2011-04-09 21:14:21Z tpowa $ +# Maintainer: Paul Mattal <paul@archlinux.org> +pkgname=xfsprogs +pkgver=3.1.5 +pkgrel=1 +pkgdesc="XFS filesystem utilities" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://oss.sgi.com/projects/xfs/" +groups=('base') +depends=('util-linux-ng>=2.16') +options=('!makeflags' '!libtool') +# We mirror the sources as upstream tends to move them once a new release is out +source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") +md5sums=('b1db37749e2b4149a0dd178abff956be') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export OPTIMIZER="-march=${CARCH/_/-} -O1" + export DEBUG=-DNDEBUG + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DIST_ROOT="${pkgdir}" install install-dev + chown -R root $pkgdir + chgrp -R root $pkgdir +} |