diff options
114 files changed, 2677 insertions, 406 deletions
diff --git a/community-testing/csfml/PKGBUILD b/community-testing/csfml/PKGBUILD new file mode 100644 index 000000000..3b7f83b55 --- /dev/null +++ b/community-testing/csfml/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 55864 2011-09-24 02:51:44Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> + +pkgname=csfml + +_git=true + +if [[ "${_git}" = "true" ]]; then + pkgver=1.99.git20110917 +fi + +pkgrel=1 +pkgdesc='C bindings for sfml' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('sfml') +makedepends=('git' 'cmake' 'doxygen') + +_gitroot='https://github.com/LaurentGomila/CSFML.git' +_gitname='CSFML' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + cd $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ + -DBUILD_DOC=true + make + make doc +} + +package() { + cd "$srcdir/$_gitname-build/build/" + + make DESTDIR="$pkgdir/" install + + install -Dm644 ../license.txt \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD new file mode 100644 index 000000000..b48447f75 --- /dev/null +++ b/community/bacula/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com> +# Contributor: Calogero Lo Leggio <kalos@autistici.org> +# Contributor: Matias Hernandez <msdark@archlinux.cl> + +pkgname=bacula +pkgver=5.0.3 +pkgrel=5 +pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)" +arch=("i686" "x86_64") +url="http://www.${pkgname}.org" +license=("GPL") +depends=("libmysqlclient") +makedepends=("qt" "wxgtk" "gtk2") +optdepends=("qt: for bat" + "wxgtk: for bwx console" + "gtk2: for tray monitor") +options=(!buildflags) +conflicts=("${pkgname}-sqlite" "${pkgname}-postgresql" "${pkgname}-client") +backup=("etc/${pkgname}/bconsole.conf" + "etc/${pkgname}/${pkgname}-dir.conf" + "etc/${pkgname}/${pkgname}-fd.conf" + "etc/${pkgname}/${pkgname}-sd.conf") +install="${pkgname}.install" +source=(http://downloads.sourceforge.net/project/bacula/bacula/${pkgver}/${pkgname}-${pkgver}.tar.gz + ${pkgname}-sd.rc.d + ${pkgname}-fd.rc.d + ${pkgname}-dir.rc.d) +md5sums=('9de254ae39cab0587fdb2f5d8d90b03b' + 'e7be4c9fb3c7ce334f9ee24d71652d3e' + 'a9a070a862e9cf39ae4bc374409c721d' + '55619ae3094c698541a3bfedc87bdb48') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # Build + ./configure --prefix=/usr \ + --enable-build-dird --enable-build-stored --enable-smartalloc \ + --enable-bat --enable-tray-monitor --enable-bwx-console \ + --with-mysql --without-openssl \ + --with-dir-user=${pkgname} --with-dir-group=${pkgname} \ + --with-sd-user=${pkgname} --with-sd-group=${pkgname} \ + --sysconfdir=/etc/${pkgname} --with-scriptdir=/etc/${pkgname}/scripts \ + --with-working-dir=/var/cache/${pkgname}/working \ + --with-subsys-dir=/var/cache/${pkgname}/working \ + --with-archivedir=/var/cache/${pkgname}/archive + + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + # Permissions + chmod a+x ${pkgdir}/etc/${pkgname}/scripts/{update_${pkgname}_tables,delete_catalog_backup,update_mysql_tables,make_catalog_backup,bconsole} + + # Daemons + mkdir -p ${pkgdir}/etc/rc.d/ + install -Dm755 ${srcdir}/*.rc.d ${pkgdir}/etc/rc.d/ + + # Logs + install -D -m644 ${srcdir}/${pkgname}-${pkgver}/scripts/logrotate ${pkgdir}/etc/logrotate.d/${pkgname} + sed -i "s|/var/cache/${pkgname}/working/log|/var/log/${pkgname}.log|g" ${pkgdir}/etc/{${pkgname}/${pkgname}-dir.conf,logrotate.d/${pkgname}} +} + diff --git a/community/bacula/bacula-dir.rc.d b/community/bacula/bacula-dir.rc.d new file mode 100644 index 000000000..a5a103dca --- /dev/null +++ b/community/bacula/bacula-dir.rc.d @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/bacula ] || mkdir -p /var/run/bacula + chown bacula:bacula /var/run/bacula + + stat_busy "Starting Bacula Director Daemon" + /usr/sbin/bacula-dir + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon bacula-dir + stat_done + fi + ;; + stop) + stat_busy "Stopping Bacula Director Daemon" + killall bacula-dir > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon bacula-dir + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community/bacula/bacula-fd.rc.d b/community/bacula/bacula-fd.rc.d new file mode 100644 index 000000000..3817a0fed --- /dev/null +++ b/community/bacula/bacula-fd.rc.d @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/bacula ] || mkdir -p /var/run/bacula + chown bacula:bacula /var/run/bacula + + stat_busy "Starting Bacula File Daemon" + /usr/sbin/bacula-fd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon bacula-fd + stat_done + fi + ;; + stop) + stat_busy "Stopping Bacula File Daemon" + killall bacula-fd > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon bacula-fd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community/bacula/bacula-sd.rc.d b/community/bacula/bacula-sd.rc.d new file mode 100644 index 000000000..96f200916 --- /dev/null +++ b/community/bacula/bacula-sd.rc.d @@ -0,0 +1,41 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/bacula ] || mkdir -p /var/run/bacula + chown bacula:bacula /var/run/bacula + + stat_busy "Starting Bacula Storage Daemon" + /usr/sbin/bacula-sd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon bacula-sd + stat_done + fi + ;; + stop) + stat_busy "Stopping Bacula Storage Daemon" + killall bacula-sd > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon bacula-sd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community/bacula/bacula.install b/community/bacula/bacula.install new file mode 100644 index 000000000..9b8a3669a --- /dev/null +++ b/community/bacula/bacula.install @@ -0,0 +1,49 @@ +post_install() { + if [ -z "`grep '^bacula::' /etc/group`" ]; then + echo "Adding bacula system group... " + groupadd -g 73 bacula >& /dev/null + fi + + if [ -z "`grep '^bacula::' /etc/passwd`" ]; then + echo "Adding bacula system user... " + useradd -u 73 -c "Bacula Daemon" -d / -g bacula -s /bin/false bacula + fi + + echo "Locking Bacula User Account..." + passwd -l bacula &>/dev/null + + post_upgrade +} + +post_upgrade() { + +cat << EOM + +Note: +==> Please don't forget to config your MySQL database for the program. +==> +==> 1. If you have not init your MySQL DB yet, run mysql_install_db. +==> 2. Run /etc/bacula/scripts/grant_mysql_privileges. This script creates database user +==> 'bacula' with unrestricted rights to the bacula's database. The +==> script create user is without any password. You may want to edit +==> the script before run it. +==> 3. Run /etc/bacula/scripts/create_mysql_database to create the Database +==> Bacula. +==> 4. Run /etc/bacula/scripts/make_mysql_tables to create tables used by bacula. + +==> The archive directory is: /var/cache/bacula + +==> Bacula's offical website : http://www.bacula.org + +EOM +} + +post_remove() { + echo "Removing Bacula's system users..." + userdel bacula &> /dev/null + groupdel bacula &> /dev/null +} + +op=$1 +shift +[ "$(type -t "$op")" = "function" ] && $op "$@" diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 70b8796d6..1a7defe84 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55681 2011-09-17 19:15:18Z giovanni $ +# $Id: PKGBUILD 55873 2011-09-24 07:43:10Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.19 +pkgver=0.8.20 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'desktop_integration.patch') -md5sums=('156c1fb275b774ce971f4ef820b9885d' +md5sums=('1b14bd08233302e3475d9dca0e0941e7' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD index ebf6bfc98..6582c4754 100644 --- a/community/camlp5/PKGBUILD +++ b/community/camlp5/PKGBUILD @@ -4,21 +4,36 @@ # Contributor: Massimiliano Brocchini <brocchini@netseven.it> pkgname=('camlp5' 'camlp5-transitional') -pkgver=6.02.3 -pkgrel=2 +_baseversion=6.02.3 +_patchlevel=1 +pkgver=${_baseversion}.${_patchlevel} +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pauillac.inria.fr/~ddr/camlp5/' license=('BSD') depends=('sh') makedepends=('ocaml') options=('!makeflags') -source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${pkgver}.tgz") -md5sums=('a4f5e0dc13c43d50eb655c8e929f556e') +source=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-${_baseversion}.tgz") +# upstream likes to release occasional patches instead of releasing new versions +for i in $(seq ${_patchlevel}); do + source+=("http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-${_baseversion}-${i}") +done +md5sums=('a4f5e0dc13c43d50eb655c8e929f556e' + 'bd5afff0952b407bc63a7b1928e5d6d6') build() { - cp -r camlp5-${pkgver} camlp5-transitional-${pkgver} + cd camlp5-${_baseversion} - cd ${srcdir}/camlp5-${pkgver} + for i in $(seq ${_patchlevel}); do + patch -Np0 -i ${srcdir}/patch-${_baseversion}-${i} + done + + cd ${srcdir} + + cp -r camlp5-${_baseversion} camlp5-transitional-${_baseversion} + + cd ${srcdir}/camlp5-${_baseversion} ./configure \ -prefix '/usr' \ @@ -27,7 +42,7 @@ build() { make world.opt - cd ${srcdir}/camlp5-transitional-${pkgver} + cd ${srcdir}/camlp5-transitional-${_baseversion} ./configure \ -prefix '/usr' \ @@ -41,7 +56,7 @@ package_camlp5() { pkgdesc='A preprocessor-pretty-printer of OCaml.' conflicts=('camlp5-transitional') - cd camlp5-${pkgver} + cd camlp5-${_baseversion} make DESTDIR=${pkgdir} install @@ -53,7 +68,7 @@ package_camlp5-transitional() { pkgdesc='A preprocessor-pretty-printer of OCaml. (transitional)' conflicts=('camlp5') - cd camlp5-transitional-${pkgver} + cd camlp5-transitional-${_baseversion} make DESTDIR=${pkgdir} install diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 336bf7cdd..9bd00f25a 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48542 2011-06-01 17:05:37Z stephane $ +# $Id: PKGBUILD 55877 2011-09-24 16:48:18Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -6,7 +6,7 @@ pkgname=cegui pkgver=0.7.5 -pkgrel=4 +pkgrel=5 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64' 'mips64el') url="http://crayzedsgui.sourceforge.net" diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD index c1f015aa3..32f7ebcb0 100644 --- a/community/clementine/PKGBUILD +++ b/community/clementine/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 49329 2011-06-14 11:51:15Z stephane $ +# $Id: PKGBUILD 55879 2011-09-24 16:48:26Z stephane $ #Maintainer: Stéphane Gaudreault <stephane@archlinux.org> #Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > #Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=clementine pkgver=0.7.1 -pkgrel=6 +pkgrel=7 pkgdesc="A music player and library organizer" url="http://www.clementine-player.org/" license=('GPL') diff --git a/community/clementine/clementine.install b/community/clementine/clementine.install index 2d71a7563..2f0338d8a 100644 --- a/community/clementine/clementine.install +++ b/community/clementine/clementine.install @@ -1,5 +1,6 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } post_upgrade() { diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD index 1eaf9f4ce..d44bd1188 100644 --- a/community/conkeror-git/PKGBUILD +++ b/community/conkeror-git/PKGBUILD @@ -1,10 +1,10 @@ # Contributor: Heeru Kiyura <M8R-p9i5nh@mailinator.com> # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> -_commit=0b48f8c21f90f26e78f06c15e144d85683981b85 +_commit=c53588e0e42330f65e8c3be41900900da17a7eda pkgname=conkeror-git pkgver=1.0pre -pkgrel=1 +pkgrel=2 pkgdesc="A highly programmable web browser based on Mozilla XULRunner." arch=('i686' 'x86_64' 'mips64el') url="http://conkeror.mozdev.org/" diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index d7d5563a1..24093969c 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 53594 2011-08-06 09:09:34Z spupykin $ +# $Id: PKGBUILD 55808 2011-09-21 20:41:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> pkgname=cython -pkgver=0.15 +pkgver=0.15.1 pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64 'mips64el') @@ -11,7 +11,7 @@ url="http://www.cython.org" license=('APACHE') depends=('python2') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('794b93c4c1c4cc031f90302cacd834ca') +md5sums=('171021b3845c9ca8bd6d8185b3cde664') build() { cd $srcdir/Cython-$pkgver diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index be91a3d52..6886b088e 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 48027 2011-05-27 16:02:04Z lfleischer $ +# $Id: PKGBUILD 55804 2011-09-21 11:27:26Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' license=('GPL2') -depends=('gtk2' 'libsamplerate' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' 'ffmpeg' - 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip') -optdepends=('libvorbis: for Ogg Vorbis playback' +depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils') +makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb' + 'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' + 'libsamplerate') +optdepends=('libsamplerate: for Resampler plugin' + 'libvorbis: for Ogg Vorbis playback' 'libmad: for MP1/MP2/MP3 playback' 'flac: for FLAC playback' 'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support' + 'imlib2: for artwork plugin' 'wavpack: for WavPack playback' 'libsndfile: for Wave playback' 'libcdio: audio cd plugin' 'libcddb: audio cd plugin' 'ffmpeg: for WMA, AA, OMA, AC, etc.' - 'libmms: for MMS protocol support' 'faad2: for AAC/MP4 support' 'dbus: for OSD notifications support' 'pulseaudio: for PulseAudio output plugin' - 'libx11: for global hotkeys plugin') + 'libx11: for global hotkeys plugin' + 'zlib: for Audio Overload plugin' + 'libzip: for vfs_zip plugin') options=('!libtool') install='deadbeef.install' source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 75c28d059..4cc7fc406 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43020 2011-03-23 21:31:21Z kchen $ +# $Id: PKGBUILD 55816 2011-09-22 11:26:50Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity -pkgver=0.6.12 +pkgver=0.6.15 pkgrel=1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('9b84c984054550bbb2ba29b553567b7b') +md5sums=('88f3c990f41fde86cd7d5af5a1bc7b81') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index 840c9b62e..da9e1278d 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51056 2011-07-04 16:35:05Z spupykin $ +# $Id: PKGBUILD 55881 2011-09-24 16:48:32Z stephane $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.10 -pkgrel=6 +pkgrel=7 pkgdesc="VRML viewer" arch=('i686' 'x86_64' 'mips64el') url="http://freewrl.sourceforge.net/" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 4253059e5..ab0bb8702 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55150 2011-09-04 08:52:45Z lcarlier $ +# $Id: PKGBUILD 55911 2011-09-24 19:25:08Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,7 +12,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.3 +pkgver=2.99.4 pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') @@ -20,14 +20,14 @@ url="http://gambas.sourceforge.net/" license=('GPL') groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'zlib' 'mesa' 'libgl' 'glew>=1.7.0' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('e576fa9e72863dab0196250cb35f2a9b' +md5sums=('4f918a701a862c7755b35d6eba988dad' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index 6bf0b4acf..600afe34b 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 53049 2011-07-30 13:32:24Z ibiru $ +# $Id: PKGBUILD 55914 2011-09-24 20:06:05Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: uastasi <uastasi@archlinux.us> pkgname=gnote -pkgver=0.7.5 +pkgver=0.8.0 pkgrel=1 -pkgdesc="Experimental port of Tomboy to C++ " +pkgdesc="A note taking application." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Gnote" -license=('GPL') -depends=('gtkmm' 'gconf' 'gtkspell' 'libxslt') +license=('GPL3') +depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'boost') options=('!libtool') install=gnote.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ccb8a4922f167d9727fbc69f559b722004fb6bad3af329dad1fe5e2a3d3d18b8') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f009852b264fb8754575524ef2937147c4d2c25eff97ecca507624ca8730c213') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,7 +22,7 @@ build() { --localstatedir=/var \ --libexecdir=/usr/lib/gnote \ --disable-scrollkeeper \ - --disable-schemas-install \ + --disable-schemas-compile \ --disable-static make } @@ -30,7 +30,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnote ${pkgdir}/etc/gconf/schemas/*.schemas - rm -rf ${pkgdir}/etc/ } diff --git a/community/gnote/gnote.install b/community/gnote/gnote.install index 780fae868..0f8eb1012 100644 --- a/community/gnote/gnote.install +++ b/community/gnote/gnote.install @@ -1,22 +1,21 @@ pkgname=gnote post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q } pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi } post_upgrade() { - post_install -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD index 1e9063374..2c72a660c 100644 --- a/community/gnunet-gtk/PKGBUILD +++ b/community/gnunet-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43132 2011-03-24 08:17:21Z spupykin $ +# $Id: PKGBUILD 55842 2011-09-23 16:15:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet-gtk -pkgver=0.9.0pre2 +pkgver=0.9.0pre3 pkgrel=1 pkgdesc="A frontend for GNUnet" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,15 @@ license=('GPL') depends=('gnunet' 'libnotify' 'libglade' 'adns') makedepends=('pkgconfig' 'glade') source=(ftp://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz) -md5sums=('2aab6fcf5a40cfdef481a7e17b150c0b') +md5sums=('42f90a00aee541cef576ead682d7fb44') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --with-gnunet=/usr --disable-libgksu2 make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD index 1de036745..736657c44 100644 --- a/community/gnunet/PKGBUILD +++ b/community/gnunet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43135 2011-03-24 08:18:05Z spupykin $ +# $Id: PKGBUILD 55840 2011-09-23 16:14:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: wahnby <wahnby@yahoo.fr> pkgname=gnunet -pkgver=0.9.0pre2 +pkgver=0.9.0pre3 pkgrel=1 pkgdesc="A framework for secure peer-to-peer networking" arch=('i686' 'x86_64' 'mips64el') @@ -16,19 +16,19 @@ backup=(etc/gnunetd.conf) options=('!libtool' '!makeflags') source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-$pkgver.tar.gz gnunet.rc - gnunet.conf.d - build-fix.patch) -md5sums=('a4d0fad4f6fc6b520b3b73ee54167270' + gnunet.conf.d) +md5sums=('34665809d6913a54547b19dcd260a951' '0d62ab7f2a28af3ac082015696ee6ef3' - 'f161b46915736e4017e77ad735521453' - 'c646e634754e29004bb569873a270bf1') + 'f161b46915736e4017e77ad735521453') build() { cd $srcdir/gnunet-$pkgver - unset LDFLAGS - patch -p1 <$srcdir/build-fix.patch [ -f Makefile ] || ./configure --prefix=/usr --without-mysql make +} + +package() { + cd $srcdir/gnunet-$pkgver make DESTDIR=$pkgdir install install -D -m0755 $srcdir/gnunet.rc $pkgdir/etc/rc.d/gnunetd install -D -m0644 $srcdir/gnunet.conf.d $pkgdir/etc/conf.d/gnunetd diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index e60cbd141..fe5dea471 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52209 2011-07-21 16:34:07Z svenstaro $ +# $Id: PKGBUILD 55887 2011-09-24 16:48:53Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.35 -pkgrel=1 +pkgrel=2 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64 'mips64el') diff --git a/community/gtk-gnutella/PKGBUILD b/community/gtk-gnutella/PKGBUILD index 68736c13a..4af3a9970 100644 --- a/community/gtk-gnutella/PKGBUILD +++ b/community/gtk-gnutella/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 54455 2011-08-18 15:06:51Z bluewind $ +# $Id: PKGBUILD 55800 2011-09-21 05:45:26Z ebelanger $ # Contributor: Dan McGee <dan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gtk-gnutella -pkgver=0.97 -pkgrel=2 -pkgdesc="A Gnutella client written in C" +pkgver=0.97.1 +pkgrel=1 +pkgdesc="A Gnutella server/client" arch=('i686' 'x86_64' 'mips64el') url="http://gtk-gnutella.sourceforge.net/" license=('GPL') depends=('gtk2') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d44e1af3441fb07a5e5712b0d522fae5') -sha1sums=('1b50790adc494d7023a7cf9319d7cdef1c9ab51e') +md5sums=('7ded76ca9892b58b0e9314ee563e4bae') +sha1sums=('14a4b5fd8c35cbed443e9997e55e44aafba05906') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i '/gnutls_transport_set_lowat(ctx->session, 0);/d' src/core/tls_common.c ./build.sh --prefix=/usr --gtk2 --disable-dbus } diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD index 22f9de6b3..564c9888f 100644 --- a/community/hatari/PKGBUILD +++ b/community/hatari/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 27018 2010-09-16 17:37:18Z schuay $ +# $Id: PKGBUILD 55846 2011-09-23 18:34:08Z lcarlier $ # Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=hatari -pkgver=1.4.0 -pkgrel=2 +pkgver=1.5.0 +pkgrel=1 pkgdesc='An Atari ST and STE emulator' arch=('i686' 'x86_64' 'mips64el') url='http://hatari.sourceforge.net/' @@ -11,7 +11,7 @@ license=('GPL') depends=('sdl' 'libpng') makedepends=('cmake') source=("http://download.berlios.de/hatari/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2f30e5c9e146ee92e3f2f5ae1cef3673') +md5sums=('16277cff73ec3a342b87b7b7ea3932f4') build() { cd ${pkgname}-${pkgver} diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD index a15ee47aa..81ddf0964 100644 --- a/community/iasl/PKGBUILD +++ b/community/iasl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44052 2011-04-01 20:24:21Z lcarlier $ +# $Id: PKGBUILD 55855 2011-09-23 21:20:50Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com> pkgname=iasl -pkgver=20110316 +pkgver=20110623 pkgrel=1 pkgdesc="Intel ACPI Source Language compiler" arch=('i686' 'x86_64' 'mips64el') @@ -16,12 +16,15 @@ options=('!makeflags') install=iasl.install source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz LICENSE) -md5sums=('785813b0e4ad38383fb7bfb15e7a2e6e' +md5sums=('93e827bf4b1f1971a1b3c2074c5f9ccb' '8615526144f69ea4e870d9bc37df9b29') build() { cd "${srcdir}/acpica-unix-${pkgver}" + # fix building with gcc-4.6 + sed -i -e 's/-Werror//g' compiler/Makefile tools/acpisrc/Makefile + cd compiler make diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index 44de6d951..5ba335310 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,8 +6,8 @@ pkgname=john pkgver=1.7.8 -pkgrel=3 -_jumbover=5 +pkgrel=4 +_jumbover=7 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64' 'mips64el') url="http://www.openwall.com/$pkgname/" @@ -19,7 +19,7 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) md5sums=('e6d7f261829610d6949c706ebac0517c' - '4dc38d4539fa019301c98a7a4094d6af' + '6513d201dfc2e87033a4068143de3ef0' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index c67671680..8e1348240 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55789 2011-09-20 16:59:20Z spupykin $ +# $Id: PKGBUILD 55818 2011-09-22 13:29:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.9.5 +pkgver=0.9.6 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') @@ -35,7 +35,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" openbsd-netcat-default.patch unixperms.patch yajl-2.x.patch) -md5sums=('2b4aae1ff231bd31057ff40ab6eb4696' +md5sums=('b74df374b524d00a22a6c89cfc23099f' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '6f36bf189ef0e5847038787d13535420' diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index e7bd4e2ad..b886299a0 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=lightspark -pkgver=0.5.0 -pkgrel=1 +pkgver=0.5.1 +pkgrel=2 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64' 'mips64el') url='http://lightspark.sourceforge.net' @@ -13,8 +13,8 @@ depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpul makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig') optdepends=('gnash-gtk: fallback support') install="lightspark.install" -source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver:0:5}/+download/lightspark-${pkgver}.tar.gz") -md5sums=('7d42c8e92c3c3b318076393a7e9508fb') +source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tgz") +md5sums=('aa0daa22646c2a663ec5045074451d45') build() { rm -rf build @@ -26,7 +26,7 @@ build() { -DCOMPILE_PLUGIN=1 \ -DCMAKE_BUILD_TYPE=Release \ -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ - ../lightspark-${pkgver} + .. make } diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index b45a50ee4..cb10cf454 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54517 2011-08-19 16:16:33Z stativ $ +# $Id: PKGBUILD 55891 2011-09-24 16:49:03Z stephane $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays pkgver=0.8 _pkgver=ed424ec77571 -pkgrel=3 +pkgrel=5 epoch=0 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/mtpfs/PKGBUILD b/community/mtpfs/PKGBUILD new file mode 100644 index 000000000..96766ddf9 --- /dev/null +++ b/community/mtpfs/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 55836 2011-09-23 12:06:39Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: yugrotavele <yugrotavele at archlinux dot us> +# Contributor: Anton Pirogov <anton.pirogov <AT> googlemail.com> + +pkgname=mtpfs +pkgver=1.0 +pkgrel=1 +pkgdesc="A FUSE filesystem that supports reading and writing from any MTP device" +arch=('i686' 'x86_64') +url="http://www.adebenham.com/mtpfs/" +license=('GPL3') +depends=('libmtp' 'glib2' 'libid3tag' 'fuse' 'libmad') +makedepends=('pkg-config' 'namcap') +source=(http://www.adebenham.com/debian/${pkgname}-${pkgver}.tar.gz) +md5sums=('7d62fdfdb59d87d115e2f804d0dc7f85') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index 148bc03ca..66a24c3df 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Massimiliano Torromeo <Massimiliano.Torromeo AT gmail DOT com> pkgname=openssh-askpass -pkgver=1.3.1 -pkgrel=2 +pkgver=1.3.2 +pkgrel=1 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64' 'mips64el') url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1' @@ -14,7 +14,7 @@ provides=('x11-ssh-askpass') conflicts=('x11-ssh-askpass') source=("http://www.phenix.bnl.gov/WWW/publish/hpereira/software/tgz/$pkgname-$pkgver.tar.gz" "$pkgname.sh") -md5sums=('39178e7ef71a1846c0a464cef08ba38e' +md5sums=('89ca29f3b21c7ca87829269866dd623b' '961738244318f3723ba99cdcaac91a21') build() { diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index 10d4fee18..0d384a226 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 48779 2011-06-05 15:15:50Z vegai $ +# $Id: PKGBUILD 55851 2011-09-23 18:46:03Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=1 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64' 'mips64el') @@ -13,6 +13,7 @@ install=openttd.install optdepends=('openttd-opengfx: free graphics' 'openttd-opensfx: free soundset') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") +md5sums=('a0a730a8e40133fe789f34f2bc9601a9') build() { cd ${pkgname}-${pkgver} @@ -35,5 +36,3 @@ package() { make install } - -md5sums=('825f6274bd46a1d56f4e95ef25a325ca') diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index ee1122d1a..721cd0098 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 55515 2011-09-13 21:33:10Z ebelanger $ +# $Id: PKGBUILD 55893 2011-09-24 16:49:07Z stephane $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=8 +pkgrel=9 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" license=('GPL') -depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew' 'libxml++' 'portaudio' 'portmidi' \ +depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.47') optdepends=('performous-freesongs: free songs for performous') diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD index bb4441b0a..c05aceb50 100644 --- a/community/pgadmin3/PKGBUILD +++ b/community/pgadmin3/PKGBUILD @@ -1,41 +1,34 @@ -# $Id: PKGBUILD 46331 2011-05-05 10:45:23Z spupykin $ +# $Id: PKGBUILD 55823 2011-09-22 21:47:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: bekks <eduard.warkentin@gmx.de> pkgname=pgadmin3 -pkgver=1.12.3 -_realver=1.12.3 +pkgver=1.14.0 pkgrel=1 pkgdesc="A comprehensive design and management interface for PostgreSQL database" arch=('i686' 'x86_64' 'mips64el') url="http://www.pgadmin.org" license=('custom') -depends=('wxgtk' 'postgresql-libs>=8.4.1' 'libxslt') -makedepends=('libpqxx' 'krb5') -source=(ftp://ftp.de.postgresql.org/pub/packages/databases/PostgreSQL/pgadmin3/release/v${_realver}/src/pgadmin3-${_realver}.tar.gz +depends=('wxgtk' 'postgresql-libs' 'libxslt') +makedepends=('libpqxx' 'krb5' 'postgresql') +source=(ftp://ftp.de.postgresql.org/pub/packages/databases/PostgreSQL/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz pgadmin3.desktop) -md5sums=('0ff7a970a14757ee951a4e8b1a246a70' +md5sums=('27bf1694809a7d9adf4feec508374df2' 'd07ba4df54baead30b66d19d7450bcad') build() { - cd $srcdir/pgadmin3-${_realver} - unset LDFLAGS - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr + cd $srcdir/pgadmin3-${pkgver} + [ -f Makefile ] || ./configure --prefix=/usr make } package() { - cd $srcdir/pgadmin3-${_realver} + cd $srcdir/pgadmin3-${pkgver} make DESTDIR=$pkgdir/ install - - install -D -m 644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n - install -D -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - - mkdir -p $pkgdir/usr/share/pgadmin3/pixmaps/ - mkdir -p $pkgdir/usr/share/applications/ - - install -D -m 644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico - install -D -m 644 $srcdir/pgadmin3.desktop $pkgdir/usr/share/applications/ + install -Dm644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico + install -Dm644 $srcdir/pgadmin3.desktop $pkgdir/usr/share/applications/pgadmin3.desktop } diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index a6ed080c9..9779a5141 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.30.01 -pkgrel=1 +pkgrel=2 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') url='http://root.cern.ch' diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index d452c5880..f1e4c060c 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55517 2011-09-13 21:33:18Z ebelanger $ +# $Id: PKGBUILD 55897 2011-09-24 16:49:31Z stephane $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=7 +pkgrel=8 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64' 'mips64el') url="http://rss-glx.sourceforge.net/" diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 8867a38b6..29a22b46e 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54051 2011-08-12 21:19:26Z svenstaro $ +# $Id: PKGBUILD 55899 2011-09-24 16:49:39Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> @@ -7,7 +7,7 @@ pkgname=sfml _git=true if [[ "${_git}" = "true" ]]; then - pkgver=1.99.git20110812 + pkgver=1.99.git20110917 fi pkgrel=1 diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 33df62a70..6af2855cb 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55302 2011-09-09 14:03:59Z spupykin $ +# $Id: PKGBUILD 55810 2011-09-21 20:42:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.1 -pkgrel=2 +pkgver=0.11.2 +pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" @@ -15,7 +15,7 @@ depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libr makedepends=('intltool' 'vala') install=shotwell.install source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2") -md5sums=('e2c388bfce992b5437281c4fc29357d9') +md5sums=('bbb479eaa4bbcf67d8ff454b406ed249') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index f4c1b9bd5..940681ffd 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52636 2011-07-26 15:57:38Z svenstaro $ +# $Id: PKGBUILD 55901 2011-09-24 16:49:52Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring pkgver=0.82.7.1 -pkgrel=6 +pkgrel=7 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index 6429387c5..02fa70f7d 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55577 2011-09-14 10:56:19Z lfleischer $ +# $Id: PKGBUILD 55918 2011-09-24 21:57:57Z dreisner $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel -pkgver=4.43 +pkgver=4.44 pkgrel=1 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' 'stunnel.rc.d') -md5sums=('84174925a0f2632cc5cd52b3503cf07b' - 'bc1280f59a117f01bb037d9376f9baf6' +md5sums=('c9dd51fc02b913ce5bf7b3fc12f9cb4a' + 'e86fc2578e5304ae5a7b586ce170f843' 'f15398497e10e080c2406d2fc541660c' 'cb647c71ff4cb1e035b6e515d5f13ebf') diff --git a/community/subtitleeditor/PKGBUILD b/community/subtitleeditor/PKGBUILD index 8ca4582bf..e0d167b0d 100644 --- a/community/subtitleeditor/PKGBUILD +++ b/community/subtitleeditor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 38397 2011-01-26 20:18:42Z jelle $ +# $Id: PKGBUILD 55853 2011-09-23 20:07:37Z lcarlier $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=subtitleeditor -pkgver=0.38.0 +pkgver=0.39.0 pkgrel=1 pkgdesc="A GTK+2 tool to edit subtitles for GNU/Linux/*BSD" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,22 @@ optdepends=('gstreamer0.10-ffmpeg: to be able to view movies inside the subtitle options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog -source=(http://download.gna.org/$pkgname/0.38/$pkgname-$pkgver.tar.gz) -md5sums=('2c4d7d4bd79f45effcea279a2e06ca66') +source=(http://download.gna.org/$pkgname/0.39/$pkgname-$pkgver.tar.gz + fix-taking-address-of-temporary-error.patch) +md5sums=('17666e652edd27abfd3104a82385f6a8' + '13e4fde005a9017da9fd24a5c2b928ed') build() { cd ${srcdir}/$pkgname-$pkgver + # fix building with gcc-4.6.0, taken from upstream + patch -Np1 -i "../fix-taking-address-of-temporary-error.patch" + ./configure --prefix=/usr - make + make +} +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } diff --git a/community/subtitleeditor/fix-taking-address-of-temporary-error.patch b/community/subtitleeditor/fix-taking-address-of-temporary-error.patch new file mode 100644 index 000000000..a35746d62 --- /dev/null +++ b/community/subtitleeditor/fix-taking-address-of-temporary-error.patch @@ -0,0 +1,56 @@ +--- trunk/plugins/subtitleformats/sami/sami.cc 2011/06/18 08:06:45 772 ++++ trunk/plugins/subtitleformats/sami/sami.cc 2011/07/02 13:01:33 777 +@@ -155,7 +155,7 @@ + int state = 0; + Glib::ustring line; + Glib::ustring text; +- Subtitle* curSt; ++ Subtitle curSt; + char tmptext[MAXBUF+1] = ""; + char *p = NULL, *q = NULL; + if (!file.getline(line)) +@@ -174,8 +174,8 @@ + start_sync = utility::string_to_int(inptr + 6); + + // Get a line from the current subtitle on memory +- curSt = &subtitles.append(); +- curSt->set_start(start_sync); ++ curSt = subtitles.append(); ++ curSt.set_start(start_sync); + + state = SAMI_STATE_SYNC_START; + continue; +@@ -239,14 +239,14 @@ + // Now we are sure that this line is the end sync. + + end_sync = utility::string_to_int(q + 6); +- curSt->set_end(end_sync); ++ curSt.set_end(end_sync); + + *p = '\0'; + trail_space(tmptext); + + // finalize the end sync of current line + if (tmptext[0] != '\0') +- curSt->set_text(tmptext); ++ curSt.set_text(tmptext); + + // an important check if this is end sync. + // Is there any delimiter " " in this line? +@@ -276,14 +276,14 @@ + else + { + end_sync = SAMISYNC_MAXVAL; +- curSt->set_end(end_sync); ++ curSt.set_end(end_sync); + + *p = '\0'; + trail_space(tmptext); + + // finalize the end sync of current line + if (tmptext[0] != '\0') +- curSt->set_text(tmptext); ++ curSt.set_text(tmptext); + + state = SAMI_STATE_FORCE_QUIT; + break; diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index 83d737e9f..563f2e415 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -5,7 +5,7 @@ pkgname=supertux pkgver=0.3.3 -pkgrel=3 +pkgrel=4 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64' 'mips64el') url="http://super-tux.sourceforge.net/" @@ -19,6 +19,7 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp + sed -i '/types\.h/d' src/addon/addon_manager.cpp cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . make } diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 9cb264b24..3404835a9 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 55043 2011-09-01 00:45:34Z dreisner $ +# $Id: PKGBUILD 55861 2011-09-23 23:07:50Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd -pkgver=35 +pkgver=36 pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2') depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172') -makedepends=('docbook-xsl' 'gperf' 'libxslt' 'cryptsetup' 'gtk2' 'intltool' 'libnotify') +makedepends=('gperf' 'cryptsetup' 'gtk2' 'intltool' 'libnotify') optdepends=('cryptsetup: required for encrypted block devices' 'dbus-python: systemd-analyze' 'gtk2: systemadm' @@ -31,7 +31,7 @@ backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" "os-release") -md5sums=('6b37b385d22f28c184a04a4e6c3c69b4' +md5sums=('e1213338efb697abc8215d9a66a7f082' '752636def0db3c03f121f8b4f44a63cd') build() { diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 03b3db760..5a9160e09 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55155 2011-09-04 13:08:06Z svenstaro $ +# $Id: PKGBUILD 55905 2011-09-24 16:50:06Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2011.09.01 -pkgrel=1 +pkgrel=3 pkgdesc="An open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64' 'mips64el') url="http://vdrift.net/" diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index c11c035a0..fd9cf1416 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 47900 2011-05-26 00:39:20Z svenstaro $ +# $Id: PKGBUILD 55907 2011-09-24 16:50:18Z stephane $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,7 +6,7 @@ pkgname=widelands pkgver=16 _realver=build16 -pkgrel=2 +pkgrel=3 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64' 'mips64el') url="http://widelands.org/" diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD index 29c749205..07256a53f 100644 --- a/community/wine/PKGBUILD +++ b/community/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 55318 2011-09-09 21:53:02Z svenstaro $ +# $Id: PKGBUILD 55863 2011-09-24 02:48:10Z svenstaro $ # 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.28 +pkgver=1.3.29 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('70574d609161cec8523804cd9364bcd2') +md5sums=('6c4159ef53c81faf5e52f29211ac50de') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD index 96bb69c72..ab3c92e82 100644 --- a/community/znc/PKGBUILD +++ b/community/znc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55376 2011-09-10 20:15:39Z dreisner $ +# $Id: PKGBUILD 55922 2011-09-25 01:01:16Z dreisner $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: mickael9 <mickael9 at gmail dot com> pkgname=znc -pkgver=0.200 +pkgver=0.202 pkgrel=1 pkgdesc='An IRC bouncer with modules & scripts support' url='http://en.znc.in/wiki/index.php/ZNC' @@ -16,7 +16,7 @@ optdepends=('tcl: modtcl module' 'perl: modperl module' 'cyrus-sasl: saslauth module') source=("http://znc.in/releases/znc-${pkgver}.tar.gz") -md5sums=('da5b690bc31b007474a77aae70c9c049') +md5sums=('3c6ff4620e139e3d9745cd53111bab20') build() { cd "znc-$pkgver" diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 6265ddb53..7680e2afb 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137777 2011-09-10 22:03:07Z tomegun $ +# $Id: PKGBUILD 138467 2011-09-24 11:28:45Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.20 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64' 'mips64el') @@ -19,14 +19,16 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${ agetty-typo.patch write-freopen.patch dmesg-non-printk.patch - dmesg-space.patch) + dmesg-space.patch + dont-close-0.patch + fix-remount.patch) optdepends=('perl: for chkdupexe support') build() { cd "${srcdir}/${pkgname}-${pkgver}" # patches from master - for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch; do + for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch dont-close-0.patch fix-remount.patch; do patch -Np1 -i "${srcdir}/${patch}" done @@ -37,7 +39,8 @@ build() { --enable-write\ --enable-raw\ --disable-wall\ - --enable-partx + --enable-partx\ + --enable-libmount-mount make } @@ -53,4 +56,6 @@ md5sums=('4dcacdbdafa116635e52b977d9d0e879' '13838c6dd8df686e0f01ad0f236d2690' '465817ff8f7c08411c8011ee91b50318' 'f3ca75a1a22a2a739c5c22d92dc07ab0' - 'd9768f0b42d36d72c02ac7797b922ba1') + 'd9768f0b42d36d72c02ac7797b922ba1' + '37eae52af90c214dda73874c701fa246' + '344c780b9e08826dd8befe4271b41ed3') diff --git a/core/util-linux/dont-close-0.patch b/core/util-linux/dont-close-0.patch new file mode 100644 index 000000000..75cfc5c5e --- /dev/null +++ b/core/util-linux/dont-close-0.patch @@ -0,0 +1,32 @@ +From 3a18db62e661fbb307ad3a53c18afabc92d3c63e Mon Sep 17 00:00:00 2001 +From: Petr Uzel <petr.uzel@suse.cz> +Date: Tue, 13 Sep 2011 11:08:46 +0200 +Subject: [PATCH 1/2] lib: do not attempt to close(0) in sysfs_deinit() + +If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt' +which hasn't been fully initialised. The 'dir_fd' is still 0, so +sysfs_deinit calls "close(0)". + +Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151 +Reported-by: Diego Ercolani <diego.ercolani@gmail.com> +Analysed-by: Neil Brown <nfbrown@suse.com> +Signed-off-by: Petr Uzel <petr.uzel@suse.cz> +--- + lib/sysfs.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/lib/sysfs.c b/lib/sysfs.c +index eec1f24..ebb3bb5 100644 +--- a/lib/sysfs.c ++++ b/lib/sysfs.c +@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, dev_t devno, struct sysfs_cxt *parent) + int fd, rc = 0; + + memset(cxt, 0, sizeof(*cxt)); ++ cxt->dir_fd = -1; + + if (!sysfs_devno_path(devno, path, sizeof(path))) + goto err; +-- +1.7.6.1 + diff --git a/core/util-linux/fix-remount.patch b/core/util-linux/fix-remount.patch new file mode 100644 index 000000000..67149ab46 --- /dev/null +++ b/core/util-linux/fix-remount.patch @@ -0,0 +1,37 @@ +From 277a6dd53569a409e05316a7bdaed0e78e326762 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Tue, 13 Sep 2011 22:59:39 +0200 +Subject: [PATCH 2/2] mount: check for target before source on remount + +Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=737091 +Reported-by: Eric Paris <eparis@redhat.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + mount/fstab.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/mount/fstab.c b/mount/fstab.c +index 8d88f68..77bf81c 100644 +--- a/mount/fstab.c ++++ b/mount/fstab.c +@@ -272,10 +272,15 @@ getmntfilebackward (const char *name, struct mntentchn *mcprev) { + mc0 = mtab_head(); + if (!mcprev) + mcprev = mc0; ++ + for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) +- if (streq(mc->m.mnt_dir, name) || +- streq(mc->m.mnt_fsname, name)) ++ if (streq(mc->m.mnt_dir, name)) + return mc; ++ ++ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) ++ if (streq(mc->m.mnt_fsname, name)) ++ return mc; ++ + return NULL; + } + +-- +1.7.6.1 + diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index dce50714f..8e1bc9f12 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136921 2011-09-02 23:48:57Z giovanni $ +# $Id: PKGBUILD 138463 2011-09-24 09:30:24Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10602 +pkgver=10616 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('17e61b690fa52b7ee5a4e7bf350967a0') +md5sums=('b94fa71f713e1bd3c39ad12b08ca8a2f') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 913e1f593..85354f042 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137652 2011-09-10 10:56:27Z pierre $ +# $Id: PKGBUILD 138476 2011-09-24 16:46:30Z stephane $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> @@ -13,7 +13,7 @@ _svn=false pkgname=blender pkgver=2.59 -pkgrel=2 +pkgrel=3 epoch=2 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index 35af04bad..ba2e71452 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 136398 2011-08-29 05:25:50Z bisson $ +# $Id: PKGBUILD 138478 2011-09-24 16:46:33Z stephane $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Kevin Piche <kevin@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=bzflag pkgver=2.4.0 -pkgrel=1 +pkgrel=2 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD index 115645330..0ecbf3586 100644 --- a/extra/chkrootkit/PKGBUILD +++ b/extra/chkrootkit/PKGBUILD @@ -1,31 +1,42 @@ -# $Id: PKGBUILD 137609 2011-09-10 03:51:07Z eric $ +# $Id: PKGBUILD 138434 2011-09-23 03:32:41Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=chkrootkit pkgver=0.49 -pkgrel=2 +pkgrel=3 pkgdesc="Locally checks for signs of a rootkit" arch=('i686' 'x86_64' 'mips64el') url="http://www.chkrootkit.org" depends=('sh' 'net-tools') license=('BSD') -source=(ftp://ftp.pangeia.com.br/pub/seg/pac/${pkgname}.tar.gz fix-tools-path.patch) +source=(ftp://ftp.pangeia.com.br/pub/seg/pac/${pkgname}.tar.gz chkrootkit.cron \ + fix-tools-path.patch backslashes.patch kallsyms.patch) md5sums=('304d840d52840689e0ab0af56d6d3a18' - '6a2f3038114b8b14e1ad74e30fe44eee') + 'f4b6494270f708bf016e087104681739' + '3e5f2d5e2f4fa7a0d780baec9039c07f' + '758f892dcf73e8a2a4694662fba366d4' + 'd087f3aad8a9e97fea496ef83e4f1d48') sha1sums=('cec1a3c482b95b20d3a946b07fffb23290abc4a6' - 'f192cda177ec1920ce3313ed983ac44ee571ca6c') + '6dda90abf779b6f5c3bacd638e1231f34635575d' + '7fcad8117a064f0a6910134e8bb3a55de110650f' + 'e22546f445c145cf05dbc1a10f7b196fcd1c8202' + 'dc5b402ee69a7a5ae622ecfd733682516df54e88') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/var/adm|/var/log|' check_wtmpx.c chklastlog.c chkutmp.c chkwtmp.c patch -p0 -i "${srcdir}/fix-tools-path.patch" + patch -p1 -i "${srcdir}/backslashes.patch" + patch -p1 -i "${srcdir}/kallsyms.patch" make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit chkrootkit.orig \ + for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit \ chkutmp chkwtmp ifpromisc strings-static ; do - install -D -m755 $i "${pkgdir}/usr/bin/$i" + install -D -m755 $i "${pkgdir}/usr/sbin/$i" done + install -D -m744 "${srcdir}/chkrootkit.cron" "${pkgdir}/etc/cron.weekly/chkrootkit" install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/chkrootkit/backslashes.patch b/extra/chkrootkit/backslashes.patch new file mode 100644 index 000000000..6ac981441 --- /dev/null +++ b/extra/chkrootkit/backslashes.patch @@ -0,0 +1,22 @@ +Author: James R. Van Zandt <jrv@debian.org> +Description: Two of the chkrootkit messages have unnecessary backslashes (#498063) +--- a/chkrootkit ++++ b/chkrootkit +@@ -672,7 +672,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h + if [ "`find ${LIBS} -name libproc.a 2> /dev/null`" != "" -a \ + "$SYSTEM" != "FreeBSD" ] + then +- echo "Possible t0rn v8 \(or variation\) rootkit installed" ++ echo "Possible t0rn v8 (or variation) rootkit installed" + else + if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi + fi +@@ -726,7 +726,7 @@ etc/ld.so.hash sbin/init.zk usr/lib/in.h + + if [ -d ${ROOTDIR}dev/ptyxx -o -r "${ROOTDIR}usr/lib/.ark?" -o \ + -d ${ROOTDIR}usr/doc/"... " ]; then +- echo "Possible Ambient's rootkit \(ark\) installed" ++ echo "Possible Ambient's rootkit (ark) installed" + else + if [ "${QUIET}" != "t" ]; then echo "nothing found"; fi + fi diff --git a/extra/chkrootkit/chkrootkit.cron b/extra/chkrootkit/chkrootkit.cron new file mode 100644 index 000000000..0fc84ded8 --- /dev/null +++ b/extra/chkrootkit/chkrootkit.cron @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/sbin/chkrootkit -q diff --git a/extra/chkrootkit/fix-tools-path.patch b/extra/chkrootkit/fix-tools-path.patch index 2f3c38528..d45f07901 100644 --- a/extra/chkrootkit/fix-tools-path.patch +++ b/extra/chkrootkit/fix-tools-path.patch @@ -1,161 +1,11 @@ ---- chkrootkit 2008-01-19 11:01:15.000000000 +0100 -+++ chkrootkit 2008-11-01 13:11:14.000000000 +0100 -@@ -158,23 +158,23 @@ - fi - - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./ifpromisc" -v -+ expertmode_output "/usr/bin/ifpromisc" -v - return 5 - fi -- if [ ! -x ./ifpromisc ]; then -- echo "not tested: can't exec ./ifpromisc" -+ if [ ! -x /usr/bin/ifpromisc ]; then -+ echo "not tested: can't exec /usr/bin/ifpromisc" - return ${NOT_TESTED} - else -- [ "${QUIET}" != "t" ] && ./ifpromisc -v || ./ifpromisc -q -+ [ "${QUIET}" != "t" ] && /usr/bin/ifpromisc -v || /usr/bin/ifpromisc -q - fi - } - - chkutmp() { -- if [ ! -x ./chkutmp ]; then -- echo "not tested: can't exec ./chkutmp" -+ if [ ! -x /usr/bin/chkutmp ]; then -+ echo "not tested: can't exec /usr/bin/chkutmp" - return ${NOT_TESTED} - fi -- if ./chkutmp -+ if /usr/bin/chkutmp - then - if [ "${QUIET}" != "t" ]; then echo "chkutmp: nothing deleted"; fi - fi -@@ -182,8 +182,8 @@ - } - - z2 () { -- if [ ! -x ./chklastlog ]; then -- echo "not tested: can't exec ./chklastlog" -+ if [ ! -x /usr/bin/chklastlog ]; then -+ echo "not tested: can't exec /usr/bin/chklastlog" - return ${NOT_TESTED} - fi - -@@ -196,32 +196,32 @@ - fi - - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./chklastlog -f ${WTMP} -l ${LASTLOG}" -+ expertmode_output "/usr/bin/chklastlog -f ${WTMP} -l ${LASTLOG}" - return 5 - fi - -- if ./chklastlog -f ${WTMP} -l ${LASTLOG} -+ if /usr/bin/chklastlog -f ${WTMP} -l ${LASTLOG} - then - if [ "${QUIET}" != "t" ]; then echo "chklastlog: nothing deleted"; fi - fi - } - - wted () { -- if [ ! -x ./chkwtmp ]; then -- echo "not tested: can't exec ./chkwtmp" -+ if [ ! -x /usr/bin/chkwtmp ]; then -+ echo "not tested: can't exec /usr/bin/chkwtmp" - return ${NOT_TESTED} - fi - - if [ "$SYSTEM" = "SunOS" ]; then -- if [ ! -x ./check_wtmpx ]; then -- echo "not tested: can't exec ./check_wtmpx" -+ if [ ! -x /usr/bin/check_wtmpx ]; then -+ echo "not tested: can't exec /usr/bin/check_wtmpx" - else - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./check_wtmpx" -+ expertmode_output "/usr/bin/check_wtmpx" - return 5 - fi - if [ -f ${ROOTDIR}var/adm/wtmp ]; then -- if ./check_wtmpx -+ if /usr/bin/check_wtmpx - then - if [ "${QUIET}" != "t" ]; then \ - echo "check_wtmpx: nothing deleted in /var/adm/wtmpx"; fi -@@ -232,12 +232,12 @@ - WTMP=`loc wtmp wtmp "${ROOTDIR}var/log ${ROOTDIR}var/adm"` - - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./chkwtmp -f ${WTMP}" -+ expertmode_output "/usr/bin/chkwtmp -f ${WTMP}" - return 5 - fi - fi - -- if ./chkwtmp -f ${WTMP} -+ if /usr/bin/chkwtmp -f ${WTMP} - then - if [ "${QUIET}" != "t" ]; then echo "chkwtmp: nothing deleted"; fi - fi -@@ -275,8 +275,8 @@ - prog="" - if [ \( "${SYSTEM}" = "Linux" -o \( "${SYSTEM}" = "FreeBSD" -a \ - `echo ${V} | ${awk} '{ if ($1 > 4.3 || $1 < 6.0) print 1; else print 0 }'` -eq 1 \) \) -a "${ROOTDIR}" = "/" ]; then -- [ -x ./chkproc -a "`find /proc | wc -l`" -gt 1 ] && prog="./chkproc" -- [ -x ./chkdirs ] && prog="$prog ./chkdirs" -+ [ -x /usr/bin/chkproc -a "`find /proc | wc -l`" -gt 1 ] && prog="/usr/bin/chkproc" -+ [ -x /usr/bin/chkdirs ] && prog="$prog /usr/bin/chkdirs" - if [ "$prog" = "" ]; then - echo "not tested: can't exec $prog" - return ${NOT_TESTED} -@@ -288,7 +288,7 @@ - PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'` - [ "$PV" = "" ] && PV=2 - [ "${SYSTEM}" = "SunOS" ] && PV=0 -- expertmode_output "./chkproc -v -v -p $PV" -+ expertmode_output "/usr/bin/chkproc -v -v -p $PV" - return 5 - fi - -@@ -315,7 +315,7 @@ - if [ "${DEBUG}" = "t" ]; then - ${echo} "*** PV=$PV ***" - fi -- if ./chkproc -p ${PV}; then -+ if /usr/bin/chkproc -p ${PV}; then - if [ "${QUIET}" != "t" ]; then echo "chkproc: nothing detected"; fi - else - echo "chkproc: Warning: Possible LKM Trojan installed" -@@ -324,7 +324,7 @@ - for i in /usr/share /usr/bin /usr/sbin /lib; do - [ -d $i ] && dirs="$dirs $i" - done -- if ./chkdirs $dirs; then -+ if /usr/bin/chkdirs $dirs; then - if [ "${QUIET}" != "t" ]; then echo "chkdirs: nothing detected"; fi - else - echo "chkdirs: Warning: Possible LKM Trojan installed" -@@ -1690,18 +1690,18 @@ - - if [ "${SYSTEM}" = "Linux" ] - then -- if [ ! -x ./strings-static ]; then -- printn "can't exec ./strings-static, " -+ if [ ! -x /usr/bin/strings-static ]; then -+ printn "can't exec /usr/bin/strings-static, " - return ${NOT_TESTED} - fi - - if [ "${EXPERT}" = "t" ]; then -- expertmode_output "./strings-static -a ${CMD}" -+ expertmode_output "/usr/bin/strings-static -a ${CMD}" - return 5 - fi - - ### strings must be a statically linked binary. -- if ./strings-static -a ${CMD} > /dev/null 2>&1 -+ if /usr/bin/strings-static -a ${CMD} > /dev/null 2>&1 - then - STATUS=${INFECTED} - fi +--- chkrootkit ++++ chkrootkit +@@ -17,6 +17,8 @@ unalias netstat > /dev/null 2>&1 + unalias ps > /dev/null 2>&1 + unalias dirname > /dev/null 2>&1 + ++cd /usr/sbin ++ + # Workaround for recent GNU coreutils + _POSIX2_VERSION=199209 + export _POSIX2_VERSION diff --git a/extra/chkrootkit/kallsyms.patch b/extra/chkrootkit/kallsyms.patch new file mode 100644 index 000000000..4e3694aad --- /dev/null +++ b/extra/chkrootkit/kallsyms.patch @@ -0,0 +1,30 @@ +--- a/chkrootkit ++++ b/chkrootkit +@@ -308,7 +316,7 @@ lkm () + fi + + if [ "${EXPERT}" = "t" ]; then +- [ -r /proc/ksyms ] && ${egrep} -i "adore|sebek" < /proc/ksyms 2>/dev/null ++ [ -r /proc/kallsyms ] && ${egrep} -i "adore|sebek" < /proc/kallsyms 2>/dev/null + [ -d /proc/knark ] && ${ls} -la /proc/knark 2> /dev/null + PV=`$ps -V 2>/dev/null| $cut -d " " -f 3 |${awk} -F . '{ print $1 "." $2 $3 }' | ${awk} '{ if ($0 > 3.19) print 3; else if ($0 < 2.015) print 1; else print 2 }'` + [ "$PV" = "" ] && PV=2 +@@ -318,14 +326,14 @@ lkm () + fi + + ### adore LKM +- [ -r /proc/ksyms ] && \ +- if `${egrep} -i adore < /proc/ksyms >/dev/null 2>&1`; then ++ [ -r /proc/kallsyms ] && \ ++ if `${egrep} -i adore < /proc/kallsyms >/dev/null 2>&1`; then + echo "Warning: Adore LKM installed" + fi + + ### sebek LKM (Adore based) +- [ -r /proc/ksyms ] && \ +- if `${egrep} -i sebek < /proc/ksyms >/dev/null 2>&1`; then ++ [ -r /proc/kallsyms ] && \ ++ if `${egrep} -i sebek < /proc/kallsyms >/dev/null 2>&1`; then + echo "Warning: Sebek LKM installed" + fi + diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index ce46b36b6..73d29edab 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126103 2011-06-01 14:26:46Z stephane $ +# $Id: PKGBUILD 138480 2011-09-24 16:46:36Z stephane $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.0 -pkgrel=2 +pkgrel=3 pkgdesc="intelligent blend tool for overlapping picture" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index f92f76cb0..0bbd13537 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138105 2011-09-16 14:11:53Z ibiru $ +# $Id: PKGBUILD 138450 2011-09-23 13:55:25Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20110916 +pkgver=20110923 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz ffmpeg-loongson.patch) -md5sums=('d065a16866c9bcf4d06c5452b2fbdc56' +md5sums=('36111c640a2eea19f677924ac3193ce4' '081d03278559a351322157a441fabcf5') build() { @@ -47,7 +47,10 @@ build() { make make tools/qt-faststart make doc/ff{mpeg,play,server}.1 +} +package() { + cd "$srcdir/$pkgname" make DESTDIR="$pkgdir" install install-man install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 2222f461e..a9d3b9d69 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138349 2011-09-20 14:19:11Z dan $ +# $Id: PKGBUILD 138474 2011-09-24 15:33:33Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.6.3 +pkgver=1.7.6.4 _manver=1.7.6.1 pkgrel=1 pkgdesc="the fast distributed version control system" @@ -80,11 +80,11 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('c8f9390f970079495085d343671d6646' +md5sums=('e0b7afcc0e5e43bbb82f85598ae34bd8' 'cae559424a62507cb2c15252d85a158e' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('b8c7642f7e2b6638c442c0d3f907d197023b8c9a35cb03681643ed7ec619eff8' +sha256sums=('c95bb6fdfa8276a6cbc1c3150e56ce3dc2fc29a4bcecd9c246ab9df5d9638ec6' 'faece1418e72d90ed9ee65e59fe89489e504db9b76e8325a2505e8fb61598a44' '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index e573f7b8d..51a9e9ea3 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125318 2011-05-25 20:28:27Z stephane $ +# $Id: PKGBUILD 138482 2011-09-24 16:46:38Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew -pkgver=1.6.0 +pkgver=1.7.0 pkgrel=1 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'mesa') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('ed555d15d0f01239b262c4cf803e97d60d8a18b6') +sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gstreamer0.10-ffmpeg/PKGBUILD b/extra/gstreamer0.10-ffmpeg/PKGBUILD index b7cbc2aaa..a5f6db925 100644 --- a/extra/gstreamer0.10-ffmpeg/PKGBUILD +++ b/extra/gstreamer0.10-ffmpeg/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 100249 2010-11-22 10:52:57Z jgc $ +# $Id: PKGBUILD 138452 2011-09-23 18:40:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer0.10-ffmpeg -pkgver=0.10.11 +pkgver=0.10.12 pkgrel=1 pkgdesc="Gstreamer FFMpeg Plugin" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gstreamer0.10-base>=0.10.30' 'bzip2') +depends=('gstreamer0.10-base' 'bzip2') makedepends=('pkgconfig' 'yasm' 'sdl') url="http://www.gstreamer.net" groups=('gstreamer0.10-plugins') +options=('!libtool') source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2) -sha256sums=('ff36a138e5af4ed8dcc459d6d6521fe66ed31ec29ba9a924dc3675c6749a692e') +sha256sums=('b17707102b4bfa5e0d5095be3608ee2d4388268eab822c9a0ce7a18011bdd73b') build() { cd "${srcdir}/gst-ffmpeg-${pkgver}" @@ -20,6 +21,10 @@ build() { unset CXXFLAGS ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-ffmpeg-extra-configure="--enable-runtime-cpudetect" make +} + +package() { + cd "${srcdir}/gst-ffmpeg-${pkgver}" + make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}"/usr/lib/gstreamer-0.10/*.la } diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 155602fa5..c6ffd408a 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132767 2011-07-25 23:16:55Z eric $ +# $Id: PKGBUILD 138484 2011-09-24 16:46:40Z stephane $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2011.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64' 'mips64el') url="http://hugin.sourceforge.net/" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 58f37c8a3..c5f1d0ece 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137987 2011-09-13 21:30:06Z eric $ +# $Id: PKGBUILD 138489 2011-09-25 02:10:52Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.2.5 +pkgver=6.7.2.8 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,9 +12,7 @@ depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg- makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -md5sums=('ce0294e6bc7ca3ece03a432518143a29' - 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('0af2f0fb913f390b0b25bc4e57b344b0d54c3560' +sha1sums=('227cc36d2a82d438cfb8b34ff1c7049e43d287ea' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index dfa38f908..49ce18484 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137656 2011-09-10 10:56:33Z pierre $ +# $Id: PKGBUILD 138486 2011-09-24 16:46:43Z stephane $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,7 +37,7 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index 71ef0e32e..a36a57435 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136206 2011-08-24 08:33:01Z ibiru $ +# $Id: PKGBUILD 138456 2011-09-23 18:49:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=3.11 +pkgver=3.12 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" @@ -12,7 +12,7 @@ url="http://www.infradead.org/openconnect.html" depends=('libxml2' 'openssl' 'libproxy') options=('!libtool' '!emptydirs') source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('b66927f98cfeb577b3016f8b83005d6b') +md5sums=('2f4fceb3f921ca8deb3a7cbd19a5e008') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD index f59e0e8d5..b24f162b7 100644 --- a/extra/pyopenssl/PKGBUILD +++ b/extra/pyopenssl/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 132041 2011-07-19 13:27:24Z ibiru $ +# $Id: PKGBUILD 138458 2011-09-23 18:52:47Z ibiru $ # Maintainer : Ionut Biru<ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgbase=pyopenssl pkgname=('pyopenssl' 'python2-pyopenssl') -pkgver=0.12 +pkgver=0.13 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/pyopenssl/" +url="http://pypi.python.org/pypi/pyOpenSSL" license=('LGPL2.1') makedepends=('python' 'python2' 'openssl') source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz) -md5sums=('60a7bbb6160950823eddcbba2cbcb0d6') +md5sums=('767bca18a71178ca353dff9e10941929') build() { cd "${srcdir}" @@ -21,7 +21,7 @@ build() { cd "pyOpenSSL-${pkgver}" python setup.py build - #build python 3 module + #build python 2 module cd ../"pyOpenSSL-${pkgver}-python2" python2 setup.py build } diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index f3e051171..556f359e8 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136236 2011-08-25 06:48:07Z tpowa $ +# $Id: PKGBUILD 138370 2011-09-21 09:30:05Z tpowa $ # Maintainer: andyrtr <andyrtr funnychar archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar -pkgver=1.2.2 -pkgrel=3 +pkgver=1.2.3 +pkgrel=1 pkgdesc="modern file manager for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') @@ -23,14 +23,10 @@ options=('!libtool') install=${pkgname}.install backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla') source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2 - org.freedesktop.udisks.pkla - fix-gvfs.patch - fix-samba.patch) + org.freedesktop.udisks.pkla) build() { cd ${srcdir}/Thunar-${pkgver} - patch -Np1 -i ../fix-gvfs.patch - patch -Np1 -i ../fix-samba.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -59,8 +55,5 @@ package() { install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/ } - -md5sums=('a86df0212db71e61f459bda6bc7b7fb6' - 'a7ddb5eec02d9a8e91a2997862e73cd8' - '167c79462cddc5aaa1fcdc814041350b' - 'c8063873958d89402046f29b78c1d8d4') +md5sums=('0a2c36cdd3cb3a2ab52cbf6055415b85' + 'a7ddb5eec02d9a8e91a2997862e73cd8') diff --git a/extra/trayer/PKGBUILD b/extra/trayer/PKGBUILD index fc5a39222..6f5de6602 100644 --- a/extra/trayer/PKGBUILD +++ b/extra/trayer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122890 2011-05-07 04:26:20Z eric $ +# $Id: PKGBUILD 138436 2011-09-23 04:20:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=trayer pkgver=1.0 -pkgrel=5 +pkgrel=6 pkgdesc="A lightweight GTK2-based systray" arch=('i686' 'x86_64' 'mips64el') url="https://gna.org/projects/fvwm-crystal/" @@ -12,13 +12,15 @@ depends=('gtk2') makedepends=('libxmu') options=('!makeflags') source=(http://download.gna.org/fvwm-crystal/trayer/${pkgver}/${pkgname}-${pkgver}.tar.gz - trayer.diff) + trayer.diff manpage.diff) md5sums=('e1b0b6464f991f2c296561e377585867' - '7f66eee885563871f9f76646bca6b14d') + '7f66eee885563871f9f76646bca6b14d' + '3f1c92bbe275f186b613c04a47e8e977') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i ../trayer.diff + patch -p1 -i ../manpage.diff sed -i 's/$(LIBS) $(OBJ) $(SYSTRAYOBJ)/$(OBJ) $(SYSTRAYOBJ) $(LIBS)/' Makefile make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } @@ -26,6 +28,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX="${pkgdir}/usr" install - install -D -m644 README "${pkgdir}/usr/share/doc/${pkgname}/README" + install -D -m644 trayer.1 "${pkgdir}/usr/share/man/man1/trayer.1" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/trayer/manpage.diff b/extra/trayer/manpage.diff new file mode 100644 index 000000000..c99fc71af --- /dev/null +++ b/extra/trayer/manpage.diff @@ -0,0 +1,204 @@ +Description: Debian manpage and path setup +Author: Jens Peter Secher <jps@debian.org> +Index: trayer/trayer.1 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ trayer/trayer.1 2011-05-08 21:38:37.000000000 +0200 +@@ -0,0 +1,197 @@ ++.TH TRAYER 1 "Feb 14, 2005" "FVWM\-Crystal" ++.SH NAME ++trayer \- a lightweight GTK2\-based systray for UNIX desktop ++.SH SYNOPSIS ++.B trayer \-h ++.br ++.B trayer \-v ++.br ++.B trayer ++.\" ++.RB [\| \-\-edge ++.RI \| left \||\| right \||\| top \||\| bottom \||\| none \|] ++.\" ++.RB [\| \-\-align ++.RI \| left \||\| right \||\| center \|] ++.\" ++.RB [\| \-\-margin ++.RI \| <size> \|] ++.\" ++.RB [\| \-\-widthtype ++.RI \| request \||\| pixel \||\| percent ++.RI \|] ++.\" ++.RB [\| \-\-width ++.RI \| <size> \|] ++.\" ++.RB [\| \-\-heighttype ++.RI \| <pixel> \|] ++.\" ++.RB [\| \-\-height ++.RI \| <size> \|] ++.\" ++.RB [\| \-\-SetDockType ++.RI \| true \||\| false \|] ++.\" ++.RB [\| \-\-SetPartialStrut ++.RI \| true \||\| false \|] ++.\" ++.RB [\| \-\-transparent ++.RI \| true \||\| false \|] ++.\" ++.RB [\| \-\-alpha ++.RI \| <value> \|] ++.\" ++.RB [\| \-\-tint ++.RI \| <color> \|] ++.\" ++.RB [\| \-\-distance ++.RI \| <length> \|] ++.\" ++.RB [\| \-\-distancefrom ++.RI \| left \||\| right \||\| top \||\| bottom \||\| none \|] ++.\" ++.RB [\| \-\-expand ++.RI \| true \||\| false \|] ++.\" ++.RB [\| \-\-padding ++.RI \| <size> \|] ++.\" ++.SH DESCRIPTION ++.B trayer ++is a small program designed to provide system tray similar to these in ++.B GNOME ++/ ++.B KDE ++desktop environments for window managers which does not ++support that function. It is similar to other applications such as ++.B peksystray ++and \fBdocker\fP. ++.PP ++System tray is a place, where many applications put their icons, so they are ++always visible. Such icons may present status of an application and allow user ++to control the program. ++.PP ++\fBtrayer\fP's code was extracted from \fBfbpanel\fP application, you can find more ++about it on its homepage: http://fbpanel.sourceforge.net/. ++.SH OPTIONS ++This programs follow the usual GNU command line syntax, with long ++options starting with two dashes (`-'). ++A summary of options is included below. ++.TP ++.B \-\-help ++.TP ++.B \-h ++Show summary of options and exit. ++ ++.TP ++.B \-\-version ++.TP ++.B \-v ++Show version of program and exit. ++ ++.TP ++\fB\-\-edge\fP \fIleft\fP\||\|\fIright\fP\||\|\fItop\fP\||\|\fIbottom\fP\||\|\fInone\fP ++Specifies a screen edge to use. ++ ++.TP ++\fB\-\-align\fP \fIleft\fP\||\|\fIcenter\fP\||\|\fIright\fP ++Specifies an align of the icons. ++ ++.TP ++\fB\-\-margin\fP \fI<size>\fP ++Specifies length of margin (in pixels) ++ ++.TP ++\fB\-\-widthtype\fB \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP ++Specifies method of calculating trayer's window width: ++.RS ++.TP ++\fIrequest\fP ++Follow application icons' size, so trayer may shrink or expand dynamically. ++ ++.TP ++\fIpixel\fP ++Set a fixed size, given with \fB\-\-width\fP option in pixels. ++ ++.TP ++\fIpercent\fP ++Set a fixed size, given with \fB\-\-width\fP option in percentage of a length of screen edge. ++.RE ++ ++.TP ++\fB\-\-width\fP \fI<size>\fP ++Width of trayer's window. Ignored when \fB\-\-widthtype\fP is set to \fIrequest\fP. ++ ++.TP ++\fB\-\-heighttype\fP \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP ++Specifies method of calculating trayer's window height: ++.RS ++.TP ++\fIrequest\fP ++Follow application icons' size, so trayer may shrink or expand dynamically. ++ ++.TP ++\fIpixel\fP ++Set a fixed size, given with \fB\-\-height\fP option in pixels. ++ ++.TP ++\fIpercent\fP ++Set a fixed size, given with \fB\-\-height\fP option in percentage of a length of screen edge. ++.RE ++ ++.TP ++\fB\-\-height\fP \fI<size>\fP ++Height of trayer's window. Ignored when \fB\-\-heighttype\fP is set to \fIrequest\fP. ++ ++.TP ++\fB\-\-SetDockType\fP \fItrue\fP\||\|\fIfalse\fP ++Identify panel window type as dock. ++ ++.TP ++\fB\-\-SetPartialStrut\fP \fItrue\fP\||\|\fIfalse\fP ++Reserve panel space so that it will not be covered by maximized windows. ++ ++.TP ++\fB\-\-transparent\fP \fItrue\fP\||\|\fIfalse\fP ++Use transparency. ++ ++.TP ++\fB\-\-alpha\fP \fI<value>\fP ++Percentage of transparency (0 \- nontransparent, 255 \- fully transparent) ++ ++.TP ++\fB\-\-tint\fP \fI<color>\fP ++Color used to tint transparent background. Color is given as a 24-bit C hexadecimal integer, for example: 0xff0000 is red, 0xff8800 is orange and 0x00ff00 is green. ++ ++.TP ++\fB\-\-distance\fP \fI<length>\fP ++Specifies distance between trayer's window and screen edge (in pixels) ++ ++.TP ++\fB\-\-distancefrom\fP \fI<edge>\fP ++Specifies which edge to calculate distance from, see above. ++ ++.TP ++\fB\-\-expand\fP \fItrue\fP\||\|\fIfalse\fP ++Specifies whether trayer may accommodate extra space when there is too much ++icons. ++ ++.TP ++\fB\-\-padding\fP \fI<size>\fP ++Extra space between icons and trayer window's border. ++ ++.SH SEE ALSO ++.BR fbpanel (1) ++.SH AUTHORS ++Anatoly Asviyan <aanatoly@users.sf.net> \- fbpanel ++.br ++Rafal Bisingier <ravbc@man.poznan.pl> ++.br ++Maciej Delmanowski <harnir@users.berlios.de> ++.br ++Grzegorz Nieweglowski <hoppke@dobremiasto.net> ++.br ++Thomas Rydzynski ++.PP ++This manual page was written by Tomasz Melcer <liori@interia.pl>. diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 015cf6547..99b3d6d2e 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120497 2011-04-24 14:50:22Z andyrtr $ +# $Id: PKGBUILD 138386 2011-09-21 13:11:57Z tpowa $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler -pkgver=0.1.21 -pkgrel=3 +pkgver=0.1.22 +pkgrel=1 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/xfce/tumbler/" license=('GPL2' 'LGPL') @@ -12,10 +12,10 @@ arch=('i686' 'x86_64' 'mips64el') groups=('xfce4') depends=('poppler-glib' 'dbus-glib') makedepends=('intltool' 'ffmpegthumbnailer') -optdepends=('ffmpegthumbnailer: for video thunbnails') +optdepends=('ffmpegthumbnailer: for video thumbnails' + 'gstreamer0.10: for video thumbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2ef0d30750f95efe345de4655049d4f6') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -31,3 +31,4 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=$pkgdir install } +md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9') diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD new file mode 100644 index 000000000..05ab8890f --- /dev/null +++ b/extra/varnish/PKGBUILD @@ -0,0 +1,44 @@ +# $Id +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Douglas Soares de Andrade +# Contributor: Roberto Alsina <ralsina@kde.org> + +pkgname=varnish +pkgver=3.0.1 +pkgrel=1 +pkgdesc="High-performance HTTP accelerator" +arch=('i686' 'x86_64') +url="http://www.varnish-cache.org/" +license=('BSD') +depends=('gcc' 'libedit' 'pcre') +backup=('etc/conf.d/varnish') +install=$pkgname.install +options=('!libtool') +source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" + "$pkgname.conf.d" + "rc.$pkgname") +md5sums=('d01d9c1f2da2b2a1b18299a0b44c8580' + 'd42eebc7f0ac429d9740125ff1e61daf' + '18b7747020ecfe2eac7445971a7014e3') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var/lib + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -D -m755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname" + install -D -m644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname" + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish new file mode 100644 index 000000000..2ebd97e33 --- /dev/null +++ b/extra/varnish/rc.varnish @@ -0,0 +1,46 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/varnish + +pidfile=/run/varnish.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case "$1" in + start) + stat_busy "Starting Varnish Reverse Proxy" + if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then + add_daemon varnish + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping Varnish Reverse Proxy" + if [[ $PID ]] && kill $PID &>/dev/null; then + rm_daemon varnish + stat_done + else + stat_fail + exit 1 + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac diff --git a/extra/varnish/varnish.conf.d b/extra/varnish/varnish.conf.d new file mode 100644 index 000000000..2970468b7 --- /dev/null +++ b/extra/varnish/varnish.conf.d @@ -0,0 +1,9 @@ +# +# Command line options to varnishd +# + +VARNISHD_OPTS="-a 0.0.0.0:80 \ + -b localhost:8080 \ + -T localhost:6082 \ + -s malloc,64M + -u nobody -g nobody" diff --git a/extra/varnish/varnish.install b/extra/varnish/varnish.install new file mode 100644 index 000000000..fceaf4be7 --- /dev/null +++ b/extra/varnish/varnish.install @@ -0,0 +1,6 @@ +#!/bin/sh + +# remove localstatedir -- compiled VCL and slab files will still be here. +post_remove() { + rm -rf /var/lib/varnish +} diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index e64e3085f..988741d19 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 119933 2011-04-17 01:32:48Z andrea $ +# $Id: PKGBUILD 138426 2011-09-22 19:46:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=virtuoso pkgver=6.1.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality' url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') depends=('openssl') makedepends=('bison' 'flex') -options=('!libtool' '!makeflags') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz") -md5sums=('7d4b0497411ff1c34d7ca247618cdd17') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz" + 'fix-unicode.patch') +md5sums=('7d4b0497411ff1c34d7ca247618cdd17' + '550dcc877dcbda707aa7ba53800e5d5b') build() { cd ${srcdir}/${pkgname}-opensource-${pkgver} + # Already fixed upstream + patch -p0 -i "${srcdir}"/fix-unicode.patch + ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc \ diff --git a/extra/virtuoso/fix-unicode.patch b/extra/virtuoso/fix-unicode.patch new file mode 100644 index 000000000..30046d233 --- /dev/null +++ b/extra/virtuoso/fix-unicode.patch @@ -0,0 +1,21 @@ +Index: libsrc/Wi/xqf.c +=================================================================== +RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v +retrieving revision 1.21.2.9 +retrieving revision 1.21.2.12 +diff -u -r1.21.2.9 -r1.21.2.12 +--- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9 ++++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12 +@@ -3520,6 +3552,12 @@ + desc = xqf_str_parser_descs + desc_idx; + if (DV_DB_NULL == arg_dtp) + return NEW_DB_NULL; ++ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */ ++ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING) ++ { ++ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING); ++ goto res_ready; ++ } + if (DV_STRING != arg_dtp) + { + caddr_t err = NULL; diff --git a/gnome-unstable/aisleriot/PKGBUILD b/gnome-unstable/aisleriot/PKGBUILD new file mode 100644 index 000000000..e2ed77e71 --- /dev/null +++ b/gnome-unstable/aisleriot/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 138400 2011-09-21 15:05:12Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=aisleriot +pkgver=3.1.92 +pkgrel=1 +pkgdesc="GNOME Solitaire card games" +arch=(i686 x86_64) +license=(GPL) +url="http://www.gnome.org" +groups=('gnome-extra') +depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf) +makedepends=(gnome-doc-utils intltool itstool) +options=('!emptydirs' '!libtool') +install=aisleriot.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('79e8b8fe1d5d18dd93e9e27a0b19146929e41aa17c242e388b75b5ebe511def6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain aisleriot ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/aisleriot/aisleriot.install b/gnome-unstable/aisleriot/aisleriot.install new file mode 100644 index 000000000..713506dba --- /dev/null +++ b/gnome-unstable/aisleriot/aisleriot.install @@ -0,0 +1,22 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + usr/sbin/gconfpkg --install aisleriot +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall aisleriot +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -f -t usr/share/icons/hicolor +} diff --git a/gnome-unstable/anjuta/PKGBUILD b/gnome-unstable/anjuta/PKGBUILD new file mode 100644 index 000000000..f2a818e58 --- /dev/null +++ b/gnome-unstable/anjuta/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 138381 2011-09-21 12:37:46Z heftig $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Harley Laue <losinggeneration@yahoo.com> + +pkgname=anjuta +pkgver=3.1.92 +pkgrel=1 +pkgdesc="GNOME Integrated Development Environment (IDE)" +arch=('i686' 'x86_64') +license=('GPL') +depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' + 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'python2' + 'shared-mime-info' 'desktop-file-utils') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') +url="http://anjuta.sourceforge.net/" +install=anjuta.install +source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +options=('!libtool' '!emptydirs') +sha256sums=('b9c2fe1e11f9df449e15cdc1e37590d582360b79b1a970db9518935ea97bec12') + +build() { + cd "${srcdir}/anjuta-${pkgver}" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper + make +} + +package(){ + cd "${srcdir}/anjuta-${pkgver}" + + make DESTDIR="${pkgdir}" install + + sed -i "1s|#!/usr/bin/python$|&2|" \ + $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py +} diff --git a/gnome-unstable/anjuta/anjuta.install b/gnome-unstable/anjuta/anjuta.install new file mode 100644 index 000000000..c6fcfec11 --- /dev/null +++ b/gnome-unstable/anjuta/anjuta.install @@ -0,0 +1,21 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-mime-database usr/share/mime > /dev/null +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall anjuta + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/brasero/PKGBUILD b/gnome-unstable/brasero/PKGBUILD new file mode 100644 index 000000000..27e472952 --- /dev/null +++ b/gnome-unstable/brasero/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 138372 2011-09-21 11:22:57Z heftig $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=brasero +pkgver=3.1.92 +pkgrel=1 +pkgdesc="A disc burning application for Gnome" +arch=('i686' 'x86_64') +url="http://www.gnome.org/projects/brasero" +license=('GPL') +options=('!libtool' '!emptydirs') +depends=('gtk3' 'gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql') +makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf') +optdepends=('libburn: alternative back-end' + 'libisofs: libburn back-end' + 'dvdauthor: video project' + 'gstreamer0.10-bad-plugins: video project' + 'vcdimager: video project') +replaces=('nautilus-cd-burner') +install=brasero.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('cbe37bd232051e698ac3a3699cfc925428a2649d69102e517d698e89badb44b5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-caches \ + --disable-schemas-compile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install +} + diff --git a/gnome-unstable/brasero/brasero.install b/gnome-unstable/brasero/brasero.install new file mode 100644 index 000000000..b6c57055e --- /dev/null +++ b/gnome-unstable/brasero/brasero.install @@ -0,0 +1,14 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/gnome-unstable/eog-plugins/PKGBUILD b/gnome-unstable/eog-plugins/PKGBUILD new file mode 100644 index 000000000..4efc98271 --- /dev/null +++ b/gnome-unstable/eog-plugins/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 138444 2011-09-23 09:59:35Z heftig $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=eog-plugins +pkgver=3.1.3 +pkgrel=1 +pkgdesc="Plugins for Eye of Gnome" +arch=('i686' 'x86_64') +url="http://www.gnome.org/" +license=('GPL2') +depends=('eog' 'libpeas' 'libchamplain' 'libexif' 'libgdata') +makedepends=('intltool') +install=eog-plugins.install +options=('!libtool') +groups=(gnome-extra) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('810c96aafc67f191f26ffe0e452407980a9fe675088647176b3d464fe96e5b4f') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/eog-plugins/eog-plugins.install b/gnome-unstable/eog-plugins/eog-plugins.install new file mode 100644 index 000000000..24072f316 --- /dev/null +++ b/gnome-unstable/eog-plugins/eog-plugins.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gdl/PKGBUILD b/gnome-unstable/gdl/PKGBUILD new file mode 100644 index 000000000..f55145e18 --- /dev/null +++ b/gnome-unstable/gdl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 138383 2011-09-21 12:47:01Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=gdl +pkgver=3.1.5 +pkgrel=1 +pkgdesc="GNOME Docking Library" +arch=(i686 x86_64) +license=('GPL') +url="http://www.gnome.org/" +depends=('gtk3') +makedepends=('gtk-doc' 'intltool' 'gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('b89a30a7df499f3ee74108bb28ac46a962dc5e94c4e50fe34c8f9cf1580db482') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/libchamplain/PKGBUILD b/gnome-unstable/libchamplain/PKGBUILD new file mode 100644 index 000000000..470090998 --- /dev/null +++ b/gnome-unstable/libchamplain/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 138442 2011-09-23 09:44:46Z heftig $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Michael Kanis <mkanis@gmx.de> + +pkgname=libchamplain +pkgver=0.12.0 +pkgrel=1 +pkgdesc="Gtk3 widget for displaying rasterized maps" +url="http://projects.gnome.org/libchamplain/" +license=('LGPL') +arch=('i686' 'x86_64') +options=('!libtool') +depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3') +makedepends=('gobject-introspection' 'gtk-doc' 'vala') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('c6d2b9dc3b8fd1715c95a11b428c9121828953fd02cf301a7eb577c9b5bdba85') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-static --disable-debug \ + --enable-vala + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/gnome-unstable/libgda/PKGBUILD b/gnome-unstable/libgda/PKGBUILD new file mode 100644 index 000000000..bbfab94e7 --- /dev/null +++ b/gnome-unstable/libgda/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 138380 2011-09-21 12:33:21Z heftig $ +# Maintainer: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=libgda +pkgver=4.99.4 +pkgrel=1 +pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" +arch=(i686 x86_64) +license=('GPL') +depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup' + 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' + 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2' + 'iso-codes' 'openssl' 'libgcrypt' 'libldap') +makedepends=('intltool' 'gobject-introspection' 'java-environment' 'gtk-doc') +options=('!libtool') +url="http://www.gnome-db.org" +install=libgda.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('efef38c0318d156ba3263416355847af961f561660793cb670633e056018beac') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-bdb=/usr --with-bdb-libdir-name=lib \ + --disable-static --enable-json + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/gnome-unstable/libgda/libgda.install b/gnome-unstable/libgda/libgda.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/gnome-unstable/libgda/libgda.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/polkit-gnome/PKGBUILD b/gnome-unstable/polkit-gnome/PKGBUILD new file mode 100644 index 000000000..20e0ccb44 --- /dev/null +++ b/gnome-unstable/polkit-gnome/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 138471 2011-09-24 15:25:13Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: onestep_ua <onestep@ukr.net> + +pkgname=polkit-gnome +pkgver=0.103 +pkgrel=1 +pkgdesc="PolicyKit integration for the GNOME desktop" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/PolicyKit" +license=('LGPL') +depends=('polkit' 'gtk3') +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz + polkit-gnome-authentication-agent-1.desktop) +sha256sums=('e12712010c76dd7031f83d932253c53940821f5e47303b02fd70d66062ce396b' + 'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/polkit-gnome-authentication-agent-1.desktop" \ + "${pkgdir}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop" +} diff --git a/gnome-unstable/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/gnome-unstable/polkit-gnome/polkit-gnome-authentication-agent-1.desktop new file mode 100644 index 000000000..fc2acc28d --- /dev/null +++ b/gnome-unstable/polkit-gnome/polkit-gnome-authentication-agent-1.desktop @@ -0,0 +1,88 @@ +[Desktop Entry] +Name=PolicyKit Authentication Agent +Name[ar]=مدير الاستيثاق PolicyKit +Name[be]=PolicyKit - аґент аўтэнтыфікацыі +Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Name[ca]=Agent d'autenticació del PolicyKit +Name[cs]=Ověřovací agent PolicyKit +Name[da]=Godkendelsesprogrammet PolicyKit +Name[de]=Legitimationsdienst von PolicyKit +Name[el]=Πράκτορας πιστοποίησης PolicyKit +Name[en_GB]=PolicyKit Authentication Agent +Name[es]=Agente de autenticación de PolicyKit +Name[eu]=PolicyKit autentifikatzeko agentea +Name[fi]=PolicytKit-tunnistautumisohjelma +Name[fr]=Agent d'authentification de PolicyKit +Name[gl]=Axente de autenticación PolicyKit +Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Name[hu]=PolicyKit hitelesítési ügynök +Name[it]=Agente di autenticazione per PolicyKit +Name[ja]=PolicyKit 認証エージェント +Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Name[lt]=PolicyKit tapatybės nustatymo agentas +Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് +Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Name[pl]=Agent uwierzytelniania PolicyKit +Name[pt]=Agente de Autenticação PolicyKit +Name[pt_BR]=Agente de autenticação PolicyKit +Name[ro]=Agent de autentificare PolicyKit +Name[sk]=Agent PolicyKit na overovanie totožnosti +Name[sl]=PolicyKit program overjanja +Name[sv]=Autentiseringsagent för PolicyKit +Name[ta]=PolicyKit அங்கீகார முகவர் +Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Name[uk]=Агент автентифікації PolicyKit +Name[zh_CN]=PolicyKit 认证代理 +Name[zh_HK]=PolicyKit 驗證代理程式 +Name[zh_TW]=PolicyKit 驗證代理程式 +Comment=PolicyKit Authentication Agent +Comment[ar]=مدير الاستيثاق PolicyKit +Comment[be]=PolicyKit - аґент аўтэнтыфікацыі +Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট +Comment[ca]=Agent d'autenticació del PolicyKit +Comment[cs]=Ověřovací agent PolicyKit +Comment[da]=Godkendelsesprogrammet PolicyKit +Comment[de]=Legitimationsdienst von PolicyKit +Comment[el]=Πράκτορας πιστοποίησης PolicyKit +Comment[en_GB]=PolicyKit Authentication Agent +Comment[es]=Agente de autenticación de PolicyKit +Comment[eu]=PolicyKit autentifikatzeko agentea +Comment[fi]=PolicytKit-tunnistautumisohjelma +Comment[fr]=Agent d'authentification de PolicyKit +Comment[gl]=Axente de autenticación PolicyKit +Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ +Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि +Comment[hu]=PolicyKit hitelesítési ügynök +Comment[it]=Agente di autenticazione per PolicyKit +Comment[ja]=PolicyKit 認証エージェント +Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ +Comment[lt]=PolicyKit tapatybės nustatymo agentas +Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് +Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट +Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ +Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ +Comment[pl]=Agent uwierzytelniania PolicyKit +Comment[pt]=Agente de Autenticação PolicyKit +Comment[pt_BR]=Agente de autenticação PolicyKit +Comment[ro]=Agent de autentificare PolicyKit +Comment[sk]=Agent PolicyKit na overovanie totožnosti +Comment[sl]=PolicyKit program overjanja +Comment[sv]=Autentiseringsagent för PolicyKit +Comment[ta]=PolicyKit அங்கீகார முகவர் +Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి +Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit +Comment[uk]=Агент автентифікації PolicyKit +Comment[zh_CN]=PolicyKit 认证代理 +Comment[zh_HK]=PolicyKit 驗證代理程式 +Comment[zh_TW]=PolicyKit 驗證代理程式 +Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +Terminal=false +Type=Application +Categories= +NoDisplay=true +NotShowIn=KDE; +AutostartCondition=GNOME3 unless-session gnome diff --git a/gnome-unstable/seed/PKGBUILD b/gnome-unstable/seed/PKGBUILD new file mode 100644 index 000000000..d20ff3499 --- /dev/null +++ b/gnome-unstable/seed/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 138418 2011-09-22 08:07:08Z ibiru $ +#Maintainer : Ionut Biru <ibiru@archlinux.org> +#Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=seed +pkgver=3.2.0 +pkgrel=1 +pkgdesc="Library and interpreter for JavaScript with GObject type system bindings." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Seed/" +license=('LGPL') +options=('!libtool') +depends=('libwebkit3' 'gobject-introspection' 'gnome-js-common') +makedepends=('intltool') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) +sha256sums=('3d1eca40834b72a5730ddaf8a5f46b8df20ddb2b3b39687d1a84ef966d3d37c0') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/bzip2/PKGBUILD b/testing/bzip2/PKGBUILD new file mode 100644 index 000000000..00bfaa834 --- /dev/null +++ b/testing/bzip2/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 138430 2011-09-22 23:27:25Z dan $ +# Maintainer: +# Contributor: Judd <jvinet@zeroflux.org> + +pkgname=bzip2 +pkgver=1.0.6 +pkgrel=2 +pkgdesc="A high-quality data compression program" +arch=('i686' 'x86_64') +license=('custom') +url="http://sources.redhat.com/bzip2" +groups=('base') +depends=('glibc') +source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz + bzip2-1.0.4-bzip2recover.patch) +md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b' + '8a8bca02bdeaf2fd8913aeb549577e7e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # add large-file support + sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so + + # use our optimization + sed -i "s|-O2|${CFLAGS}|g" Makefile + sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so + + patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch + + make -f Makefile-libbz2_so + make bzip2 bzip2recover libbz2.a +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make test +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -dm755 $pkgdir/bin + install -m755 bzip2-shared $pkgdir/bin/bzip2 + install -m755 bzip2recover $pkgdir/bin + ln -sf bzip2 $pkgdir/bin/bunzip2 + ln -sf bzip2 $pkgdir/bin/bzcat + + install -dm755 $pkgdir/usr/bin + install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin + + install -Dm755 libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0.6 + ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so + ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1 + ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0 + + install -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a + ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so + + install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h + + install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1 + ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1 + ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1 + ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1 + + install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \ + $pkgdir/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/bzip2/bzip2-1.0.4-bzip2recover.patch b/testing/bzip2/bzip2-1.0.4-bzip2recover.patch new file mode 100644 index 000000000..e2bfe1cc1 --- /dev/null +++ b/testing/bzip2/bzip2-1.0.4-bzip2recover.patch @@ -0,0 +1,12 @@ +--- bzip2-1.0.4/bzip2recover.c.pom 2007-01-03 03:00:55.000000000 +0100 ++++ bzip2-1.0.4/bzip2recover.c 2007-02-05 11:55:17.000000000 +0100 +@@ -309,7 +309,8 @@ + UInt32 buffHi, buffLo, blockCRC; + Char* p; + +- strcpy ( progName, argv[0] ); ++ strncpy ( progName, argv[0], BZ_MAX_FILENAME-1); ++ progName[BZ_MAX_FILENAME-1]='\0'; + inFileName[0] = outFileName[0] = 0; + + fprintf ( stderr, diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD new file mode 100644 index 000000000..7db99b002 --- /dev/null +++ b/testing/java7-openjdk/PKGBUILD @@ -0,0 +1,267 @@ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Guillaume ALAUX <guillaume@archlinux.org> + +pkgname=('jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') +pkgbase=java7-openjdk +_java_ver=7 +_openjdk_build=b147 +_openjdk_date=27_jun_2011 +_icedtea_ver=2.0 +_date=20110922 + +# check "${srcdir}/icedtea7"/Makefile.am +_CORBA_CHANGESET=616c760dc288 +_HOTSPOT_CHANGESET=1dd9b3d73b22 +_JAXP_CHANGESET=c40983d6ae70 +_JAXWS_CHANGESET=83db5e316798 +_JDK_CHANGESET=0cb15650412a +_LANGTOOLS_CHANGESET=fb7fb3071b64 +_OPENJDK_CHANGESET=3defd24c2671 + +pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} +pkgrel=0.20110922.1 +arch=('i686' 'x86_64') +url="http://icedtea.classpath.org" +license=('custom') +makedepends=('eclipse-ecj' 'libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2' + 'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib' + 'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2') +source=(ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz + http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz + http://icedtea.classpath.org/download/drops/{jdk7-jaf-2010_08_19.zip,jdk7-jaxws2_2_4-b03-2011_05_27.zip,jaxp145_01.zip} + fontconfig-paths.diff + fix_corba_cmds_path.diff + openjdk7_fix_jdk_cmds_path.diff + openjdk7_nonreparenting-wm.diff + jdk7-openjdk.profile + jdk7-openjdk.profile.csh + jre7-openjdk.profile + jre7-openjdk.profile.csh + jconsole.desktop + policytool.desktop) +sha1sums=('e569c8a1265d30856caa646d101ce3e1e4a2a69f' + '51dafe7367732d58a5ee531f5840fe1ab9c9d2bf' + 'c246e4a01d11bdbe4fb23f1bd3819456d1446f52' + '8a286c9314f47f7bb6c59b8e8b4560db81019a83' + 'c0e7e9b99d4de220ef3346f3da942a4a39bb8b71' + '6a115a71c94b4de1ad4e9c00fe3994bc31acd943' + '29f8481fd98d709c72a81d5d742097455f38af7d' + 'a8a199fb4c908852a0afdd76937ad194191d20f7' + '63ea970dcf129fbbba39a132d8f71add19fbf1f0' + '539bcf80b9a86c97406a3c79e7d10684b213a4be' + '106db88c8e53abb1a064e83d41cc7acd16b7713c' + '00ae05d9c8679deb72c0a9008a670daafeb21565' + 'e551b40820393c4cab3a82154f51b55577644ba1' + 'fe04691f0a23f43a8d9017f7c5fccd4620bc9019' + 'ab22e135916786c181be66be39acd7954175bb9c' + 'b2dbb1a8a7264db229d6888467ed3f2799a007b0' + '344f7e911ab52e38f1ff237ed770bec362d79f79' + '683cbb342c8d3077b43b31be700864379c0aa54b' + '2a12035cc3e586131952cbb78d9885f6dc10d1b2' + '2e7827f47b9190dcc0697752b0f799caea872239' + '0bc35e5436f1663f5251b8f8c159a04088a09484') + +#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip + +noextract=("${_OPENJDK_CHANGESET}.tar.gz" + "${_CORBA_CHANGESET}.tar.gz" + "${_JAXP_CHANGESET}.tar.gz" + "${_JAXWS_CHANGESET}.tar.gz" + "${_JDK_CHANGESET}.tar.gz" + "${_LANGTOOLS_CHANGESET}.tar.gz" + "${_HOTSPOT_CHANGESET}.tar.gz" + "jdk7-jaf-2010_08_19.zip" + "jdk7-jaxws2_2_4-b03-2011_05_27.zip" + "jaxp145_01.zip") + +# source PKGBUILD && mksource +#makedepends+=('mercurial') +mksource() { + mkdir /tmp/icedtea7-${_date} + pushd /tmp/icedtea7-${_date} + hg -v clone http://icedtea.classpath.org/hg/icedtea7 + rm -rf icedtea7/.hg* + tar -cvJf /tmp/icedtea7-${_date}/icedtea7-${_date}-hg.tar.xz * + popd +} + +build() { + cd "${srcdir}/icedtea7" + + unset JAVA_HOME + unset CLASSPATH + unset MAKEFLAGS + + export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" + export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" + + . /etc/profile.d/apache-ant.sh + + cp ${srcdir}/*.diff ${srcdir}/icedtea7/patches + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" + + # Bootstrap IcedTea with ecj and a GNU Classpath-based JDK: + autoreconf --force --install + + ./configure \ + --disable-bootstrap \ + --disable-tests \ + --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \ + --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \ + --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \ + --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \ + --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \ + --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \ + --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ + --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ + --with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \ + --with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \ + --with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \ + --enable-pulse-java #--help + +# + +# --enable-systemtap Enable inclusion of SystemTap trace support +# --enable-nss Enable inclusion of NSS security provider +# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed + + + #LD_PRELOAD="" + make +} + +check() { + cd "${srcdir}/icedtea7" + make -k check +} + +package_jre7-openjdk() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment" + depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' + 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng') + optdepends=('icedtea-web: web browser plugin + Java Web Start' + 'alsa-lib: for sound' + 'giflib: for gif format support') + provides=('java-runtime=7') + conflicts=('java-runtime') +# replaces=('openjdk6') # once we remove openjdk6 pkg from the repos + backup=(etc/profile.d/jre7-openjdk.sh) + install=jre7-openjdk.install + + _jvmdir=/usr/lib/jvm/java-7-openjdk + + cd "${srcdir}/icedtea7/openjdk.build/j2sdk-image/jre" + + install -d -m755 ${pkgdir}/${_jvmdir}/jre/ + cp -a bin lib ${pkgdir}/${_jvmdir}/jre + + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc + rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc + rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src + + # Install man pages + pushd ../../j2re-image/man + install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/ + install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1 + install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1 + popd + + # Install icons and menu entries + for s in 16 24 32 48 ; do + install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/ + install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ + ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png + done + + # Link binaries into /usr/bin + pushd ${pkgdir}/${_jvmdir}/jre/bin + install -m755 -d ${pkgdir}/usr/bin/ + for file in *; do + ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin + done + popd + + # Link JKS keystore from ca-certificates-java + rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" + + # Set some variables + install -m755 -d ${pkgdir}/etc/profile.d/ + install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh + install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh + + # Install license + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ + install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ + ${pkgdir}/usr/share/licenses/${pkgbase} +} + +package_jdk7-openjdk() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK" + depends=('jre7-openjdk') + provides=('java-environment=7') + conflicts=('java-environment') + # replaces=('openjdk6') + backup=(etc/profile.d/jdk7-openjdk.sh) + + _jvmdir=/usr/lib/jvm/java-7-openjdk + + cd "${srcdir}/icedtea7/openjdk.build/j2sdk-image" + + # Main files + install -m755 -d ${pkgdir}/${_jvmdir}/ + + cp -a demo include lib sample ${pkgdir}/${_jvmdir} + + # 'bin' files + pushd bin + install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \ + ${pkgdir}/usr/bin/ \ + ${pkgdir}/usr/share/man/{,ja/}man1/ + + # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page + for b in $(ls | grep -v java-rmi.cgi); do + if [ -e ../jre/bin/${b} ]; then + # Provide a link of the jre binary in the jdk/bin/ directory + ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b} + else + # Copy binary to jdk/bin/ + install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b} + # Copy man page + install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1 + install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1 + # Link from /bin/ + ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b} + fi + done + popd + + # Handling 'java-rmi.cgi' separately + install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi + + # Desktop files + install -m755 -d ${pkgdir}/usr/share/applications/ + install -m644 ${srcdir}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications/ + + # Set some variables + install -m755 -d ${pkgdir}/etc/profile.d/ + install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh + install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh +} + +package_openjdk7-src() { + pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources" + + install -D ${srcdir}/icedtea7/openjdk.build/j2sdk-image/src.zip \ + ${pkgdir}/${_jvmdir}/src.zip +} diff --git a/testing/java7-openjdk/fix_corba_cmds_path.diff b/testing/java7-openjdk/fix_corba_cmds_path.diff new file mode 100644 index 000000000..842657880 --- /dev/null +++ b/testing/java7-openjdk/fix_corba_cmds_path.diff @@ -0,0 +1,33 @@ +--- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 ++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 +@@ -86,10 +86,10 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio +-CUT = $(UTILS_USR_BIN_PATH)cut ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -136,7 +136,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq +@@ -186,7 +186,7 @@ + # others have it in /usr/bin. + SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ + $(wildcard $(UTILS_USR_BIN_PATH)sort)) +- NAWK = $(USRBIN_PATH)gawk ++ NAWK = $(UTILS_COMMAND_PATH)gawk + # Intrinsic unix command, with backslash-escaped character interpretation + ECHO = /bin/echo -e + # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/testing/java7-openjdk/fontconfig-paths.diff b/testing/java7-openjdk/fontconfig-paths.diff new file mode 100644 index 000000000..fa08db629 --- /dev/null +++ b/testing/java7-openjdk/fontconfig-paths.diff @@ -0,0 +1,134 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000 +@@ -275,73 +275,61 @@ + + # Font File Names + +-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf +-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf +-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf +-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf +- +-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf +-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf +-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf +-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf +- +-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf +-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf +-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf +-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf +- +-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf +- +-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf +-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf +-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf +-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf +-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf +-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf +-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf +-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf +-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf +- +-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf +-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf +-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf +-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf +- +-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf +-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf +-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf +-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf +-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf +-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf +-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf +-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf +-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf +-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf +-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf +-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf +- +-# AWT X11 font paths +-awtfontpath.latin-1=/usr/share/fonts/X11/Type1 +-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic +-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic +-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic +-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic +-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy +-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi +-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami +-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic +-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk +-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts ++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf ++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf ++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf ++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf ++ ++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf ++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf ++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf ++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf ++ ++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf ++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf ++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf ++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf ++ ++filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf ++ ++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf ++filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf ++filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf ++filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf ++filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf ++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf ++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf ++filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf ++filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf ++ ++filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf ++filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf ++#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf ++filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf ++filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf ++filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf ++filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf ++ ++filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf ++filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf ++filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf ++filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf ++filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf ++filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf ++filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf ++filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf ++filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf ++filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf ++filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf ++filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf ++ diff --git a/testing/java7-openjdk/jconsole.desktop b/testing/java7-openjdk/jconsole.desktop new file mode 100644 index 000000000..ffbdd42ad --- /dev/null +++ b/testing/java7-openjdk/jconsole.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Monitoring & Management Console +Comment=Monitor and manage OpenJDK applications +Exec=/usr/bin/jconsole +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-tools-jconsole-JConsole +Categories=Development;Monitor;Java; +Version=1.0 diff --git a/testing/java7-openjdk/jdk7-openjdk.profile b/testing/java7-openjdk/jdk7-openjdk.profile new file mode 100644 index 000000000..c69fdb9b3 --- /dev/null +++ b/testing/java7-openjdk/jdk7-openjdk.profile @@ -0,0 +1,6 @@ +export J2SDKDIR=/usr/lib/jvm/java-7-openjdk +export J2REDIR=$J2SDKDIR/jre +export JAVA_HOME=/usr/lib/jvm/java-7-openjdk + +# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' +# in /etc/profile.d/jre7-openjdk.sh diff --git a/testing/java7-openjdk/jdk7-openjdk.profile.csh b/testing/java7-openjdk/jdk7-openjdk.profile.csh new file mode 100644 index 000000000..cc7dc8ab1 --- /dev/null +++ b/testing/java7-openjdk/jdk7-openjdk.profile.csh @@ -0,0 +1 @@ +setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk" diff --git a/testing/java7-openjdk/jre7-openjdk.install b/testing/java7-openjdk/jre7-openjdk.install new file mode 100644 index 000000000..8e3ff0ee0 --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk.install @@ -0,0 +1,24 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi + echo "when you use a non-reparenting window manager" + echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" + echo "/etc/profile.d/jre7-openjdk.sh" +# update-desktop-database -q +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + if [ ! -f /etc/ssl/certs/java/cacerts ]; then + /usr/sbin/init-jks-keystore + fi +# update-desktop-database -q +} + + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +# update-desktop-database -q +} diff --git a/testing/java7-openjdk/jre7-openjdk.profile b/testing/java7-openjdk/jre7-openjdk.profile new file mode 100644 index 000000000..c86ce857a --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk.profile @@ -0,0 +1,5 @@ +export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre +export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre} + +# enable this for non-reparenting window managers +#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/testing/java7-openjdk/jre7-openjdk.profile.csh b/testing/java7-openjdk/jre7-openjdk.profile.csh new file mode 100644 index 000000000..a9aed27d1 --- /dev/null +++ b/testing/java7-openjdk/jre7-openjdk.profile.csh @@ -0,0 +1,5 @@ +setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre" +setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre" + +# enable this for non-reparenting window managers +#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff new file mode 100644 index 000000000..c68bd4441 --- /dev/null +++ b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff @@ -0,0 +1,24 @@ +--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 +@@ -91,10 +91,10 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio +-CUT = $(UTILS_USR_BIN_PATH)cut ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -141,7 +141,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff new file mode 100644 index 000000000..ba1a588e1 --- /dev/null +++ b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff @@ -0,0 +1,58 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200 +@@ -102,7 +102,8 @@ + METACITY_WM = 11, + COMPIZ_WM = 12, + LG3D_WM = 13, +- MUTTER_WM = 14; ++ MUTTER_WM = 14, ++ OTHER_NONREPARENTING_WM = 15; + public String toString() { + switch (WMID) { + case NO_WM: +@@ -576,7 +577,7 @@ + // TODO: according to wikipedia, compiz is now reparenting. This should + // probably be updated. + static boolean isNonReparentingWM() { +- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); ++ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); + } + + /* +@@ -762,9 +763,17 @@ + * supports WIN or _NET wm spec. + */ + else if (l_net_protocol.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } else if (win.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } + /* + * Check for legacy WMs. +@@ -775,6 +784,8 @@ + awt_wmgr = XWM.MOTIF_WM; + } else if (isOpenLook()) { + awt_wmgr = XWM.OPENLOOK_WM; ++ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; + } +@@ -1289,6 +1300,7 @@ + res = new Insets(28, 6, 6, 6); + break; + case NO_WM: ++ case OTHER_NONREPARENTING_WM: + case LG3D_WM: + res = zeroInsets; + break; diff --git a/testing/java7-openjdk/policytool.desktop b/testing/java7-openjdk/policytool.desktop new file mode 100644 index 000000000..702b44a6f --- /dev/null +++ b/testing/java7-openjdk/policytool.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=OpenJDK Policy Tool +Comment=Manage OpenJDK policy files +Exec=/usr/bin/policytool +Icon=java +Terminal=false +Type=Application +StartupWMClass=sun-security-tools-PolicyTool +Categories=Development;Java; +Version=1.0 diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD new file mode 100644 index 000000000..d12720e4c --- /dev/null +++ b/testing/openldap/PKGBUILD @@ -0,0 +1,96 @@ +# $Id: PKGBUILD 138388 2011-09-21 13:18:13Z stephane $ +# Maintainer: + +pkgbase=openldap +pkgname=('libldap' 'openldap') +pkgver=2.4.26 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://www.openldap.org/" +license=('custom') +makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl') +source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz + slapd slapd.default ntlm.patch) +md5sums=('f36f3086031dd56ae94f722ffae8df5e' + '40fdbdd6c343019cbadf4eb26c6189f2' + '6be69f6b7e522cb64cce8703da81ed32' + '4258ddbef923d1f29f2843bc050f8c56') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -Np1 -i "${srcdir}"/ntlm.patch + sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in + sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h + sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf + sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in + + LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" + ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \ + --sysconfdir=/etc --localstatedir=/var/lib/openldap \ + --enable-ipv6 --enable-syslog --enable-local \ + --enable-bdb --enable-hdb \ + --enable-crypt --enable-dynamic \ + --with-threads --disable-wrappers \ + --enable-spasswd --with-cyrus-sasl \ + --enable-overlays=mod --enable-modules=yes + make +} + +check() { + cd "${srcdir}"/${pkgbase}-${pkgver} + make test +} + +package_libldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" + depends=('libsasl' 'libfetch' 'e2fsprogs') + backup=('etc/openldap/ldap.conf') + options=('!libtool') + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in include libraries doc/man/man3 ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2 + ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2 + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_openldap() { + pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" + depends=("libldap>=${pkgver}" 'libtool' 'util-linux') + backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') + options=('!libtool' 'emptydirs') + install=openldap.install + + cd "${srcdir}"/${pkgbase}-${pkgver} + for dir in clients servers doc/man/man{1,5,8} ; do + pushd ${dir} + make DESTDIR="${pkgdir}" install + popd + done + rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5 + rm -r "${pkgdir}"/run + +# get rid of duplicate default conf files + rm "${pkgdir}"/etc/openldap/*.default + + ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd + + chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example} + + install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap + install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d + install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd + install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch new file mode 100644 index 000000000..6804b610d --- /dev/null +++ b/testing/openldap/ntlm.patch @@ -0,0 +1,230 @@ +Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is +actually called by evolution-data-server, checked at version 1.12.2. +Without this patch, the Exchange addressbook integration uses simple binds +with cleartext passwords. + +Russ checked with openldap-software for upstream's opinion on this patch +on 2007-12-21. Upstream had never received it as a patch submission and +given that it's apparently only for older Exchange servers that can't do +SASL and DIGEST-MD5, it's not very appealing. + +Bug#457374 filed against evolution-data-server asking if this support is +still required on 2007-12-21. + +Index: trunk/include/ldap.h +=================================================================== +--- trunk.orig/include/ldap.h ++++ trunk/include/ldap.h +@@ -2461,5 +2461,25 @@ + LDAPControl **ctrls, + LDAPDerefRes **drp )); + ++/* ++ * hacks for NTLM ++ */ ++#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) ++#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) ++LDAP_F( int ) ++ldap_ntlm_bind LDAP_P(( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp )); ++LDAP_F( int ) ++ldap_parse_ntlm_bind_result LDAP_P(( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge)); ++ + LDAP_END_DECL + #endif /* _LDAP_H */ +Index: trunk/libraries/libldap/ntlm.c +=================================================================== +--- /dev/null ++++ trunk/libraries/libldap/ntlm.c +@@ -0,0 +1,138 @@ ++/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ ++/* ++ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. ++ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file ++ */ ++ ++/* Mostly copied from sasl.c */ ++ ++#include "portable.h" ++ ++#include <stdlib.h> ++#include <stdio.h> ++ ++#include <ac/socket.h> ++#include <ac/string.h> ++#include <ac/time.h> ++#include <ac/errno.h> ++ ++#include "ldap-int.h" ++ ++int ++ldap_ntlm_bind( ++ LDAP *ld, ++ LDAP_CONST char *dn, ++ ber_tag_t tag, ++ struct berval *cred, ++ LDAPControl **sctrls, ++ LDAPControl **cctrls, ++ int *msgidp ) ++{ ++ BerElement *ber; ++ int rc; ++ ber_int_t id; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( msgidp != NULL ); ++ ++ if( msgidp == NULL ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ /* create a message to send */ ++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ assert( LBER_VALID( ber ) ); ++ ++ LDAP_NEXT_MSGID( ld, id ); ++ rc = ber_printf( ber, "{it{istON}" /*}*/, ++ id, LDAP_REQ_BIND, ++ ld->ld_version, dn, tag, ++ cred ); ++ ++ /* Put Server Controls */ ++ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { ++ ld->ld_errno = LDAP_ENCODING_ERROR; ++ ber_free( ber, 1 ); ++ return ld->ld_errno; ++ } ++ ++ /* send the message */ ++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); ++ ++ if(*msgidp < 0) ++ return ld->ld_errno; ++ ++ return LDAP_SUCCESS; ++} ++ ++int ++ldap_parse_ntlm_bind_result( ++ LDAP *ld, ++ LDAPMessage *res, ++ struct berval *challenge) ++{ ++ ber_int_t errcode; ++ ber_tag_t tag; ++ BerElement *ber; ++ ber_len_t len; ++ ++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); ++ ++ assert( ld != NULL ); ++ assert( LDAP_VALID( ld ) ); ++ assert( res != NULL ); ++ ++ if ( ld == NULL || res == NULL ) { ++ return LDAP_PARAM_ERROR; ++ } ++ ++ if( res->lm_msgtype != LDAP_RES_BIND ) { ++ ld->ld_errno = LDAP_PARAM_ERROR; ++ return ld->ld_errno; ++ } ++ ++ if ( ld->ld_error ) { ++ LDAP_FREE( ld->ld_error ); ++ ld->ld_error = NULL; ++ } ++ if ( ld->ld_matched ) { ++ LDAP_FREE( ld->ld_matched ); ++ ld->ld_matched = NULL; ++ } ++ ++ /* parse results */ ++ ++ ber = ber_dup( res->lm_ber ); ++ ++ if( ber == NULL ) { ++ ld->ld_errno = LDAP_NO_MEMORY; ++ return ld->ld_errno; ++ } ++ ++ tag = ber_scanf( ber, "{ioa" /*}*/, ++ &errcode, challenge, &ld->ld_error ); ++ ber_free( ber, 0 ); ++ ++ if( tag == LBER_ERROR ) { ++ ld->ld_errno = LDAP_DECODING_ERROR; ++ return ld->ld_errno; ++ } ++ ++ ld->ld_errno = errcode; ++ ++ return( ld->ld_errno ); ++} ++ +Index: trunk/libraries/libldap/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap/Makefile.in ++++ trunk/libraries/libldap/Makefile.in +@@ -27,7 +27,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + + OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ +@@ -40,7 +40,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include +Index: trunk/libraries/libldap_r/Makefile.in +=================================================================== +--- trunk.orig/libraries/libldap_r/Makefile.in ++++ trunk/libraries/libldap_r/Makefile.in +@@ -29,7 +29,7 @@ + init.c options.c print.c string.c util-int.c schema.c \ + charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ + tls2.c tls_o.c tls_g.c tls_m.c \ +- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ ++ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ + assertion.c deref.c ldif.c fetch.c + SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ + thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ +@@ -47,7 +47,7 @@ + init.lo options.lo print.lo string.lo util-int.lo schema.lo \ + charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ + tls2.lo tls_o.lo tls_g.lo tls_m.lo \ +- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ ++ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ + assertion.lo deref.lo ldif.lo fetch.lo + + LDAP_INCDIR= ../../include diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install new file mode 100644 index 000000000..cf3cb9f25 --- /dev/null +++ b/testing/openldap/openldap.install @@ -0,0 +1,20 @@ +post_install(){ + groupadd -g 439 ldap &>/dev/null + useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_upgrade(){ + getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null + getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null + chown -R ldap:ldap var/lib/openldap &>/dev/null +} + +post_remove(){ + if getent passwd ldap >/dev/null 2>&1; then + userdel ldap + fi + if getent group ldap >/dev/null 2>&1; then + groupdel ldap + fi +} diff --git a/testing/openldap/slapd b/testing/openldap/slapd new file mode 100755 index 000000000..4f212da66 --- /dev/null +++ b/testing/openldap/slapd @@ -0,0 +1,49 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd + +PID=`pidof -o %PPID /usr/sbin/slapd` +case "$1" in + start) + stat_busy "Starting OpenLDAP" + [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap + if [ -z "$PID" ]; then + if [ -z "$SLAPD_SERVICES" ]; then + /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS + else + /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS + fi + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + add_daemon slapd + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping OpenLDAP" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /run/openldap/slapd.pid + rm -f /run/openldap/slapd.args + rm_daemon slapd + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/openldap/slapd.default b/testing/openldap/slapd.default new file mode 100644 index 000000000..72ae2a6a7 --- /dev/null +++ b/testing/openldap/slapd.default @@ -0,0 +1,6 @@ +# slapd normally serves ldap only on all TCP-ports 389. slapd can also +# service requests on TCP-port 636 (ldaps) and requests via unix +# sockets. +# Example usage: +#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///" +SLAPD_OPTIONS="" diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch new file mode 100644 index 000000000..d936efaaa --- /dev/null +++ b/testing/xorg-server/autoconfig-sis.patch @@ -0,0 +1,19 @@ +--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 ++++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +@@ -1140,7 +1140,15 @@ + driverList[0] = "savage"; break; + } + break; +- case 0x1039: driverList[0] = "sis"; break; ++ case 0x1039: ++ switch (dev->device_id) ++ { ++ case 0x6350: case 0x6351: ++ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; ++ default: ++ driverList[0] = "sis"; break; ++ } ++ break; + case 0x126f: driverList[0] = "siliconmotion"; break; + case 0x121a: + if (dev->device_id < 0x0003) |