diff options
Diffstat (limited to 'extra')
52 files changed, 234 insertions, 1458 deletions
diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD deleted file mode 100644 index 801fab5e8..000000000 --- a/extra/archboot/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 133661 2011-07-30 09:38:54Z tpowa $ -# Maintainer : Tobias Powalowski <tpowa@archlinux.org> - -pkgname=archboot -pkgver=2011.08 -pkgrel=1 -pkgdesc="Advanced, modular arch boot/install image creation utility" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.archlinux.org/" -depends=('mkinitcpio>=0.7.2-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.07.3-1' 'subversion>=1.6.17-6' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-3' 'cryptsetup>=1.3.1-2' 'dialog>=1.1_20110707-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=4.0.0-1' 'grep>=2.9-1' 'iputils>=20101006-1' 'jfsutils>=1.1.15-2' 'less>=444-1' 'lvm2>=2.02.86-1' 'mdadm>=3.2.2-2' 'module-init-tools>=3.16-1' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-18' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-4' 'psmisc>=22.14-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-3' 'sysvinit>=2.88-2' 'tar>=1.26-1' 'util-linux>=2.19.1-2' 'which>=2.20-4' 'kbd>=1.15.3-1' 'wireless_tools>=29-4' 'xfsprogs>=3.1.5-1' 'dnsutils>=9.8.0.P4-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-3' 'openssh>=5.8p2-9' 'hwdetect>=2011.06-1' 'shadow>=4.1.4.3-2' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre2-1' 'dosfstools>=3.0.11-1' 'glibc>=2.14-4' 'linux-api-headers>=2.6.39.1-1' 'linux>=3.0-2' 'kernel26-lts>=2.6.32.43-1' 'xinetd>=2.3.14-7' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-7' 'lilo>=23.2-1' 'iptables>=1.4.12-2' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=003-1' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-2' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.86-1' 'screen>=4.0.3-12' 'elfutils>=0.152-1' 'pam>=1.1.3-2' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.4-1' 'nfsidmap>=0.24-2' 'readline>=6.2.001-2' 'acl>=2.2.51-1' 'attr>=2.4.46-1' 'pcre>=8.12-1' 'cpio>=2.11-2' 'fuse>=2.8.5-1' 'libusb>=1.0.8-1' 'vim>=7.3.266-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-6' 'libldap>=2.4.26-3' 'gpm>=1.20.6-6' 'libevent>=2.0.12-1' 'gcc-libs>=4.6.1-2' 'sdparm>=1.06-1' 'licenses>=2.8-1' 'pptpclient>=1.7.2-3' 'zd1211-firmware>=1.4-4' 'ipw2100-fw>=1.3-5' 'ipw2200-fw>=3.1-3' 'smbclient>=3.5.10-1' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.6-1' 'dmraid>=1.0.0.rc16.3-2' 'linux-atm>=2.5.1-2' 'netcfg>=2.6.5-1' 'parted>=3.0-3' 'tzdata>=2011h-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.5.0-1' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.39-1' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-2' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.17-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.3-1' 'libtirpc>=0.2.2-2' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=172-2' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.3-1' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.2-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-6' 'linux-firmware>=20110727-1' 'iana-etc>=2.30-2' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.5.2-1' 'libisoburn>=1.1.2-1' 'squashfs-tools>=4.2-1') -optdepends=('grub2-bios: for grub2 support' - 'grub2-efi-i386: for grub2 support' - 'grub2-efi-x86_64: for grub2 support' - 'efibootmgr: for grub2 support' -) -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$pkgrel.tar.bz2 vmware-detect.c) -backup=('etc/archboot/allinone.conf' - 'etc/archboot/allinone-lts.conf' - 'etc/archboot/default.conf' - 'etc/archboot/default-ftp.conf' - 'etc/archboot/default-pxelinux.conf' - 'etc/archboot/default-ftp-pxelinux.conf' - 'etc/archboot/presets/allinone' - 'etc/archboot/presets/allinone-lts' - 'etc/archboot/presets/isolinux' - 'etc/archboot/presets/isolinux-ftp' - 'etc/archboot/presets/syslinux' - 'etc/archboot/presets/syslinux-ftp' - 'etc/archboot/presets/pxelinux' - 'etc/archboot/presets/pxelinux-ftp' -) -install=archboot.install - -### to bump the depends list use this: -#for i in $(grep ^depends= PKGBUILD | sed -e 's/depends=(//g' -e 's/)//g'); do sed -i -e "s/$(echo $i)/$(echo $i | sed -e "s/>=.*/>=$(pacman -Qi $(echo $i | sed -e "s/'//g" -e 's/>=.*//g') | grep ^Version | sed -e 's/.*: //g')'/g")/g" PKGBUILD; done - -build() -{ - cd $srcdir/$pkgname-$pkgver-$pkgrel - mv * $pkgdir/ - # vmware-detect - cd $startdir/src - gcc -o vmware-detect vmware-detect.c - install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect -} -md5sums=('4b71827d6767c99c1144df9215108349' - '7e2b03463747cb22ab388e79a09fa0cb') diff --git a/extra/archboot/archboot.install b/extra/archboot/archboot.install deleted file mode 100644 index 315f97d7e..000000000 --- a/extra/archboot/archboot.install +++ /dev/null @@ -1,20 +0,0 @@ -# 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 -post_install() { - cat << EOF -ARCHBOOT usage: ---------------- ---> Main config files were installed to '/etc/archboot/'. - Preset files were installed to '/etc/archboot/presets'. - Modify them to your needs. ---> Use the preset files as config file of your build tool: - mkisolinux, mksyslinux or mkpxelinux ---> For Allinone ISOs use archboot-allinone.sh -EOF -} - -post_upgrade() { - post_install $1 -} diff --git a/extra/archboot/vmware-detect.c b/extra/archboot/vmware-detect.c deleted file mode 100644 index d242a388d..000000000 --- a/extra/archboot/vmware-detect.c +++ /dev/null @@ -1,13 +0,0 @@ -#include <stdio.h> -int main() { - unsigned char idtr[6]; - asm("sidt %0" : "=m" (idtr)); - if(0xff==idtr[5]) - { - return 0; - } - else - { - return 1; - } -} diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 1d8ecb84c..29c8d9b28 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132306 2011-07-22 16:28:25Z bisson $ +# $Id: PKGBUILD 135326 2011-08-12 20:59:31Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.0 -pkgrel=5 +pkgver=3.0.1 +pkgrel=1 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' arch=('i686' 'x86_64' 'mips64el') url='http://audacious-media-player.org/' @@ -13,7 +13,7 @@ license=('GPL3') depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('unzip: zipped skins support') source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('d32de719f5b09440d0f6c802a5140a32b3827475') +sha1sums=('1532fce78702da80418d940dea96b857b75c1f9e') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/bftpd/PKGBUILD b/extra/bftpd/PKGBUILD index 5d3424581..664c29d51 100644 --- a/extra/bftpd/PKGBUILD +++ b/extra/bftpd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 123903 2011-05-14 09:54:29Z thomas $ +# $Id: PKGBUILD 135462 2011-08-13 23:06:44Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=bftpd -pkgver=3.4 +pkgver=3.6 pkgrel=1 pkgdesc="Small, easy-to-configure FTP server" arch=(i686 x86_64 'mips64el') @@ -19,7 +19,7 @@ source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz bftpd.logrotate bftpd.pam bftpd.xinetd) -md5sums=('dcee04b5fad8c918e86c49712424fcdd' +md5sums=('7c45b158646e3b266530bf46778fc2d0' '56a1bf7738a6db2b2cff89e611f4f11a' '853680dad0df39d0b4d2fb43d4be430a' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD index 800feeca4..ea646f637 100644 --- a/extra/bmp/PKGBUILD +++ b/extra/bmp/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 134409 2011-08-03 18:32:37Z angvp $ +# $Id: PKGBUILD 135355 2011-08-13 06:32:50Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> pkgname=bmp pkgver=0.9.7.1 -pkgrel=6 +pkgrel=8 pkgdesc="gtk2 port of xmms" -arch=(i686 x86_64 'mips64el') +arch=(i686 x86_64 mips64el) url="http://sourceforge.net/projects/beepmp/" license=('GPL') -depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'unzip') +depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils') makedepends=('libxt') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) +install=bmp.install +source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \ + ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) md5sums=('c25d5a8d49cc5851d13d525a20023c4c' 'fa1bdf5a8d03e8539a6bed5caa471176' '42ad4109ddb66024d4c6d1f3e572ab86') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i ../${pkgver}-visualization.patch patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch ./configure --prefix=/usr --mandir=/usr/share/man @@ -26,7 +28,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } # vim: ts=2 sw=2 et ft=sh diff --git a/extra/bmp/bmp.install b/extra/bmp/bmp.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/extra/bmp/bmp.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 727981572..0b64ad9d0 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 117080 2011-03-28 14:57:03Z dan $ +# $Id: PKGBUILD 135533 2011-08-15 02:13:14Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" makedepends=('flex' 'texlive-core' 'ghostscript' 'texlive-latexextra') #'qt' source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('ff908759ff7cd9464424b04ae6c68e48') -sha1sums=('4f68b655c93265cb15ef1b8c9ca35ebc39698cf0') +md5sums=('40912d0a4b8248d78df6f705837dcd80') +sha1sums=('406c261950b73037d91a2dce0799693a42d96051') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/esound/PKGBUILD b/extra/esound/PKGBUILD deleted file mode 100644 index bf8f8c0c3..000000000 --- a/extra/esound/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 131830 2011-07-16 00:02:10Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=esound -pkgver=0.2.41 -pkgrel=2 -pkgdesc="Enlightened Sound Daemon" -arch=(i686 x86_64 'mips64el') -license=('LGPL') -depends=('audiofile' 'alsa-lib>=1.0.18') -url="http://www.tux.org/~ricdude/EsounD.html" -provides=("esd=${pkgver}") -replaces=('esd') -conflicts=('esd') -backup=('etc/esd.conf') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2 - esd-0.2.38-alsa-drain.patch - esd) -md5sums=('8d9aad3d94d15e0d59ba9dc0ea990c6c' - '3de93efcd1bc196a3585e6aef50eac48' - 'a4c76e7c7f75b201ea7ab6fb15b47472') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --with-audiofile --without-libwrap \ - --enable-alsa --disable-artstest - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd" -} diff --git a/extra/esound/esd b/extra/esound/esd deleted file mode 100755 index d90ef55fa..000000000 --- a/extra/esound/esd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/esd` -case "$1" in - start) - stat_busy "Starting Esound Daemon" - if [ -z "$PID" ]; then - /usr/bin/esd -nobeeps & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon esd - stat_done - fi - ;; - stop) - stat_busy "Stopping Esound Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon esd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/esound/esd-0.2.38-alsa-drain.patch b/extra/esound/esd-0.2.38-alsa-drain.patch deleted file mode 100644 index f2fb716ba..000000000 --- a/extra/esound/esd-0.2.38-alsa-drain.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- esound-0.2.38/audio_alsa09.c.old 2007-06-11 12:22:24.000000000 +0200 -+++ esound-0.2.38/audio_alsa09.c 2007-06-11 12:22:49.000000000 +0200 -@@ -486,7 +486,7 @@ void esd_audio_flush(void) - } - - if (alsa_playback_handle != NULL) -- snd_pcm_drain( alsa_playback_handle ); -+ snd_pcm_drop( alsa_playback_handle ); - - if (alsadbg) - print_state(); diff --git a/extra/ettercap/01_pointers_and_ints_dont_mix.diff b/extra/ettercap/01_pointers_and_ints_dont_mix.diff index bf7022266..65571309c 100644 --- a/extra/ettercap/01_pointers_and_ints_dont_mix.diff +++ b/extra/ettercap/01_pointers_and_ints_dont_mix.diff @@ -1,12 +1,13 @@ See debian bug #521857, patch from Timothy Redaelli <timothy@redaelli.eu> +Revised by Robert Edmonds <edmonds@debian.org> ---- ettercap-0.7.3.orig/src/protocols/ec_tcp.c -+++ ettercap-0.7.3/src/protocols/ec_tcp.c +--- a/src/protocols/ec_tcp.c ++++ b/src/protocols/ec_tcp.c @@ -116,7 +116,7 @@ tcp = (struct tcp_header *)DECODE_DATA; opt_start = (u_char *)(tcp + 1); - opt_end = (u_char *)((int)tcp + tcp->off * 4); -+ opt_end = (u_char *)(tcp + tcp->off * 4); ++ opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4); DECODED_LEN = (u_int32)(tcp->off * 4); diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD index 4c26f1985..34d86d7e1 100644 --- a/extra/ettercap/PKGBUILD +++ b/extra/ettercap/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134606 2011-08-06 11:42:31Z giovanni $ +# $Id: PKGBUILD 135334 2011-08-12 21:28:33Z giovanni $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ettercap pkgver=NG_0.7.3 _origver=NG-0.7.3 -pkgrel=17 +pkgrel=18 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" arch=('i686' 'x86_64' 'mips64el') url="http://ettercap.sourceforge.net/" @@ -18,8 +18,8 @@ source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar. 01_pointers_and_ints_dont_mix.diff ettercap-NG-0.7.3_dns_support_on_x86_64.patch) md5sums=('28fb15cd024162c55249888fe1b97820' - 'ad235cd90aaa3e168575d06efac4d862' - 'f3d66186eece056a6d71453f9f288623') + 'c8f2b004f69ac3522ffebb530478b324' + 'd44f80292afcefdc13cba9a30c6391d6') build() { cd ${srcdir}/${pkgname}-${_origver} diff --git a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch index ed455a878..1754f2e3d 100644 --- a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch +++ b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch @@ -14,7 +14,7 @@ else - if false; then -+if true; then ++ if true; then HAVE_DN_EXPAND_TRUE= HAVE_DN_EXPAND_FALSE='#' else diff --git a/extra/hal/PKGBUILD b/extra/hal/PKGBUILD deleted file mode 100644 index a78832db8..000000000 --- a/extra/hal/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 105528 2011-01-10 10:53:12Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Link Dupont <link@subpop.net> - -pkgname=hal -pkgver=0.5.14 -pkgrel=6 -pkgdesc="Hardware Abstraction Layer" -arch=(i686 x86_64 'mips64el') -license=('GPL' 'custom') -url="http://www.freedesktop.org/wiki/Software/hal" -depends=('dbus-glib>=0.82' 'libusb-compat' 'udev>=146' 'filesystem>=0.7.1-5' 'hal-info>=0.20090716' 'eject' 'dmidecode' 'pciutils>=3.0.2' 'usbutils>=0.73-5' 'pm-utils>=1.2.5' 'consolekit>=0.4.1' 'util-linux-ng>=2.16') -makedepends=('pkgconfig' 'gperf') -options=('!libtool' '!makeflags') -install=hal.install -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz - hal - hal-0.5.9-hide-diagnostic.patch - hal-remove-dell-killswitch.patch - hal-KVM-evdev.patch - hal-HDAPS-blacklist.patch - hal-xen-unignore-axes.patch - hal-use-at-console.patch - fix-libusb-detection.patch - dbus-error-init.patch - path-max.patch - handle-input-touchpad.patch - macbook-fix-ioperm.patch - hal-ignore-internal-dm-devices.patch) -md5sums=('e9163df591a6f38f59fdbfe33e73bf20' - '277e96ac130d7bfce0b30f0b80db8782' - '4d4b6801a1cedca22b8bdd9db73b16fb' - '6d87c3e63184ae3a69caafc846f538a3' - '6507e5091ee2d11a87ae738a8e2caecb' - '1171c2d83b76059f2da7a3538e08fa4e' - '52bd305299aa22ae07f1a862c22d30fa' - '3f11234fb5e5044fbfc5199ec65b182c' - 'da088f12cfc2d190bbf95b747e19ab9e' - '634f4ec2203eff7de8fa2ed2c6b9cbe0' - 'f8c9b3a40d03907b498feef571d42466' - '0575677614db0632b17b1a719798c7e0' - '46a5db3ff896ee37762aa8d7e70942c4' - '17bc2b911f245cef4a1d98769d5c4d14') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch" - patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch" - patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch" - patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch" - patch -Np1 -i "${srcdir}/hal-xen-unignore-axes.patch" - patch -Np1 -i "${srcdir}/hal-use-at-console.patch" - patch -Np1 -i "${srcdir}/fix-libusb-detection.patch" - patch -Np1 -i "${srcdir}/dbus-error-init.patch" - patch -Np1 -i "${srcdir}/path-max.patch" - patch -Np1 -i "${srcdir}/handle-input-touchpad.patch" - patch -Np1 -i "${srcdir}/macbook-fix-ioperm.patch" - patch -Np1 -i "${srcdir}/hal-ignore-internal-dm-devices.patch" - - libtoolize --force - aclocal - autoconf - automake - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/hal --with-udev-prefix=/etc \ - --enable-static=no --disable-acpi-ibm \ - --disable-docbook-docs --disable-console-kit \ - --disable-policy-kit --disable-acl-management \ - --enable-umount-helper --disable-smbios \ - --with-hal-user=hal --with-hal-group=hal \ - --with-pid-file=/var/run/hald.pid \ - --disable-gtk-doc - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/etc/rc.d" - install -m755 -d "${pkgdir}/media" - install -m755 "${srcdir}/hal" "${pkgdir}/etc/rc.d/" - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - # Fix udev rule location - install -d -m755 "${pkgdir}/lib" - mv "${pkgdir}/etc/udev" "${pkgdir}/lib/" -} diff --git a/extra/hal/dbus-error-init.patch b/extra/hal/dbus-error-init.patch deleted file mode 100644 index fb3ad020a..000000000 --- a/extra/hal/dbus-error-init.patch +++ /dev/null @@ -1,231 +0,0 @@ -From dcb2829b8eff61463b0869614ddb07b1c86cecaa Mon Sep 17 00:00:00 2001 -From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> -Date: Wed, 30 Dec 2009 11:42:52 +0000 -Subject: linux/probe-input: don't use error prio init - -it may happen in the out: case that LIBHAL_FREE_DBUS_ERROR (&error) is -called before the error structure is initialized via -dbus_error_init (&error). This could lead to a segfault during startup -as seen in dmesg: - -|Intel AES-NI instructions are not detected. -|padlock: VIA PadLock not detected. -|hald-probe-inpu[1793]: segfault at 2 ip 00007f656fb68969 sp 00007fff39eeb950 error 4 in libc-2.10.2.so[7f656faf3000+14a000] -|hald-probe-inpu[1796]: segfault at 2 ip 00007fa2c3293969 sp 00007fffd92a5dd0 error 4 in libc-2.10.2.so[7fa2c321e000+14a000] -|hald-probe-inpu[1797]: segfault at 2 ip 00007f1d08ba2969 sp 00007fff34244e30 error 4 in libc-2.10.2.so[7f1d08b2d000+14a000] -|hald-probe-inpu[1799]: segfault at 2 ip 00007f35c0e3d969 sp 00007fffe5ec7ee0 error 4 in libc-2.10.2.so[7f35c0dc8000+14a000] -|hald-probe-inpu[1800]: segfault at 2 ip 00007f931c556969 sp 00007fffe1825b60 error 4 in libc-2.10.2.so[7f931c4e1000+14a000] -|hald-probe-inpu[1801]: segfault at 2 ip 00007f5156d9a969 sp 00007fff4e620af0 error 4 in libc-2.10.2.so[7f5156d25000+14a000] -|RPC: Registered udp transport module. -|RPC: Registered tcp transport module. - -What I run into seems to be reported as Debian #562068 [0]. This patch -makes the segfault go away on my machine. - -[0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068 - -Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> -Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> ---- -diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c -index 94e9929..cad47d3 100644 ---- a/hald/linux/probing/probe-input.c -+++ b/hald/linux/probing/probe-input.c -@@ -70,6 +70,7 @@ main (int argc, char *argv[]) - fd = -1; - - setup_logger (); -+ dbus_error_init (&error); - - button_type = getenv ("HAL_PROP_BUTTON_TYPE"); - if (button_type == NULL) -@@ -96,7 +97,6 @@ main (int argc, char *argv[]) - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - --- -cgit v0.8.3-6-g21f6 -From baa61a879985d63f549854518ef14efd40e62e8c Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Wed, 24 Feb 2010 16:19:28 +0000 -Subject: Make sure dbus_error_init() is called before LIBHAL_FREE_DBUS_ERROR() - -If dbus_error_init() is not called before LIBHAL_FREE_DBUS_ERROR() is -called on that error, then it is uninitialized and may segfault. This -means that dbus_error_init() must be called before any "goto out" if -"out:" calls LIBHAL_FREE_DBUS_ERROR(). - -Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> ---- -diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c -index 45d2084..bffc040 100644 ---- a/hald/linux/probing/probe-hiddev.c -+++ b/hald/linux/probing/probe-hiddev.c -@@ -57,11 +57,12 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c -index 70b0f86..aaa92e2 100644 ---- a/hald/linux/probing/probe-ieee1394-unit.c -+++ b/hald/linux/probing/probe-ieee1394-unit.c -@@ -388,6 +388,8 @@ int main (int argc, char *argv[]) - - setup_logger (); - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; -@@ -396,7 +398,6 @@ int main (int argc, char *argv[]) - if (ieee1394_udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c -index 0b1b912..e911eea 100644 ---- a/hald/linux/probing/probe-net-bluetooth.c -+++ b/hald/linux/probing/probe-net-bluetooth.c -@@ -141,6 +141,8 @@ main (int argc, char *argv[]) - DBusMessage *reply = NULL; - DBusError error; - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; -@@ -151,8 +153,6 @@ main (int argc, char *argv[]) - - HAL_INFO (("Investigating '%s'", iface)); - -- dbus_error_init (&error); -- - if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c -index 91ed7bc..7c6d1c6 100644 ---- a/hald/linux/probing/probe-printer.c -+++ b/hald/linux/probing/probe-printer.c -@@ -66,6 +66,8 @@ main (int argc, char *argv[]) - ret = 1; - - setup_logger (); -+ -+ dbus_error_init (&error); - - udi = getenv ("UDI"); - if (udi == NULL) { -@@ -73,7 +75,6 @@ main (int argc, char *argv[]) - goto out; - } - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { - HAL_ERROR (("ctx init failed")); - goto out; -diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c -index 0bc9689..15c0d4f 100644 ---- a/hald/linux/probing/probe-smbios.c -+++ b/hald/linux/probing/probe-smbios.c -@@ -129,6 +129,8 @@ main (int argc, char *argv[]) - ret = 1; - - setup_logger (); -+ -+ dbus_error_init (&error); - - udi = getenv ("UDI"); - if (udi == NULL) { -@@ -136,7 +138,6 @@ main (int argc, char *argv[]) - goto out; - } - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { - HAL_ERROR (("ctx init failed")); - goto out; -diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c -index 824a82e..dd524ca 100644 ---- a/hald/linux/probing/probe-storage.c -+++ b/hald/linux/probing/probe-storage.c -@@ -109,6 +109,8 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - if ((udi = getenv ("UDI")) == NULL) - goto out; - if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL) -@@ -127,7 +129,6 @@ main (int argc, char *argv[]) - else - only_check_for_fs = FALSE; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c -index cf913c0..7bc13e8 100644 ---- a/hald/linux/probing/probe-video4linux.c -+++ b/hald/linux/probing/probe-video4linux.c -@@ -58,6 +58,8 @@ main (int argc, char *argv[]) - - setup_logger (); - -+ dbus_error_init (&error); -+ - device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE"); - if (device_file == NULL) - goto out; -@@ -66,7 +68,6 @@ main (int argc, char *argv[]) - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - ctx = libhal_ctx_init_direct (&error); - if (ctx == NULL) - goto out; -diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c -index 0de1b91..7268fff 100644 ---- a/hald/linux/probing/probe-volume.c -+++ b/hald/linux/probing/probe-volume.c -@@ -318,6 +318,8 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - if ((udi = getenv ("UDI")) == NULL) - goto out; - if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL) -@@ -346,7 +348,6 @@ main (int argc, char *argv[]) - - fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE"); - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - --- -cgit v0.8.3-6-g21f6 diff --git a/extra/hal/fix-libusb-detection.patch b/extra/hal/fix-libusb-detection.patch deleted file mode 100644 index d4f966dec..000000000 --- a/extra/hal/fix-libusb-detection.patch +++ /dev/null @@ -1,66 +0,0 @@ -From fce91df8ba7f305c624baf1f06961c040b088ecc Mon Sep 17 00:00:00 2001 -From: Joe Marcus Clarke <marcus@FreeBSD.org> -Date: Tue, 08 Dec 2009 00:05:27 +0000 -Subject: Fix libusb detection on Linux - -Adjust the FreeBSD libusb20 code so that it does not interfere with the -Linux libusb detection. - -Reported by: Robby Workman <rw@rlworkman.net> ---- -diff --git a/configure.in b/configure.in -index a8fda51..8363595 100644 ---- a/configure.in -+++ b/configure.in -@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then - fi - AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"]) - --USE_LIBUSB20=no --USE_LIBUSB=no --LIBUSB20_LIBS="" - AC_ARG_WITH([backend], - AS_HELP_STRING([--with-backend=<name>], - [backend to use (linux/solaris/freebsd/dummy)]), -@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin - AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) - AC_SUBST(HALD_BACKEND) - if test "x$HALD_BACKEND" = "xfreebsd"; then -- AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) --fi --if test "x$USE_LIBUSB20" = "xno"; then -- AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no]) --fi --AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"]) --AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"]) --if test "x$USE_LIBUSB20" = "xyes"; then -- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) -- LIBUSB20_LIBS="-lusb20" --elif test "x$USE_LIBUSB" = "xyes"; then -- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) -- LIBUSB20_LIBS="-lusb" -+ USE_BSDLIBUSB20=no -+ USE_BSDLIBUSB=no -+ LIBUSB20_LIBS="" -+ AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no]) -+ if test "x$USE_BSDLIBUSB20" = "xno"; then -+ AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no]) -+ fi -+ AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"]) -+ if test "x$USE_BSDLIBUSB20" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) -+ LIBUSB20_LIBS="-lusb20" -+ elif test "x$USE_BSDLIBUSB" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) -+ LIBUSB20_LIBS="-lusb" -+ fi -+ AC_SUBST(LIBUSB20_LIBS) -+else -+ AM_CONDITIONAL([HAVE_LIBUSB20], [false]) - fi --AC_SUBST(LIBUSB20_LIBS) - - dnl DBUS API is subject to changes - AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) --- -cgit v0.8.3-6-g21f6 diff --git a/extra/hal/hal b/extra/hal/hal deleted file mode 100644 index 012d456ed..000000000 --- a/extra/hal/hal +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - #Check for running dbus, start when not running - ck_daemon dbus && /etc/rc.d/dbus start - if [ -x /etc/rc.d/acpid ]; then - ck_daemon acpid && /etc/rc.d/acpid start - fi - stat_busy "Starting Hardware Abstraction Layer" - if [ ! -x /var/cache/hald ] ; then - install -m755 -g 82 -o 82 -d /var/cache/hald - fi - if [ ! -x /var/run/hald ]; then - install -m755 -g 82 -o 82 -d /var/run/hald - fi - if [ ! -x /var/run/hald/hald-local ]; then - install -m755 -g 0 -o 0 -d /var/run/hald/hald-local - fi - if [ ! -x /var/run/hald/hald-runner ]; then - install -m755 -g 0 -o 0 -d /var/run/hald/hald-runner - fi - /usr/sbin/hald - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon hal - stat_done - fi - ;; - stop) - stat_busy "Stopping Hardware Abstraction Layer" - [ -f /var/run/hald.pid ] && kill `cat /var/run/hald.pid` &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon hal - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/extra/hal/hal-0.5.9-hide-diagnostic.patch b/extra/hal/hal-0.5.9-hide-diagnostic.patch deleted file mode 100644 index 58c882d77..000000000 --- a/extra/hal/hal-0.5.9-hide-diagnostic.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi.orig 2007-05-01 21:39:31.000000000 +0000 -+++ hal-0.5.9/fdi/policy/10osvendor/20-storage-methods.fdi 2007-05-01 21:51:14.000000000 +0000 -@@ -100,6 +100,11 @@ - </match> - </match> - -+ <!-- Hide partitions marked as Compaq Diagnostics --> -+ <match key="volume.partition.type" string="0x12"> -+ <merge key="volume.ignore" type="bool">true</merge> -+ </match> -+ - <!-- EFI firmware partitions --> - <match key="volume.fstype" string="vfat"> - <match key="volume.label" string="EFI"> diff --git a/extra/hal/hal-HDAPS-blacklist.patch b/extra/hal/hal-HDAPS-blacklist.patch deleted file mode 100644 index 8a6822817..000000000 --- a/extra/hal/hal-HDAPS-blacklist.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e1f85fe0cdfa7e4d4ce7a811d0b0c90bf38fba0c Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu, 25 Jun 2009 09:47:27 +1000 -Subject: [PATCH] Blacklist HDAPS accelerometer device from being picked up in X. - -This device posts accelerometer data through ABS_X/ABS_Y, making X unusable -if it's controlling the pointer. ---- - fdi/policy/10osvendor/10-x11-input.fdi | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index a342421..89ba672 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -38,5 +38,11 @@ - <merge key="input.x11_driver" type="string">evdev</merge> - </match> - </match> -+ -+ <!-- http://bugs.freedesktop.org/show_bug.cgi?id=22442 -+ Posts accel data through ABS_X/ABS_Y, makes X unusable --> -+ <match key="info.product" contains="ThinkPad HDAPS accelerometer data"> -+ <remove key="input.x11_driver" /> -+ </match> - </device> - </deviceinfo> --- -1.6.3.rc1.2.g0164.dirty - diff --git a/extra/hal/hal-KVM-evdev.patch b/extra/hal/hal-KVM-evdev.patch deleted file mode 100644 index 917655ed1..000000000 --- a/extra/hal/hal-KVM-evdev.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7618498eec840cb26474dc47821e083957772706 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri, 20 Mar 2009 14:37:24 +1000 -Subject: [PATCH] Add x11_driver for American Megatrends KVM. - -This device exposes only ABS_X, ABS_Y and buttons. It gets input.joystick -assigned but not input.mouse, hence the default evdev mapping doesn't pick up -on it. - -Red Hat Bug 484776 <https://bugzilla.redhat.com/show_bug.cgi?id=484776> - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - fdi/policy/10osvendor/10-x11-input.fdi | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index 769f75b..eb9767e 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -2,6 +2,12 @@ - <deviceinfo version="0.2"> - <device> - -+ <!-- This KVMS has abs x/y and buttons. It only has inputInfo.joystick -+ set by hal and doesn't get picked up by default --> -+ <match key="input.product" contains="American Megatrends Inc. Virtual Keyboard and Mouse"> -+ <merge key="input.x11_driver" type="string">evdev</merge> -+ </match> -+ - <!-- KVM emulates a USB graphics tablet which works in absolute coordinate mode --> - <match key="input.product" contains="QEMU USB Tablet"> - <merge key="input.x11_driver" type="string">evdev</merge> --- -1.6.0.6 - diff --git a/extra/hal/hal-ignore-internal-dm-devices.patch b/extra/hal/hal-ignore-internal-dm-devices.patch deleted file mode 100644 index 9ad8656ca..000000000 --- a/extra/hal/hal-ignore-internal-dm-devices.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6f16321da13f6a7cbd9c424ddba2e727e434fa25 Mon Sep 17 00:00:00 2001 -From: Milan Broz <mbroz@redhat.com> -Date: Tue, 13 Jul 2010 14:07:32 +0000 -Subject: HAL: Ignore internal DM devices with new DM udev rules - -With new device-mapper udev rules are /dev/mapper/* symlinks -to basic device name /dev/dm-X. -(Change requested by udev upstream.) - -This change breaks temporary-cryptsetup workaround inside hal. - -With new dm-udev rules (uncluded since device-mapper 1.02.39) -there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable -which controls that scan should be ignored for this device -(it is set for all internal devices, including temporary cryptsetup, -internal parts of lvm devices etc.) - -Ignore device if this flag is set. - -See bugs -https://bugzilla.redhat.com/show_bug.cgi?id=613909 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286 - -Signed-off-by: Milan Broz <mbroz@redhat.com> ---- -diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c -index a8233fd..6d616bc 100644 ---- a/hald/linux/osspec.c -+++ b/hald/linux/osspec.c -@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data) - g_free (str); - } - g_free (dstr); -+ } else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) { -+ if (strtoul(&key[33], NULL, 10) == 1) { -+ HAL_INFO (("ignoring device requested by DM udev rules")); -+ goto invalid; -+ } - } - } - --- -cgit v0.8.3-6-g21f6 diff --git a/extra/hal/hal-remove-dell-killswitch.patch b/extra/hal/hal-remove-dell-killswitch.patch deleted file mode 100644 index ae0cf7a2b..000000000 --- a/extra/hal/hal-remove-dell-killswitch.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux ---- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux 2008-08-22 07:34:47.000000000 +0100 -+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux 2009-03-03 10:45:20.000000000 +0000 -@@ -8,11 +8,6 @@ - # the Free Software Foundation; either version 2 of the License, or - # (at your option) any later version. - --DELL_WCTL=/usr/bin/dellWirelessCtl --if [ -x "/usr/sbin/dellWirelessCtl" ]; then -- DELL_WCTL=/usr/sbin/dellWirelessCtl --fi -- - if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then - value="`hal-system-sonypic getbluetooth`" -@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - exit 1 - fi - exit ${value} -- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- $DELL_WCTL --st_bt -- value=$? -- if [ "$value" = "0" ]; then -- exit 1 -- elif [ "$value" = "1" ]; then -- exit 0 -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $value" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi - elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then - read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null - if [ $? -eq 0 ]; then -@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - echo "Access type not supported" >&2 - exit 1 - fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- $DELL_WCTL --st_wlan -- value=$? -- if [ "$value" = "0" ]; then -- exit 1 -- elif [ "$value" = "1" ]; then -- exit 0 -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $value" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- $DELL_WCTL --st_wwan -- value=$? -- if [ "$value" = "0" ]; then -- exit 1 -- elif [ "$value" = "1" ]; then -- exit 0 -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $value" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Killswitch type not supported" >&2 -diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux ---- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux 2008-10-24 09:45:54.000000000 +0100 -+++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux 2009-03-03 10:44:49.000000000 +0000 -@@ -8,11 +8,6 @@ - # the Free Software Foundation; either version 2 of the License, or - # (at your option) any later version. - --DELL_WCTL=/usr/bin/dellWirelessCtl --if [ -x "/usr/sbin/dellWirelessCtl" ]; then -- DELL_WCTL=/usr/sbin/dellWirelessCtl --fi -- - if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then - if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then - hal-system-sonypic setbluetooth $value -@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - exit 1 - fi - exit 0 -- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # TODO: write our own binary that links with libsmbios? -- if [ "$value" = "true" ]; then -- $DELL_WCTL --bt 1 -- ret=$? -- else -- $DELL_WCTL --bt 0 -- ret=$? -- fi -- if [ "$ret" != "0" ]; then -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $ret" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi - elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then - if [ "$value" = "true" ]; then - bit=1; -@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue - echo "Access type not supported" >&2 - exit 1 - fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # As a side effect we disable the physical kill switch -- # TODO: write our own binary that links with libsmbios? -- if [ "$value" = "true" ]; then -- $DELL_WCTL --sw_wlan 0 --wlan 1 -- ret=$? -- else -- $DELL_WCTL --sw_wlan 0 --wlan 0 -- ret=$? -- fi -- if [ "$ret" != "0" ]; then -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $ret" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi --elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then -- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then -- if [ -x "$DELL_WCTL" ]; then -- # As a side effect we disable the physical kill switch -- # TODO: write our own binary that links with libsmbios? -- if [ "$value" = "true" ]; then -- $DELL_WCTL --sw_wwan 0 --wwan 1 -- ret=$? -- else -- $DELL_WCTL --sw_wwan 0 --wwan 0 -- ret=$? -- fi -- if [ "$ret" != "0" ]; then -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl returned $ret" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 -- exit 1 -- fi -- else -- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 -- echo "Access type not supported" >&2 -- exit 1 -- fi - else - echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 - echo "Killswitch type not supported" >&2 diff --git a/extra/hal/hal-use-at-console.patch b/extra/hal/hal-use-at-console.patch deleted file mode 100644 index 0b32f17f0..000000000 --- a/extra/hal/hal-use-at-console.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up hal-0.5.13/hal.conf.in.drop-polkit hal-0.5.13/hal.conf.in ---- hal-0.5.13/hal.conf.in.drop-polkit 2009-02-04 17:07:23.000000000 -0500 -+++ hal-0.5.13/hal.conf.in 2009-07-29 23:15:16.866766074 -0400 -@@ -25,7 +25,41 @@ - send_interface="org.freedesktop.Hal.Device"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Manager"/> -+ </policy> -+ -+ <!-- Only allow users at the local console to manipulate devices --> -+ <policy at_console="true"> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.CPUFreq"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.DockStation"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.KillSwitch"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.LaptopPanel"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Leds"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.LightSensor"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Storage"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Storage.Removable"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Volume"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/> -+ <allow send_destination="org.freedesktop.Hal" -+ send_interface="org.freedesktop.Hal.Device.WakeOnLan"/> -+ -+ </policy> - -+ <!-- well,...and root too --> -+ <policy user="root"> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.CPUFreq"/> - <allow send_destination="org.freedesktop.Hal" diff --git a/extra/hal/hal-xen-unignore-axes.patch b/extra/hal/hal-xen-unignore-axes.patch deleted file mode 100644 index b248639b7..000000000 --- a/extra/hal/hal-xen-unignore-axes.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e48f59d2b9bcb43ea8a7b8c884dcb73c8f65b170 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon, 19 Oct 2009 14:27:20 +1000 -Subject: [PATCH] Un-ignore absolute axes for the Xen Virtual Pointer. - -The evdev-internal axis type picking fails for the Xen Virtual Pointer as it -exposes both relative and absolute axes. Evdev picks the relative axes by -default, leading to a immovable pointer if the Xen backend only sends -absolute coordinates. - -Explicitly tell evdev to not ignore the absolute axes. - -https://bugzilla.redhat.com/show_bug.cgi?id=523914 - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - fdi/policy/10osvendor/10-x11-input.fdi | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index 89ba672..752c4ab 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -44,5 +44,12 @@ - <match key="info.product" contains="ThinkPad HDAPS accelerometer data"> - <remove key="input.x11_driver" /> - </match> -+ -+ <!-- https://bugzilla.redhat.com/show_bug.cgi?id=523914 -+ Mouse does not move in PV Xen guest --> -+ <match key="info.product" contains="Xen Virtual Pointer"> -+ <merge key="input.x11_options.IgnoreAbsoluteAxes" type="string">false</merge> -+ <merge key="input.x11_options.IgnoreRelativeAxes" type="string">false</merge> -+ </match> - </device> - </deviceinfo> --- -1.6.2.5 - diff --git a/extra/hal/hal.install b/extra/hal/hal.install deleted file mode 100644 index d6afee384..000000000 --- a/extra/hal/hal.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - getent group hal >/dev/null || usr/sbin/groupadd -g 82 hal - getent group optical >/dev/null || usr/sbin/groupadd -g 93 optical - getent group floppy >/dev/null || usr/sbin/groupadd -g 94 floppy - getent group storage >/dev/null || usr/sbin/groupadd -g 95 storage - getent passwd hal >/dev/null || usr/sbin/useradd -c 'HAL daemon' -u 82 -g hal -G optical,floppy,storage -d '/' -s /bin/false hal - usr/bin/passwd -l hal &>/dev/null -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -post_remove() { - if getent passwd hal &>/dev/null; then - usr/sbin/userdel hal - fi - if getent group hal &>/dev/null; then - usr/sbin/groupdel hal - fi -} diff --git a/extra/hal/handle-input-touchpad.patch b/extra/hal/handle-input-touchpad.patch deleted file mode 100644 index 9cd646422..000000000 --- a/extra/hal/handle-input-touchpad.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d Mon Sep 17 00:00:00 2001 -From: Michael Witten <mfwitten@gmail.com> -Date: Wed, 06 Jan 2010 00:53:17 +0000 -Subject: Policy: handle `input.touchpad' explicitly - -This commit essentially duplicates the policy for: - - <match key="info.capabilities" contains="input.mouse"> - -and then changes `input.mouse' to `input.touchpad'. This -is necessary because in Linus Torvalds's Linux repo: - - git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git - -the following commit: - - commit 7105d2ea73e1391b681d0e1212c42f561c64d429 - Author: Dmitry Torokhov <dmitry.torokhov@gmail.com> - Date: Fri Dec 11 23:54:54 2009 -0800 - - Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad - - Relative events are only reported via secondary device therefore device - associated with the touchpad should not advertise these capabilities. - - Signed-off-by: Dmitry Torokhov <dtor@mail.ru> - -made these few changes: - - diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c - index a3f492a..b03e7e0 100644 - /--- a/drivers/input/mouse/alps.c - /+++ b/drivers/input/mouse/alps.c - /@@ -487,6 +487,17 @@ int alps_init(struct psmouse *psmouse) - if (alps_hw_init(psmouse)) - goto init_fail; - - + /* - + * Undo part of setup done for us by psmouse core since touchpad - + * is not a relative device. - + */ - + __clear_bit(EV_REL, dev1->evbit); - + __clear_bit(REL_X, dev1->relbit); - + __clear_bit(REL_Y, dev1->relbit); - + - + /* - + * Now set up our capabilities. - + */ - dev1->evbit[BIT_WORD(EV_KEY)] |= BIT_MASK(EV_KEY); - dev1->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH); - dev1->keybit[BIT_WORD(BTN_TOOL_FINGER)] |= BIT_MASK(BTN_TOOL_FINGER); - -so that HAL no longer adds: - - input.mouse - -to an ALPS touchpad's: - - info.capabilities - -so that HAL no longer marks the ALPS touchpad with: - - input.x11_driver = 'evdev' - -because the policy file: - - fdi/policy/10osvendor/10-x11-input.fdi - -doesn't define the policy for: - - <match key="info.capabilities" contains="input.touchpad"> - -which was previous unnecessary because everything used to -be caught by the policy for: - - <match key="info.capabilities" contains="input.mouse"> - -Signed-off-by: Michael Witten <mfwitten@gmail.com> -Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> ---- -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index cff8fc5..8bbe263 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -16,6 +16,14 @@ - </match> - </match> - -+ <match key="info.capabilities" contains="input.touchpad"> -+ <merge key="input.x11_driver" type="string">mouse</merge> -+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" -+ string="Linux"> -+ <merge key="input.x11_driver" type="string">evdev</merge> -+ </match> -+ </match> -+ - <match key="info.capabilities" contains="input.tablet"> - <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" - string="Linux"> --- -cgit v0.8.3-6-g21f6 diff --git a/extra/hal/macbook-fix-ioperm.patch b/extra/hal/macbook-fix-ioperm.patch deleted file mode 100644 index 14d0b392d..000000000 --- a/extra/hal/macbook-fix-ioperm.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 597c1ffffd61a15a334ce42f2a569c59f0270bcb Mon Sep 17 00:00:00 2001 -From: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Date: Thu, 25 Feb 2010 10:25:18 +0000 -Subject: Fix incorrect arguments to ioperm() call - -The second argument of ioperm() is not the last port to be accessed -but rather length of the port range [port, port + len). - -Signed-off-by: Dmitry Torokhov <dtor@mail.ru> -Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> ---- -diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c -index e869192..54e4ea3 100644 ---- a/hald/linux/addons/addon-imac-backlight.c -+++ b/hald/linux/addons/addon-imac-backlight.c -@@ -158,7 +158,8 @@ main (int argc, char **argv) - goto out; - } - -- if (ioperm(0xB2, 0xB3, 1) < 0) -+ /* Allow access to ports 0xB2 and 0xB3 */ -+ if (ioperm(0xB2, 2, 1) < 0) - { - HAL_ERROR (("ioperm failed (you should be root).")); - exit(1); -diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c -index 2a6fef6..c1bbbac 100644 ---- a/hald/linux/addons/addon-macbookpro-backlight.c -+++ b/hald/linux/addons/addon-macbookpro-backlight.c -@@ -507,7 +507,8 @@ main (int argc, char *argv[]) - state = INREG(0x7ae4); - OUTREG(0x7ae4, state); - -- if (ioperm (0x300, 0x304, 1) < 0) { -+ /* Allow access to porta 0x300 through 0x304 */ -+ if (ioperm (0x300, 5, 1) < 0) { - HAL_ERROR (("ioperm failed (you should be root).")); - exit(1); - } --- -cgit v0.8.3-6-g21f6 diff --git a/extra/hal/path-max.patch b/extra/hal/path-max.patch deleted file mode 100644 index 304185d7d..000000000 --- a/extra/hal/path-max.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a2c3dd5a04d79265772c09c4280606d5c2ed72c6 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Mon, 04 Jan 2010 15:56:13 +0000 -Subject: Bump HAL_PATH_MAX to 4096 - -Some bits in the code use realpath() with destination paths of size -HAL_PATH_MAX. This potentially breaks on systems where PATH_MAX is bigger than -HAL_PATH_MAX (which was 512 until now). - -Since we can't use PATH_MAX directly (due to platforms like GNU/Hurd, which -apparently don't have it), just bump HAL_PATH_MAX to 4096 (as PATH_MAX is on -Linux), to avoid potential buffer overflows and also fix hal on Linux when -enabling FORTIFY in gcc. - -https://bugs.freedesktop.org/show_bug.cgi?id=25888 ---- -diff --git a/hald/util.h b/hald/util.h -index c2a1584..7883333 100644 ---- a/hald/util.h -+++ b/hald/util.h -@@ -38,7 +38,7 @@ - #endif - - #define HAL_NAME_MAX 256 --#define HAL_PATH_MAX 512 -+#define HAL_PATH_MAX 4096 - - gboolean hal_util_remove_trailing_slash (gchar *path); - --- -cgit v0.8.3-6-g21f6 diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD index 3dc9b7c38..b56f92c4c 100644 --- a/extra/hydrogen/PKGBUILD +++ b/extra/hydrogen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115128 2011-03-17 06:06:23Z schiv $ +# $Id: PKGBUILD 135233 2011-08-11 10:28:18Z schiv $ # Maintainer: tobias <tobias@archlinux.org> # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> @@ -14,13 +14,16 @@ url="http://www.hydrogen-music.org/" depends=('libarchive' 'liblrdf' 'qt' 'jack') makedepends=('scons') options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e96f291d60e58f5d62fe616cee577dc0') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + lrdf_raptor2.patch) +md5sums=('e96f291d60e58f5d62fe616cee577dc0' + '2124851e890f46158189b5fa90006d40') build() { cd "${srcdir}/${pkgname}-${pkgver}" export QTDIR=/usr + patch -Np1 -i "${srcdir}/lrdf_raptor2.patch" scons prefix=/usr libarchive=1 } diff --git a/extra/hydrogen/lrdf_raptor2.patch b/extra/hydrogen/lrdf_raptor2.patch new file mode 100644 index 000000000..ec176b716 --- /dev/null +++ b/extra/hydrogen/lrdf_raptor2.patch @@ -0,0 +1,11 @@ +diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct +--- hydrogen-0.9.5.old/Sconstruct 2011-08-11 18:00:07.889112348 +0800 ++++ hydrogen-0.9.5/Sconstruct 2011-08-11 18:00:34.945632437 +0800 +@@ -83,6 +83,7 @@ + includes.append( './' ) + includes.append( 'gui/src/' ) + includes.append( '3rdparty/install/include' ) ++ includes.append( '/usr/include/raptor2' ) + + if sys.platform == "darwin": + ldflags.append( '-L/opt/local/lib' ) diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD index 4b7821882..9d804dc5f 100644 --- a/extra/java-commons-daemon/PKGBUILD +++ b/extra/java-commons-daemon/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=('java-commons-daemon' 'java-jsvc') pkgbase=java-commons-daemon -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://commons.apache.org/daemon/" license=('APACHE') _libname=commons-daemon source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz) -md5sums=('2fe0a35d4a9c0338ecd45dad20f33662') +md5sums=('28dc2e0a3634b2dc3605e9e6444d079f') makedepends=('apache-ant' 'docbook2x' 'docbook-xsl') @@ -25,7 +25,7 @@ build() { } package_java-commons-daemon() { - pkgdesc="Set of Apache libraries for making Java applications run on UNIX more easily" + pkgdesc="Alternative invocation mechanism for unix-daemon-like java code" depends=('java-runtime') cd "${srcdir}/${_libname}-${pkgver}-src" @@ -40,7 +40,6 @@ package_java-jsvc() { pkgdesc="Apache application for making Java applications run on UNIX more easily" depends=("java-${_libname}" 'libcap') - # jsvc cd "${srcdir}/${_libname}-${pkgver}-src/src/native/unix" install -Dm755 jsvc ${pkgdir}/usr/bin/jsvc diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 2497c7894..06c3b05cf 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132576 2011-07-25 00:12:30Z andrea $ +# $Id: PKGBUILD 135257 2011-08-11 16:57:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python pkgver=4.7.0 -pkgrel=1 -pkgdesc="KDE bindings for python" +pkgrel=2 +pkgdesc="KDE bindings for Python" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index c7a73e6bb..e51eb9258 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 133252 2011-07-27 22:57:56Z andrea $ +# $Id: PKGBUILD 135366 2011-08-13 08:45:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.6.95 +pkgver=4.7.0 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') -depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt') +depends=('kdebase-runtime' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-smoke') -source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") -sha1sums=('304fcb7a38b3656db1d6614b8ff77e6e27274de6') +source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") +sha1sums=('7f0366cc6144ea684c571ed3876dd0eac6d72fb6') build() { cd "${srcdir}" @@ -21,7 +21,8 @@ build() { cd build cmake ../smokeqt-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Qwt5=OFF make } diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD index 3ed7dec43..c818e5e30 100644 --- a/extra/lcms2/PKGBUILD +++ b/extra/lcms2/PKGBUILD @@ -6,7 +6,7 @@ pkgname=lcms2 pkgver=2.2 pkgrel=1 pkgdesc="Small-footprint color management engine, version 2" -arch=(i686 x86_64 'mips64el') +arch=(i686 x86_64 mips64el) license=('MIT') depends=('libtiff>=3.9.4') url="http://www.littlecms.com" diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD index 3f6cc1113..2040b2742 100644 --- a/extra/libxfont/PKGBUILD +++ b/extra/libxfont/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97682 2010-11-01 09:15:00Z jgc $ +# $Id: PKGBUILD 135207 2011-08-11 07:14:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfont -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha1sums=('191b40c566f80737cf6838747d86ebaee7b0c7d7') +sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041') build() { cd "${srcdir}/libXfont-${pkgver}" diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index b441d8e90..afb279677 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 128517 2011-06-24 07:46:40Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 135431 2011-08-13 11:30:30Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.9.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') @@ -17,17 +17,23 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-more.patch) + nm09-more.patch + ticket-14351-multiple-display-of-room-members.patch) md5sums=('2cd285c7a40f93b7a51bfe733971d3a6' - 'a673659d86c7a65aa710f7c8c7feda82') + 'a673659d86c7a65aa710f7c8c7feda82' + '47f16f838b741cfdeda18d7b08a7b816') build() { cd "$srcdir/$pkgname-$pkgver" # Further fixes for NetworkManager 0.9 - # (http://developer.pidgin.im/ticket/13859) + # http://developer.pidgin.im/ticket/13859 patch -Np1 -i "$srcdir/nm09-more.patch" + # Fix upstream issue #14351: multiple display of room members + # http://developer.pidgin.im/ticket/14351 + patch -Np0 -i "$srcdir/ticket-14351-multiple-display-of-room-members.patch" + # Use Python 2 sed -i 's/env python$/\02/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -74,8 +80,7 @@ package_pidgin(){ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' - 'cyrus-sasl-plugins') + depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') diff --git a/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch new file mode 100644 index 000000000..bf0966891 --- /dev/null +++ b/extra/pidgin/ticket-14351-multiple-display-of-room-members.patch @@ -0,0 +1,17 @@ +# +# +# patch "libpurple/conversation.c" +# from [cd6817f4863abafef969359f65cc025f9483b401] +# to [19aac10ceebae1ee28788b6f0c02bcfcff0c8803] +# +============================================================ +--- libpurple/conversation.c cd6817f4863abafef969359f65cc025f9483b401 ++++ libpurple/conversation.c 19aac10ceebae1ee28788b6f0c02bcfcff0c8803 +@@ -1978,7 +1978,6 @@ purple_conv_chat_clear_users(PurpleConvC + } + + g_hash_table_remove_all(chat->users); +- chat->users = NULL; + + g_list_free(users); + chat->in_room = NULL; diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 73cc1d3a2..713e1bc06 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -13,7 +13,8 @@ url="http://pulseaudio.org/" license=(GPL LGPL) makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit speex libsamplerate tdb udev dbus-core xcb-util avahi bluez - gconf intltool jack lirc-utils openssl) + gconf intltool jack openssl) +[ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils) options=(!emptydirs !libtool !makeflags) source=("http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.gz" $pkgbase.xinit) @@ -47,8 +48,8 @@ package_pulseaudio() { 'bluez: bluetooth support' 'gconf: configuration through gconf' 'jack: jack support' - 'lirc-utils: infra-red support' 'openssl: RAOP support') +[ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: infra-red support') backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) install=pulseaudio.install cd "$srcdir/$pkgbase-$pkgver" diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index 5f2d31f30..ce2edc0c0 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122181 2011-05-02 17:31:08Z andrea $ +# $Id: PKGBUILD 135252 2011-08-11 16:55:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.4 +pkgver=4.8.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" @@ -13,7 +13,7 @@ license=('GPL') makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('97c5dc1042feb5b3fe20baabad055af1') +md5sums=('0e4264bb912edfbda319bb236ac84407') build() { cd "${srcdir}" diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD deleted file mode 100644 index 9ac060591..000000000 --- a/extra/python2/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 129895 2011-06-29 15:22:59Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributer: Allan McRae <allan@archlinux.org> -# Contributer: Jason Chu <jason@archlinux.org> - -pkgname=python2 -pkgver=2.7.2 -pkgrel=2 -pkgrel=1 # holdver -_pybasever=2.7 -pkgdesc="A high-level scripting language" -arch=('i686' 'x86_64' 'mips64el') -license=('PSF') -url="http://www.python.org/" -depends=('bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi') -makedepends=('tk') -optdepends=('tk: for IDLE') -conflicts=('python<3') -options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53') - -build() { - cd "${srcdir}/Python-${pkgver}" - - # Temporary workaround for FS#22322 - # See http://bugs.python.org/issue10835 for upstream report - sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c - - # Enable built-in SQLite3 module to load extensions (fix FS#22122) - sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py - - # FS#23997 - sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py - - # 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}* - - export OPT="${CFLAGS}" - ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ - --enable-unicode=ucs4 --with-system-expat --with-system-ffi - - make -} - -package() { - cd "${srcdir}/Python-${pkgver}" - make DESTDIR="${pkgdir}" altinstall maninstall - - ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" - ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" - ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" - - ln -sf ../../libpython${_pybasever}.so \ - "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" - - mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" - - # some useful "stuff" - install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} - install -m755 Tools/i18n/{msgfmt,pygettext}.py \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" - install -m755 Tools/scripts/{README,*py} \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" - - # fix conflicts with python - mv "${pkgdir}"/usr/bin/idle{,2} - mv "${pkgdir}"/usr/bin/pydoc{,2} - mv "${pkgdir}"/usr/bin/2to3{,-2.7} - - # clean up #!s - find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ - xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" - - # clean-up reference to build directory - sed -i "s#${srcdir}/Python-${pkgver}:##" \ - "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" - - # license - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 2f16810e5..e1016b0c9 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 126938 2011-06-08 20:01:54Z tpowa $ +# $Id: PKGBUILD 135290 2011-08-12 09:22:48Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=0.14.1 -pkgrel=2 +pkgver=0.15.0 +pkgrel=1 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64 'mips64el') license=('GPL2' 'LGPL2.1') url="http://www.linux-kvm.org" -depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') -makedepends=('texi2html' 'perl') +depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng') +makedepends=('texi2html' 'perl' 'python2') backup=('etc/qemu/target-x86_64.conf') install=qemu-kvm.install conflicts=('qemu') @@ -23,8 +23,9 @@ build() cd ${srcdir}/${pkgname}-${pkgver} # fix esound building ./configure --prefix=/usr \ + --python=/usr/bin/python2 \ --sysconfdir=/etc \ - --audio-drv-list=alsa,sdl,oss,esd \ + --audio-drv-list=alsa,sdl,oss \ --audio-card-list=ac97,sb16,es1370,hda \ --enable-docs make @@ -53,5 +54,5 @@ package() esac done } -md5sums=('ed37a2c0b1981220b842920140574c63' +md5sums=('b45b0deebba4ce47dcaaab3807f6ed47' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index f6b1913ea..61389e8e7 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 124178 2011-05-17 13:06:59Z tpowa $ +# $Id: PKGBUILD 135285 2011-08-12 09:21:08Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=0.14.1 +pkgver=0.15.0 pkgrel=1 -pkgdesc="QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." +pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" -makedepends=('texi2html' 'perl') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'esound' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl') +makedepends=('texi2html' 'perl' 'python2') +depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl') backup=('etc/qemu/target-x86_64.conf') install=qemu.install -source=(http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz 65-kvm.rules) options=(!strip) @@ -19,10 +19,10 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i -e 's/lib64/lib/g' x86_64.ld - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,esd \ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \ + --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs \ - --kerneldir="/usr/src/linux-$(uname -r)" + --enable-docs make } @@ -40,5 +40,5 @@ package() { done } -md5sums=('b6c713a8db638e173af53a62d5178640' +md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index c41f9caee..b2c5880a7 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124858 2011-05-24 19:56:15Z schiv $ +# $Id: PKGBUILD 135263 2011-08-11 18:35:34Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -13,22 +13,23 @@ url="http://www.rosegardenmusic.com/" license=('GPL') depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils' 'perl' 'qt' 'shared-mime-info') -makedepends=('pkgconfig' 'imake') +makedepends=('imake') optdepends=('lilypond: notation display' 'cups: printing support' 'okular: print preview, or any other PDF viewer' 'timidity++: MIDI playback, or any other softsynth' 'flac' 'wavpack') -[ "$CARCH" = "i686" ] && optdepends=("${optdepends[@]}" - 'dssi-vst: win32 VST support') +[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") md5sums=('77ab43d06de53ace338843ff82e26288') build() { cd "$srcdir/$pkgname-$pkgver" + # lrdf + raptor2 compatibility + export lrdf_CFLAGS="$(pkg-config --cflags raptor2)" ./configure --prefix=/usr make } @@ -36,7 +37,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/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch new file mode 100644 index 000000000..fe5a807ee --- /dev/null +++ b/extra/sbcl/0001-Fix-version-string-parsing-for-Linux-3.0.patch @@ -0,0 +1,43 @@ +From b43c51beeb0569a38900e1e5a78606711f987742 Mon Sep 17 00:00:00 2001 +From: Paul Khuong <pvk@pvk.ca> +Date: Wed, 3 Aug 2011 10:20:41 -0400 +Subject: [PATCH] Fix version string parsing for Linux 3.0 + + Stop assuming the presence of minor and patch version numbers; missing + values are defaulted to 0 (e.g. 3.0.0). + + Reported by a few people on IRC. +--- + src/runtime/linux-os.c | 14 ++++++++++---- + 1 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/src/runtime/linux-os.c b/src/runtime/linux-os.c +index db72fa6..e262f41 100644 +--- a/src/runtime/linux-os.c ++++ b/src/runtime/linux-os.c +@@ -198,12 +198,18 @@ os_init(char *argv[], char *envp[]) + int patch_version; + char *p; + uname(&name); ++ + p=name.release; + major_version = atoi(p); +- p=strchr(p,'.')+1; +- minor_version = atoi(p); +- p=strchr(p,'.')+1; +- patch_version = atoi(p); ++ minor_version = patch_version = 0; ++ p=strchr(p,'.'); ++ if (p != NULL) { ++ minor_version = atoi(++p); ++ p=strchr(p,'.'); ++ if (p != NULL) ++ patch_version = atoi(++p); ++ } ++ + if (major_version<2) { + lose("linux kernel version too old: major version=%d (can't run in version < 2.0.0)\n", + major_version); +-- +1.7.6 + diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 6b53be48d..c1e659b61 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 132801 2011-07-26 10:22:05Z juergen $ +# $Id: PKGBUILD 135444 2011-08-13 20:11:24Z dreisner $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Leslie Polzer (skypher) +# Contributor: Leslie Polzer (skypher) pkgname=sbcl pkgver=1.0.50 -pkgrel=1 +pkgrel=2 pkgdesc="Steel Bank Common Lisp" +url="http://www.sbcl.org/" arch=('i686' 'x86_64' 'mips64el') license=('custom') depends=('glibc') @@ -20,17 +21,24 @@ source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pk md5sums=('74ce9b24516885d066ec4287cde52e8c' '7ac0c1936547f4278198b8bf7725204d' 'a456535d65d6c5b85b1b646f11455fce') -url="http://www.sbcl.org/" install=sbcl.install +source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" + "arch-fixes.lisp" + "0001-Fix-version-string-parsing-for-Linux-3.0.patch") +md5sums=('74ce9b24516885d066ec4287cde52e8c' + '7ac0c1936547f4278198b8bf7725204d' + '7af58d1de2d788ad6a8d82c89279a75f') build() { - export CFLAGS="${CFLAGS} -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" + cd "$srcdir/$pkgname-$pkgver" + + export CFLAGS+=" -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" export GNUMAKE="make -e" # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS - export LINKFLAGS="$LD_FLAGS" + export LINKFLAGS="$LDFLAGS" unset LDFLAGS - cd ${startdir}/src/${pkgname}-${pkgver} + # Make a multi-threaded SBCL, disable LARGEFILE cat >customize-target-features.lisp <<EOF (lambda (features) @@ -40,44 +48,40 @@ build() { (disable :largefile))) EOF + # fix build against 3.0-ARCH + patch -Np1 < "$srcdir/0001-Fix-version-string-parsing-for-Linux-3.0.patch" patch -Nup1 < "${srcdir}/mips-arch.h.diff" if [ "$CARCH" = "mips64el" ]; then - sh make.sh clisp + sh make.sh clisp else - sh make.sh sbcl + sh make.sh sbcl fi - mkdir -p ${startdir}/pkg/usr - pushd doc/manual - make info || return 1 - popd - INSTALL_ROOT=${startdir}/pkg/usr sh install.sh + + make -C doc/manual info +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + INSTALL_ROOT="$pkgdir/usr" sh install.sh src/runtime/sbcl --core output/sbcl.core --script ${startdir}/src/arch-fixes.lisp mv sbcl-new.core ${startdir}/pkg/usr/lib/sbcl/sbcl.core -# sources - mkdir -p ${startdir}/pkg/usr/share/sbcl-source - cp -R -t ${startdir}/pkg/usr/share/sbcl-source \ - ${startdir}/src/${pkgname}-${pkgver}/{src,contrib} + # sources + mkdir -p "$pkgdir/usr/share/sbcl-source" + cp -R -t "$pkgdir/usr/share/sbcl-source" "$srcdir/$pkgname-$pkgver/"{src,contrib} -# drop unwanted files - find ${startdir}/pkg/usr/share/sbcl-source -type f \ - -name \*.fasl -or \ - -name \*.o -or \ - -name \*.log -or \ - -name \*.so -or \ - -name a.out -delete - - rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl - rm ${startdir}/pkg/usr/share/sbcl-source/src/runtime/sbcl.nm + # license + install -D -m644 "$srcdir/$pkgname-$pkgver/COPYING" \ + "$pkgdir/usr/share/licenses/$pkgname/license.txt" - find ${startdir}/pkg \( -name Makefile -o -name .cvsignore \) -delete + # drop unwanted files + find "$pkgdir" \( -name Makefile -o -name .cvsignore \) -delete + find "$pkgdir/usr/share/sbcl-source" -type f \ + \( -name \*.fasl -o -name \*.o -o -name \*.log -o -name \*.so -o -name a.out \) -delete - rm $startdir/pkg/usr/share/info/dir - gzip -9nf $startdir/pkg/usr/share/info/* + rm "$pkgdir/usr/share/sbcl-source/src/runtime/sbcl"{,.nm} - # license - install -D -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt } diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD index c894ec8dd..1fa433641 100644 --- a/extra/scummvm/PKGBUILD +++ b/extra/scummvm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106447 2011-01-17 06:22:16Z angvp $ +# $Id: PKGBUILD 135227 2011-08-11 09:16:00Z juergen $ # Maintainer: juergen <juergen@hoetzel.info> # Contributor: Manolis Tzanidakis, Petter Gundersen pkgname=scummvm -pkgver=1.2.1 +pkgver=1.3.1 pkgrel=1 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games." arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') url="http://www.scummvm.org/" depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'flac>=1.1.4' 'sdl' 'fluidsynth') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b1d224d7640bc7fdccaca958164b31df') +md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/sdl/PKGBUILD b/extra/sdl/PKGBUILD index b7c5035aa..daaf7073f 100644 --- a/extra/sdl/PKGBUILD +++ b/extra/sdl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 99967 2010-11-19 16:37:58Z heftig $ +# $Id: PKGBUILD 135310 2011-08-12 14:45:48Z ibiru $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=sdl pkgver=1.2.14 -pkgrel=6 +pkgrel=7 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard" arch=('i686' 'x86_64' 'mips64el') url="http://www.libsdl.org" license=('LGPL') depends=('glibc' 'libxext' 'libxrender' 'libx11') -makedepends=('alsa-lib' 'esound' 'mesa' 'libpulse') +makedepends=('alsa-lib' 'mesa' 'libpulse') options=('!libtool') source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz sdl-1.2.14-joystick-crash.diff diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 471f0bedb..2a0edc878 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,25 +1,20 @@ -# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $ +# $Id: PKGBUILD 135247 2011-08-11 16:54:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.12.3 -pkgrel=2 +pkgver=4.12.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') -source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz" - 'fix-regression.patch') -md5sums=('d0f1fa60494db04b4d115d4c2d92f79e' - '598ffc65ebaf1c0e8855a352b02c43e7') +source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") +md5sums=('6cbd56abb7d35aad833789c98ae61652') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/fix-regression.patch - cd "${srcdir}" cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/sip/fix-regression.patch b/extra/sip/fix-regression.patch deleted file mode 100644 index d4dc794ad..000000000 --- a/extra/sip/fix-regression.patch +++ /dev/null @@ -1,26 +0,0 @@ - -# HG changeset patch -# User Phil Thompson <phil@riverbankcomputing.com> -# Date 1308852953 -3600 -# Node ID f9f4b161c94021c117e995eccba945d4dd3d0ed4 -# Parent df42f6bf92c8cd12dd7cc5a30231728a4c23ead4 -Fixed a regression introduced in the recent sipIsPyMethod() changes in the -handling of special methods implemented by object (eg. __lt__). - -diff -r df42f6bf92c8 -r f9f4b161c940 siplib/siplib.c.in ---- a/siplib/siplib.c.in Thu Jun 23 17:24:41 2011 +0100 -+++ b/siplib/siplib.c.in Thu Jun 23 19:15:53 2011 +0100 -@@ -7604,9 +7604,10 @@ - #endif - - /* -- * Check any possible reimplementation is not the wrapped C++ method. -+ * Check any possible reimplementation is not the wrapped C++ method or -+ * a default special method implementation.. - */ -- if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type) -+ if (cls_dict != NULL && (cls_attr = PyDict_GetItem(cls_dict, mname_obj)) != NULL && Py_TYPE(cls_attr) != &sipMethodDescr_Type && Py_TYPE(cls_attr) != &PyWrapperDescr_Type) - { - reimp = cls_attr; - break; - diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index cff9140ab..9cdf5653b 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 133089 2011-07-27 19:11:28Z ibiru $ +# $Id: PKGBUILD 135521 2011-08-14 19:04:44Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble pkgver=0.12.4 -pkgrel=1 +pkgrel=3 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org" @@ -20,7 +20,7 @@ md5sums=('428962565d568667d3ff1aa7eee3da51') build() { cd ${srcdir}/${pkgname}-${pkgver} PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --libexecdir=/usr/lib/telepathy + --libexecdir=/usr/lib/telepathy --with-tls=openssl make } diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 7fd6833d9..3c35d24a2 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 126185 2011-06-02 11:28:46Z thomas $ +# $Id: PKGBUILD 135456 2011-08-13 22:59:53Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils -pkgver=0.8.4 +pkgver=0.8.5 pkgrel=1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('qt') optdepends=('qt') depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('20bf73b0c2255dfc6ae82806ec8a663e00ab039df9ee6eadae633466841c0dd7') +sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c') build() { cd "${srcdir}/${pkgname}-${pkgver}" |