diff options
Diffstat (limited to 'extra')
47 files changed, 788 insertions, 268 deletions
diff --git a/extra/archboot/PKGBUILD b/extra/archboot/PKGBUILD index 9521ead0d..a5a0aa15c 100644 --- a/extra/archboot/PKGBUILD +++ b/extra/archboot/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 130388 2011-07-06 10:05:42Z tpowa $ +# $Id: PKGBUILD 132074 2011-07-19 20:24:15Z eric $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=archboot pkgver=2011.06 -pkgrel=1 +pkgrel=2 +_sourcerel=1 pkgdesc="Advanced, modular arch boot/install image creation utility" -arch=(i686 x86_64 'mips64el') -license=('GPL') +arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/" -depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' '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.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'tcp_wrappers>=7.6-12' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' '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.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' '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.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-1') +license=('GPL') +depends=('mkinitcpio>=0.6.12-1' 'mksyslinux>=2010.08-1' 'mkpxelinux>=2010.08-1' 'mkisolinux>=2010.08-1' 'initscripts>=2011.05.2-1' 'subversion>=1.6.15-2' 'wget>=1.12-7' 'bash>=4.2.010-1' 'coreutils>=8.12-1' 'cryptsetup>=1.3.0-1' 'dialog>=1.1_20110302-1' 'e2fsprogs>=1.41.14-1' 'findutils>=4.4.2-3' 'gawk>=3.1.8-2' 'grep>=2.7-1' 'iputils>=20101006-1' 'jfsutils>=1.1.14-2' 'less>=443-1' 'lvm2>=2.02.85-1' 'mdadm>=3.2.1-3' 'module-init-tools>=3.12-2' 'nano>=2.2.6-1' 'ncurses>=5.9-1' 'net-tools>=1.60-14' 'gnu-netcat>=0.7.1-3' 'ntfsprogs>=2011.4.12-1' 'pcmciautils>=017-2' 'procps>=3.2.8-3' 'psmisc>=22.13-1' 'reiserfsprogs>=3.6.21-3' 'sed>=4.2.1-3' 'snarf>=7.0-4' 'syslog-ng>=3.2.4-1' '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.P1-1' 'hdparm>=9.37-1' 'memtest86+>=4.20-1' 'inetutils>=1.8-2' 'openssh>=5.8p2-6' 'hwdetect>=2011.03-1' 'shadow>=4.1.4.3-1' 'bridge-utils>=1.4-4' 'ifenslave>=1.1.0-6' 'cpufrequtils>=008-1' 'links>=2.3pre1-1' 'dosfstools>=3.0.11-1' 'glibc>=2.13-5' 'linux-api-headers>=2.6.38.1-1' 'kernel26>=2.6.38.6-2' 'kernel26-lts>=2.6.32.40-1' 'xinetd>=2.3.14-6' 'kexec-tools>=2.0.2-3' 'ppp>=2.4.5-2' 'rp-pppoe>=3.10-6' 'lilo>=23.2-1' 'iptables>=1.4.10-1' 'capi4k-utils>=050718-7' 'isdn4k-utils>=3.2p1-6' 'ntfs-3g>=2011.4.12-1' 'pciutils>=3.1.7-4' 'usbutils>=002-3' 'vpnc>=0.5.3-3' 'openvpn>=2.2.0-1' 'b43-fwcutter>=014-1' 'wpa_supplicant>=0.7.3-3' 'rsync>=3.0.8-1' 'gzip>=1.4-2' 'libarchive>=2.8.4-2' 'device-mapper>=2.02.85-1' 'screen>=4.0.3-11' 'elfutils>=0.152-1' 'pam>=1.1.3-1' 'cracklib>=2.8.18-1' 'nfs-utils>=1.2.3-2' 'nfsidmap>=0.24-2' 'readline>=6.2.001-1' '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.177-1' 'lzo2>=2.05-1' 'libsasl>=2.1.23-5' 'libldap>=2.4.24-1' 'gpm>=1.20.6-6' 'libevent>=2.0.11-1' 'gcc-libs>=4.6.0-5' '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.8-3' 'bittorrent>=5.2.2-4' 'dhcpcd>=5.2.12-1' 'openssl>=1.0.0.d-1' 'git>=1.7.5.1-1' 'dmraid>=1.0.0.rc16.3-1' 'linux-atm>=2.5.1-2' 'netcfg>=2.5.4-1' 'parted>=2.3-1' 'tzdata>=2011g-1' 'ntp>=4.2.6.p3-3' 'libgcrypt>=1.4.6-3' 'iw>=0.9.22-1' 'crda>=1.1.1-3' 'libnl>=1.1-2' 'iproute2>=2.6.38-2' 'wireless-regdb>=2010.11.24-1' 'v86d>=0.1.10-1' 'dhclient>=4.2.1.1-1' 'syslinux>=4.04-1' 'mtools>=4.0.16-1' 'fsarchiver>=0.6.12-1' 'xz>=5.0.2-1' 'libtirpc>=0.2.1-3' 'librpcsecgss>=0.19-5' 'rpcbind>=0.2.0-3' 'testdisk>=6.12-1' 'wipe>=2.3.1-1' 'ddrescue>=1.14-1' 'udev>=168-1' 'ifplugd>=0.28-7' 'wpa_actiond>=1.1-2' 'nouveau-firmware>=20091212-4' 'rfkill>=0.4-2' 'libgssglue>=0.1-4' 'mkinitcpio-nfs-utils>=0.2-1' 'gptfdisk>=0.7.1-1' 'nilfs-utils>=2.0.23-1' 'btrfs-progs-unstable>=0.19.20101006-1' 'nouveau-drm-lts>=0.0.16_20100313-5' 'linux-firmware>=20110512-2' 'iana-etc>=2.30-1' 'libusb-compat>=0.1.3-1' 'eject>=2.1.5-5' 'keyutils>=1.4-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' @@ -31,18 +31,22 @@ backup=('etc/archboot/allinone.conf' 'etc/archboot/presets/pxelinux-ftp' ) install=archboot.install +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver-$_sourcerel.tar.bz2 vmware-detect.c) +md5sums=('eac77ae13bf2e6b5a92317b9885c69dd' + '7e2b03463747cb22ab388e79a09fa0cb') ### 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() +build() { - cd $srcdir/$pkgname-$pkgver-$pkgrel - mv * $pkgdir/ - # vmware-detect - cd $startdir/src + cd "$srcdir" gcc -o vmware-detect vmware-detect.c - install -D -m 755 vmware-detect $startdir/pkg/usr/bin/vmware-detect } -md5sums=('eac77ae13bf2e6b5a92317b9885c69dd' - '7e2b03463747cb22ab388e79a09fa0cb') + +package() +{ + cd "$srcdir/$pkgname-$pkgver-$_sourcerel" + mv * "$pkgdir/" + install -D -m 755 "$srcdir/vmware-detect" "$pkgdir/usr/bin/vmware-detect" +} diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index a91e74352..1d8ecb84c 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 132002 2011-07-18 22:19:52Z bisson $ +# $Id: PKGBUILD 132306 2011-07-22 16:28:25Z 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=2 +pkgrel=5 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' arch=('i686' 'x86_64' 'mips64el') url='http://audacious-media-player.org/' license=('GPL3') -depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'audacious-plugins' 'desktop-file-utils' 'hicolor-icon-theme') +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') diff --git a/extra/esound/PKGBUILD b/extra/esound/PKGBUILD index b7dd727b7..bf8f8c0c3 100644 --- a/extra/esound/PKGBUILD +++ b/extra/esound/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 19660 2008-11-28 20:33:47Z jgc $ +# $Id: PKGBUILD 131830 2011-07-16 00:02:10Z dreisner $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=esound pkgver=0.2.41 -pkgrel=1 +pkgrel=2 pkgdesc="Enlightened Sound Daemon" arch=(i686 x86_64 'mips64el') license=('LGPL') -depends=('audiofile' 'tcp_wrappers' 'alsa-lib>=1.0.18') +depends=('audiofile' 'alsa-lib>=1.0.18') url="http://www.tux.org/~ricdude/EsounD.html" provides=("esd=${pkgver}") replaces=('esd') @@ -22,13 +22,17 @@ md5sums=('8d9aad3d94d15e0d59ba9dc0ea990c6c' build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch" || return 1 + patch -Np1 -i "${srcdir}/esd-0.2.38-alsa-drain.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --with-audiofile --with-libwrap \ - --enable-alsa --disable-artstest || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --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" || return 1 + install -m755 "${srcdir}/esd" "${pkgdir}/etc/rc.d/esd" } diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD index 20a0ae614..7a961be54 100644 --- a/extra/freeciv/PKGBUILD +++ b/extra/freeciv/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 115046 2011-03-16 15:19:54Z eric $ +# $Id: PKGBUILD 132082 2011-07-19 22:17:46Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=freeciv -pkgver=2.2.5 +pkgver=2.2.7 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeciv.org/" license=('GPL') -depends=('gtk2' 'sdl_mixer' 'readline' 'bzip2') +depends=('gtk2' 'sdl_mixer' 'bzip2' 'hicolor-icon-theme') options=('!libtool') install=freeciv.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('e717de02c77139593f21b930245d1709') -sha1sums=('b204c4ae581be632fd2385517ada62558d48e702') +md5sums=('db61c36222ad0bd1de233cf29226ff27') +sha1sums=('b7cf680a25e9006cb3a289a2e5c786dd385577cb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index 487b4fa07..a0ce16552 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130871 2011-07-08 15:15:27Z ibiru $ +# $Id: PKGBUILD 132112 2011-07-20 12:08:11Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-disk-utility -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="GNOME libraries and applications for dealing with storage devices" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,17 +12,14 @@ depends=('dbus-glib' 'libgnome-keyring' 'libunique3' 'udisks' 'libnotify' 'hicol makedepends=('gtk-doc' 'intltool') options=('!libtool' '!emptydirs') install=gnome-disk-utility.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - fix-freeze.patch - add-support-for-DeviceAutomountHint.patch) -sha256sums=('94d31142a5f488d034cd2954df4ab1c26bd053fb0d46d230fba91b4f8b3663fb' - '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526' - '1e2f8d2d8ea121d21ff2b2a1e208c0fd4af603a4ed0d024ad326a991ebc7a613') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + fix-freeze.patch) +sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5' + '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/fix-freeze.patch" - patch -Np1 -i "${srcdir}/add-support-for-DeviceAutomountHint.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-disk-utility \ --disable-scrollkeeper --disable-nautilus --disable-gtk-doc diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index d127982df..c8358321c 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 128504 2011-06-24 07:05:04Z andyrtr $ +# $Id: PKGBUILD 130900 2011-07-08 17:01:10Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls pkgver=2.12.7 -pkgrel=1 +pkgrel=2 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'libgcrypt') +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) md5sums=(4b48aa3119f549d30d550bf4162c721b'') 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 @@ -29,7 +26,7 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" #make check # passes all || /bin/true - make check || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html + make check # || /bin/true # see https://lists.gnu.org/archive/html/gnutls-devel/2011-06/msg00007.html } package() { diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 71cca0883..db28df151 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124848 2011-05-24 19:25:12Z giovanni $ +# $Id: PKGBUILD 132036 2011-07-19 10:15:48Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=gparted -pkgver=0.8.1 +pkgver=0.9.0 pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ optdepends=('e2fsprogs: for ext2/ext3 partitions' 'gpart: for recovering corrupt partition tables') install=gparted.install source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ba3a434a259ae2ddcfc7f7488ee648ef') +md5sums=('56ec9c80413ba2d8ad0193bfc2b5a99f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index e581efeaf..f968f775c 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 127010 2011-06-09 16:03:05Z andyrtr $ +# $Id: PKGBUILD 132127 2011-07-20 16:03:07Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.1 -pkgrel=2 +pkgver=1.1.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('openjdk6' 'zip' 'xulrunner') source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) -md5sums=('a7d70cb446c38213e554d4bdfb926f63') +md5sums=('16017dc91f7216e0631b759db1eebecb') build() { _javaver=6 diff --git a/extra/iperf/PKGBUILD b/extra/iperf/PKGBUILD index 274ca0c60..d69c713c1 100644 --- a/extra/iperf/PKGBUILD +++ b/extra/iperf/PKGBUILD @@ -1,25 +1,35 @@ -# $Id: PKGBUILD 86402 2010-08-01 10:53:45Z giovanni $ +# $Id: PKGBUILD 132026 2011-07-19 09:15:09Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> pkgname=iperf pkgver=2.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to measure maximum TCP bandwidth" arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://iperf.sourceforge.net" -depends=(gcc-libs) +depends=('gcc-libs') source=(http://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz - license) + license + client.cpp.patch) md5sums=('44b5536b67719f4250faed632a3cd016' - 'a2879f900b76668b28a1cc922909db18') + 'a2879f900b76668b28a1cc922909db18' + '82ce63c87cc8bb2f0f94069857ac14a9') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # FS#25159 + patch -Np1 -i ${srcdir}/client.cpp.patch + ./configure --prefix=/usr - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - install -Dm644 ${srcdir}/license "${pkgdir}/usr/share/licenses/iperf/LICENSE" || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -Dm644 ${srcdir}/license "${pkgdir}/usr/share/licenses/iperf/LICENSE" } diff --git a/extra/iperf/client.cpp.patch b/extra/iperf/client.cpp.patch new file mode 100644 index 000000000..85f89e765 --- /dev/null +++ b/extra/iperf/client.cpp.patch @@ -0,0 +1,17 @@ +--- a/src/Client.cpp 2010-04-01 22:23:17.000000000 +0200 ++++ b/src/Client.cpp 2011-07-19 11:03:42.000000000 +0200 +@@ -212,10 +212,10 @@ + char* readAt = mBuf; + + #if HAVE_THREAD +- if ( !isUDP( mSettings ) ) { +- RunTCP(); +- return; +- } ++// if ( !isUDP( mSettings ) ) { ++// RunTCP(); ++// return; ++// } + #endif + + // Indicates if the stream is readable diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD index 5d518186f..71d3ac492 100644 --- a/extra/js/PKGBUILD +++ b/extra/js/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 131990 2011-07-18 19:11:01Z ibiru $ +# $Id: PKGBUILD 132237 2011-07-21 21:43:04Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=js pkgver=1.8.5 -pkgrel=2 +pkgrel=3 pkgdesc="JavaScript interpreter and libraries" arch=(i686 x86_64) url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5" @@ -20,8 +20,6 @@ build() { patch -Np0 -i $srcdir/js185-destdir.patch - export CXXFLAGS="$CXXFLAGS -DJS_C_STRINGS_ARE_UTF8" - ./configure --prefix=/usr --with-system-nspr \ --enable-threadsafe diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index 934b2b469..f17c7c32d 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130264 2011-07-04 19:28:03Z andrea $ +# $Id: PKGBUILD 131799 2011-07-15 11:47:07Z ronald $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -73,18 +73,24 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.6.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + "kdeobservatory-qwt6.patch") +sha1sums=('3bce5e41160ec318dbea9128c3e9104a4428deb8' + '140b2611fb23aed583c2691a77870e5c48152409') build() { cd ${srcdir} + + # qwt 6.0.0 patch + patch -Np0 -i ${srcdir}/kdeobservatory-qwt6.patch + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/extra/kdeplasma-addons/kdeobservatory-qwt6.patch b/extra/kdeplasma-addons/kdeobservatory-qwt6.patch new file mode 100644 index 000000000..46ba0345d --- /dev/null +++ b/extra/kdeplasma-addons/kdeobservatory-qwt6.patch @@ -0,0 +1,12 @@ +diff -Naur kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp +--- kdeplasma-addons-4.6.5.bak/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:17.323188525 +0200 ++++ kdeplasma-addons-4.6.5/applets/kdeobservatory/src/commithistoryview.cpp 2011-07-15 14:04:39.186521458 +0200 +@@ -124,7 +124,7 @@ + plot->setCanvasBackground(QColor(0, 0, 140)); + + QwtPlotCurve *curve = new QwtPlotCurve; +- curve->setData(x, y, j); ++ curve->setSamples(x, y, j); + delete []x; + delete []y; + diff --git a/extra/kipi-plugins/PKGBUILD b/extra/kipi-plugins/PKGBUILD index 890acb1a7..b3abd8af3 100644 --- a/extra/kipi-plugins/PKGBUILD +++ b/extra/kipi-plugins/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112839 2011-03-07 07:34:56Z tpowa $ +# $Id: PKGBUILD 132346 2011-07-23 09:53:11Z andrea $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kipi-plugins pkgver=1.9.0 -pkgrel=1 -pkgdesc="libkipi plugins for digikam and kde apps" +pkgrel=2 +pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.kipi-plugins.org" diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD index 437416148..d6a04e9e2 100644 --- a/extra/lablgtk2/PKGBUILD +++ b/extra/lablgtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123211 2011-05-09 10:15:03Z jgc $ +# $Id: PKGBUILD 132150 2011-07-21 11:38:25Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=lablgtk2 pkgver=2.14.2 -pkgrel=2 +pkgrel=3 pkgdesc=" An Objective Caml interface to gtk2" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD index d49c92fc7..dbad1b497 100644 --- a/extra/libimobiledevice/PKGBUILD +++ b/extra/libimobiledevice/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 109895 2011-02-13 16:49:33Z ibiru $ +# $Id: PKGBUILD 132259 2011-07-22 09:16:48Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" @@ -14,7 +14,7 @@ makedepends=('swig' 'python2') options=('!libtool') source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2 swig-version-check.patch) -md5sums=('b38bb70a41538a2ad593b0779651a636' +md5sums=('cdc13037e822d9ac2e109536701d153a' '8bb215e36fe0e08a72332c108c7842cc') build() { diff --git a/extra/libmpdclient/PKGBUILD b/extra/libmpdclient/PKGBUILD index d0861240d..f64f57a3c 100644 --- a/extra/libmpdclient/PKGBUILD +++ b/extra/libmpdclient/PKGBUILD @@ -1,25 +1,29 @@ # $Id: PKGBUILD 50625 2009-08-30 03:02:23Z allan $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libmpdclient -pkgver=2.4 +pkgver=2.5 pkgrel=1 -pkgdesc='An asynchronous API library for interfacing MPD in the C, C++ & Objective C languages' +pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages' arch=('i686' 'x86_64' 'mips64el') url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient' -license=('GPL2') -depends=('glibc') +license=('custom') options=('!libtool') -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('fe240e56eb5cae082ea4894a810c1fdadc3d03a1') +source=("http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a2e68352f2b7d55787d14a45ee0d902f2427b3dc') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + + cd "${pkgdir}" + install -d usr/share/licenses/libmpdclient + ln -s ../../doc/libmpdclient/COPYING usr/share/licenses/libmpdclient/COPYING } diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD index 4fb8c7f12..b9dc6c5fa 100644 --- a/extra/libva/PKGBUILD +++ b/extra/libva/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 117421 2011-04-01 18:27:40Z ibiru $ +# $Id: PKGBUILD 125889 2011-05-31 13:21:31Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva -pkgver=1.0.12 +pkgver=1.0.13 pkgrel=1 pkgdesc="Video Acceleration (VA) API for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,12 @@ optdepends=('vdpau-video: VDPAU backend for VA API') options=('!libtool') source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2 libva-dont-install-tests.patch) -md5sums=('84408a0746a63b8cf308dc7b9f2451cf' - '0a9bd14c36545c0e9819dfe32ea80f41') +md5sums=('221207c386129e02fc05827147af7aa6' + 'd13d1868f2db99bedec1057bbfbd9c61') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i "${srcdir}/libva-dont-install-tests.patch" + patch -Np1 -i "${srcdir}/libva-dont-install-tests.patch" ./autogen.sh ./configure --prefix=/usr \ --enable-i965-driver \ diff --git a/extra/libva/libva-dont-install-tests.patch b/extra/libva/libva-dont-install-tests.patch index 43e4cbaa7..97f33e32d 100644 --- a/extra/libva/libva-dont-install-tests.patch +++ b/extra/libva/libva-dont-install-tests.patch @@ -1,8 +1,6 @@ -Don't install some useeless tests programs - - ---- test/basic/Makefile.am~ 2010-02-12 09:42:10.000000000 -0500 -+++ test/basic/Makefile.am 2010-03-10 13:36:50.449834525 -0500 +diff -Nur libva-1.0.13.orig/test/basic/Makefile.am libva-1.0.13/test/basic/Makefile.am +--- libva-1.0.13.orig/test/basic/Makefile.am 2011-05-31 13:10:55.021797329 +0000 ++++ libva-1.0.13/test/basic/Makefile.am 2011-05-31 13:11:52.252331062 +0000 @@ -20,7 +20,7 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -11,9 +9,10 @@ Don't install some useeless tests programs +check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \ test_07 test_08 test_09 test_10 test_11 - AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA ---- test/decode/Makefile.am~ 2010-02-12 09:42:10.000000000 -0500 -+++ test/decode/Makefile.am 2010-03-10 13:37:09.636843464 -0500 + AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 +diff -Nur libva-1.0.13.orig/test/decode/Makefile.am libva-1.0.13/test/decode/Makefile.am +--- libva-1.0.13.orig/test/decode/Makefile.am 2011-05-31 13:10:55.021797329 +0000 ++++ libva-1.0.13/test/decode/Makefile.am 2011-05-31 13:12:12.175851534 +0000 @@ -20,7 +20,7 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -21,21 +20,23 @@ Don't install some useeless tests programs -bin_PROGRAMS = mpeg2vldemo +check_PROGRAMS = mpeg2vldemo - AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA + AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 ---- test/encode/Makefile.am~ 2010-02-12 09:42:10.000000000 -0500 -+++ test/encode/Makefile.am 2010-03-10 13:37:26.701846294 -0500 +diff -Nur libva-1.0.13.orig/test/encode/Makefile.am libva-1.0.13/test/encode/Makefile.am +--- libva-1.0.13.orig/test/encode/Makefile.am 2011-05-31 13:10:55.021797329 +0000 ++++ libva-1.0.13/test/encode/Makefile.am 2011-05-31 13:12:35.499399421 +0000 @@ -20,7 +20,7 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --bin_PROGRAMS = h264encode -+check_PROGRAMS = h264encode +-bin_PROGRAMS = h264encode avcenc ++check_PROGRAMS = h264encode avcenc - AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA + AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 ---- test/putsurface/Makefile.am~ 2010-03-10 13:18:55.270697040 -0500 -+++ test/putsurface/Makefile.am 2010-03-10 13:38:08.106713556 -0500 +diff -Nur libva-1.0.13.orig/test/putsurface/Makefile.am libva-1.0.13/test/putsurface/Makefile.am +--- libva-1.0.13.orig/test/putsurface/Makefile.am 2011-05-31 13:10:55.021797329 +0000 ++++ libva-1.0.13/test/putsurface/Makefile.am 2011-05-31 13:12:48.836190403 +0000 @@ -20,7 +20,7 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -43,5 +44,5 @@ Don't install some useeless tests programs -bin_PROGRAMS = putsurface +check_PROGRAMS = putsurface - AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA + AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 59430babe..23b87c139 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131676 2011-07-13 14:16:16Z giovanni $ +# $Id: PKGBUILD 132361 2011-07-23 15:00:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.07.08 +pkgver=2011.07.21 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 63dbc0ff2..2ed603918 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123402 2011-05-11 03:51:18Z eric $ +# $Id: PKGBUILD 132325 2011-07-23 00:44:08Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors -pkgver=3.3.0 -pkgrel=3 +pkgver=3.3.1 +pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64' 'mips64el') url="http://www.lm-sensors.org/" @@ -14,37 +14,32 @@ optdepends=('rrdtool: for logging with sensord') backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \ - sensors.rc fancontrol.rc sensors-detect.patch healthd healthd.conf healthd.rc \ - sensord.conf sensord.rc daemonarg.patch \ - changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff) -md5sums=('5eb18d7531ead4f54f28a1133a606535' + sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ + sensord.rc daemonarg.patch) +md5sums=('8c0eebda8524fc87da1393b4564d279b' 'c370f5e620bfe41113354a1e22c0c18c' '232bedf043dd5dedde82df1a399c682c' - '47c40b381d1f25d6634ae84cecf35f33' '6549050897c237514aeaa2bb6cfd29ea' 'f8af587038b0e2a89c441f7eeaa5e640' '970408d2e509dc4138927020efefe323' '96a8dd468e81d455ec9b165bdf33e0b7' '41a5c20854bbff00ea7174bd2276b736' - '40c8eb16af8249a0f1d851fc1057ea15' - '2f1c004bd525bdc9b2495503a77d375a') -sha1sums=('16c13a186557164fa51459a02209b120c0335f96' + '40c8eb16af8249a0f1d851fc1057ea15') +sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' 'a068ac0a3115a6191a487e11422506baa922b40a' - '47095a32a918d6be50bd8daa8aaa9c24940d60e9' '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' '72a60251d1d55a67307dab4105d9f3f01a080af4' - '34241388c4001bfb6e49b7e10da1217e29a258d6' - '0de66445805adaf65935764da9974df1db125865') + '34241388c4001bfb6e49b7e10da1217e29a258d6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../sensors-detect.patch + sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \ + -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/detect/sensors-detect patch -p1 < ../daemonarg.patch - patch -p2 < ../changeset_lm-sensors_trunk_prog_detect_sensors-detect_r5964.diff make PREFIX=/usr } diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 92ecff27a..70da42fb6 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130378 2011-07-06 07:48:11Z andrea $ +# $Id: PKGBUILD 131641 2011-07-13 07:03:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,11 +6,11 @@ pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') pkgver=5.5.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.mysql.com/" -makedepends=('cmake' 'openssl' 'tcp_wrappers' 'zlib') +makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' @@ -31,7 +31,6 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DMANUFACTURER="Arch Linux" \ -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mysql \ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ @@ -51,7 +50,7 @@ build() { -DWITH_READLINE=ON \ -DWITH_ZLIB=system \ -DWITH_SSL=system \ - -DWITH_LIBWRAP=ON \ + -DWITH_LIBWRAP=OFF \ -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ -DWITH_EXTRA_CHARSETS=complex \ -DWITH_EMBEDDED_SERVER=ON \ @@ -67,7 +66,7 @@ build() { package_libmysqlclient(){ pkgdesc="MySQL client libraries" - depends=('openssl' 'gcc-libs' 'tcp_wrappers') + depends=('openssl') cd "${srcdir}"/build for dir in include libmysql libmysqld libservices; do @@ -105,6 +104,7 @@ package_mysql(){ install=mysql.install depends=('mysql-clients' 'net-tools') optdepends=('perl-dbi' 'perl-dbd-mysql') + options=('emptydirs') cd "${srcdir}"/build make DESTDIR="${pkgdir}" install diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index d259a349c..68be83af0 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 119611 2011-04-12 16:49:38Z eric $ +# $Id: PKGBUILD 132063 2011-07-19 17:35:27Z stephane $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgbase=nasm pkgname=('nasm' 'nasm-doc') -pkgver=2.09.08 +pkgver=2.09.10 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.nasm.us" license=('BSD') makedepends=('ghostscript') source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('6abfa388a74ee47e163fdb30ecfd40f9') -sha1sums=('37ce7d945a41276eab255b061c88c2ad2f7979f6') +md5sums=('15c79dcb5838870a0fac15feb5fade66') +sha1sums=('ca57a7454b29e18c64018e49cdf5c832937497ab') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index a765a3d05..68bd5942d 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,34 +1,39 @@ -# $Id: PKGBUILD 125239 2011-05-25 19:13:43Z foutrelis $ +# $Id: PKGBUILD 131650 2011-07-13 08:13:14Z andrea $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://www.net-snmp.org/" license=('custom') -depends=('openssl' 'tcp_wrappers' 'libnl') +depends=('openssl' 'libnl') makedepends=('setuptools') optdepends=('perl-term-readkey: for snmpcheck application' 'perl-tk: for snmpcheck and tkmib applications' - 'python2: for the python modules') + 'python2: for the python modules') provides=('ucd-snmp') options=('!libtool' '!makeflags' '!emptydirs') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'snmpd.rc') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'snmpd.rc') md5sums=('b4e30ead5783b0bb1d280172c6095ea4' '9f0d13676ba1fae1eb7eb178edd85b43') -sha1sums=('45bbf1295253d5379a5d1efd918593160387fd00' '2c679b564a2c319d9ce2714a9776aa0e6d89c60a') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ - --enable-ucd-snmp-compatibility --enable-ipv6 --with-libwrap --with-python-modules \ - --with-default-snmp-version="3" --with-sys-contact="root@localhost" \ - --with-sys-location="Unknown" --with-logfile="/var/log/snmpd.log" \ + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-ucd-snmp-compatibility \ + --enable-ipv6 \ + --with-python-modules \ + --with-default-snmp-version="3" \ + --with-sys-contact="root@localhost" \ + --with-sys-location="Unknown" \ + --with-logfile="/var/log/snmpd.log" \ --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ --with-persistent-directory="/var/net-snmp" \ PYTHONPROG=/usr/bin/python2 @@ -39,5 +44,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD new file mode 100644 index 000000000..085e98f5d --- /dev/null +++ b/extra/nettle/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 130897 2011-07-08 16:53:06Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: bender02 at gmx dot com + +pkgname=nettle +pkgver=2.1 +pkgrel=1 +pkgdesc="A low-level cryptographic library" +arch=('i686' 'x86_64') +url="http://www.lysator.liu.se/~nisse/nettle/" +license=('GPL2') +install=$pkgname.install +depends=('gmp') +source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) +md5sums=('2bfaf16234a5d8deb96cd23f53a682bb') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --libdir=/usr/lib \ + --enable-shared \ + --disable-static # <-- seems not working now + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + # remove static libs + rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a +} diff --git a/extra/nettle/nettle.install b/extra/nettle/nettle.install new file mode 100644 index 000000000..3d19b5f19 --- /dev/null +++ b/extra/nettle/nettle.install @@ -0,0 +1,20 @@ +infodir=/usr/share/info +filelist=(nettle.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 9bd6730c6..9d178ac62 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126852 2011-06-08 05:53:21Z andyrtr $ +# $Id: PKGBUILD 132227 2011-07-21 17:20:32Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -6,7 +6,7 @@ pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" #_date=20100715 _javaver=6 -_icedteaver=1.10.2 +_icedteaver=1.10.3 _openjdk_version=b22 _openjdk_date=28_feb_2011 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date} @@ -32,7 +32,7 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar openjdk6.profile openjdk6.profile.csh) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz) -md5sums=('83041b2d0de66cb5289813cc6f05af11' +md5sums=('0a1301785e9826d7c87ed7e8b10a6985' '2d2bbbb0f9b81f1fec41ec730da8a933' 'ef7a8b3624ea904bf584bc46d79b5e75' '91adfd41e6f001add4f92ae31216b1e3' diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD index 5d6383bdf..f59e0e8d5 100644 --- a/extra/pyopenssl/PKGBUILD +++ b/extra/pyopenssl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 110679 2011-02-21 13:19:09Z stephane $ +# $Id: PKGBUILD 132041 2011-07-19 13:27:24Z ibiru $ # Maintainer : Ionut Biru<ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgbase=pyopenssl pkgname=('pyopenssl' 'python2-pyopenssl') -pkgver=0.11 -pkgrel=2 +pkgver=0.12 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/pyopenssl/" license=('LGPL2.1') makedepends=('python' 'python2' 'openssl') -source=(http://launchpad.net/${pkgname}/main/${pkgver}/+download/pyOpenSSL-${pkgver}.tar.gz) -md5sums=('9e76e57e00fa48745fcfe23944db1e6c') +source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz) +md5sums=('60a7bbb6160950823eddcbba2cbcb0d6') build() { cd "${srcdir}" diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD index 4dd303717..b7b18e573 100644 --- a/extra/quota-tools/PKGBUILD +++ b/extra/quota-tools/PKGBUILD @@ -1,25 +1,40 @@ -# $Id: PKGBUILD 122880 2011-05-07 02:23:54Z eric $ +# $Id: PKGBUILD 131802 2011-07-15 11:55:43Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=quota-tools -pkgver=3.17 -pkgrel=2 +pkgver=4.00_pre1 +pkgrel=1 pkgdesc="Tools to manage kernel-level quotas in Linux" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/linuxquota/" license=('GPL' 'BSD') -depends=('e2fsprogs' 'tcp_wrappers') +depends=('e2fsprogs') backup=('etc/warnquota.conf' 'etc/quotatab' 'etc/quotagrpadmins') options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver}.tar.gz LICENSE) -md5sums=('cb3e98a039c0cf98e7c1ad4b50a5bda7' - 'dd792440e684043e4e4ef80963d0237b') -sha1sums=('8dc04ea803a43496dfe275a8260757f558a2d762' - '57297bdc9e638c500506169bbbe12eb89bcf7d07') +source=(http://downloads.sourceforge.net/sourceforge/linuxquota/quota-${pkgver/_/-}.tar.gz LICENSE \ + quotaon.diff system_inodes.diff repquota.diff nulls.diff) +md5sums=('ef9d66e8a968ecffd2d9df648fa8ada2' + 'dd792440e684043e4e4ef80963d0237b' + '9ac7ca4746de1ad057baee21474b7906' + '92d9f2a4b3e5e3adf2977051391785a7' + 'd1d70d4167e53d1414079b4391f1cfb8' + '094bce5226c4fd1c383bd0b75405ee2c') +sha1sums=('adf29b49dab449078eb6ffdfe8af51fe85419e28' + '57297bdc9e638c500506169bbbe12eb89bcf7d07' + '2304f03cddd06d8791167f621683f7ef54610673' + 'e2a33f1f95a3ff8c741a2067058e898f6054af09' + '8b00e7c4f7af2188ad49a50a616c1d71eee20459' + '0527f761aa869f5d9e463ceab4a3bf82881d05c2') build() { cd "${srcdir}/${pkgname}" + patch -p1 -i "${srcdir}/quotaon.diff" + patch -p1 -i "${srcdir}/system_inodes.diff" + patch -p1 -i "${srcdir}/repquota.diff" + patch -p1 -i "${srcdir}/nulls.diff" ./configure --prefix=/usr --sysconfdir=/etc + sed -i -e 's/#define HOSTS_ACCESS 1//' -e 's/HOSTS_ACCESS//' config.h + sed -i 's/-lwrap//' Makefile make } diff --git a/extra/quota-tools/nulls.diff b/extra/quota-tools/nulls.diff new file mode 100644 index 000000000..97c5bc482 --- /dev/null +++ b/extra/quota-tools/nulls.diff @@ -0,0 +1,20 @@ +#Description: Avoid memory corruption of NULL address +#Author: Petr Pisar + +--- quota/quotasys.c 2010-02-18 09:44:11.000000000 +0100 ++++ quota-tools/quotasys.c 2010-05-05 08:02:53.000000000 +0200 +@@ -746,9 +746,12 @@ + kernel_qfmt_num = 0; + if (!stat("/proc/fs/xfs/stat", &st)) + kernel_qfmt[kernel_qfmt_num++] = QF_XFS; +- else +- if (!quotactl(QCMD(Q_XGETQSTAT, 0), NULL, 0, NULL) || (errno != EINVAL && errno != ENOSYS)) ++ else { ++ fs_quota_stat_t dummy; ++ ++ if (!quotactl(QCMD(Q_XGETQSTAT, 0), "/dev/root", 0, (void *)&dummy) || (errno != EINVAL && errno != ENOSYS)) + kernel_qfmt[kernel_qfmt_num++] = QF_XFS; ++ } + /* Detect new kernel interface; Assume generic interface unless we can prove there is not one... */ + if (!stat("/proc/sys/fs/quota", &st) || errno != ENOENT) { + kernel_iface = IFACE_GENERIC; diff --git a/extra/quota-tools/quotaon.diff b/extra/quota-tools/quotaon.diff new file mode 100644 index 000000000..6a43cee6c --- /dev/null +++ b/extra/quota-tools/quotaon.diff @@ -0,0 +1,216 @@ +# Description: Fix quotaon to work with XFS and print all informational messages only in verbose mode +# Author: Jan Kara + +diff -u quota/quotaon.c quota-tools/quotaon.c +--- quota/quotaon.c 2010-07-28 11:14:02.000000000 +0200 ++++ quota-tools/quotaon.c 2010-06-15 10:11:30.000000000 +0200 +@@ -42,6 +42,7 @@ + #include <getopt.h> + #include <string.h> + #include <stdlib.h> ++#include <stdarg.h> + + #include "quotaon.h" + #include "quota.h" +@@ -145,6 +146,19 @@ + } + } + ++int pinfo(char *fmt, ...) ++{ ++ va_list arg; ++ int ret; ++ ++ if (!(flags & FL_VERBOSE)) ++ return 0; ++ va_start(arg, fmt); ++ ret = vprintf(fmt, arg); ++ va_end(arg); ++ return ret; ++} ++ + /* + * Enable/disable rsquash on given filesystem + */ +@@ -171,10 +185,10 @@ + errstr(_("set root_squash on %s: %s\n"), quotadev, strerror(errno)); + return 1; + } +- if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_OFF)) +- printf(_("%s: %s root_squash turned off\n"), quotadev, type2name(type)); +- else if ((flags & STATEFLAG_VERBOSE) && (flags & STATEFLAG_ON)) +- printf(_("%s: %s root_squash turned on\n"), quotadev, type2name(type)); ++ if (flags & STATEFLAG_OFF) ++ pinfo(_("%s: %s root_squash turned off\n"), quotadev, type2name(type)); ++ else if (flags & STATEFLAG_ON) ++ pinfo(_("%s: %s root_squash turned on\n"), quotadev, type2name(type)); + #endif + return 0; + } +@@ -195,8 +209,7 @@ + errstr(_("quotactl on %s [%s]: %s\n"), quotadev, quotadir, strerror(errno)); + return 1; + } +- if (flags & STATEFLAG_VERBOSE) +- printf(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type)); ++ pinfo(_("%s [%s]: %s quotas turned off\n"), quotadev, quotadir, type2name(type)); + return 0; + } + if (kernel_iface == IFACE_GENERIC) { +@@ -218,8 +231,7 @@ + errstr(_("Quota format not supported in kernel.\n")); + return 1; + } +- if (flags & STATEFLAG_VERBOSE) +- printf(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type)); ++ pinfo(_("%s [%s]: %s quotas turned on\n"), quotadev, quotadir, type2name(type)); + return 0; + } + +@@ -268,8 +280,6 @@ + int sflags, ret = 0; + + sflags = flags & FL_OFF ? STATEFLAG_OFF : STATEFLAG_ON; +- if (flags & FL_VERBOSE) +- sflags |= STATEFLAG_VERBOSE; + if (flags & FL_ALL) + sflags |= STATEFLAG_ALL; + +@@ -281,10 +291,7 @@ + errstr(_("Cannot change state of XFS quota. It's not compiled in kernel.\n")); + return 1; + } +- if ((flags & FL_OFF && (kern_quota_on(mnt->mnt_fsname, USRQUOTA, QF_XFS) != -1 +- || kern_quota_on(mnt->mnt_fsname, GRPQUOTA, QF_XFS) != -1)) +- || (!(flags & FL_OFF) && kern_quota_on(mnt->mnt_fsname, type, QF_XFS) == -1)) +- ret = xfs_newstate(mnt, type, extra, sflags); ++ ret = xfs_newstate(mnt, type, extra, sflags); + } + else if (meta_qf_fstype(mnt->mnt_type)) { + if (!hasquota(mnt, type, 0)) +@@ -376,7 +383,7 @@ + while ((mnt = get_next_mount())) { + if (nfs_fstype(mnt->mnt_type)) { + if (!(flags & FL_ALL)) +- fprintf(stderr, "%s: Quota cannot be turned on on NFS filesystem\n", mnt->mnt_fsname); ++ errstr(_("%s: Quota cannot be turned on on NFS filesystem\n"), mnt->mnt_fsname); + continue; + } + +diff -u quota/quotaon.h quota-tools/quotaon.h +--- quota/quotaon.h 2010-02-18 09:44:11.000000000 +0100 ++++ quota-tools/quotaon.h 2010-06-12 12:06:08.000000000 +0200 +@@ -13,7 +13,7 @@ + #define STATEFLAG_ON 0x01 + #define STATEFLAG_OFF 0x02 + #define STATEFLAG_ALL 0x04 +-#define STATEFLAG_VERBOSE 0x08 + + typedef int (newstate_t) (struct mntent * mnt, int type, char *file, int flags); + extern int xfs_newstate(struct mntent *mnt, int type, char *file, int flags); ++extern int pinfo(char *fmt, ...); +diff -u quota/quotaon_xfs.c quota-tools/quotaon_xfs.c +--- quota/quotaon_xfs.c 2010-07-26 18:48:24.000000000 +0200 ++++ quota-tools/quotaon_xfs.c 2010-06-15 10:11:30.000000000 +0200 +@@ -59,8 +59,8 @@ + return 1; + case Q_XFS_QUOTAON: + if (roothack) { +- printf(_("Enabling %s quota on root filesystem" +- " (reboot to take effect)\n"), type2name(type)); ++ pinfo(_("Enabling %s quota on root filesystem" ++ " (reboot to take effect)\n"), type2name(type)); + return 1; + } + errstr(_("Enable XFS %s quota accounting during mount\n"), +@@ -79,12 +79,12 @@ + return -1; + case Q_XFS_QUOTAON: + if (roothack) { +- printf(_("Enabling %s quota on root filesystem" +- " (reboot to take effect)\n"), type2name(type)); ++ pinfo(_("Enabling %s quota on root filesystem" ++ " (reboot to take effect)\n"), type2name(type)); + return 1; + } + if (xopts & XFS_QUOTA_UDQ_ENFD || xopts & XFS_QUOTA_GDQ_ENFD) { +- printf(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev); ++ pinfo(_("Enabling %s quota enforcement on %s\n"), type2name(type), dev); + return 1; + } + errstr(_("Already accounting %s quota on %s\n"), +@@ -92,7 +92,7 @@ + return -1; + case Q_XFS_QUOTAOFF: + if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) { +- printf(_("Disabling %s quota accounting on %s\n"), ++ pinfo(_("Disabling %s quota accounting on %s\n"), + type2name(type), dev); + return 1; + } +@@ -121,9 +121,9 @@ + return -1; + } + if (xopts & XFS_QUOTA_UDQ_ACCT || xopts & XFS_QUOTA_GDQ_ACCT) +- acctstr = _("and accounting "); +- printf(_("Disabling %s quota enforcement %son %s\n"), +- type2name(type), acctstr, dev); ++ acctstr = _("and accounting "); ++ pinfo(_("Disabling %s quota enforcement %son %s\n"), ++ type2name(type), acctstr, dev); + return 1; + } + break; +@@ -146,10 +146,10 @@ + errstr(_("quotactl on %s: %s\n"), dev, strerror(errno)); + return 1; + } +- if ((flags & STATEFLAG_VERBOSE) && qoff) +- printf(_("%s: %s quotas turned off\n"), dev, type2name(type)); +- else if ((flags & STATEFLAG_VERBOSE) && !qoff) +- printf(_("%s: %s quotas turned on\n"), dev, type2name(type)); ++ if (qoff) ++ pinfo(_("%s: %s quotas turned off\n"), dev, type2name(type)); ++ else ++ pinfo(_("%s: %s quotas turned on\n"), dev, type2name(type)); + return 0; + } + +@@ -168,8 +168,7 @@ + return 1; + } + +- if (flags & STATEFLAG_VERBOSE) +- printf(_("%s: deleted %s quota blocks\n"), dev, type2name(type)); ++ pinfo(_("%s: deleted %s quota blocks\n"), dev, type2name(type)); + return 0; + } + +@@ -208,16 +207,12 @@ + } + #endif /* XFS_ROOTHACK */ + +- if (xarg == NULL) { /* both acct & enfd on/off */ +- xopts |= (type == USRQUOTA) ? +- (XFS_QUOTA_UDQ_ACCT | XFS_QUOTA_UDQ_ENFD) : +- (XFS_QUOTA_GDQ_ACCT | XFS_QUOTA_GDQ_ENFD); ++ if (xarg == NULL) { /* only enfd on/off */ ++ xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ENFD : ++ XFS_QUOTA_GDQ_ENFD; + err = xfs_onoff((char *)dev, type, flags, roothack, xopts); + } + else if (strcmp(xarg, "account") == 0) { +- /* only useful if we want root accounting only */ +- if (!roothack || !(flags & STATEFLAG_ON)) +- goto done; + xopts |= (type == USRQUOTA) ? XFS_QUOTA_UDQ_ACCT : XFS_QUOTA_GDQ_ACCT; + err = xfs_onoff((char *)dev, type, flags, roothack, xopts); + } +@@ -231,7 +226,6 @@ + } + else + die(1, _("Invalid argument \"%s\"\n"), xarg); +- done: + free((char *)dev); + return err; + } diff --git a/extra/quota-tools/repquota.diff b/extra/quota-tools/repquota.diff new file mode 100644 index 000000000..3d79497d9 --- /dev/null +++ b/extra/quota-tools/repquota.diff @@ -0,0 +1,91 @@ +# Description: fix repquota to get latest quota info header +# Author: Jan Kara + +diff -u quota/quotaio.c quota-tools/quotaio.c +--- quota/quotaio.c 2010-07-28 11:14:02.000000000 +0200 ++++ quota-tools/quotaio.c 2010-05-28 09:05:21.000000000 +0200 +@@ -147,6 +147,15 @@ + } + } + if (!QIO_ENABLED(h) || flags & IOI_OPENFILE) { /* Need to open file? */ ++ if (QIO_ENABLED(h)) { /* Kernel uses same file? */ ++ unsigned int cmd = ++ (kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC; ++ if (quotactl(QCMD(cmd, h->qh_type), h->qh_quotadev, ++ 0, NULL) < 0) { ++ die(4, _("Cannot sync quotas on device %s: %s\n"), ++ h->qh_quotadev, strerror(errno)); ++ } ++ } + /* We still need to open file for operations like 'repquota' */ + if ((fd = open(qfname, QIO_RO(h) ? O_RDONLY : O_RDWR)) < 0) { + errstr(_("Cannot open quotafile %s: %s\n"), +diff -u quota/quotaio_v1.c quota-tools/quotaio_v1.c +--- quota/quotaio_v1.c 2010-07-26 18:48:24.000000000 +0200 ++++ quota-tools/quotaio_v1.c 2010-05-28 09:05:23.000000000 +0200 +@@ -348,11 +348,6 @@ + struct dquot *dquot = get_empty_dquot(); + qid_t id = 0; + +- if (QIO_ENABLED(h)) /* Kernel uses same file? */ +- if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type), +- h->qh_quotadev, 0, NULL) < 0) +- die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev, +- strerror(errno)); + memset(dquot, 0, sizeof(*dquot)); + dquot->dq_h = h; + lseek(h->qh_fd, 0, SEEK_SET); +diff -u quota/quotaio_v2.c quota-tools/quotaio_v2.c +--- quota/quotaio_v2.c 2010-02-18 09:44:11.000000000 +0100 ++++ quota-tools/quotaio_v2.c 2010-05-28 09:05:23.000000000 +0200 +@@ -484,11 +484,6 @@ + + static int v2_scan_dquots(struct quota_handle *h, int (*process_dquot) (struct dquot *, char *)) + { +- if (QIO_ENABLED(h)) /* Kernel uses same file? */ +- if (quotactl(QCMD((kernel_iface == IFACE_GENERIC) ? Q_SYNC : Q_6_5_SYNC, h->qh_type), +- h->qh_quotadev, 0, NULL) < 0) +- die(4, _("Cannot sync quotas on device %s: %s\n"), h->qh_quotadev, +- strerror(errno)); + return qtree_scan_dquots(h, process_dquot); + } + +diff -u quota/quotasys.c quota-tools/quotasys.c +--- quota/quotasys.c 2010-07-28 11:14:02.000000000 +0200 ++++ quota-tools/quotasys.c 2010-06-15 10:11:30.000000000 +0200 +@@ -861,22 +861,23 @@ + if (kernel_iface == IFACE_GENERIC) { + int actfmt; + +- if (quotactl(QCMD(Q_GETFMT, type), dev, 0, (void *)&actfmt) < 0) +- return -1; +- actfmt = kern2utilfmt(actfmt); +- if (actfmt < 0) +- return -1; +- return actfmt; ++ if (quotactl(QCMD(Q_GETFMT, type), dev, 0, ++ (void *)&actfmt) >= 0) { ++ actfmt = kern2utilfmt(actfmt); ++ if (actfmt >= 0) ++ return actfmt; ++ } ++ } else { ++ if ((fmt == -1 || fmt == QF_VFSV0) && ++ v2_kern_quota_on(dev, type)) /* VFSv0 quota format */ ++ return QF_VFSV0; ++ if ((fmt == -1 || fmt == QF_VFSOLD) && ++ v1_kern_quota_on(dev, type)) /* Old quota format */ ++ return QF_VFSOLD; + } +- if ((fmt == -1 || fmt == QF_VFSV0) && +- v2_kern_quota_on(dev, type)) /* VFSv0 quota format */ +- return QF_VFSV0; + if ((fmt == -1 || fmt == QF_XFS) && + xfs_kern_quota_on(dev, type)) /* XFS quota format */ + return QF_XFS; +- if ((fmt == -1 || fmt == QF_VFSOLD) && +- v1_kern_quota_on(dev, type)) /* Old quota format */ +- return QF_VFSOLD; + return -1; + } + diff --git a/extra/quota-tools/system_inodes.diff b/extra/quota-tools/system_inodes.diff new file mode 100644 index 000000000..94f4d66da --- /dev/null +++ b/extra/quota-tools/system_inodes.diff @@ -0,0 +1,18 @@ +# Description: Do not count system inodes into quota for ext[234] +# Author: Jan Kara + +--- quota/quotacheck.c 2010-02-18 09:44:10.000000000 +0100 ++++ quota-tools//quotacheck.c 2010-05-22 16:47:53.000000000 +0200 +@@ -455,8 +455,10 @@ + return -1; + } + +- while ((long)i_num) { +- if (inode.i_links_count) { ++ while (i_num) { ++ if ((i_num == EXT2_ROOT_INO || ++ i_num >= EXT2_FIRST_INO(fs->super)) && ++ inode.i_links_count) { + debug(FL_DEBUG, _("Found i_num %ld, blocks %ld\n"), (long)i_num, (long)inode.i_blocks); + if (flags & FL_VERBOSE) + blit(NULL); diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index f9ff98690..b3eccf6de 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 94465 2010-10-07 10:54:24Z ronald $ +# $Id: PKGBUILD 131712 2011-07-13 18:32:34Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qwt -pkgver=5.2.1 +pkgver=6.0.0 pkgrel=1 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64' 'mips64el') url="http://qwt.sourceforge.net/" -depends=('qt>=4.5.1') +depends=('qt') options=('!makeflags') license=("custom:$pkgname") source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \ "qwtconfig-archlinux.pri") -md5sums=('4a595b8db0ec3856b117836c1d60cb27' - '2cb9135ec875d6de0214fcb032f184a3') +sha1sums=('306957fc06c90f2049aec57e13a971f54c3cb21a' + 'aba0fc75f6d450237028b7b143bdcf05a79cabb3') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -24,7 +24,7 @@ build() { # build qwt: qmake qwt.pro - make || return 1 + make } package() { @@ -32,10 +32,10 @@ package() { make INSTALL_ROOT=${pkgdir} QTDIR=/usr install - # fix doc files - install -d ${pkgdir}/usr/share/doc/${pkgname} - mv -f ${pkgdir}/usr/share/html/* ${pkgdir}/usr/share/doc/${pkgname} - + # Move man files to proper directory. + install -d ${pkgdir}/usr/share/man/man3 + mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3 + # install licence install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \ ${pkgdir}/usr/share/licenses/${pkgname}/license.txt diff --git a/extra/qwt/qwtconfig-archlinux.pri b/extra/qwt/qwtconfig-archlinux.pri index 646a2b759..520e32d4b 100644 --- a/extra/qwt/qwtconfig-archlinux.pri +++ b/extra/qwt/qwtconfig-archlinux.pri @@ -1,34 +1,56 @@ +################################################################ +# Qwt Widget Library +# Copyright (C) 1997 Josef Wilgen +# Copyright (C) 2002 Uwe Rathmann +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the Qwt License, Version 1.0 +################################################################ + +QWT_VER_MAJ = 6 +QWT_VER_MIN = 1 +QWT_VER_PAT = 0 +QWT_VERSION = $${QWT_VER_MAJ}.$${QWT_VER_MIN}.$${QWT_VER_PAT} + ###################################################################### # Install paths ###################################################################### +QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] + unix { - INSTALLBASE = /usr + QWT_INSTALL_PREFIX = /usr } win32 { - INSTALLBASE = C:/Qwt + QWT_INSTALL_PREFIX = C:/Qwt } -target.path = $$INSTALLBASE/lib -headers.path = $$INSTALLBASE/include/qwt -doc.path = $$INSTALLBASE/share +QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/share/doc/qwt +QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include/qwt +QWT_INSTALL_LIBS = $${QWT_INSTALL_PREFIX}/lib ###################################################################### -# qmake internal options +# Designer plugin ###################################################################### -CONFIG += qt # Also for Qtopia Core! -CONFIG += warn_on -CONFIG += thread +#QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer +# QWT_INSTALL_PLUGINS = $${QT_INSTALL_PREFIX}/plugins/designer ###################################################################### -# release/debug mode -# The designer plugin is always built in release mode. -# If want to change this, you have to edit designer/designer.pro. +# Features +# When building a Qwt application with qmake you might want to load +# the compiler/linker flags, that are required to build a Qwt application +# from qwt.prf. Therefore all you need to do is to add "CONFIG += qwt" +# to your project file and take care, that qwt.prf can be found by qmake. +# ( see http://doc.trolltech.com/4.7/qmake-advanced-usage.html#adding-new-configuration-features ) +# I recommend not to install the Qwt features together with the +# Qt features, because you will have to reinstall the Qwt features, +# with every Qt upgrade. ###################################################################### -CONFIG += release # release/debug +#QWT_INSTALL_FEATURES = $${QWT_INSTALL_PREFIX}/features +# QWT_INSTALL_FEATURES = $${QT_INSTALL_PREFIX}/features ###################################################################### # Build the static/shared libraries. @@ -36,50 +58,61 @@ CONFIG += release # release/debug # it will be a static library. ###################################################################### -CONFIG += QwtDll +QWT_CONFIG += QwtDll ###################################################################### -# QwtPlot enables all classes, that are needed to use the QwtPlot -# widget. +# QwtPlot enables all classes, that are needed to use the QwtPlot +# widget. ###################################################################### -CONFIG += QwtPlot +QWT_CONFIG += QwtPlot ###################################################################### # QwtWidgets enables all classes, that are needed to use the all other -# widgets (sliders, dials, ...), beside QwtPlot. +# widgets (sliders, dials, ...), beside QwtPlot. ###################################################################### -CONFIG += QwtWidgets +QWT_CONFIG += QwtWidgets ###################################################################### -# If you want to display svg images on the plot canvas, enable the -# line below. Note that Qwt needs the svg+xml, when enabling -# QwtSVGItem. +# If you want to display svg images on the plot canvas, or +# export a plot to a SVG document ###################################################################### -CONFIG += QwtSVGItem +QWT_CONFIG += QwtSvg ###################################################################### -# If you have a commercial license you can use the MathML renderer -# of the Qt solutions package to enable MathML support in Qwt. -# So if you want this, copy qtmmlwidget.h + qtmmlwidget.cpp to -# textengines/mathml and enable the line below. +# You can use the MathML renderer of the Qt solutions package to +# enable MathML support in Qwt. Because of license implications +# the ( modified ) code of the MML Widget solution is included and +# linked together with the QwtMathMLTextEngine into an own library. +# To use it you will have to add "CONFIG += qwtmathml" +# to your qmake project file. ###################################################################### -#CONFIG += QwtMathML +#QWT_CONFIG += QwtMathML ###################################################################### -# If you want to build the Qwt designer plugin, +# If you want to build the Qwt designer plugin, # enable the line below. # Otherwise you have to build it from the designer directory. ###################################################################### -CONFIG += QwtDesigner +QWT_CONFIG += QwtDesigner ###################################################################### # If you want to auto build the examples, enable the line below # Otherwise you have to build them from the examples directory. ###################################################################### -#CONFIG += QwtExamples +#QWT_CONFIG += QwtExamples + +###################################################################### +# When Qt has been built as framework qmake ( qtAddLibrary ) wants +# to link frameworks instead of regular libs +###################################################################### + +macx:CONFIG(qt_framework, qt_framework|qt_no_framework) { + + QWT_CONFIG += QwtFramework +} diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 9461d374d..0f8597943 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,42 +1,39 @@ -# $Id: PKGBUILD 122820 2011-05-06 10:48:44Z ronald $ +# $Id: PKGBUILD 132100 2011-07-20 07:19:13Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r -pkgver=2.13.0 +pkgver=2.13.1 pkgrel=1 -pkgdesc="R is a language and environment for statistical computing and graphics" +pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url=('http://www.r-project.org/') depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' - 'tk' 'libxt' 'libxmu' 'pango') + 'tk' 'libxt' 'libxmu' 'pango' 'xz') makedepends=('openjdk6' 'gcc-fortran') +backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') options=('!makeflags') source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" 'r.desktop' 'r.png') -sha1sums=('878510e8a5fa1ccd1e0c4af5866f5416f3c27469' +install=r.install +sha1sums=('8b9d48c7a654186064f369652ea34a085eff239b' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978') - build() { cd ${srcdir}/R-${pkgver} sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c ./configure --prefix=/usr \ --libdir=/usr/lib \ + --sysconfdir=/etc/R \ --datarootdir=/usr/share \ rsharedir=/usr/share/R/ \ rincludedir=/usr/include/R/ \ - rdocdir=/usr/share/R/docs/ \ - --with-gnu-ld \ - --with-readline \ + rdocdir=/usr/share/doc/R/ \ --with-x \ - --with-zlib \ - --with-bzlib \ - --with-pcre \ --enable-R-shlib \ --with-lapack \ --with-blas \ @@ -60,4 +57,12 @@ package() { ${pkgdir}/usr/share/applications/r.desktop install -Dm644 ${srcdir}/r.png \ ${pkgdir}/usr/share/pixmaps/r.png - } + + # move the config directory to /etc and create symlinks + install -d ${pkgdir}/etc/R + cd ${pkgdir}/usr/lib/R/etc + for i in *; do + mv -f ${i} ${pkgdir}/etc/R + ln -s /etc/R/${i} ${i} + done +} diff --git a/extra/r/r.install b/extra/r/r.install new file mode 100644 index 000000000..d3289ab64 --- /dev/null +++ b/extra/r/r.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index e96f2a5c8..184bb230c 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 127048 2011-06-10 06:18:26Z eric $ +# $Id: PKGBUILD 131818 2011-07-15 23:27:54Z dan $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.5 -pkgrel=2 +pkgrel=3 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" license=('GPL' 'custom') -depends=('libpng' 'libxml2' 'pango' 'tcp_wrappers') +depends=('libpng' 'libxml2' 'pango') makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') optdepends=('tcl: to use corresponding binding' \ 'python2: to use corresponding binding' \ @@ -26,7 +26,7 @@ build() { ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ - --enable-lua --enable-lua-site-install --enable-tcl + --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap make } diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD index 1d1af26d0..458009ce3 100644 --- a/extra/socat/PKGBUILD +++ b/extra/socat/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 125383 2011-05-26 13:02:11Z bisson $ +# $Id: PKGBUILD 131647 2011-07-13 08:01:50Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=socat pkgver=1.7.1.3 -pkgrel=2 +pkgrel=3 pkgdesc='Multipurpose relay' url='http://www.dest-unreach.org/socat/' license=('GPL2') arch=('i686' 'x86_64') -depends=('readline' 'openssl' 'tcp_wrappers') -source=("http://www.dest-unreach.org/socat/download/$pkgname-$pkgver.tar.gz") +depends=('readline' 'openssl') +source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz") sha1sums=('5a42275da0d8a5182452b36535a74c3cdf21793b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ + --disable-libwrap # only required while base/base-devel uses tcp_wrappers make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index 29cef1a5e..74572d980 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128070 2011-06-21 15:42:15Z ibiru $ +# $Id: PKGBUILD 132254 2011-07-22 09:07:47Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.14.8 +pkgver=0.14.9 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('07dae468cd6b55a2bddbd0b3c80f3796') +md5sums=('212335854fa14b9d6319525ec7546d2f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 6581d8593..d7d3b6b79 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 123605 2011-05-11 18:21:04Z ibiru $ +# $Id: PKGBUILD 132301 2011-07-22 16:07:21Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.7.11 +pkgver=5.8.0 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64' 'mips64el') -url="http://mission-control.sourceforge.net/" +url="http://telepathy.freedesktop.org/wiki/Mission Control" license=('LGPL2.1') depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('d4b37aa43f391c34d033b1af5ab32e6d') +md5sums=('a708767687a6515058ee1a3654eda5c1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD index f64e99434..4b4c7f596 100644 --- a/extra/tftp-hpa/PKGBUILD +++ b/extra/tftp-hpa/PKGBUILD @@ -1,29 +1,35 @@ -# $Id: PKGBUILD 42756 2009-06-18 19:44:52Z tpowa $ +# $Id: PKGBUILD 131856 2011-07-16 06:36:05Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Contributor: Jose Javier <jojapa@terra.es> pkgname=tftp-hpa -pkgver=5.0 -pkgrel=3 +pkgver=5.1 +pkgrel=1 pkgdesc="Official tftp server" arch=('i686' 'x86_64' 'mips64el') url="http://www.kernel.org/pub/software/network/tftp/" license=('BSD') -depends=('tcp_wrappers' 'readline>=6.0.00') +depends=('readline>=6.0.00') conflicts=('netkit-tftp') backup=('etc/conf.d/tftpd') source=(http://www.kernel.org/pub/software/network/tftp/$pkgname-$pkgver.tar.gz tftpd.rc tftpd.conf LICENSE) -md5sums=('1ae813a94670f0d8c294aafa9f5ecf65' 'a974d02526f19222146c8e3d3b598871'\ - '414a79dc891bced056d99a9bb790fc9e' '6ce21e27b6fdc1a1adf85c81e42aeecf') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make INSTALLROOT="${pkgdir}" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make INSTALLROOT="${pkgdir}" install install -d "${pkgdir}/etc/rc.d" install -d "${pkgdir}/var/tftpboot" - install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" || return 1 - install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" || return 1 + install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" + install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" rm "${pkgdir}/usr/share/man/man8/tftpd.8" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } +md5sums=('d086b1bd6e5ed6375ad407e273afccdf' + '83fbb6f52205d95951a3c059e5351ca2' + '414a79dc891bced056d99a9bb790fc9e' + '6ce21e27b6fdc1a1adf85c81e42aeecf') diff --git a/extra/tftp-hpa/tftpd.rc b/extra/tftp-hpa/tftpd.rc index b21f87f5c..0222d1693 100755 --- a/extra/tftp-hpa/tftpd.rc +++ b/extra/tftp-hpa/tftpd.rc @@ -14,7 +14,7 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - add_daemon in.tftpd + add_daemon tftpd stat_done fi ;; @@ -24,7 +24,7 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - rm_daemon in.tftpd + rm_daemon tftpd stat_done fi ;; diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index fc79178a2..b051af36b 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129943 2011-06-30 15:04:13Z ibiru $ +# $Id: PKGBUILD 132249 2011-07-22 09:01:42Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.32 +pkgver=2.33 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" @@ -11,15 +11,13 @@ license=('MIT') makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'qt' 'libevent' 'libcanberra' 'dbus-glib') source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2 transmissiond transmissiond.conf) -md5sums=('cac5d0e07b92e563b34b61de5a6235c7' +md5sums=('082217a65713ac879410c622cbe6eb26' '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - export CFLAGS="$CFLAGS -fno-strict-aliasing" - - ./configure --prefix=/usr --disable-gconf2 + ./configure --prefix=/usr make pushd qt qmake qtr.pro diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 654c7d390..7dc877239 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 131876 2011-07-16 10:50:22Z giovanni $ +# $Id: PKGBUILD 132018 2011-07-19 08:30:36Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.11 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('GPL') -depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' +depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') -makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify' +makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' 'lirc-utils' 'gnutls' 'libcaca') diff --git a/extra/vsftpd/PKGBUILD b/extra/vsftpd/PKGBUILD index e68914a11..d1651dd39 100644 --- a/extra/vsftpd/PKGBUILD +++ b/extra/vsftpd/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 130325 2011-07-05 09:57:35Z andrea $ +# $Id: PKGBUILD 131827 2011-07-15 23:59:43Z dreisner $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=vsftpd pkgver=2.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64' 'mips64el') url="https://security.appspot.com/vsftpd.html" license=('GPL2') -depends=('tcp_wrappers' 'openssl') +depends=('openssl') backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') install=vsftpd.install source=("https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz" @@ -25,7 +25,6 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" # build-time config sed \ - -e 's|^#undef VSF_BUILD_TCPWRAPPERS$|#define VSF_BUILD_TCPWRAPPERS|' \ -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ -i builddefs.h make CFLAGS="${CFLAGS}" diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index eac2509d0..c7925666d 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127256 2011-06-11 21:34:35Z guillaume $ +# $Id: PKGBUILD 132077 2011-07-19 20:50:29Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume at alaux dot net> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lu url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('9f9314c89bf1c8b440a7909884838cfd') +md5sums=('dc1e8c9800b64130674b120a183e2308') build() { cd "${srcdir}/${pkgbase}-${pkgver}" |