diff options
32 files changed, 732 insertions, 88 deletions
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index b1ac9e391..4d4e547f3 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) @@ -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 ed938ccc1..8d4a63c9e 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') 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/gtk-gnutella/PKGBUILD b/community/gtk-gnutella/PKGBUILD index 3fb207387..562ebbab1 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') 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/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index cd4aefbf8..3434efba7 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') 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/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index 5217ae570..ff393d892 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') 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/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index e7a3f1d33..e51bf5bfd 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') 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/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/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD index 8589aef02..e9a200874 100644 --- a/gnome-unstable/folks/PKGBUILD +++ b/gnome-unstable/folks/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138344 2011-09-20 10:21:26Z heftig $ +# $Id: PKGBUILD 138408 2011-09-21 16:18:20Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=folks pkgname=(folks folks-tracker) pkgver=0.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64) url="http://telepathy.freedesktop.org/wiki/Folks" @@ -21,6 +21,9 @@ build() { # Change tracker version grep -lr sparql-0.10 . | xargs sed -i 's/sparql-0.10/sparql-0.12/g' + # Fix the sed command to work with LANG=C + sed -i '/dlname=/s/A-Za-z0-9\.-+/A-Za-z0-9./' folks/Makefile.* + ./configure --prefix=/usr --enable-tracker-backend make } 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/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD index 8b1ff95ad..e7ce7f125 100644 --- a/gnome-unstable/gdm/PKGBUILD +++ b/gnome-unstable/gdm/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 137581 2011-09-09 22:14:52Z ibiru $ +# $Id: PKGBUILD 138396 2011-09-21 14:24:14Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.1.91 +pkgver=3.1.92 pkgrel=1 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64') @@ -11,14 +11,15 @@ backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'e 'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf') groups=('gnome-extra') options=('!libtool') -depends=('caribou' 'libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss') +depends=('libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss') makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') +optdepends=('gnome-shell: new login interface') install=gdm.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz fix_external_program_directories.patch gdm gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) -sha256sums=('a9163b711f9cdd005b872575226dd97e06b3eb5e34369aae905e96677e682ef2' +sha256sums=('0cb9dd720b1d2782c9b5108f0d9778d64ee4f9a8825cfa11a44a1368f7850f03' '55654861b14fea344bc7a43fa265c9aaffcd16f5cf56360483fff5d4dc83cf15' '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' diff --git a/gnome-unstable/gjs/PKGBUILD b/gnome-unstable/gjs/PKGBUILD index a891878ad..f0de086b7 100644 --- a/gnome-unstable/gjs/PKGBUILD +++ b/gnome-unstable/gjs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 136610 2011-08-30 18:10:26Z ibiru $ +# $Id: PKGBUILD 138392 2011-09-21 14:01:12Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gjs -pkgver=1.29.17 +pkgver=1.29.18 pkgrel=1 pkgdesc="Javascript Bindings for GNOME" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('GPL') depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') options=('!libtool') source=(http://download.gnome.org/sources/${pkgname}/1.29/${pkgname}-${pkgver}.tar.xz) -sha256sums=('427d3f7feb28303e05fc3d494318affc280c0087a26f7ffa2989ea86b68bd625') +sha256sums=('f2040c2a61ec8ace64ba8d7777a81489b50a4f67a8fb8d565e175114a45f3ab4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/gnome-games/PKGBUILD b/gnome-unstable/gnome-games/PKGBUILD index 2838f5ee8..cca761daf 100644 --- a/gnome-unstable/gnome-games/PKGBUILD +++ b/gnome-unstable/gnome-games/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136888 2011-09-02 16:27:34Z heftig $ +# $Id: PKGBUILD 138402 2011-09-21 15:18:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.1.90 +pkgver=3.1.92 pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f4b865a86d0dc02645b65e33fcdd4e1a04fdce4acb849951e4cfb37fe6c18d77') +sha256sums=('43aa83ca8ab132c63209c1e731f2b712a0b56a5de1564cc29e5c9da520f5986d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/gnome-session/PKGBUILD b/gnome-unstable/gnome-session/PKGBUILD index 5a58af631..2b534470e 100644 --- a/gnome-unstable/gnome-session/PKGBUILD +++ b/gnome-unstable/gnome-session/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 138308 2011-09-19 22:19:48Z ibiru $ +# $Id: PKGBUILD 138398 2011-09-21 14:27:36Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-session -pkgver=3.1.91 +pkgver=3.1.92 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' - 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf') +depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf') makedepends=('intltool' 'mesa' 'xtrans') options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4de05975b78e5a0ff29a421cec50be379059a88abf15247b21ec65afb3125d0d') +sha256sums=('dc505c6730da6ed984d7f72ad31c9780d4d19d72f673ea60feec2e9f685c33f3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD index 19f7fd5a8..1abba1b82 100644 --- a/gnome-unstable/gnome-shell/PKGBUILD +++ b/gnome-unstable/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138295 2011-09-19 21:31:14Z ibiru $ +# $Id: PKGBUILD 138394 2011-09-21 14:14:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.1.91.1 -pkgrel=2 +pkgver=3.1.92 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.1/$pkgname-$pkgver.tar.xz) -sha256sums=('d0da24c87f6851811e89774bb271b66377e67b5373ca3f73cfda7fec827f3865') +sha256sums=('3c819d962ce703a24a68ca3352df2e942d836a00c018f8aedabc14a8be5d31a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/gobject-introspection/PKGBUILD b/gnome-unstable/gobject-introspection/PKGBUILD index 6cf9e2d1d..9edda4146 100644 --- a/gnome-unstable/gobject-introspection/PKGBUILD +++ b/gnome-unstable/gobject-introspection/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 136718 2011-08-31 17:27:59Z ibiru $ +# $Id: PKGBUILD 138364 2011-09-21 05:51:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=gobject-introspection -pkgver=1.29.17 -pkgrel=2 +pkgver=1.30.0 +pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" arch=('x86_64' 'i686') license=('LGPL' 'GPL') depends=('glib2' 'python2') -makedepends=('cairo' 'vala') +makedepends=('cairo') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.29/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ce1cc5a9a992151f91d56ec1a0d424e3fe019e58b74fef02a133d91ed8dcebfe') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.30/${pkgname}-${pkgver}.tar.xz) +sha256sums=('8e4274579096e983fad3148cdab50295a4701e45cd9a4e02f7242fc0a04c47b2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/gthumb/PKGBUILD b/gnome-unstable/gthumb/PKGBUILD index 315dc1fd9..2e84e3877 100644 --- a/gnome-unstable/gthumb/PKGBUILD +++ b/gnome-unstable/gthumb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137983 2011-09-13 21:08:13Z heftig $ +# $Id: PKGBUILD 138390 2011-09-21 13:46:16Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb pkgver=2.13.90 -pkgrel=1 +pkgrel=2 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64) license=('GPL') 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/libgnomekbd/PKGBUILD b/gnome-unstable/libgnomekbd/PKGBUILD index 348b94d79..e54cbc349 100644 --- a/gnome-unstable/libgnomekbd/PKGBUILD +++ b/gnome-unstable/libgnomekbd/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 136774 2011-09-01 13:37:50Z ibiru $ +# $Id: PKGBUILD 138412 2011-09-21 21:33:41Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomekbd -pkgver=3.1.90 +pkgver=3.1.92 pkgrel=1 pkgdesc="Gnome keyboard library" url="http://gswitchit.sourceforge.net" arch=('i686' 'x86_64') license=('LGPL') -depends=('libxklavier>=5.1' 'gtk3' 'dconf') +depends=('libxklavier' 'gtk3' 'dconf') makedepends=('intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=libgnomekbd.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('bbe4ee869c6d3feabe9610255918e632dcfc873a76c1a462b92be8154456afc6') +sha256sums=('4b8166b33ae8d11847d6eeb35b1ca005ad3eb84fdedceb00aa0397c4ca641522') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/libpeas/PKGBUILD b/gnome-unstable/libpeas/PKGBUILD index 5b272047c..d451db46b 100644 --- a/gnome-unstable/libpeas/PKGBUILD +++ b/gnome-unstable/libpeas/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 136852 2011-09-02 12:37:57Z ibiru $ +# $Id: PKGBUILD 138379 2011-09-21 12:32:47Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + pkgname=libpeas -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="A GObject-based plugins engine" arch=('i686' 'x86_64') @@ -14,7 +15,7 @@ optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' options=('!libtool') install=libpeas.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('74e80a86f7f34bb03ab914ecd6f5fb8201c062f577b9b60317e6cc72bbedb2c0') +sha256sums=('1f21230aac4359b123116b86f249b7dc867c1237ad2a48b4d827bf572f0879fe') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD index cb4c0f992..68e7e527f 100644 --- a/gnome-unstable/mutter/PKGBUILD +++ b/gnome-unstable/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138293 2011-09-19 21:23:39Z ibiru $ +# $Id: PKGBUILD 138366 2011-09-21 05:59:07Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.1.91.1 -pkgrel=2 +pkgver=3.1.92 +pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) license=('GPL') @@ -15,8 +15,8 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ea665ba523d2b62f8cdfb1b0285c7672ac395774af3cb059bfd39bed8cb71d31') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('a8aec093b50ba1a9663971c5c080ca8c6892e85f6e20d0cd5ff829c9808ca37f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/totem/PKGBUILD b/gnome-unstable/totem/PKGBUILD index 02c492259..06765e393 100644 --- a/gnome-unstable/totem/PKGBUILD +++ b/gnome-unstable/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138351 2011-09-20 14:27:11Z ibiru $ +# $Id: PKGBUILD 138410 2011-09-21 21:31:15Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.1.91 -pkgrel=2 +pkgver=3.1.92 +pkgrel=1 pkgdesc="A GNOME3 integrated movie player based on Gstreamer." url="http://www.gnome.org" arch=('i686' 'x86_64') @@ -16,11 +16,14 @@ depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plpars makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils' 'libepc' 'bluez' 'vala' 'grilo') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('7a1d7f63c3a97ce1f074801c5164b2dc553bf69e582180b52432dd0c67186d11') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz + convert.patch::http://git.gnome.org/browse/totem/patch/?id=75d00dfd0d3a6779f879e52c96babbbd52816d75) +sha256sums=('a7186a3c3a62f5ec0a8749aba9718c999507b43ab99711ebf4f7b65c24e995ab' + '243656eed0beda9fd097a24f33683dbcf39dbe7fdf385f6e5bc5fc85d5b34c0c') build() { cd "${srcdir}/${pkgbase}-${pkgver}" + patch -Np1 -i ${srcdir}/convert.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/totem \ @@ -53,9 +56,6 @@ package_totem() { $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py} install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem/COPYING" - - # https://bugzilla.gnome.org/show_bug.cgi?id=659547 - rm -f $pkgdir/usr/share/GConf/gsettings/pythonconsole.convert } package_totem-plugin() { 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="" |