diff options
| author | root <root@rshg054.dnsready.net> | 2011-11-05 23:14:55 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-11-05 23:14:55 +0000 |
| commit | 82fd7f658509afe9737e14e8d1ee9fefe13c9d1f (patch) | |
| tree | 9c41c06e2e0b0ef270dc8eec367171163497f622 | |
| parent | 3026bb55941e3b04b56f5fb41b88941c6c2ce0cd (diff) | |
Sat Nov 5 23:14:55 UTC 2011
105 files changed, 2789 insertions, 286 deletions
diff --git a/community-staging/ffmpeg2theora/PKGBUILD b/community-staging/ffmpeg2theora/PKGBUILD new file mode 100644 index 000000000..6cc8cf6fa --- /dev/null +++ b/community-staging/ffmpeg2theora/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 57906 2011-11-04 10:37:07Z jelle $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Angelo Theodorou <encelo@users.sourceforge.net> + +pkgname=ffmpeg2theora +pkgver=0.28 +pkgrel=2 +pkgdesc="A simple converter to create Ogg Theora files" +arch=('i686' 'x86_64') +url="http://www.v2v.cc/~j/ffmpeg2theora/" +license=('GPL3') +depends=('ffmpeg') +makedepends=('pkgconfig' 'scons') +changelog=$pkgname.changelog +source=(http://www.v2v.cc/~j/${pkgname}/downloads/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6893c1444d730a1514275ba76ba487ca207205b916d6cb1285704225ee86fe1e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + scons +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + scons install destdir="${pkgdir}" prefix="/usr" mandir="PREFIX/share/man" +} diff --git a/community-staging/ffmpeg2theora/ffmpeg2theora.changelog b/community-staging/ffmpeg2theora/ffmpeg2theora.changelog new file mode 100644 index 000000000..adbe34807 --- /dev/null +++ b/community-staging/ffmpeg2theora/ffmpeg2theora.changelog @@ -0,0 +1,28 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * ffmpeg2theora 0.28-1 + * Upstream update + +2010-06-25 Eric Belanger <eric@archlinux.org> + + * ffmpeg2theora 0.27-1 + * Upstream update + +2010-02-05 Eric Belanger <eric@archlinux.org> + + * ffmpeg2theora 0.26-1 + * Upstream update + * Updated license + * Updated source url + +2010-01-10 Eric Belanger <eric@archlinux.org> + + * ffmpeg2theora 0.25-1 + * Upstream update + * Built against ffmpeg 20100108 + +2009-06-06 Eric Belanger <eric@archlinux.org> + + * ffmpeg2theora 0.24-1 + * Upstream update + * Added ChangeLog diff --git a/community-staging/qmmp/PKGBUILD b/community-staging/qmmp/PKGBUILD new file mode 100644 index 000000000..a03104add --- /dev/null +++ b/community-staging/qmmp/PKGBUILD @@ -0,0 +1,38 @@ +#$Id: PKGBUILD 57919 2011-11-04 13:16:35Z jelle $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=qmmp +pkgver=0.5.2 +pkgrel=2 +pkgdesc="Qt4 based audio-player" +arch=('i686' 'x86_64') +url="http://qmmp.ylsoftware.com/" +license=('GPL') +depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg' 'qt' 'taglib' 'xdg-utils') +makedepends=('cmake' 'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack') +optdepends=('flac: native FLAC support' + 'jack: JACK sound output' + 'libmpcdec: Musepack support' + 'pulseaudio: PulseAudio output' + 'libcdio: Compact Disc input and control support' + 'libcddb: CDDB server support' + 'libmms: MMS stream protocol support' + 'libmodplug: MOD playing library' + 'libsndfile: sampled sound support' + 'ffmpeg' 'libsamplerate' 'wavpack') +install=$pkgname.install +source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) +sha256sums=('6391dec020d2a381d7f4b7890fae6c49eadf88b3c9aef571fe3c5e96140822ec') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/qmmp/qmmp.changelog b/community-staging/qmmp/qmmp.changelog new file mode 100644 index 000000000..31050d69e --- /dev/null +++ b/community-staging/qmmp/qmmp.changelog @@ -0,0 +1,47 @@ +2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.2-1 + +2011-07-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.1-1 + +2011-04-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.0-1 + +2011-02-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.4.4-1 + +2010-11-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.4.3 + +2010-09-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.4.2 + +2010-06-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.4.1 + +2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.4.0 + +2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3.4 + +2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3.3 + +2010-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3.2 + +2009-07-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.3.0 + +2009-03-30 Giovanni Scafora <giovanni@archlinux.org> + * Fixed x86_64 build + +2009-03-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.2.4 + +2008-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.2.3 + +2008-08-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release v0.2.2 diff --git a/community-staging/qmmp/qmmp.install b/community-staging/qmmp/qmmp.install new file mode 100644 index 000000000..4c0972beb --- /dev/null +++ b/community-staging/qmmp/qmmp.install @@ -0,0 +1,12 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD index ced055501..1851f8317 100644 --- a/community-testing/virtualbox-modules/PKGBUILD +++ b/community-testing/virtualbox-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57348 2011-10-26 10:15:54Z ibiru $ +# $Id: PKGBUILD 57949 2011-11-04 18:45:15Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules') -pkgver=4.1.4 -pkgrel=3 +pkgver=4.1.6 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -12,12 +12,12 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) -md5sums=('dc6e6801b3823332b6ca2e9915221aae' +md5sums=('03cd0875729558a46f910483e1984316' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') _extramodules=extramodules-3.1-ARCH -_kernver="$(cat /lib/modules/${_extramodules}/version)" +_kernver="$(cat /lib/modules/${_extramodules}/version || true)" export KERN_DIR=/lib/modules/${_kernver}/build export KERN_INCL=/usr/src/linux-${_kernver}/include/ diff --git a/community-testing/virtualbox-modules/virtualbox-modules.install b/community-testing/virtualbox-modules/virtualbox-modules.install index 188c1874c..ec29d3a87 100644 --- a/community-testing/virtualbox-modules/virtualbox-modules.install +++ b/community-testing/virtualbox-modules/virtualbox-modules.install @@ -10,7 +10,7 @@ EOF post_upgrade() { EXTRAMODULES='extramodules-3.1-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) - rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.' + echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD index 9bd955e8b..cebea94bf 100644 --- a/community-testing/virtualbox/PKGBUILD +++ b/community-testing/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57745 2011-11-02 06:49:24Z ibiru $ +# $Id: PKGBUILD 57944 2011-11-04 18:30:05Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source') -pkgver=4.1.4 -pkgrel=4 +pkgver=4.1.6 +pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -175,10 +175,10 @@ package_virtualbox-archlinux-additions(){ # install sample config install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" } -md5sums=('dc6e6801b3823332b6ca2e9915221aae' - 'bc048d1e58d84ece4a186199ee48d4c8' +md5sums=('03cd0875729558a46f910483e1984316' + 'af534f713993eb077df26ff9a44fb080' '5f85710e0b8606de967716ded7b2d351' - 'cc3f278bc273011aa95277500a76f677' + '88b847c3480df14139980d62597329ec' '78ffa67ff131680f1d2b6f06d4325c5b' 'a82d698e7868315cdf876cfb02fd2268' '97e193f050574dd272a38e5ee5ebe62b' diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch index c310dbc8d..9f4b127cd 100644 --- a/community-testing/virtualbox/vboxdrv-reference.patch +++ b/community-testing/virtualbox/vboxdrv-reference.patch @@ -1,45 +1,57 @@ -diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp ---- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 15:11:37.730121727 +0000 -+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 19:02:15.658471139 +0000 -@@ -75,9 +75,8 @@ +diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +--- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 ++++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 +@@ -75,10 +75,9 @@ "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " "module by executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " -- "package first. This package keeps track of Linux kernel changes and " -+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" -+ "as root. This package keeps track of Linux kernel changes and" - "recompiles the vboxdrv kernel module if necessary." +- "as root. If it is available in your distribution, you should install the " +- "DKMS package first. This package keeps track of Linux kernel changes and " +- "recompiles the vboxdrv kernel module if necessary." ++ " <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>" ++ "as root. If you don't use our stock kernel, install virtualbox-source and" ++ "execute /usr/bin/vboxbuild ." ); -@@ -92,7 +91,7 @@ + QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( +@@ -90,11 +89,8 @@ + + QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing<br/><br/>" +- "VirtualBox. The installation of VirtualBox was apparently not " +- "successful. Executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" +- "may correct this. Make sure that you do not mix the " +- "OSE version and the PUEL version of VirtualBox." ++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " + " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." ); -diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh ---- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-07-19 15:11:37.603453927 +0000 -+++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2011-07-19 19:02:15.658471139 +0000 -@@ -34,7 +34,7 @@ + + QString g_QStrHintOtherNoDriver = QApplication::tr( +diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh +--- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 ++++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 +@@ -32,17 +32,18 @@ + cat << EOF + WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by +- load. Please recompile the kernel module and install it by ++ load. Please recompile the kernel module virtualbox-modules or ++ if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup + sudo /usr/bin/vboxbuild You will not be able to start VMs until this problem is fixed. EOF -@@ -42,7 +42,7 @@ + elif [ ! -c /dev/vboxdrv ]; then cat << EOF - WARNING: The character device /dev/vboxdrv does not exist. Try +-WARNING: The character device /dev/vboxdrv does not exist. Try ++WARNING: The character device /dev/vboxdrv does not exist. Try to load the module - sudo /etc/init.d/vboxdrv restart -+ sudo /usr/bin/vboxbuild ++ sudo modprobe vboxdrv and if that is not successful, try to re-install the package. diff --git a/community-testing/virtualbox/virtualbox.install b/community-testing/virtualbox/virtualbox.install index 39186177e..c794b857d 100644 --- a/community-testing/virtualbox/virtualbox.install +++ b/community-testing/virtualbox/virtualbox.install @@ -20,9 +20,9 @@ post_install() { post_upgrade() { getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers utils - if [ "$(vercmp $2 4.1.4-4)" -lt 0 ]; then + if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then /bin/cat << EOF -===> Starting with virtualbox version 4.1.4-3, kernel modules handling is done by virtualbox-modules. +===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules. ===> Use virtualbox-source package if you don't use our stock linux package. EOF fi diff --git a/community/audex/PKGBUILD b/community/audex/PKGBUILD index aaae88304..1572774dc 100644 --- a/community/audex/PKGBUILD +++ b/community/audex/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57866 2011-11-03 22:08:58Z lcarlier $ +# $Id: PKGBUILD 57952 2011-11-04 20:47:05Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: mightyjaym <jmambrosino@gmail.com> # Contributor: moostik <mooostik_at_gmail.com> @@ -17,7 +17,7 @@ optdepends=('vorbis-tools: OGG encoder' 'flac: FLAC encoder' 'lame: MP3 encoder') install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz" +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz" "google_regex.patch") md5sums=('20fdf9a0f89c08f44a151b6bdaab8782' '77b33d8daead89d5f4f15b78a1cd1d55') diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD index 3697a70b7..56769ac4f 100644 --- a/community/critter/PKGBUILD +++ b/community/critter/PKGBUILD @@ -1,15 +1,17 @@ -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> +# $Id: PKGBUILD 57886 2011-11-04 08:24:44Z lcarlier $ +# Contributor: Allan McRae <mcrae_allan@hotmail.com> +# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> pkgname=critter _origname=CriticalMass pkgver=1.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game" arch=('i686' 'x86_64') -url="http://criticalmass.sourceforge.net/critter.php" +url="http://sourceforge.net/projects/criticalmass" license=('GPL') depends=('sdl_image' 'sdl_mixer' 'mesa') -source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-$pkgver.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2 critter-gcc43.patch critter.desktop) md5sums=('e2aff114bffa717fb79c82e1dc473ebe' @@ -17,13 +19,21 @@ md5sums=('e2aff114bffa717fb79c82e1dc473ebe' '98c17809aed964c445adad09827035df') build() { - cd $startdir/src/$_origname-$pkgver + cd ${srcdir}/$_origname-${pkgver} + patch -Np1 -i ../critter-gcc43.patch sed -i 's|-lpng12|-lpng|g' configure + ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$startdir/pkg install - install -Dm644 critter.png ${startdir}/pkg/usr/share/pixmaps/critter.png + make +} + +package() { + cd ${srcdir}/$_origname-${pkgver} + + make DESTDIR=${pkgdir} install + + install -Dm644 critter.png ${pkgdir}/usr/share/pixmaps/critter.png install -Dm644 ../critter.desktop \ - ${startdir}/pkg/usr/share/applications/critter.desktop + ${pkgdir}/usr/share/applications/critter.desktop } diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index 1fad2201e..42b0688a1 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57001 2011-10-18 03:48:42Z ebelanger $ +# $Id: PKGBUILD 57890 2011-11-04 08:33:14Z lcarlier $ # Maintainer: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=7 +pkgrel=8 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64') url="http://openil.sourceforge.net/" @@ -18,16 +18,16 @@ md5sums=('7918f215524589435e5ec2e8736d5e1d' '0f839ccefd43b0ee8b4b3f99806147fc') build() { - cd $srcdir/devil-$pkgver + cd ${srcdir}/devil-$pkgver - patch -Np1 -i $srcdir/libpng14.patch + patch -Np1 -i ${srcdir}/libpng14.patch ./configure --prefix=/usr --enable-ILU --enable-ILUT --enable-opengl --enable-sdl make } package() { - cd $srcdir/devil-$pkgver + cd ${srcdir}/devil-$pkgver - make prefix=$pkgdir/usr install + make prefix=${pkgdir}/usr install } diff --git a/community/egoboo/PKGBUILD b/community/egoboo/PKGBUILD index 08d8bc934..bbb759c28 100644 --- a/community/egoboo/PKGBUILD +++ b/community/egoboo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57498 2011-10-29 13:47:47Z lcarlier $ +# $Id: PKGBUILD 57902 2011-11-04 09:04:39Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> @@ -7,7 +7,7 @@ pkgname=egoboo pkgver=2.8.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL') pkgdesc="An open-source action RPG/dungeon crawling adventure with OpenGL 3D graphics" diff --git a/community/fuseiso/PKGBUILD b/community/fuseiso/PKGBUILD index cfc87ea2c..39ee9bffc 100644 --- a/community/fuseiso/PKGBUILD +++ b/community/fuseiso/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54617 2011-08-22 06:10:07Z lcarlier $ +# $Id: PKGBUILD 57911 2011-11-04 11:59:27Z lcarlier $ # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=fuseiso pkgver=20070708 -pkgrel=3 +pkgrel=4 pkgdesc="FUSE module to mount ISO filesystem images" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/fuseiso/" diff --git a/community/gtk-kde4/PKGBUILD b/community/gtk-kde4/PKGBUILD index b4bfe18a0..367b79207 100644 --- a/community/gtk-kde4/PKGBUILD +++ b/community/gtk-kde4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 31082 2010-10-26 19:44:12Z lcarlier $ +# $Id: PKGBUILD 57913 2011-11-04 12:08:54Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Viliam Pucik <viliam dot pucik at gmail dot com> pkgname=gtk-kde4 pkgver=0.9.5b -pkgrel=1 +pkgrel=2 pkgdesc='Allows you to change style, icons, font of GTK applications in KDE4.' arch=('i686' 'x86_64') url='http://kde-look.org/content/show.php?content=74689' diff --git a/community/hping/PKGBUILD b/community/hping/PKGBUILD index dce8a2d72..ee6b4e835 100644 --- a/community/hping/PKGBUILD +++ b/community/hping/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 32612 2010-11-15 22:11:14Z lfleischer $ +# $Id: PKGBUILD 57877 2011-11-04 07:45:07Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=hping pkgver=3.0.0 -pkgrel=1 -pkgdesc='hping is a command-line oriented TCP/IP packet assembler/analyzer.' +pkgrel=2 +pkgdesc='A command-line oriented TCP/IP packet assembler/analyzer.' arch=('i686' 'x86_64') url='http://www.hping.org' license=('GPL2' 'BSD') @@ -20,7 +20,7 @@ md5sums=('ca4ea4e34bcc2162aedf25df8b2d1747' build() { cd "${srcdir}/hping3-20051105" - [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../bytesex.h.patch + [[ "$CARCH" == "x86_64" ]] && patch -Np1 -i ../bytesex.h.patch MANPATH=/usr/share/man ./configure --no-tcl make diff --git a/community/hsetroot/PKGBUILD b/community/hsetroot/PKGBUILD index 37f14ea83..e6b8b4992 100644 --- a/community/hsetroot/PKGBUILD +++ b/community/hsetroot/PKGBUILD @@ -4,7 +4,7 @@ pkgname=hsetroot pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='A tool which allows you to compose wallpapers for X.' url='http://www.thegraveyard.org/hsetroot.php' license=('GPL') diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD index 620d34ca6..6f2ef773e 100644 --- a/community/iasl/PKGBUILD +++ b/community/iasl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57443 2011-10-27 20:27:47Z lcarlier $ +# $Id: PKGBUILD 57915 2011-11-04 12:13:21Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com> pkgname=iasl pkgver=20110922 -pkgrel=1 +pkgrel=2 pkgdesc="Intel ACPI Source Language compiler" arch=('i686' 'x86_64') url="http://acpica.org" diff --git a/community/kaudiocreator/PKGBUILD b/community/kaudiocreator/PKGBUILD index cd6f3fd99..f0fef23d0 100644 --- a/community/kaudiocreator/PKGBUILD +++ b/community/kaudiocreator/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55199 2011-09-06 06:39:38Z lcarlier $ +# $Id: PKGBUILD 57921 2011-11-04 14:03:31Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=kaudiocreator pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php/KAudioCreator?content=107645" diff --git a/community/kgraphviewer/PKGBUILD b/community/kgraphviewer/PKGBUILD index 3c31a4838..e40108382 100644 --- a/community/kgraphviewer/PKGBUILD +++ b/community/kgraphviewer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 50630 2011-06-29 08:39:25Z lcarlier $ +# $Id: PKGBUILD 57923 2011-11-04 14:25:20Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kgraphviewer pkgver=2.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A Graphviz dot graph file viewer for KDE" arch=('i686' 'x86_64') url='http://opendesktop.org/content/show.php?content=23999' diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index 576477ef8..d251f7ac9 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 53704 2011-08-07 21:16:33Z lcarlier $ +# $Id: PKGBUILD 57927 2011-11-04 15:11:18Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> pkgname=knemo pkgver=0.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=12956" diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD index 3af883844..834afe33f 100644 --- a/community/kphotoalbum/PKGBUILD +++ b/community/kphotoalbum/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56337 2011-10-05 19:08:01Z andrea $ +# $Id: PKGBUILD 57929 2011-11-04 16:33:01Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com> @@ -7,7 +7,7 @@ pkgname=kphotoalbum pkgver=4.1.1 -pkgrel=10 +pkgrel=11 pkgdesc="KDE Photo Album, picture collection manager" url="http://www.kphotoalbum.org/" arch=('i686' 'x86_64') diff --git a/community/kpovmodeler/PKGBUILD b/community/kpovmodeler/PKGBUILD index e874a0c30..ef0506a54 100644 --- a/community/kpovmodeler/PKGBUILD +++ b/community/kpovmodeler/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 27553 2010-09-25 08:31:17Z andrea $ +# $Id: PKGBUILD 57931 2011-11-04 17:14:03Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kpovmodeler pkgver=1.1.3 _kdever=4.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="A graphical editor for povray scenes" arch=('i686' 'x86_64') url='http://kpovmodeler.org' @@ -19,8 +19,10 @@ md5sums=('aee8461cc813bb8e21ece3339c677288') build() { cd ${srcdir} + mkdir build cd build + cmake ../${pkgname}-${pkgver}-kde${_kdever} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr @@ -29,5 +31,6 @@ build() { package() { cd ${srcdir}/build + make DESTDIR=${pkgdir} install } diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD index fb2fa4336..3328af055 100644 --- a/community/krecipes/PKGBUILD +++ b/community/krecipes/PKGBUILD @@ -7,7 +7,7 @@ pkgname=krecipes pkgver=2.0beta2 _pkgver=2.0-beta2 -pkgrel=1 +pkgrel=2 pkgdesc="A tool designed to make organizing your personal recipes collection fast and easy" arch=('i686' 'x86_64') url="http://extragear.kde.org/apps/krecipes/" @@ -21,8 +21,10 @@ md5sums=('4c01ccad7ad1409cb35c824a61250fe2') build() { cd ${srcdir} + mkdir build cd build + cmake ../${pkgname}-${_pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr @@ -31,5 +33,6 @@ build() { package() { cd ${srcdir}/build + make DESTDIR=${pkgdir} install } diff --git a/community/libesmtp/PKGBUILD b/community/libesmtp/PKGBUILD index f254a928e..76c54991e 100644 --- a/community/libesmtp/PKGBUILD +++ b/community/libesmtp/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 31477 2010-10-31 23:37:55Z loui $ +# $Id: PKGBUILD 57896 2011-11-04 08:47:23Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libesmtp pkgver=1.0.6 -pkgrel=1 -pkgdesc="A library to manage posting (or submission of) electronic mail using SMTP to a preconfigured Mail Transport Agent (MTA)" +pkgrel=2 +pkgdesc='A library to manage posting mail to a preconfigured MTA.' arch=('i686' 'x86_64') -url="http://www.stafford.uklinux.net/libesmtp/" +url='http://www.stafford.uklinux.net/libesmtp/' license=('LGPL') depends=('openssl') -source=(http://www.stafford.uklinux.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +source=("http://www.stafford.uklinux.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('bf3915e627fd8f35524a8fdfeed979c8') options=('!libtool') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('bf3915e627fd8f35524a8fdfeed979c8') diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 314eac204..c9d204dc6 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55891 2011-09-24 16:49:03Z stephane $ +# $Id: PKGBUILD 57940 2011-11-04 18:08:34Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays pkgver=0.8 _pkgver=ed424ec77571 -pkgrel=5 +pkgrel=6 epoch=0 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index dd58e3676..0796e26b4 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54540 2011-08-19 22:35:41Z ebelanger $ +# $Id: PKGBUILD 57947 2011-11-04 18:37:21Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -6,20 +6,22 @@ pkgname=luxrender pkgver=0.8 _pkgver=45d3e13eb94c _luxblend=9cb3fcee0be8 -_blender=2.59 -pkgrel=8 +_blender=2.60 +pkgrel=9 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') depends=('boost-libs' 'freeimage' 'openexr' 'libcl') -optdepends=('blender: Blender exporter' 'qt: Qt GUI') +optdepends=('blender: Blender exporter' 'qt: Qt GUI' \ + 'nvidia-utils: OpenCL support for nVidia GPUs' \ + 'amdstream: OpenCL support for AMD GPUs' \ + 'intel-opencl-sdk: OpenCL support for Intel CPUs') makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers') -install=luxrender.install source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2 \ - ftp://ftp.archlinux.org/other/community/luxrender/luxblend-"$pkgver".tar.bz2) + https://bitbucket.org/luxrender/luxblend25/get/v08-2.60.tar.bz2) md5sums=('0f2d856385db72131f51e44a7ee527fa' - '0c3c8d9efba76133f8c687b5dd2bca8a') + '004596f577bbe681358c40507b2583e8') build() { cd "$srcdir"/luxrender-lux-$_pkgver @@ -43,9 +45,9 @@ package() { # fix library path on x86_64 [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - # install blender exporter + # install the blender exporter install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons - cp -a "$srcdir"/luxrender-luxblend25-$_luxblend/src/luxrender \ + cp -a "$srcdir"/luxrender-luxblend25-v08-2.60/src/luxrender \ "$pkgdir"/usr/share/blender/$_blender/scripts/addons cp -a "$srcdir"/luxrender-lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/ } diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index e93d30b6e..12462f625 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 57777 2011-11-02 15:28:31Z ibiru $ +# $Id: PKGBUILD 57938 2011-11-04 18:07:05Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight Display Manager (part of LXDE)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lxdm/" @@ -26,7 +26,7 @@ md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' '705f394052fdd0dec22e95321d170de0') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm make @@ -36,18 +36,12 @@ build() { package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="${pkgdir}" install install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm - # these files are not in the package, but should be owned by lxdm - taken from Fedora pkg - #touch ${pkgdir}/etc/lxdm/xinitrc - install -d ${pkgdir}/var/{lib,run}/lxdm - #touch ${pkgdir}/var/lib/lxdm/lxdm.conf - # fix the greeter location - # on 0.4.1 this sed have to changed since they changed the default path sed -i -e "s/local\/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf } diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install index 8d42de90f..522f9e3b1 100644 --- a/community/lxdm/lxdm.install +++ b/community/lxdm/lxdm.install @@ -1,59 +1,17 @@ pkgname=lxdm post_install() { - # make sure the group and user "lxdm" exist on this system and have the correct values - if grep -q "^lxdm:" /etc/group &> /dev/null ; then - groupmod -g 121 -n lxdm lxdm &> /dev/null - else - groupadd -g 121 lxdm &> /dev/null - fi - - if grep -q "^lxdm:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm lxdm &> /dev/null - else - useradd -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm -m -r lxdm &> /dev/null - fi - passwd -l lxdm > /dev/null - -# chown root:lxdm /etc/lxdm/{lxdm.conf,xinitrc} > /dev/null - chown root:lxdm /etc/lxdm/lxdm.conf > /dev/null - chown -R root:lxdm /var/lib/lxdm > /dev/null - chown -R root:lxdm /var/run/lxdm > /dev/null - -cat << EOF ->>> To make the LXDM as your default DM, ->>> put, 'lxdm' or '@lxdm' (without quotes) on DAEMONS in /etc/rc.conf ->>> ->>> You can also use /etc/inittab, ->>> just add 'x:5:respawn:/usr/sbin/lxdm >& /dev/null' (without quotes) ->>> in the end of the file /etc/inittab ->>> and uncoment the line on the top 'id:5:initdefault:'. -EOF + getent group lxdm > /dev/null 2>&1 || groupadd -g 121 lxdm + getent passwd lxdm > /dev/null 2>&1 || useradd -c 'LXDE Display Manager' -u 121 -g lxdm -d /var/lib/lxdm -s /sbin/nologin lxdm + passwd -l lxdm > /dev/null + chown -R lxdm:lxdm /var/lib/lxdm > /dev/null } post_upgrade() { - # make sure the group and user "lxdm" exist on this system and have the correct values - if grep -q "^lxdm:" /etc/group &> /dev/null ; then - groupmod -g 121 -n lxdm lxdm &> /dev/null - else - groupadd -g 121 lxdm &> /dev/null - fi - - if grep -q "^lxdm:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm lxdm &> /dev/null - else - useradd -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm -m -r lxdm &> /dev/null - fi - passwd -l lxdm > /dev/null - -# chown root:lxdm /etc/lxdm/{lxdm.conf,xinitrc} > /dev/null - chown root:lxdm /etc/lxdm/lxdm.conf > /dev/null - chown -R root:lxdm /var/lib/lxdm > /dev/null - chown -R root:lxdm /var/run/lxdm > /dev/null + post_install } post_remove() { - # Removing lxdm group+user - getent passwd lxdm >/dev/null 2>&1 && userdel lxdm #|| /bin/true - getent group lxdm >/dev/null 2>&1 && groupdel lxdm #|| /bin/true + getent passwd lxdm > /dev/null 2>&1 && userdel lxdm + getent group lxdm > /dev/null 2>&1 && groupdel lxdm } diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index 2acfd7516..dae948032 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56264 2011-10-04 09:39:17Z spupykin $ +# $Id: PKGBUILD 57954 2011-11-04 21:05:32Z lcarlier $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> @@ -10,20 +10,22 @@ pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") arch=('i686' 'x86_64') -depends=() options=('docs') -source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" +#source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" "${pkgname}.rc") md5sums=('b42f2214de6f4feb992556149edc67fa' 'f039a77d7bde3518d3d695b144816e8a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + mkdir -p $pkgdir/usr/share/doc/mcelog make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron" diff --git a/community/pidgin-musictracker/PKGBUILD b/community/pidgin-musictracker/PKGBUILD index 591871645..16300fcf3 100644 --- a/community/pidgin-musictracker/PKGBUILD +++ b/community/pidgin-musictracker/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 35447 2010-12-20 16:56:30Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor : Ionut Biru <ionut@archlinux.ro> +# $Id: PKGBUILD 57892 2011-11-04 08:42:55Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Ionut Biru <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=pidgin-musictracker pkgver=0.4.22 -pkgrel=1 +pkgrel=2 pkgdesc="A plugin for Pidgin which displays the music track currently playing." url='http://code.google.com/p/pidgin-musictracker' license=('GPL2') depends=('pidgin' 'gtk2' 'dbus-glib') makedepends=('xmms2') arch=('i686' 'x86_64') -source=(http://pidgin-musictracker.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +source=("http://pidgin-musictracker.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') md5sums=('8d7225c705484db86b864cab5a536423') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make - make DESTDIR=${pkgdir} install +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/python-numarray/PKGBUILD b/community/python-numarray/PKGBUILD index 9a27928e4..02d098a71 100644 --- a/community/python-numarray/PKGBUILD +++ b/community/python-numarray/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 34440 2010-12-07 21:07:34Z lfleischer $ +# $Id: PKGBUILD 57888 2011-11-04 08:26:37Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> pkgname=python-numarray pkgver=1.5.2 -pkgrel=4 +pkgrel=5 pkgdesc='Provides array manipulation and computational capabilities.' arch=('i686' 'x86_64') url='http://numpy.scipy.org/' diff --git a/community/tcsh/PKGBUILD b/community/tcsh/PKGBUILD index 772cf8afc..a1ac07f5b 100644 --- a/community/tcsh/PKGBUILD +++ b/community/tcsh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 34438 2010-12-07 21:04:26Z lfleischer $ +# $Id: PKGBUILD 57883 2011-11-04 08:18:37Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tcsh pkgver=6.17.00 -pkgrel=3 +pkgrel=4 pkgdesc='Enhanced version of the Berkeley C shell.' arch=('i686' 'x86_64') url='http://www.tcsh.org/Welcome' diff --git a/community/wyrd/PKGBUILD b/community/wyrd/PKGBUILD index e93adb06e..81973859a 100644 --- a/community/wyrd/PKGBUILD +++ b/community/wyrd/PKGBUILD @@ -1,27 +1,27 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Jeff Mickey <jeff@archlinux.org> -# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> +# Contributor: Daniel J Griffiths <griffithsdj@archlinux.us> pkgname=wyrd pkgver=1.4.5 -pkgrel=1 -pkgdesc="A text-based front-end to Remind." +pkgrel=3 +pkgdesc='A text-based front-end to Remind.' arch=('i686' 'x86_64') -url="http://pessimization.com/software/wyrd/" +url='http://pessimization.com/software/wyrd/' license=('GPL') depends=('remind' 'ncurses') makedepends=('ocaml') -source=(http://pessimization.com/software/wyrd/${pkgname}-${pkgver}.tar.gz) +source=("http://pessimization.com/software/wyrd/${pkgname}-${pkgver}.tar.gz") md5sums=('3f39fa83a54d2d890823094aba9ca3cc') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --enable-utf8 make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 6979842b3..8de47d4de 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 129828 2011-06-29 04:14:18Z allan $ +# $Id: PKGBUILD 142060 2011-11-04 23:35:49Z allan $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Allan McRae <allan@archlinux.org> @@ -6,7 +6,7 @@ pkgname=bash _basever=4.2 _patchlevel=010 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64') license=('GPL') @@ -16,7 +16,7 @@ backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) depends=('readline>=6.1' 'glibc') provides=('sh') install=bash.install -source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz +source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} dot.bashrc dot.bash_profile dot.bash_logout @@ -24,16 +24,15 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz system.bash_logout) if [ $_patchlevel -gt 000 ]; then for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p)) + source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) done fi build() { cd ${srcdir}/${pkgname}-$_basever - for p in ../bash${_basever//./}-*; do - [[ -e "$p" ]] || continue - msg "applying patch ${p}" - patch -Np0 -i ${p} + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" + patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) done _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\' @@ -74,18 +73,29 @@ package() { } md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' + '8d37a3f97a48c1e56e1a4ded877ed944' '027d6bd8f5f6a06b75bb7698cb478089' '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' 'fe5d3a367f7d5f754214dc05e3d958ab' '472f536d7c9e8250dc4568ec4cfaf294' '1100bc1dda2cdc06ac44d7e5d17864a3' + 'a7184b76eb4a079f10174a0a8f574819' '30e7948079921d3261efcc6a40722135' + 'c4d45307f7e69fe508ce347c4cec1955' '9ea06decec43a198f3d7cf29acc602f8' + '74bddae6eeb9227a04a467d42597a34d' 'fb48f6134d7b013135929476aa0c250c' + '3e6a18226b16c773229246abd07a1f5e' 'e70e45de33426b38153b390be0dbbcd4' + 'e667dc9348ebc3e0e14bfdd87f4b6ff2' 'ce4e5c484993705b27daa151eca242c2' + '41cbd8e57589bc081a546a014ddb12f8' '88d1f96db29461767602e2546803bda7' + 'b8b781520f4c7493a2a1ac3010a44a44' '24c574bf6d6a581e300823d9c1276af6' + '354a0899a7c4b446454c52546562b55b' '4c5835f2fbab36c4292bb334977e5b6d' - '0a51602b535ef661ee707be6c8bdb373') + 'ff4547ca7b508d52101729d61f5b77b6' + '0a51602b535ef661ee707be6c8bdb373' + 'cec7c92a4d8052ea4b29216365d16566') diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 72cb1194c..6636990e4 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138015 2011-09-14 11:16:01Z dreisner $ +# $Id: PKGBUILD 142038 2011-11-04 18:42:20Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -7,12 +7,13 @@ pkgname=curl pkgver=7.22.0 -pkgrel=1 +pkgrel=4 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') -depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') +depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +makedepends=('perl-libwww') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} curlbuild.h) @@ -20,11 +21,11 @@ md5sums=('e8c36126d21c893f085aca233906b5cc' '1b061c348b63ea3e90c3f2c3af6a08d6' '751bd433ede935c8fae727377625a8ae') - -case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in +ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') +case $ptrsize in 8) _curlbuild=curlbuild-64.h ;; 4) _curlbuild=curlbuild-32.h ;; - *) error "unsupported architecture: %s" "$CARCH" + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" exit 1 ;; esac @@ -33,18 +34,18 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure \ - --with-random=/dev/urandom \ --prefix=/usr \ --mandir=/usr/share/man \ --disable-dependency-tracking \ - --enable-ipv6 \ - --disable-ldaps \ --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ --enable-manual \ --enable-versioned-symbols \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ + --enable-threaded-resolver \ --without-libidn \ - --enable-threaded-resolver + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt make } @@ -53,7 +54,10 @@ package() { make DESTDIR="$pkgdir" install + # license install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index 958f5b0e5..18ef7c6d4 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 128670 2011-06-25 12:20:55Z allan $ +# $Id: PKGBUILD 142062 2011-11-04 23:35:52Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep pkgver=2.9 -pkgrel=1 +pkgrel=2 pkgdesc="A string search utility" arch=('i686' 'x86_64') license=('GPL3') @@ -13,8 +13,9 @@ groups=('base') depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('25e41b2aa201104354740961ef36005a') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('25e41b2aa201104354740961ef36005a' + '78b903e88d23890d9e737e1415f4de21') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD index 6eb622dfa..67e967ed8 100644 --- a/core/gzip/PKGBUILD +++ b/core/gzip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137785 2011-09-11 01:35:04Z allan $ +# $Id: PKGBUILD 142064 2011-11-04 23:35:55Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gzip pkgver=1.4 -pkgrel=3 +pkgrel=4 pkgdesc="GNU compression utility" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gzip/" @@ -13,8 +13,9 @@ groups=('base') depends=('glibc' 'bash') makedepends=('patch') install=gzip.install -source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.gz) -md5sums=('e381b8506210c794278f5527cba0e765') +source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.gz{,.sig}) +md5sums=('e381b8506210c794278f5527cba0e765' + '3b11d485d1638f2d16f7494a0486a6e8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -38,6 +39,5 @@ package() { make prefix=${pkgdir}/usr install install -dm755 ${pkgdir}/bin - mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/ - cd $pkgdir/bin + mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/ } diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD index 36b928066..20d09d07d 100644 --- a/core/less/PKGBUILD +++ b/core/less/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 128667 2011-06-25 12:14:07Z allan $ +# $Id: PKGBUILD 142066 2011-11-04 23:35:58Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=less pkgver=444 -pkgrel=1 +pkgrel=2 pkgdesc="A terminal based program for viewing text files" license=('GPL3') arch=('i686' 'x86_64') url="http://www.greenwoodsoftware.com/less" groups=('base') depends=('ncurses' 'pcre') -source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('56f9f76ffe13f70155f47f6b3c87d421') +source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('56f9f76ffe13f70155f47f6b3c87d421' + 'd5fafbd94a9cfdeaad0c82143a033fe5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD index 9d8647bff..de13524da 100644 --- a/core/m4/PKGBUILD +++ b/core/m4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129843 2011-06-29 04:25:22Z allan $ +# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=m4 pkgver=1.4.16 -pkgrel=1 +pkgrel=2 pkgdesc="The GNU macro processor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/m4" @@ -12,11 +12,15 @@ license=('GPL3') groups=('base-devel') depends=('glibc' 'bash') install=m4.install -source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz) -md5sums=('7548ec061a1ba993790159764f522d0e') +source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig} + m4-1.4.16-readlink-einval.patch) +md5sums=('7548ec061a1ba993790159764f522d0e' + 'eebe5c94e74e7551e2e30c5844f1b653' + 'cea138fa9b568d06e46269611cec8dd0') build() { cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch ./configure --prefix=/usr make } diff --git a/core/m4/m4-1.4.16-readlink-einval.patch b/core/m4/m4-1.4.16-readlink-einval.patch new file mode 100644 index 000000000..6a987510d --- /dev/null +++ b/core/m4/m4-1.4.16-readlink-einval.patch @@ -0,0 +1,12 @@ +diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h +--- m4-1.4.16/tests/test-readlink.h.orig 2011-09-19 12:44:58.745546826 +0200 ++++ m4-1.4.16/tests/test-readlink.h 2011-09-19 12:46:00.079548410 +0200 +@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con + ASSERT (errno == ENOENT); + errno = 0; + ASSERT (func ("", buf, sizeof buf) == -1); +- ASSERT (errno == ENOENT); ++ ASSERT (errno == ENOENT || errno == EINVAL); + errno = 0; + ASSERT (func (".", buf, sizeof buf) == -1); + ASSERT (errno == EINVAL); diff --git a/core/mlocate/PKGBUILD b/core/mlocate/PKGBUILD index d6f1f0be4..ef1b74590 100644 --- a/core/mlocate/PKGBUILD +++ b/core/mlocate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118924 2011-04-09 12:46:47Z allan $ +# $Id: PKGBUILD 142070 2011-11-04 23:36:03Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: lydgate pkgname=mlocate pkgver=0.24 -pkgrel=1 +pkgrel=2 pkgdesc="Faster merging drop-in for slocate" arch=('i686' 'x86_64') url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate" diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD index 1b387c6b1..fdf6a0343 100644 --- a/core/ncurses/PKGBUILD +++ b/core/ncurses/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 118921 2011-04-09 12:39:04Z allan $ +# $Id: PKGBUILD 142072 2011-11-04 23:36:06Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=ncurses pkgver=5.9 -pkgrel=1 +pkgrel=2 pkgdesc="System V Release 4.0 curses emulation library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/ncurses/" license=('MIT') depends=('glibc') -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1' + '014ffdbbfec6d41a9a89d6cbe6434638') build() { cd ${srcdir}/ diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD index c51ae2eed..8c0185fa9 100644 --- a/core/patch/PKGBUILD +++ b/core/patch/PKGBUILD @@ -1,31 +1,40 @@ -# $Id: PKGBUILD 99945 2010-11-19 15:36:41Z stephane $ +# $Id: PKGBUILD 142074 2011-11-04 23:36:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=patch pkgver=2.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64') url="http://www.gnu.org/software/patch/patch.html" license=('GPL') groups=('base-devel') depends=('glibc') +makedepends=('ed') optdepends=('ed: Interpret the patch as an ed script; for patch -e functionality(deprecated)') -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz patch-2.6.1-get-arg.patch) -md5sums=('d758eb96d3f75047efc004a720d33daf' '45cd5709adbbcdcb3ab95dc43559c07c') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} + patch-2.6.1-get-arg.patch) +md5sums=('d758eb96d3f75047efc004a720d33daf' + 'f7953f3e472fae5118815e6138372e22' + '45cd5709adbbcdcb3ab95dc43559c07c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} # Fixed argument type for --get # see https://bugzilla.redhat.com/show_bug.cgi?id=553624 - patch -Np1 -i ../patch-2.6.1-get-arg.patch + patch -Np1 -i $srcdir/patch-2.6.1-get-arg.patch ./configure --prefix=/usr --mandir=/usr/share/man make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install } diff --git a/core/pkg-config/PKGBUILD b/core/pkg-config/PKGBUILD index 95ed134c6..ce42fd9b7 100644 --- a/core/pkg-config/PKGBUILD +++ b/core/pkg-config/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124806 2011-05-24 14:39:31Z stephane $ +# $Id: PKGBUILD 142076 2011-11-04 23:36:11Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=pkg-config pkgver=0.26 -pkgrel=1 +pkgrel=2 pkgdesc="A system for managing library compile/link flags" arch=('i686' 'x86_64') url="http://pkgconfig.freedesktop.org/wiki/" @@ -18,7 +18,8 @@ source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) md5sums=('47525c26a9ba7ba14bf85e01509a7234') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} + # Use system popt ./configure --prefix=/usr --with-installed-popt @@ -26,11 +27,11 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD index e6e0000a3..5e268d05e 100644 --- a/core/sed/PKGBUILD +++ b/core/sed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100052 2010-11-20 03:28:20Z stephane $ +# $Id: PKGBUILD 142078 2011-11-04 23:36:15Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sed pkgver=4.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="GNU stream editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/sed" @@ -13,16 +13,22 @@ groups=('base') depends=('acl' 'sh') makedepends=('gettext') install=sed.install -source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz) -md5sums=('f0fd4d7da574d4707e442285fd2d3b86') +source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('f0fd4d7da574d4707e442285fd2d3b86' + '91871b227dbf0916e019ba1fb0fbfdf3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --bindir=/bin --without-included-regex make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD index 1ddcafe09..f064f08c1 100644 --- a/core/tar/PKGBUILD +++ b/core/tar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129859 2011-06-29 04:33:10Z allan $ +# $Id: PKGBUILD 142080 2011-11-04 23:36:17Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=tar pkgver=1.26 -pkgrel=1 +pkgrel=2 pkgdesc="Utility used to store, backup, and transport files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/tar/tar.html" @@ -13,10 +13,11 @@ groups=('base') depends=('glibc' 'sh') options=('!emptydirs') install=tar.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} tar.1) md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1' - 'e0538778516a284e3558c454b2576c2f') + '6618d5fe7785e138c27d7d6a24e998b2' + 'e97e7343f4e23724b4c48bca2f033e38') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/core/tar/tar.1 b/core/tar/tar.1 index 872c8dcec..75bbcd38c 100644 --- a/core/tar/tar.1 +++ b/core/tar/tar.1 @@ -1,5 +1,5 @@ -.\" generated by script on Wed Mar 10 17:01:09 2010 -.Dd Mar 10, 2010 +.\" generated by script on Fri Aug 19 16:19:30 2011 +.Dd Aug 19, 2011 .Dt TAR 1 .Sh NAME .Nm tar @@ -110,6 +110,8 @@ use archive file or device ARCHIVE run script at end of each tape (implies -M) .It Fl \-force\-local archive file is local even if it has a colon +.It Fl \-full\-time +print file time to its full resolution .It Fl g , Fl \-listed\-incremental Ar FILE handle new GNU-format incremental backup .It Fl G , Fl \-incremental @@ -283,7 +285,7 @@ unquote filenames read with -T (default) .It Fl \-no\-unquote do not unquote filenames read with -T .It Fl \-utc -print file modification dates in UTC +print file modification times in UTC .It Fl v , Fl \-verbose verbosely list files processed .It Fl V , Fl \-label Ar TEXT @@ -329,6 +331,7 @@ Device or file to use for the archive if .Fl \-file is not specified. If this environment variable is unset, use stdin or stdout instead. +.It Ev TAR_LONGLINK_100 .El .Sh EXAMPLES Create archive.tar from files foo and bar. diff --git a/core/which/PKGBUILD b/core/which/PKGBUILD index c9a7b1abf..65495fe69 100644 --- a/core/which/PKGBUILD +++ b/core/which/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100049 2010-11-20 03:27:58Z stephane $ +# $Id: PKGBUILD 142082 2011-11-04 23:36:20Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=which pkgver=2.20 -pkgrel=4 +pkgrel=5 pkgdesc="A utility to show the full path of commands" arch=('i686' 'x86_64') url="http://www.xs4all.nl/~carlo17/which" diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index c50e90add..1c9ae1425 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140082 2011-10-06 08:10:19Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142040 2011-11-04 20:43:48Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=3.1 +pkgver=3.3 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') @@ -17,11 +17,12 @@ optdepends=('php: generate a PHP status page for your GPS' 'pygtk: GUI frontends') makedepends=('scons' 'docbook-xsl' 'chrpath') backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') -options=('!libtool' '!buildflags') +options=('!libtool') install="${pkgname}.install" -source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} 'gpsd' 'gpsd.conf.d') -md5sums=('f783c2890774fcafa56bdb968a0372fc' +md5sums=('4cfdcfd88e925f4d0d6c2272fc573ab5' + '90086315ed6f266748b9acb338b903a5' '1f3402f8e33a7032b9ae6dfd077234f7' '3e963df3f9f7ef3572ecc648ae829315') @@ -32,8 +33,8 @@ build() { sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps gpscat gpsfake \ - gpsprof xgps xgpsspeed + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \ + gpscat gpsfake gpsprof xgps xgpsspeed scons prefix=/usr \ systemd=yes \ @@ -62,6 +63,7 @@ package() { chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0 chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps} chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl} + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so install -D -m644 packaging/X11/xgps.desktop \ "${pkgdir}/usr/share/applications/xgps.desktop" diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index f206dd06c..f6b7670b4 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0beta2 -_pkgver=0.8.90 +pkgver=0.9.0rc2 +_pkgver=0.8.95 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('mobile-broadband-provider-info: Database of mobile broadband servic 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install source=("ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2") -sha1sums=('9336049eb00f5e4fe7434e710eeb0bdfc22e0984') +sha1sums=('43df2e26acb1b96f3b5e394568a25d04036a085b') build() { cd "${srcdir}" diff --git a/multilib/lib32-acl/PKGBUILD b/multilib/lib32-acl/PKGBUILD index 162ebf858..6654ef38c 100644 --- a/multilib/lib32-acl/PKGBUILD +++ b/multilib/lib32-acl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id$ +# $Id: PKGBUILD 57960 2011-11-04 22:18:21Z lcarlier $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=lib32-acl pkgver=2.2.51 -pkgrel=1 +pkgrel=2 pkgdesc="Access control list libraries (32-bit)" arch=('x86_64') url="http://savannah.nongnu.org/projects/acl" diff --git a/multilib/lib32-alsa-oss/PKGBUILD b/multilib/lib32-alsa-oss/PKGBUILD index bf8874c8e..bcb47a8e7 100644 --- a/multilib/lib32-alsa-oss/PKGBUILD +++ b/multilib/lib32-alsa-oss/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 26502 2010-09-15 22:26:51Z bluewind $ +# $Id: PKGBUILD 57964 2011-11-04 22:23:42Z lcarlier $ # Maintainer: judd <jvinet@zeroflux.org> _pkgbasename=alsa-oss pkgname=lib32-${_pkgbasename} pkgver=1.0.17 -pkgrel=2 +pkgrel=3 pkgdesc="OSS compatibility library (32 bit)" arch=(x86_64) license=('GPL') diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD index 3c9e3e1f8..a32afa6e4 100644 --- a/multilib/lib32-glib2/PKGBUILD +++ b/multilib/lib32-glib2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56231 2011-10-03 15:46:17Z bluewind $ +# $Id: PKGBUILD 57908 2011-11-04 11:02:50Z bluewind $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> _pkgbasename=glib2 pkgname=lib32-$_pkgbasename -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=1 pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" url="http://www.gtk.org/" @@ -15,7 +15,7 @@ depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename) makedepends=('gcc-multilib' python2) options=('!libtool' '!docs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz) -sha256sums=('d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1') +sha256sums=('82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9') build() { export CC="gcc -m32" @@ -23,7 +23,7 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" cd "${srcdir}/glib-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \ --enable-static --enable-shared --with-pcre=system --disable-fam make } diff --git a/multilib/lib32-libffi/PKGBUILD b/multilib/lib32-libffi/PKGBUILD index ad100170a..9d5ef76fa 100644 --- a/multilib/lib32-libffi/PKGBUILD +++ b/multilib/lib32-libffi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55844 2011-09-23 18:25:45Z lcarlier $ +# $Id: PKGBUILD 57969 2011-11-04 23:32:00Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=lib32-libffi pkgver=3.0.10 -pkgrel=1 +pkgrel=3 pkgdesc="A portable, high level programming interface to various calling conventions (32 bits version)" arch=('x86_64') license=('MIT') @@ -22,6 +22,11 @@ build() { --libdir=/usr/lib32 --libexecdir=/usr/lib32 make +} + +package() { + cd "${srcdir}/libffi-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 6b429ea3f..2075a2eb3 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 57120 2011-10-22 02:03:14Z svenstaro $ +# $Id: PKGBUILD 57956 2011-11-04 21:20:50Z bluewind $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.31 +pkgver=1.3.32 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('9c575dbbb308d269ad76e1c6f5a0866d') +md5sums=('2f8655434711b0ef11247f1bf7c28d13') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/staging/k3b/PKGBUILD b/staging/k3b/PKGBUILD new file mode 100644 index 000000000..785c00f25 --- /dev/null +++ b/staging/k3b/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 142017 2011-11-04 04:07:38Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=k3b +pkgver=2.0.2 +pkgrel=3 +pkgdesc="Feature-rich and easy to handle CD burning application" +arch=('i686' 'x86_64') +url="http://k3b.org/" +license=('GPL') +depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' + 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft') +makedepends=('cmake' 'automoc4' 'docbook-xml') +optdepends=('dvd+rw-tools: for dvd burning support' + 'vcdimager: for vcd burning support' + 'transcode: for advanced mpeg conversion support' + 'emovix: for bootable multimedia cd/dvd support') +options=('!libtool') +install=k3b.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ + k3b-2.0.2-ffmpeg.patch) +sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' + '8120c0e22e6c41ea285ca6060be13723ed91c52b') + +build() { + cd "${srcdir}" + (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch") + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/k3b/k3b-2.0.2-ffmpeg.patch b/staging/k3b/k3b-2.0.2-ffmpeg.patch new file mode 100644 index 000000000..2878b1edc --- /dev/null +++ b/staging/k3b/k3b-2.0.2-ffmpeg.patch @@ -0,0 +1,96 @@ +commit 61ca30beb978f68e72257408777c6433f33129bd +Author: Michal Malek <michalm@jabster.pl> +Date: Sun Aug 28 20:18:53 2011 +0200 + + Fixed compilation with new FFMPEG + + BUG: 274817 + FIXED-IN: 2.0.3 + +diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +index 0ad59fc..0c5f366 100644 +--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() + #else + ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; + #endif +- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { ++ if( codecContext->codec_type != ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif ++ { + kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; + return false; + } +@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const + QString K3bFFMpegFile::title() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->title[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->title ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const + QString K3bFFMpegFile::author() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->author[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->author ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const + QString K3bFFMpegFile::comment() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->comment[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->comment ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer() + #if LIBAVCODEC_VERSION_MAJOR < 52 + int len = ::avcodec_decode_audio( + #else ++ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ int len = ::avcodec_decode_audio3( ++ #else + int len = ::avcodec_decode_audio2( ++ #endif + #endif ++ + #ifdef FFMPEG_BUILD_PRE_4629 + &d->formatContext->streams[0]->codec, + #else +@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer() + #endif + (short*)d->alignedOutputBuffer, + &d->outputBufferSize, ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ &d->packet ); ++#else + d->packetData, d->packetSize ); ++#endif + + if( d->packetSize <= 0 || len < 0 ) + ::av_free_packet( &d->packet ); diff --git a/staging/k3b/k3b.install b/staging/k3b/k3b.install new file mode 100644 index 000000000..413ad60f7 --- /dev/null +++ b/staging/k3b/k3b.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kradio/PKGBUILD b/staging/kradio/PKGBUILD new file mode 100644 index 000000000..485d59029 --- /dev/null +++ b/staging/kradio/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 142035 2011-11-04 16:35:33Z eric $ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=kradio +pkgver=4.0.2 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL2') +pkgdesc="A comfortable KDE radio application" +url="http://kradio.sourceforge.net/" +depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') +makedepends=('pkg-config' 'automoc4' 'cmake') +install=kradio.install +source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff) +options=(!libtool) + +build() { + cd "$srcdir" + (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff") + mkdir build + cd build + cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} +md5sums=('18fea3e2bc7100882075187c6a89f7bd' + '5f407eb75536f39e79c77a70613e8704' + '7d31a4f54602bc109f39cc0a7a1dc50c') diff --git a/staging/kradio/kradio-ffmpeg.diff b/staging/kradio/kradio-ffmpeg.diff new file mode 100644 index 000000000..27d224fec --- /dev/null +++ b/staging/kradio/kradio-ffmpeg.diff @@ -0,0 +1,34 @@ +X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988 + +diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp +index 4cd6cc0..c74d6e2 100644 +--- a/plugins/internetradio/decoder_thread.cpp ++++ b/plugins/internetradio/decoder_thread.cpp +@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + + //av_log_set_level(255); + m_av_pFormatCtx = avformat_alloc_context(); +- memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx)); + m_av_pFormatCtx->probesize = m_maxProbeSize; + m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE; + +@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_pFormatCtx_opened = true; + } + else { +- + // IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start"); + if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) { + if (warningsNotErrors) { +@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_audioStream = -1; + for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) { + // if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) { ++#if LIBAVCODEC_VERSION_MAJOR < 53 + if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream ++#else ++ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream ++#endif + m_av_audioStream = i; + break; + } diff --git a/staging/kradio/kradio.install b/staging/kradio/kradio.install new file mode 100644 index 000000000..af52669f5 --- /dev/null +++ b/staging/kradio/kradio.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD new file mode 100644 index 000000000..cd5c378bd --- /dev/null +++ b/staging/opencv/PKGBUILD @@ -0,0 +1,110 @@ +# $Id: PKGBUILD 142029 2011-11-04 08:15:42Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgbase=opencv +pkgname=('opencv' 'opencv-docs' 'opencv-samples') +_realname=OpenCV +pkgver=2.3.1 +pkgrel=2 +pkgdesc="Open Source Computer Vision Library" +arch=('i686' 'x86_64') +license=('BSD') +url="http://opencv.willowgarage.com/" +depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030' + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') +makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +optdepends=('python2-numpy: Python 2.x interface' + 'eigen2') +options=('!libtool') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-$pkgver.tar.bz2") +md5sums=('827c9f8aa14384c531c73aa165f9b777') + +_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_TESTS=OFF' + '-D ENABLE_SSE=ON' + '-D ENABLE_SSE2=ON' + '-D ENABLE_SSE3=OFF' + '-D ENABLE_SSSE3=OFF' + '-D ENABLE_SSE41=OFF' + '-D ENABLE_SSE42=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D WITH_XINE=ON' + '-D WITH_QT=OFF' + '-D WITH_QT_OPENGL=OFF' + '-D WITH_UNICAP=OFF' + '-D WITH_PVAPI=OFF' + '-D WITH_OPENNI=OFF' + '-D WITH_TBB=OFF' + '-D WITH_IPP=OFF' + '-D WITH_CUDA=OFF' + '-D USE_FAST_MATH=ON') + +build() { + cd "$srcdir/$_realname-$pkgver" + + # x64, i.e "Athlon64" and upwards, can use SSE3 + [ $CARCH = x86_64 ] && \ + _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} + + cmake ${_cmakeopts[@]} . + + make +} + +package_opencv() { + install=$pkgname.install + + cd "$srcdir/$_realname-$pkgver" + + make DESTDIR="$pkgdir" install + + # install license file + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$pkgdir/usr/share" + + # prepare FSH-friendly dirs + if [ -d OpenCV ]; then + mv opencv/samples OpenCV/ + rm -r opencv + mv OpenCV opencv + fi + + # separate docs package; also be -R friendly + [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc" + + # separate samples package + [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples" +} + +package_opencv-docs() { + pkgdesc+=" (documentation)" + depends=() + optdepends=() + options=('docs') + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/doc" + cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" +} + +package_opencv-samples() { + pkgdesc+=" (samples)" + depends=() + optdepends=() + options=() + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/opencv" + cp -r opencv-samples "$pkgdir/usr/share/opencv/samples" +} + +# vim:set ts=2 sw=2 et: diff --git a/staging/opencv/opencv.install b/staging/opencv/opencv.install new file mode 100644 index 000000000..ae3f50d5c --- /dev/null +++ b/staging/opencv/opencv.install @@ -0,0 +1,11 @@ +post_install() { + echo " Documentation and samples are in separate packages:" + echo " * opencv-docs" + echo " * opencv-samples" +} + +post_upgrade() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/db/PKGBUILD b/testing/db/PKGBUILD new file mode 100644 index 000000000..7577ca553 --- /dev/null +++ b/testing/db/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 142046 2011-11-04 22:40:39Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgname=db +pkgver=5.2.36 +pkgrel=2 +pkgdesc="The Berkeley DB embedded database system" +arch=('i686' 'x86_64') +url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" +license=('custom') +depends=('gcc-libs' 'sh') +options=('!libtool') +install=db.install +source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz) +sha1sums=('1a7997e5bcdf504a439f90d9eaed63864806ed5f') + +build() { + cd "${srcdir}/$pkgname-${pkgver}/build_unix" + ../dist/configure --prefix=/usr --enable-compat185 \ + --enable-shared --enable-static --enable-cxx --enable-dbm + make LIBSO_LIBS=-lpthread +} + +package() { + cd "${srcdir}/$pkgname-${pkgver}/build_unix" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/docs + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/db/db.install b/testing/db/db.install new file mode 100644 index 000000000..03b64042d --- /dev/null +++ b/testing/db/db.install @@ -0,0 +1,5 @@ +post_upgrade() { + if [ "$(vercmp $2 5.1)" -lt 0 ]; then + echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases." + fi +} diff --git a/testing/dhcpcd/PKGBUILD b/testing/dhcpcd/PKGBUILD index a6acd400f..422486a8e 100644 --- a/testing/dhcpcd/PKGBUILD +++ b/testing/dhcpcd/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 142006 2011-11-03 21:26:34Z ronald $ +# $Id: PKGBUILD 142023 2011-11-04 06:51:06Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd pkgver=5.2.12 -pkgrel=2 +pkgrel=3 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" arch=('i686' 'x86_64') license=('BSD') groups=('base') -depends=('glibc' 'sh' 'inetutils' 'net-tools') +depends=('glibc' 'sh' 'inetutils' 'iproute2') backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d') + 'dhcpcd.conf.d' 'remove_ifconfig.patch') sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0') + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + 'de3e14a24b479b2832c6671ba12586444bd86ebe') build() { cd ${srcdir}/${pkgname}-${pkgver} + # remove ifconfig call but use ip (iproute2) instead + patch -Np0 -i ${srcdir}/remove_ifconfig.patch + # configure variables ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd diff --git a/testing/dhcpcd/remove_ifconfig.patch b/testing/dhcpcd/remove_ifconfig.patch new file mode 100644 index 000000000..5bcc4a68f --- /dev/null +++ b/testing/dhcpcd/remove_ifconfig.patch @@ -0,0 +1,20 @@ +--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100 ++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100 +@@ -7,7 +7,7 @@ + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if ip link set "$interface" mtu "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ ip link set "$interface" mtu "$new_interface_mtu" + rm "$mtu_dir/$interface" + fi + fi diff --git a/testing/dialog/PKGBUILD b/testing/dialog/PKGBUILD new file mode 100644 index 000000000..e1f83a78f --- /dev/null +++ b/testing/dialog/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 142048 2011-11-04 22:42:38Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgname=dialog +pkgver=1.1_20111020 +pkgrel=1 +pkgdesc="A tool to display dialog boxes from shell scripts" +arch=('i686' 'x86_64') +url="http://invisible-island.net/dialog/" +license=('LGPL2.1') +depends=('ncurses') +source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) +sha1sums=('ddabc0950275db4e9cef382a862ff3b20746e843') + +build() { + cd "${srcdir}/$pkgname-${pkgver/_/-}" + ./configure --prefix=/usr --mandir=/usr/share/man \ + --with-ncursesw --enable-nls + make +} + +package() { + cd "${srcdir}/$pkgname-${pkgver/_/-}" + make DESTDIR="${pkgdir}" install install-lib +} diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD new file mode 100644 index 000000000..a159d301b --- /dev/null +++ b/testing/dnsutils/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 142025 2011-11-04 07:03:15Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> +# Contributor: mario <mario_vazq@hotmail.com> + +pkgname=dnsutils + +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.8.1 +_pkgver=9.8.1 +pkgrel=2 + +pkgdesc='DNS utilities: dig host nslookup' +url='http://www.isc.org/software/bind/' +license=('custom:ISC') +arch=('i686' 'x86_64') +options=('!makeflags') +depends=('openssl' 'krb5' 'idnkit') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'remove-bind.patch') +sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c' + 'b465ef6160b004838f04de9978fe1be8422af777') + +replaces=('bind-tools' 'host') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../remove-bind.patch + export STD_CDEFINES='-DDIG_SIGCHASE' + + # hack to remove unused bloat from the binaries + CFLAGS+=' -fdata-sections -ffunction-sections' + LDFLAGS+=' -Wl,--gc-sections' + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-idn \ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}" + + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + cd bin + make DESTDIR="${pkgdir}" install +} diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch new file mode 100644 index 000000000..19d650964 --- /dev/null +++ b/testing/dnsutils/remove-bind.patch @@ -0,0 +1,25 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 ++++ new/bin/Makefile.in 2011-08-28 19:16:17.245495043 -0700 +@@ -19,8 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +- check confgen @PKCS11_TOOLS@ ++SUBDIRS = dig + TARGETS = + + @BIND9_MAKE_RULES@ +diff -aur old/lib/Makefile.in new/lib/Makefile.in +--- old/lib/Makefile.in 2007-06-19 16:47:13.000000000 -0700 ++++ new/lib/Makefile.in 2011-08-28 19:17:50.828688599 -0700 +@@ -23,7 +23,7 @@ + # Attempt to disable parallel processing. + .NOTPARALLEL: + .NO_PARALLEL: +-SUBDIRS = isc isccc dns isccfg bind9 lwres tests ++SUBDIRS = isc dns isccfg bind9 lwres + TARGETS = + + @BIND9_MAKE_RULES@ diff --git a/testing/gdbm/PKGBUILD b/testing/gdbm/PKGBUILD new file mode 100644 index 000000000..b56c4a3b0 --- /dev/null +++ b/testing/gdbm/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 142050 2011-11-04 22:53:48Z stephane $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=gdbm +pkgver=1.8.3 +pkgrel=9 +pkgdesc="GNU database library" +url="http://www.gnu.org/software/gdbm/gdbm.html" +license=('GPL') +arch=('i686' 'x86_64') +depends=('glibc' 'sh') +source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz + gdbm-1.8.3-zeroheaders.patch + gdbm-1.8.3-fhs.patch) +options=('!libtool' '!makeflags') +install=gdbm.install +md5sums=('1d1b1d5c0245b1c00aff92da751e9aa1' + 'a2ed344be9258775bd718074cf2e4ec6' + '66a7c235416c136dc89efc7d03352514') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Prevent gdbm from storing uninitialized memory content + # to database files. This patch improves security, as the + # uninitialized memory might contain sensitive informations + # from other applications. + # https://bugzilla.redhat.com/show_bug.cgi?id=4457 + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927 + patch -Np1 -i ../gdbm-1.8.3-zeroheaders.patch + + # Make gdbm buildable. + patch -Np1 -i ../gdbm-1.8.3-fhs.patch + + libtoolize --force --copy + aclocal + autoconf + + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + + # flock does not work on nfs, we use fcntl instead + # https://bugzilla.redhat.com/show_bug.cgi?id=477300 + echo "/* We use fcntl locking (POSIX) instead of flock (BSD) */" >> autoconf.h + echo "#undef HAVE_FLOCK" >> autoconf.h + + make prefix=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix=$pkgdir/usr \ + manprefix=$pkgdir/usr/share/man \ + man3dir=$pkgdir/usr/share/man/man3 \ + infodir=$pkgdir/usr/share/info \ + install install-compat + + ln -sf gdbm/gdbm.h $pkgdir/usr/include +} diff --git a/testing/gdbm/gdbm-1.8.3-fhs.patch b/testing/gdbm/gdbm-1.8.3-fhs.patch new file mode 100644 index 000000000..58ce4de0b --- /dev/null +++ b/testing/gdbm/gdbm-1.8.3-fhs.patch @@ -0,0 +1,138 @@ +diff -up gdbm-1.8.3/Makefile.in.fhs gdbm-1.8.3/Makefile.in +--- gdbm-1.8.3/Makefile.in.fhs 2002-10-08 18:09:12.000000000 +0200 ++++ gdbm-1.8.3/Makefile.in 2010-03-10 15:41:01.516025096 +0100 +@@ -1,7 +1,7 @@ + #### Start of system configuration section. #### + + srcdir = @srcdir@ +-top_builddir = . ++top_builddir = @top_builddir@ + VPATH = @srcdir@ + + CC = @CC@ +@@ -14,17 +14,13 @@ INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + +-# File ownership and group +-BINOWN = bin +-BINGRP = bin +- + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + +-DEFS = ++DEFS = @DEFS@ + + # Where the system [n]dbm routines are... +-LIBS = @LIBS@ -lc ++LIBS = @LIBS@ + + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ +@@ -32,16 +28,17 @@ LDFLAGS = @LDFLAGS@ + # Common prefix for installation directories + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-binprefix = $(exec_prefix) +-manprefix = $(prefix) ++datarootdir = @datarootdir@ + + # Directory in which to put libgdbm.a. + libdir = @libdir@ + # The include directory for gdbm.h and dbm.h. + includedir = @includedir@ ++pkgincludedir = $(includedir)/gdbm + # Info and man directories. + infodir = @infodir@ +-man3dir = @mandir@/man3 ++mandir = @mandir@ ++man3dir = $(mandir)/man3 + manext = 3 + + #### End of system configuration section. #### +@@ -57,7 +54,7 @@ manext = 3 + + SHELL = /bin/sh + +-PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm ++PROGS = libgdbm.la testgdbm testdbm testndbm conv2gdbm + + DBM_CF = dbminit.c delete.c fetch.c store.c seq.c close.c + +@@ -127,26 +124,17 @@ all: libgdbm.la libgdbm_compat.la + progs: $(PROGS) + + install: libgdbm.la gdbm.h gdbm.info +- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ +- $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ +- $(INSTALL_ROOT)$(infodir) +- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ +- $(INSTALL_ROOT)$(includedir)/gdbm.h +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ +- $(INSTALL_ROOT)$(man3dir)/gdbm.3 +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ +- $(INSTALL_ROOT)$(infodir)/gdbm.info ++ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) $(man3dir) $(infodir) ++ $(LIBTOOL) install install libgdbm.la $(libdir)/libgdbm.la ++ $(INSTALL_DATA) gdbm.h $(pkgincludedir)/gdbm.h ++ $(INSTALL_DATA) $(srcdir)/gdbm.3 $(man3dir)/gdbm.3 ++ $(INSTALL_DATA) $(srcdir)/gdbm.info $(infodir)/gdbm.info + + install-compat: +- $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ +- $(INSTALL_ROOT)$(includedir) +- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ +- $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ +- $(INSTALL_ROOT)$(includedir)/dbm.h +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ +- $(INSTALL_ROOT)$(includedir)/ndbm.h ++ $(srcdir)/mkinstalldirs $(libdir) $(pkgincludedir) ++ $(LIBTOOL) install install libgdbm_compat.la $(libdir)/libgdbm_compat.la ++ $(INSTALL_DATA) $(srcdir)/dbm.h $(pkgincludedir)/dbm.h ++ $(INSTALL_DATA) $(srcdir)/ndbm.h $(pkgincludedir)/ndbm.h + + #libgdbm.a: $(OBJS) gdbm.h + # rm -f libgdbm.a +@@ -161,7 +149,7 @@ libgdbm.la: $(LOBJS) gdbm.h + libgdbm_compat.la: $(C_LOBJS) gdbm.h + rm -f libgdbm_compat.la + $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \ +- -version-info $(SHLIB_VER) $(C_LOBJS) ++ -version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm + + gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 + rm -f gdbm.h +@@ -172,10 +160,10 @@ gdbm.h: gdbm.proto gdbmerrno.h gdbm.prot + chmod -w gdbm.h + + testgdbm: testgdbm.o libgdbm.la @LIBOBJS@ +- $(LIBTOOL) $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ ++ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testgdbm testgdbm.o libgdbm.la @LIBOBJS@ + + testdbm: testdbm.o libgdbm.la libgdbm_compat.la +- $(LIBTOOL) $(CC) $(LDFLAGS) -o testdbm testdbm.o libgdbm.la libgdbm_compat.la ++ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testdbm testdbm.o $(LIBS) libgdbm_compat.la + + tdbm: testdbm.o + $(CC) $(LDFLAGS) -o tdbm testdbm.o $(LIBS) +@@ -184,7 +172,7 @@ testndbm.o: testndbm.c + $(CC) -c -I. -I$(srcdir) $(CFLAGS) $(DEFS) -DGNU $(srcdir)/testndbm.c + + testndbm: testndbm.o libgdbm.la libgdbm_compat.la +- $(LIBTOOL) $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm.la libgdbm_compat.la ++ $(LIBTOOL) link $(CC) $(LDFLAGS) -o testndbm testndbm.o libgdbm_compat.la + + tndbm.o: testndbm.c + cp $(srcdir)/testndbm.c ./tndbm.c +@@ -195,7 +183,7 @@ tndbm: tndbm.o + $(CC) $(LDFLAGS) -o tndbm tndbm.o $(LIBS) + + conv2gdbm: conv2gdbm.o libgdbm.la @LIBOBJS@ +- $(LIBTOOL) $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm.la @LIBOBJS@ ++ $(LIBTOOL) link $(CC) $(LDFLAGS) -o conv2gdbm conv2gdbm.o $(LIBS) libgdbm_compat.la @LIBOBJS@ + + lintgdbm: + lint $(DEFS) $(LFLAGS) $(DBM_CF) $(NDBM_CF) $(GDBM_CF) testgdbm.c diff --git a/testing/gdbm/gdbm-1.8.3-zeroheaders.patch b/testing/gdbm/gdbm-1.8.3-zeroheaders.patch new file mode 100644 index 000000000..088956aef --- /dev/null +++ b/testing/gdbm/gdbm-1.8.3-zeroheaders.patch @@ -0,0 +1,44 @@ +02_zero-headers.patch by Jeff Johnson <jbj@redhat.com> and Colin Watson <cjwatson@debian.org> + +diff -urNad a/falloc.c b/falloc.c +--- a/falloc.c 2001-02-28 06:52:33.000000000 +0000 ++++ b/falloc.c 2003-09-08 23:58:43.000000000 +0100 +@@ -272,7 +272,7 @@ + + + /* Split the header block. */ +- temp = (avail_block *) malloc (av_size); ++ temp = (avail_block *) calloc (1, av_size); + if (temp == NULL) _gdbm_fatal (dbf, "malloc error"); + /* Set the size to be correct AFTER the pop_avail_block. */ + temp->size = dbf->header->avail.size; +diff -urNad a/gdbmopen.c b/gdbmopen.c +--- a/gdbmopen.c 2003-09-08 23:58:01.000000000 +0100 ++++ b/gdbmopen.c 2003-09-08 23:58:43.000000000 +0100 +@@ -212,7 +212,7 @@ + file_block_size = block_size; + + /* Get space for the file header. */ +- dbf->header = (gdbm_file_header *) malloc (file_block_size); ++ dbf->header = (gdbm_file_header *) calloc (1, file_block_size); + if (dbf->header == NULL) + { + gdbm_close (dbf); +@@ -256,7 +256,7 @@ + (dbf->header->block_size - sizeof (hash_bucket)) + / sizeof (bucket_element) + 1; + dbf->header->bucket_size = dbf->header->block_size; +- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size); ++ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if (dbf->bucket == NULL) + { + gdbm_close (dbf); +@@ -420,7 +420,7 @@ + for(index = 0; index < size; index++) + { + (dbf->bucket_cache[index]).ca_bucket +- = (hash_bucket *) malloc (dbf->header->bucket_size); ++ = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if ((dbf->bucket_cache[index]).ca_bucket == NULL) + { + gdbm_errno = GDBM_MALLOC_ERROR; diff --git a/testing/gdbm/gdbm.install b/testing/gdbm/gdbm.install new file mode 100644 index 000000000..2d1ce2c5a --- /dev/null +++ b/testing/gdbm/gdbm.install @@ -0,0 +1,21 @@ +infodir=/usr/share/info +filelist=(gdbm.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file $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 + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + diff --git a/testing/gettext/PKGBUILD b/testing/gettext/PKGBUILD new file mode 100644 index 000000000..3bd769036 --- /dev/null +++ b/testing/gettext/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 142033 2011-11-04 11:47:22Z tpowa $ +# Maintainer: + +pkgname=gettext +pkgver=0.18.1.1 +pkgrel=4 +pkgdesc="GNU internationalization library" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/gettext/" +license=('GPL') +groups=('base') +depends=('gcc-libs' 'acl' 'sh' 'glib2') +optdepends=('cvs: for autopoint tool') +options=(!libtool !docs) +install=gettext.install +source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz) +md5sums=('3dd55b952826d2b32f51308f2f91aa89') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c + ./configure --prefix=/usr --enable-csharp + make +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make check +#} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gettext/gettext.install b/testing/gettext/gettext.install new file mode 100644 index 000000000..0ff52942f --- /dev/null +++ b/testing/gettext/gettext.install @@ -0,0 +1,22 @@ +infodir=/usr/share/info +filelist=(gettext.info.gz autosprintf.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file $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 $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/heirloom-mailx/PKGBUILD b/testing/heirloom-mailx/PKGBUILD new file mode 100644 index 000000000..eaa3bdddc --- /dev/null +++ b/testing/heirloom-mailx/PKGBUILD @@ -0,0 +1,64 @@ +# $Id: PKGBUILD 142042 2011-11-04 20:49:22Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com> +# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de> + +pkgname=heirloom-mailx +pkgver=12.5 +pkgrel=3 +pkgdesc="A commandline utility for sending and receiving email" +arch=('i686' 'x86_64') +url="http://heirloom.sourceforge.net/mailx.html" +license=('custom') +groups=('base') +depends=('openssl' 'krb5') +optdepends=('smtp-forwarder: for sending mail') +replaces=('mailx' 'mailx-heirloom') +provides=('mailx' 'mailx-heirloom') +conflicts=('mailx' 'mailx-heirloom') +backup=(etc/mail.rc) +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('1998dd6168a68400e533712ae7163c72b6a7c056') +options=('!makeflags') # Does not build with MAKEFLAGS=-jX, X>1 + +# source PKGBUILD && mksource +mksource() { + export CVSROOT=:pserver:anonymous@nail.cvs.sourceforge.net:/cvsroot/nail + D=nail + [ -d "${D}" ] && cvs up "${D}" || cvs co "${D}" + + _dirname=${pkgname}-${pkgver} + mv $D ${_dirname} + tar -cJv --exclude=CVS -f ${_dirname}.tar.xz ${_dirname} + rm -rf ${_dirname} +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's|/etc/nail.rc|/etc/mail.rc|g' mailx.1 + + # For Linux and BSD, this should be set. + echo "set bsdcompat" >> nail.rc + + sed -i "s/pg/less/" cmd1.c + + echo PREFIX=/usr \ + MAILRC=/etc/mail.rc \ + SENDMAIL=/usr/sbin/sendmail \ + MAILSPOOL=/var/spool/mail \ + UCBINSTALL=/bin/install > makeflags + + make `cat makeflags` IPv6=-DHAVE_IPv6_FUNCS +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" `cat makeflags` install + + # For compatibility with the old mailx program + ln -sf mailx "${pkgdir}"/usr/bin/mail + ln -sf mailx.1.gz "${pkgdir}"/usr/share/man/man1/mail.1.gz + + install -D -m0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/keyutils/PKGBUILD b/testing/keyutils/PKGBUILD new file mode 100644 index 000000000..97486239a --- /dev/null +++ b/testing/keyutils/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 142044 2011-11-04 20:54:48Z stephane $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=keyutils +pkgver=1.5.2 +pkgrel=2 +pkgdesc="Linux Key Management Utilities" +arch=(i686 x86_64) +url="http://www.kernel.org" +license=('GPL2' 'LGPL2.1') +depends=('glibc' 'sh') +backup=(etc/request-key.conf) +source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('19811ee31f683058a9aae3e6a3a23a7f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s|/lib64|/lib|g" Makefile + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD new file mode 100644 index 000000000..0ba2538c2 --- /dev/null +++ b/testing/krb5/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 142052 2011-11-04 23:20:14Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=krb5 +pkgver=1.9.2 +pkgrel=1 +pkgdesc="The Kerberos network authentication system" +arch=('i686' 'x86_64') +url="http://web.mit.edu/kerberos/" +license=('custom') +depends=('e2fsprogs' 'libldap' 'keyutils') +makedepends=('perl') +provides=('heimdal') +replaces=('heimdal') +conflicts=('heimdal') +backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar + krb5-kadmind + krb5-kdc + krb5-kpropd + krb5-1.9.1-config-script.patch) +sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' + '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' + '7f402078fa65bb9ff1beb6cbbbb017450df78560' + '7342410760cf44bfa01bb99bb4c49e12496cb46f') +options=('!emptydirs') + +build() { + tar zxvf ${pkgname}-${pkgver}.tar.gz + cd "${srcdir}/${pkgname}-${pkgver}/src" + + # - Make krb5-config suppress CFLAGS output when called with --libs + # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391 + # + # - Omit extra libraries because their interfaces are not exposed to applications + # by libkrb5, unless do_deps is set to 1, which indicates that the caller + # wants the whole list. + # + # Patch from upstream : + # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 + patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch + + # FS#25384 + sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --localstatedir=/var/lib \ + --enable-shared \ + --with-system-et \ + --with-system-ss \ + --disable-rpath \ + --without-tcl \ + --enable-dns-for-realm \ + --with-ldap + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/src" + make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install + + # Sample KDC config file + install -dm 755 "${pkgdir}"/var/lib/krb5kdc + install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + + # Default configuration file + install -dm 755 "${pkgdir}"/etc + install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf + + install -dm 755 "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kpropd "${pkgdir}"/etc/rc.d + + install -dm 755 "${pkgdir}"/usr/share/aclocal + install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/krb5/krb5-1.9.1-2011-006.patch b/testing/krb5/krb5-1.9.1-2011-006.patch new file mode 100644 index 000000000..05a22caf5 --- /dev/null +++ b/testing/krb5/krb5-1.9.1-2011-006.patch @@ -0,0 +1,75 @@ +diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c +index b473611..50c60b7 100644 +--- a/src/plugins/kdb/db2/lockout.c ++++ b/src/plugins/kdb/db2/lockout.c +@@ -169,6 +169,9 @@ krb5_db2_lockout_audit(krb5_context context, + return 0; + } + ++ if (entry == NULL) ++ return 0; ++ + if (!db_ctx->disable_lockout) { + code = lookup_lockout_policy(context, entry, &max_fail, + &failcnt_interval, &lockout_duration); +@@ -176,6 +179,15 @@ krb5_db2_lockout_audit(krb5_context context, + return code; + } + ++ /* ++ * Don't continue to modify the DB for an already locked account. ++ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and ++ * this check is unneeded, but in rare cases, we can fail with an ++ * integrity error or preauth failure before a policy check.) ++ */ ++ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry)) ++ return 0; ++ + /* Only mark the authentication as successful if the entry + * required preauthentication, otherwise we have no idea. */ + if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) { +diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c +index 552e39a..c2f44ab 100644 +--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c ++++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c +@@ -105,6 +105,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor, + CHECK_LDAP_HANDLE(ldap_context); + + if (is_principal_in_realm(ldap_context, searchfor) != 0) { ++ st = KRB5_KDB_NOENTRY; + krb5_set_error_message (context, st, "Principal does not belong to realm"); + goto cleanup; + } +diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c +index a218dc7..fd164dd 100644 +--- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c ++++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c +@@ -165,6 +165,9 @@ krb5_ldap_lockout_audit(krb5_context context, + return 0; + } + ++ if (entry == NULL) ++ return 0; ++ + if (!ldap_context->disable_lockout) { + code = lookup_lockout_policy(context, entry, &max_fail, + &failcnt_interval, +@@ -173,9 +176,16 @@ krb5_ldap_lockout_audit(krb5_context context, + return code; + } + +- entry->mask = 0; ++ /* ++ * Don't continue to modify the DB for an already locked account. ++ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and ++ * this check is unneeded, but in rare cases, we can fail with an ++ * integrity error or preauth failure before a policy check.) ++ */ ++ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry)) ++ return 0; + +- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry)); ++ entry->mask = 0; + + /* Only mark the authentication as successful if the entry + * required preauthentication, otherwise we have no idea. */ diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch new file mode 100644 index 000000000..e5a38498f --- /dev/null +++ b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch @@ -0,0 +1,58 @@ +diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c +--- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 2011-02-09 16:55:36.000000000 -0500 ++++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c 2011-09-26 18:42:01.465190278 -0400 +@@ -470,13 +470,10 @@ + + /***** STATE_REFERRALS *****/ + +-/* +- * Possibly retry a request in the fallback realm after a referral request +- * failure in the local realm. Expects ctx->reply_code to be set to the error +- * from a referral request. +- */ ++/* Possibly try a non-referral request after a referral request failure. ++ * Expects ctx->reply_code to be set to the error from a referral request. */ + static krb5_error_code +-try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx) ++try_fallback(krb5_context context, krb5_tkt_creds_context ctx) + { + krb5_error_code code; + char **hrealms; +@@ -485,9 +482,10 @@ + if (ctx->referral_count > 1) + return ctx->reply_code; + +- /* Only fall back if the original request used the referral realm. */ ++ /* If the request used a specified realm, make a non-referral request to ++ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */ + if (!krb5_is_referral_realm(&ctx->req_server->realm)) +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + + if (ctx->server->length < 2) { + /* We need a type/host format principal to find a fallback realm. */ +@@ -500,10 +498,10 @@ + if (code != 0) + return code; + +- /* Give up if the fallback realm isn't any different. */ ++ /* If the fallback realm isn't any different, use the existing TGT. */ + if (data_eq_string(ctx->server->realm, hrealms[0])) { + krb5_free_host_realm(context, hrealms); +- return ctx->reply_code; ++ return begin_non_referral(context, ctx); + } + + /* Rewrite server->realm to be the fallback realm. */ +@@ -540,9 +538,9 @@ + krb5_error_code code; + const krb5_data *referral_realm; + +- /* Possibly retry with the fallback realm on error. */ ++ /* Possibly try a non-referral fallback request on error. */ + if (ctx->reply_code != 0) +- return try_fallback_realm(context, ctx); ++ return try_fallback(context, ctx); + + if (krb5_principal_compare(context, ctx->reply_creds->server, + ctx->server)) { diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch new file mode 100644 index 000000000..a72a75edf --- /dev/null +++ b/testing/krb5/krb5-1.9.1-config-script.patch @@ -0,0 +1,27 @@ +diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in +--- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500 ++++ krb5-1.9.1/src/krb5-config.in 2011-09-26 18:27:09.018487087 -0400 +@@ -186,7 +186,7 @@ + -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ + -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ + -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ +- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` ++ -e 's#\$(CFLAGS)##'` + + if test $library = 'kdb'; then + lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" +@@ -214,9 +214,13 @@ + fi + + if test $library = 'krb5'; then +- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB" ++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err" + fi + ++ # If we ever support a flag to generate output suitable for static ++ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB" ++ # here. ++ + echo $lib_flags + fi + diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind new file mode 100644 index 000000000..04df0dcff --- /dev/null +++ b/testing/krb5/krb5-kadmind @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kadmind` +case "$1" in + start) + stat_busy "Starting Kerberos Admin Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kadmind + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kadmind + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Admin Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kadmind + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc new file mode 100644 index 000000000..05a03411e --- /dev/null +++ b/testing/krb5/krb5-kdc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/krb5kdc` +case "$1" in + start) + stat_busy "Starting Kerberos Authentication" + if [ -z "$PID" ]; then + /usr/sbin/krb5kdc + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kdc + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Authentication" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kdc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kpropd b/testing/krb5/krb5-kpropd new file mode 100644 index 000000000..a0077d68e --- /dev/null +++ b/testing/krb5/krb5-kpropd @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kpropd` +case "$1" in + start) + stat_busy "Starting Kerberos Database Propagation Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kpropd -S + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon kpropd + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Database Propagation Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kpropd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/module-init-tools/PKGBUILD b/testing/module-init-tools/PKGBUILD new file mode 100644 index 000000000..587af1307 --- /dev/null +++ b/testing/module-init-tools/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 142090 2011-11-05 00:45:30Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=module-init-tools +pkgver=3.16 +pkgrel=2 +pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules" +arch=('i686' 'x86_64') +url="https://modules.wiki.kernel.org" +license=('GPL') +depends=('glibc') +makedepends=('docbook2x') +backup=('etc/modprobe.d/modprobe.conf') +source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2" + modprobe.conf + docfix.patch) +md5sums=('bc44832c6e41707b8447e2847d2019f5' + '325657db471b3190f685e5a89c9b90e3' + '4320d19902ded43bed55c804b065cdc7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # fix headers in SGML manpage sources and an XML typo + patch -Np0 < "$srcdir/docfix.patch" + + ./configure --prefix=/usr --exec-prefix=/ --enable-zlib + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR=$pkgdir install + + # extra modprobe.d conf dir + install -dm755 "$pkgdir/lib/modprobe.d" + + # Install our custom (read: empty) modprobe.conf + install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf" +} diff --git a/testing/module-init-tools/docfix.patch b/testing/module-init-tools/docfix.patch new file mode 100644 index 000000000..0151ca3f1 --- /dev/null +++ b/testing/module-init-tools/docfix.patch @@ -0,0 +1,90 @@ +--- doc/depmod.conf.sgml.orig 2011-06-25 10:07:15.897805024 -0400 ++++ doc/depmod.conf.sgml 2011-06-25 10:07:48.810805020 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/depmod.sgml.orig 2011-06-25 10:07:15.898805024 -0400 ++++ doc/depmod.sgml 2011-06-25 10:07:56.636805021 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +@@ -52,7 +52,7 @@ + <arg><option>-n</option></arg> + <arg><option>-v</option></arg> + <arg><option>-P <replaceable>prefix</replaceable></option></arg> +- <arg><option>-w</option><arg> ++ <arg><option>-w</option></arg> + <arg><option><replaceable>version</replaceable></option></arg> + <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg> + </cmdsynopsis> +--- doc/insmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400 ++++ doc/insmod.sgml 2011-06-25 10:07:59.228805019 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/lsmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400 ++++ doc/lsmod.sgml 2011-06-25 10:08:04.804805020 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/modinfo.sgml.orig 2011-06-25 10:07:15.900805024 -0400 ++++ doc/modinfo.sgml 2011-06-25 10:08:07.630805019 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/modprobe.conf.sgml.orig 2011-06-25 10:07:15.901805024 -0400 ++++ doc/modprobe.conf.sgml 2011-06-25 10:08:10.173805018 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/modprobe.sgml.orig 2011-06-25 10:07:15.902805024 -0400 ++++ doc/modprobe.sgml 2011-06-25 10:08:13.623805019 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/modules.dep.sgml.orig 2011-06-25 10:07:15.903805024 -0400 ++++ doc/modules.dep.sgml 2011-06-25 10:08:19.323805019 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> +--- doc/rmmod.sgml.orig 2011-06-25 10:07:15.904805024 -0400 ++++ doc/rmmod.sgml 2011-06-25 10:08:27.691805017 -0400 +@@ -1,4 +1,5 @@ +-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [ ++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN" ++ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ + <!ENTITY debian "<productname>Debian GNU/Linux</productname>"> + <!ENTITY docbook "<productname>DocBook</productname>"> + <!ENTITY sgml "<abbrev>SGML</abbrev>"> diff --git a/testing/module-init-tools/modprobe.conf b/testing/module-init-tools/modprobe.conf new file mode 100644 index 000000000..551bdfbdf --- /dev/null +++ b/testing/module-init-tools/modprobe.conf @@ -0,0 +1,3 @@ +# +# /etc/modprobe.d/modprobe.conf +# diff --git a/testing/net-tools/PKGBUILD b/testing/net-tools/PKGBUILD index abd59addb..24e6c701e 100644 --- a/testing/net-tools/PKGBUILD +++ b/testing/net-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142002 2011-11-03 21:20:18Z ronald $ +# $Id: PKGBUILD 142021 2011-11-04 06:41:37Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=net-tools pkgver=1.60.20110819cvs -pkgrel=2 +pkgrel=3 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) license=('GPL2') @@ -24,8 +24,8 @@ sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf' build() { cd $srcdir/$pkgname-$pkgver -# patch -Np1 -i ../net-tools-1.60-miiioctl.patch -# patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch + patch -Np1 -i ../net-tools-1.60-miiioctl.patch + patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch yes "" | make } @@ -38,6 +38,6 @@ package() { rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 # hostname is provided by inetutils -# rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname} -# rm -rf "${pkgdir}"/usr/share/man/man1 + rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname} + rm -rf "${pkgdir}"/usr/share/man/man1 } diff --git a/testing/popt/PKGBUILD b/testing/popt/PKGBUILD new file mode 100644 index 000000000..fc6688a4f --- /dev/null +++ b/testing/popt/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 142031 2011-11-04 09:28:13Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=popt +pkgver=1.16 +pkgrel=4 +pkgdesc="A commandline option parser" +arch=('i686' 'x86_64') +url="http://rpm5.org" +license=('custom') +depends=('glibc') +options=('!libtool') +source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('3743beefa3dd6247a73f8f7a32c14c33') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # move libs in /lib + install -Dm755 "${pkgdir}"/usr/lib/libpopt.so.0.0.0 \ + ${pkgdir}/lib/libpopt.so.0.0.0 + + rm "${pkgdir}"/usr/lib/libpopt.so* + ln -sf /lib/libpopt.so "${pkgdir}"/usr/lib/libpopt.so + ln -sf libpopt.so.0 "${pkgdir}"/lib/libpopt.so + ln -sf libpopt.so.0.0.0 "${pkgdir}"/lib/libpopt.so.0 + + # install license + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/rfkill/60-rfkill.rules b/testing/rfkill/60-rfkill.rules new file mode 100644 index 000000000..bc98a3bef --- /dev/null +++ b/testing/rfkill/60-rfkill.rules @@ -0,0 +1 @@ +KERNEL=="rfkill", GROUP="rfkill", MODE="0664" diff --git a/testing/rfkill/PKGBUILD b/testing/rfkill/PKGBUILD new file mode 100644 index 000000000..68d7ec070 --- /dev/null +++ b/testing/rfkill/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 142056 2011-11-04 23:31:12Z stephane $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=rfkill +pkgver=0.4 +pkgrel=3 +pkgdesc="A tool for enabling and disabling wireless devices" +arch=('i686' 'x86_64') +url="http://linuxwireless.org/en/users/Documentation/rfkill" +license=('custom') +depends=('glibc' 'filesystem>=2010.01') +source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + 60-rfkill.rules + rfkill.conf.d + rfkill.rc.d) +backup=(etc/conf.d/rfkill) +md5sums=('727892c0fb35c80ee3849fbe89b45350' + '63f9bf9264911242e430867a41e8918c' + '398e7cadf023e05e3e0c323aa33575b9' + '793f0510e26547eb2632efce7d16e50e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + # License + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Udev rule + install -Dm644 "${srcdir}/60-rfkill.rules" "${pkgdir}/lib/udev/rules.d/60-rfkill.rules" + # Init script + install -Dm644 "${srcdir}/rfkill.conf.d" "${pkgdir}/etc/conf.d/rfkill" + install -Dm755 "${srcdir}/rfkill.rc.d" "${pkgdir}/etc/rc.d/rfkill" +} diff --git a/testing/rfkill/rfkill.conf.d b/testing/rfkill/rfkill.conf.d new file mode 100644 index 000000000..4483da26c --- /dev/null +++ b/testing/rfkill/rfkill.conf.d @@ -0,0 +1,20 @@ +# +# /etc/conf.d/rfkill +# Configuration for the rfkill startup script +# + +# List of devices to block on startup (space-separated) +RFKILL_BLOCK="" + +# List of devices to unblock on startup (space-separated) +RFKILL_UNBLOCK="all" + +# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ... +# See "rfkill list" for available devices +# Examples: +# +# Block all bluetooth devices: +# RFKILL_BLOCK="bluetooth" +# +# Unblock the phy0 wifi device and all wwan devices: +# RFKILL_UNBLOCK="phy0 wwan" diff --git a/testing/rfkill/rfkill.rc.d b/testing/rfkill/rfkill.rc.d new file mode 100755 index 000000000..ce90ee150 --- /dev/null +++ b/testing/rfkill/rfkill.rc.d @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/rfkill + +case "$1" in + start) + for device in ${RFKILL_BLOCK}; do + stat_busy "Blocking rfkill device: ${device}" + /usr/sbin/rfkill block ${device} + if [ $? -eq 0 ]; then + stat_done + else + stat_fail + fi + done + for device in ${RFKILL_UNBLOCK}; do + stat_busy "Unblocking rfkill device: ${device}" + /usr/sbin/rfkill unblock ${device} + if [ $? -eq 0 ]; then + stat_done + else + stat_fail + fi + done + ;; + stop) + ;; + restart) + $0 start + ;; + *) + echo "usage: $0 {start}" + exit 1 + ;; +esac +exit 0 diff --git a/testing/vi/PKGBUILD b/testing/vi/PKGBUILD new file mode 100644 index 000000000..3262ba0fb --- /dev/null +++ b/testing/vi/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 142054 2011-11-04 23:27:15Z stephane $ +# Maintainer: tobias [ tobias at archlinux org ] + +pkgname=vi +pkgver=050325 +pkgrel=2 +epoch=1 +pkgdesc='The original ex/vi text editor.' +arch=('i686' 'x86_64') +url='http://ex-vi.sourceforge.net/' +license=('custom:ex') +depends=('ncurses') +optdepends=('mailx: used by the preserve command for notification') +groups=('base') +options=(strip !libtool emptydirs) +source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2 + exrc.sample + navkeys.patch + increase-tube.patch + preserve_dir.patch) +md5sums=('e668595254233e4d96811083a3e4e2f3' + 'd3b483c994d859232ce369b82a4b5668' + 'aac133930047eafa4f28736cfaf976b3' + 'e596e05a00a24187b576e389fa1de45d' + '419a8755e0dd16e95542bc107e6d2b24') + +build() { + cd "${srcdir}/ex-${pkgver}" + + # apply patches + patch -Np1 -i ../navkeys.patch + patch -Np0 -i ../increase-tube.patch + # FS#20653 + patch -Np1 -i ../preserve_dir.patch + + make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex \ + 'FEATURES=-DCHDIR -DFASTTAG -DUCVISUAL -DMB -DBIT8' TERMLIB=ncurses +} + +package() { + cd "${srcdir}/ex-${pkgver}" + + make PREFIX=/usr LIBEXECDIR=/usr/lib/ex PRESERVEDIR=/var/lib/ex INSTALL=/bin/install \ + DESTDIR="$pkgdir" install + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/vi/exrc.sample b/testing/vi/exrc.sample new file mode 100644 index 000000000..44b3045fd --- /dev/null +++ b/testing/vi/exrc.sample @@ -0,0 +1,5 @@ +" A sample .exrc file. Copy it to your home dir as ~/.exrc in order to work. +set showmode +set noflash +set autoindent +set shiftwidth=2 diff --git a/testing/vi/increase-tube.patch b/testing/vi/increase-tube.patch new file mode 100644 index 000000000..5010798ce --- /dev/null +++ b/testing/vi/increase-tube.patch @@ -0,0 +1,13 @@ +--- config.h 2005-02-19 05:25:39.000000000 -0500 ++++ config.h.fixed 2010-01-04 22:02:01.000000000 -0500 +@@ -95,8 +95,8 @@ + #define TUBESIZE 6000 /* Maximum screen size for visual */ + #else /* VMUNIX */ + #define TUBELINES 100 +-#define TUBECOLS 160 +-#define TUBESIZE 16000 ++#define TUBECOLS 320 ++#define TUBESIZE 32000 + #endif /* VMUNIX */ + + /* diff --git a/testing/vi/navkeys.patch b/testing/vi/navkeys.patch new file mode 100644 index 000000000..46924379c --- /dev/null +++ b/testing/vi/navkeys.patch @@ -0,0 +1,55 @@ +diff -ru ex-050325/ex_tty.c ex-050325-du/ex_tty.c +--- ex-050325/ex_tty.c 2005-03-04 13:42:58.000000000 +0100 ++++ ex-050325-du/ex_tty.c 2009-06-25 20:06:57.000000000 +0200 +@@ -132,7 +132,8 @@ + &ED, &EI, &F0, &F1, &F2, &F3, &F4, &F5, &F6, &F7, &F8, &F9, + &HO, &IC, &IM, &IP, &KD, &KE, &KH, &KL, &KR, &KS, &KU, &LL, &ND, &xNL, + &xPC, &RC, &SC, &SE, &SF, &SO, &SR, &TA, &TE, &TI, &UP, &VB, &VS, &VE, +- &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM ++ &AL_PARM, &DL_PARM, &UP_PARM, &DOWN_PARM, &LEFT_PARM, &RIGHT_PARM, ++ &kI, &kD, &kh, &at7, &kP, &kN + }; + bool *sflags[] = { + &AM, &BS, &DA, &DB, &EO, &HC, +@@ -170,7 +171,12 @@ + addmac1(KD, "j", "down", arrows, 1); + addmac1(KL, "h", "left", arrows, 1); + addmac1(KR, "l", "right", arrows, 1); +- addmac1(KH, "H", "home", arrows, 1); ++ addmac1(kI, "i", "insert", arrows, 1); ++ addmac1(kD, "x", "delete", arrows, 1); ++ addmac1(kh, "^", "home", arrows, 1); ++ addmac1(at7, "$", "end", arrows, 1); ++ addmac1(kP, "", "pgup", arrows, 1); ++ addmac1(kN, "", "pgdn", arrows, 1); + + /* + * Handle funny termcap capabilities +@@ -341,7 +347,7 @@ + *(*fp++) = flag; + namp += 2; + } while (*namp); +- namp = "albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERI"; ++ namp = "albcbtcdceclcmcrcsdcdldmdoedeik0k1k2k3k4k5k6k7k8k9hoicimipkdkekhklkrkskullndnlpcrcscsesfsosrtatetiupvbvsveALDLUPDOLERIkIkDkh@7kPkN"; + sp = sstrs; + do { + string = tgetstr(namp, &aoftspace); +diff -ru ex-050325/ex_tty.h ex-050325-du/ex_tty.h +--- ex-050325/ex_tty.h 2004-12-01 19:21:06.000000000 +0100 ++++ ex-050325-du/ex_tty.h 2009-06-25 20:06:05.000000000 +0200 +@@ -183,6 +183,15 @@ + var bool XX; /* Tektronix 4025 insert line */ + /* X? is reserved for severely nauseous glitches */ + /* If there are enough of these we may need bit masks! */ ++/* ++ * Insert, Delete, Home, End, PgUp an PgDown keys ++ */ ++var char *kI; ++var char *kD; ++var char *kh; ++var char *at7; ++var char *kP; ++var char *kN; + + /* + * From the tty modes... diff --git a/testing/vi/preserve_dir.patch b/testing/vi/preserve_dir.patch new file mode 100644 index 000000000..5209f7b02 --- /dev/null +++ b/testing/vi/preserve_dir.patch @@ -0,0 +1,81 @@ +diff -Naur ex-050325.ori/ex.1 ex-050325/ex.1 +--- ex-050325.ori/ex.1 2005-02-17 07:39:36.000000000 -0500 ++++ ex-050325/ex.1 2011-02-01 16:21:51.496666674 -0500 +@@ -1950,7 +1950,7 @@ + .B /var/tmp/Rx\fInnnnnnnnnn\fP + named buffer temporary + .TP +-.B /var/preserve ++.B /var/lib/ex + preservation directory + .SH DOCUMENTATION + The document +diff -Naur ex-050325.ori/expreserve.c ex-050325/expreserve.c +--- ex-050325.ori/expreserve.c 2005-03-04 07:44:46.000000000 -0500 ++++ ex-050325/expreserve.c 2011-02-01 16:22:06.583333342 -0500 +@@ -272,7 +272,7 @@ + #ifdef notdef + char pattern[] = "/usr/preserve/Exaa`XXXXX"; + #else +-char pattern[] = "/var/preserve/Exa`XXXXXXXXXX"; ++char pattern[] = "/var/lib/ex/Exa`XXXXXXXXXX"; + #endif + + /* +@@ -296,7 +296,7 @@ + timestamp = ctime(&time); + timestamp[16] = 0; /* blast from seconds on */ + putenv("MAILRC=/dev/null"); +- sprintf(cmd, "/bin/mail %s", pp->pw_name); ++ sprintf(cmd, "/usr/bin/mail %s", pp->pw_name); + setuid(getuid()); + mf = popen(cmd, "w"); + if (mf == NULL) +diff -Naur ex-050325.ori/exrecover.c ex-050325/exrecover.c +--- ex-050325.ori/exrecover.c 2005-03-04 07:44:46.000000000 -0500 ++++ ex-050325/exrecover.c 2011-02-01 16:21:51.496666674 -0500 +@@ -167,7 +167,7 @@ + #ifdef notdef + char mydir[] = "/usr/preserve"; + #else +-char mydir[] = "/var/preserve"; ++char mydir[] = "/var/lib/ex"; + #endif + + /* +diff -Naur ex-050325.ori/ex.spec ex-050325/ex.spec +--- ex-050325.ori/ex.spec 2005-03-24 18:50:09.000000000 -0500 ++++ ex-050325/ex.spec 2011-02-01 16:21:51.496666674 -0500 +@@ -20,7 +20,7 @@ + %define libexecdir %{prefix}/5lib + %define mandir %{prefix}/share/man/5man + +-%define preservedir /var/preserve ++%define preservedir /var/lib/ex + + # install command + %define ucbinstall install +diff -Naur ex-050325.ori/Makefile ex-050325/Makefile +--- ex-050325.ori/Makefile 2005-03-24 18:50:09.000000000 -0500 ++++ ex-050325/Makefile 2011-02-01 16:21:51.496666674 -0500 +@@ -83,7 +83,7 @@ + BINDIR = $(PREFIX)/bin + LIBEXECDIR = $(PREFIX)/libexec + MANDIR = $(PREFIX)/share/man +-PRESERVEDIR = /var/preserve ++PRESERVEDIR = /var/lib/ex + + # + # DESTDIR is prepended to the installation paths. It is mostly useful +diff -Naur ex-050325.ori/vi.1 ex-050325/vi.1 +--- ex-050325.ori/vi.1 2005-02-17 07:39:36.000000000 -0500 ++++ ex-050325/vi.1 2011-02-01 16:21:51.496666674 -0500 +@@ -979,7 +979,7 @@ + .B /var/tmp/Rx\fInnnnnnnnnn\fP + named buffer temporary + .TP +-.B /var/preserve ++.B /var/lib/ex + preservation directory + .SH SEE ALSO + ex(1), diff --git a/testing/wpa_actiond/PKGBUILD b/testing/wpa_actiond/PKGBUILD new file mode 100644 index 000000000..ff374f5c5 --- /dev/null +++ b/testing/wpa_actiond/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 142088 2011-11-05 00:43:25Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +pkgname=wpa_actiond +pkgver=1.1 +pkgrel=3 +pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events" +arch=('i686' 'x86_64') +url="http://projects.archlinux.org/wpa_actiond.git/" +license=('GPL') +depends=('glibc' 'wpa_supplicant') +source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz) +sha256sums=('d50a49cb5d56c31345d18e58f017b4ff923e8959a7e4e709abd156744f1668c3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make CFLAGS="${CFLAGS}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond" +} +# vim:set ts=2 sw=2 et: diff --git a/testing/wpa_supplicant/PKGBUILD b/testing/wpa_supplicant/PKGBUILD new file mode 100644 index 000000000..34ddb9427 --- /dev/null +++ b/testing/wpa_supplicant/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 142085 2011-11-05 00:39:35Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgname=wpa_supplicant +pkgver=0.7.3 +pkgrel=4 +pkgdesc="A utility providing key negotiation for WPA wireless networks" +url="http://hostap.epitest.fi/wpa_supplicant" +arch=('i686' 'x86_64') +depends=('openssl' 'dbus-core>=1.2.4' 'readline>=6.0' 'libnl') +optdepends=('wpa_supplicant_gui: wpa_gui program') +license=('GPL') +groups=('base') +backup=('etc/wpa_supplicant.conf') +source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz + config dbus.patch) +sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443' + '6a0837f18e5ff179ccd6954f7952dfc2e6aa69f353194ee4cb29c1ed2ef68c5d' + '13effa9ed6a1bb940ffc056a3eabcf64c8cc057069eca5cc1822b98ed769812a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + # Required by NetworkManager 0.8.995 + patch -Np2 -i "$srcdir/dbus.patch" + cp "${srcdir}/config" ./.config + sed -i 's@/usr/local@$(PREFIX)@g' Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}" + make PREFIX=/usr DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/etc" + install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant.conf" + install -d -m755 "${pkgdir}/usr/share/man/man"{5,8} + install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/" + install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/" + rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8 + + install -m755 -d "${pkgdir}/usr/share/dbus-1/system-services" + install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/" + sed -e 's/sbin/usr\/sbin/' -i "${pkgdir}/usr/share/dbus-1/system-services/"*.service + install -m755 -d "${pkgdir}/etc/dbus-1/system.d" + install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf" +} diff --git a/testing/wpa_supplicant/config b/testing/wpa_supplicant/config new file mode 100644 index 000000000..192e338f2 --- /dev/null +++ b/testing/wpa_supplicant/config @@ -0,0 +1,404 @@ +# Example wpa_supplicant build time configuration +# +# This file lists the configuration options that are used when building the +# hostapd binary. All lines starting with # are ignored. Configuration option +# lines must be commented out complete, if they are not to be included, i.e., +# just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cases, these lines should use += in order not +# to override previous values of the variables. + + +# Uncomment following two lines and fix the paths if you have installed OpenSSL +# or GnuTLS in non-default location +#CFLAGS += -I/usr/local/openssl/include +#LIBS += -L/usr/local/openssl/lib + +# Some Red Hat versions seem to include kerberos header files from OpenSSL, but +# the kerberos files are not in the default include path. Following line can be +# used to fix build issues on such systems (krb5.h not found). +#CFLAGS += -I/usr/include/kerberos + +# Example configuration for various cross-compilation platforms + +#### sveasoft (e.g., for Linksys WRT54G) ###################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS += -I../src/include -I../../src/router/openssl/include +#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl +############################################################################### + +#### openwrt (e.g., for Linksys WRT54G) ####################################### +#CC=mipsel-uclibc-gcc +#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc +#CFLAGS += -Os +#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \ +# -I../WRT54GS/release/src/include +#LIBS = -lssl +############################################################################### + + +# Driver interface for Host AP driver +#CONFIG_DRIVER_HOSTAP=y + +# Driver interface for Agere driver +#CONFIG_DRIVER_HERMES=y +# Change include directories to match with the local setup +#CFLAGS += -I../../hcf -I../../include -I../../include/hcf +#CFLAGS += -I../../include/wireless + +# Driver interface for madwifi driver +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_MADWIFI=y +# Set include directory to the madwifi source tree +#CFLAGS += -I../../madwifi + +# Driver interface for ndiswrapper +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_NDISWRAPPER=y + +# Driver interface for Atmel driver +#CONFIG_DRIVER_ATMEL=y + +# Driver interface for old Broadcom driver +# Please note that the newer Broadcom driver ("hybrid Linux driver") supports +# Linux wireless extensions and does not need (or even work) with the old +# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver. +#CONFIG_DRIVER_BROADCOM=y +# Example path for wlioctl.h; change to match your configuration +#CFLAGS += -I/opt/WRT54GS/release/src/include + +# Driver interface for Intel ipw2100/2200 driver +# Deprecated; use CONFIG_DRIVER_WEXT=y instead. +#CONFIG_DRIVER_IPW=y + +# Driver interface for Ralink driver +#CONFIG_DRIVER_RALINK=y + +# Driver interface for generic Linux wireless extensions +CONFIG_DRIVER_WEXT=y + +# Driver interface for Linux drivers using the nl80211 kernel interface +CONFIG_DRIVER_NL80211=y + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib +#LIBS_p += -L/usr/local/lib +#LIBS_c += -L/usr/local/lib + +# Driver interface for Windows NDIS +#CONFIG_DRIVER_NDIS=y +#CFLAGS += -I/usr/include/w32api/ddk +#LIBS += -L/usr/local/lib +# For native build using mingw +#CONFIG_NATIVE_WINDOWS=y +# Additional directories for cross-compilation on Linux host for mingw target +#CFLAGS += -I/opt/mingw/mingw32/include/ddk +#LIBS += -L/opt/mingw/mingw32/lib +#CC=mingw32-gcc +# By default, driver_ndis uses WinPcap for low-level operations. This can be +# replaced with the following option which replaces WinPcap calls with NDISUIO. +# However, this requires that WZC is disabled (net stop wzcsvc) before starting +# wpa_supplicant. +# CONFIG_USE_NDISUIO=y + +# Driver interface for development testing +#CONFIG_DRIVER_TEST=y + +# Include client MLME (management frame processing) for test driver +# This can be used to test MLME operations in hostapd with the test interface. +# space. +#CONFIG_CLIENT_MLME=y + +# Driver interface for wired Ethernet drivers +CONFIG_DRIVER_WIRED=y + +# Driver interface for the Broadcom RoboSwitch family +#CONFIG_DRIVER_ROBOSWITCH=y + +# Driver interface for no driver (e.g., WPS ER only) +#CONFIG_DRIVER_NONE=y + +# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is +# included) +CONFIG_IEEE8021X_EAPOL=y + +# EAP-MD5 +CONFIG_EAP_MD5=y + +# EAP-MSCHAPv2 +CONFIG_EAP_MSCHAPV2=y + +# EAP-TLS +CONFIG_EAP_TLS=y + +# EAL-PEAP +CONFIG_EAP_PEAP=y + +# EAP-TTLS +CONFIG_EAP_TTLS=y + +# EAP-FAST +# Note: Default OpenSSL package does not include support for all the +# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, +# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch) +# to add the needed functions. +#CONFIG_EAP_FAST=y + +# EAP-GTC +CONFIG_EAP_GTC=y + +# EAP-OTP +CONFIG_EAP_OTP=y + +# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) +#CONFIG_EAP_SIM=y + +# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# EAP-PAX +#CONFIG_EAP_PAX=y + +# LEAP +CONFIG_EAP_LEAP=y + +# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) +#CONFIG_EAP_AKA=y + +# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). +# This requires CONFIG_EAP_AKA to be enabled, too. +#CONFIG_EAP_AKA_PRIME=y + +# Enable USIM simulator (Milenage) for EAP-AKA +#CONFIG_USIM_SIMULATOR=y + +# EAP-SAKE +#CONFIG_EAP_SAKE=y + +# EAP-GPSK +#CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +#CONFIG_EAP_GPSK_SHA256=y + +# EAP-TNC and related Trusted Network Connect support (experimental) +#CONFIG_EAP_TNC=y + +# Wi-Fi Protected Setup (WPS) +CONFIG_WPS=y + +# EAP-IKEv2 +#CONFIG_EAP_IKEV2=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) +CONFIG_PKCS12=y + +# Smartcard support (i.e., private key on a smartcard), e.g., with openssl +# engine. +CONFIG_SMARTCARD=y + +# PC/SC interface for smartcards (USIM, GSM SIM) +# Enable this if EAP-SIM or EAP-AKA is included +#CONFIG_PCSC=y + +# Development testing +#CONFIG_EAPOL_TEST=y + +# Select control interface backend for external programs, e.g, wpa_cli: +# unix = UNIX domain sockets (default for Linux/*BSD) +# udp = UDP sockets using localhost (127.0.0.1) +# named_pipe = Windows Named Pipe (default for Windows) +# y = use default (backwards compatibility) +# If this option is commented out, control interface is not included in the +# build. +CONFIG_CTRL_IFACE=y + +# Include support for GNU Readline and History Libraries in wpa_cli. +# When building a wpa_cli binary for distribution, please note that these +# libraries are licensed under GPL and as such, BSD license may not apply for +# the resulting binary. +CONFIG_READLINE=y + +# Remove debugging code that is printing out debug message to stdout. +# This can be used to reduce the size of the wpa_supplicant considerably +# if debugging code is not needed. The size reduction can be around 35% +# (e.g., 90 kB). +#CONFIG_NO_STDOUT_DEBUG=y + +# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save +# 35-50 kB in code size. +#CONFIG_NO_WPA=y + +# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to +# save about 1 kB in code size when building only WPA-Personal (no EAP support) +# or 6 kB if building for WPA-Enterprise. +#CONFIG_NO_WPA2=y + +# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support +# This option can be used to reduce code size by removing support for +# converting ASCII passphrases into PSK. If this functionality is removed, the +# PSK can only be configured as the 64-octet hexstring (e.g., from +# wpa_passphrase). This saves about 0.5 kB in code size. +#CONFIG_NO_WPA_PASSPHRASE=y + +# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. +# This can be used if ap_scan=1 mode is never enabled. +#CONFIG_NO_SCAN_PROCESSING=y + +# Select configuration backend: +# file = text file (e.g., wpa_supplicant.conf; note: the configuration file +# path is given on command line, not here; this option is just used to +# select the backend that allows configuration files to be used) +# winreg = Windows registry (see win_example.reg for an example) +CONFIG_BACKEND=file + +# Remove configuration write functionality (i.e., to allow the configuration +# file to be updated based on runtime configuration changes). The runtime +# configuration can still be changed, the changes are just not going to be +# persistent over restarts. This option can be used to reduce code size by +# about 3.5 kB. +#CONFIG_NO_CONFIG_WRITE=y + +# Remove support for configuration blobs to reduce code size by about 1.5 kB. +#CONFIG_NO_CONFIG_BLOBS=y + +# Select program entry point implementation: +# main = UNIX/POSIX like main() function (default) +# main_winsvc = Windows service (read parameters from registry) +# main_none = Very basic example (development use only) +#CONFIG_MAIN=main + +# Select wrapper for operatins system and C library specific functions +# unix = UNIX/POSIX like systems (default) +# win32 = Windows systems +# none = Empty template +#CONFIG_OS=unix + +# Select event loop implementation +# eloop = select() loop (default) +# eloop_win = Windows events and WaitForMultipleObject() loop +# eloop_none = Empty template +#CONFIG_ELOOP=eloop + +# Select layer 2 packet implementation +# linux = Linux packet socket (default) +# pcap = libpcap/libdnet/WinPcap +# freebsd = FreeBSD libpcap +# winpcap = WinPcap with receive thread +# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) +# none = Empty template +#CONFIG_L2_PACKET=linux + +# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) +CONFIG_PEERKEY=y + +# IEEE 802.11w (management frame protection) +# This version is an experimental implementation based on IEEE 802.11w/D1.0 +# draft and is subject to change since the standard has not yet been finalized. +# Driver support is also needed for IEEE 802.11w. +#CONFIG_IEEE80211W=y + +# Select TLS implementation +# openssl = OpenSSL (default) +# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA) +# internal = Internal TLSv1 implementation (experimental) +# none = Empty template +#CONFIG_TLS=openssl + +# Whether to enable TLS/IA support, which is required for EAP-TTLSv1. +# You need CONFIG_TLS=gnutls for this to have any effect. Please note that +# even though the core GnuTLS library is released under LGPL, this extra +# library uses GPL and as such, the terms of GPL apply to the combination +# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not +# apply for distribution of the resulting binary. +#CONFIG_GNUTLS_EXTRA=y + +# If CONFIG_TLS=internal is used, additional library and include paths are +# needed for LibTomMath. Alternatively, an integrated, minimal version of +# LibTomMath can be used. See beginning of libtommath.c for details on benefits +# and drawbacks of this option. +#CONFIG_INTERNAL_LIBTOMMATH=y +#ifndef CONFIG_INTERNAL_LIBTOMMATH +#LTM_PATH=/usr/src/libtommath-0.39 +#CFLAGS += -I$(LTM_PATH) +#LIBS += -L$(LTM_PATH) +#LIBS_p += -L$(LTM_PATH) +#endif +# At the cost of about 4 kB of additional binary size, the internal LibTomMath +# can be configured to include faster routines for exptmod, sqr, and div to +# speed up DH and RSA calculation considerably +#CONFIG_INTERNAL_LIBTOMMATH_FAST=y + +# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. +# This is only for Windows builds and requires WMI-related header files and +# WbemUuid.Lib from Platform SDK even when building with MinGW. +#CONFIG_NDIS_EVENTS_INTEGRATED=y +#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" + +# Add support for old DBus control interface +# (fi.epitest.hostap.WPASupplicant) +CONFIG_CTRL_IFACE_DBUS=y + +# Add support for new DBus control interface +# (fi.w1.hostap.wpa_supplicant1) +CONFIG_CTRL_IFACE_DBUS_NEW=y + +# Add introspection support for new DBus control interface +CONFIG_CTRL_IFACE_DBUS_INTRO=y + +# Add support for loading EAP methods dynamically as shared libraries. +# When this option is enabled, each EAP method can be either included +# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn). +# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to +# be loaded in the beginning of the wpa_supplicant configuration file +# (see load_dynamic_eap parameter in the example file) before being used in +# the network blocks. +# +# Note that some shared parts of EAP methods are included in the main program +# and in order to be able to use dynamic EAP methods using these parts, the +# main program must have been build with the EAP method enabled (=y or =dyn). +# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries +# unless at least one of them was included in the main build to force inclusion +# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included +# in the main build to be able to load these methods dynamically. +# +# Please also note that using dynamic libraries will increase the total binary +# size. Thus, it may not be the best option for targets that have limited +# amount of memory/flash. +#CONFIG_DYNAMIC_EAP_METHODS=y + +# IEEE Std 802.11r-2008 (Fast BSS Transition) +#CONFIG_IEEE80211R=y + +# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) +CONFIG_DEBUG_FILE=y + +# Enable privilege separation (see README 'Privilege separation' for details) +#CONFIG_PRIVSEP=y + +# Enable mitigation against certain attacks against TKIP by delaying Michael +# MIC error reports by a random amount of time between 0 and 60 seconds +#CONFIG_DELAYED_MIC_ERROR_REPORT=y + +# Enable tracing code for developer debugging +# This tracks use of memory allocations and other registrations and reports +# incorrect use with a backtrace of call (or allocation) location. +#CONFIG_WPA_TRACE=y +# For BSD, comment out these. +#LIBS += -lexecinfo +#LIBS_p += -lexecinfo +#LIBS_c += -lexecinfo + +# Use libbfd to get more details for developer debugging +# This enables use of libbfd to get more detailed symbols for the backtraces +# generated by CONFIG_WPA_TRACE=y. +#CONFIG_WPA_TRACE_BFD=y +# For BSD, comment out these. +#LIBS += -lbfd -liberty -lz +#LIBS_p += -lbfd -liberty -lz +#LIBS_c += -lbfd -liberty -lz diff --git a/testing/wpa_supplicant/dbus.patch b/testing/wpa_supplicant/dbus.patch new file mode 100644 index 000000000..4c5002003 --- /dev/null +++ b/testing/wpa_supplicant/dbus.patch @@ -0,0 +1,61 @@ +From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001 +From: Dan Williams <dcbw@redhat.com> +Date: Fri, 17 Dec 2010 15:56:01 +0200 +Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes + +The supplicant was not emitting property changed events when the BSSs +property changed. + +Signed-off-by: Dan Williams <dcbw@redhat.com> +(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72) +--- + wpa_supplicant/dbus/dbus_new.c | 6 ++++++ + wpa_supplicant/dbus/dbus_new.h | 1 + + 2 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c +index bdfbbac..c66640a 100644 +--- a/wpa_supplicant/dbus/dbus_new.c ++++ b/wpa_supplicant/dbus/dbus_new.c +@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, + wpas_dbus_getter_current_network; + prop = "CurrentNetwork"; + break; ++ case WPAS_DBUS_PROP_BSSS: ++ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss; ++ prop = "BSSs"; ++ break; + default: + wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", + __func__, property); +@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s, + } + + wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path); ++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); + + return 0; + } +@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, + } + + wpas_dbus_signal_bss_added(wpa_s, bss_obj_path); ++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); + + return 0; + +diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h +index 80ea98c..9cdefcb 100644 +--- a/wpa_supplicant/dbus/dbus_new.h ++++ b/wpa_supplicant/dbus/dbus_new.h +@@ -30,6 +30,7 @@ enum wpas_dbus_prop { + WPAS_DBUS_PROP_STATE, + WPAS_DBUS_PROP_CURRENT_BSS, + WPAS_DBUS_PROP_CURRENT_NETWORK, ++ WPAS_DBUS_PROP_BSSS, + }; + + enum wpas_dbus_bss_prop { +-- +1.7.4-rc1 + |