From d1d68784dc66793601c239fa64cc0e02ebd9444e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 3 Jan 2012 23:14:43 +0000 Subject: Tue Jan 3 23:14:42 UTC 2012 --- staging/apr-util/PKGBUILD | 4 +- staging/claws-mail-extra-plugins/PKGBUILD | 66 ++++++ staging/cmake/PKGBUILD | 40 ++++ staging/cmake/cmake.install | 12 ++ staging/evolution-data-server/PKGBUILD | 31 +++ staging/evolution-exchange/PKGBUILD | 33 +++ .../evolution-exchange/evolution-exchange.install | 17 ++ staging/evolution-groupwise/PKGBUILD | 32 +++ staging/gvfs/PKGBUILD | 113 ++++++++++ staging/gvfs/gvfs-module.install | 7 + staging/gvfs/gvfs-smb.install | 12 ++ staging/gvfs/gvfs.install | 14 ++ staging/libarchive/PKGBUILD | 36 ++++ staging/libarchive/release-2.8-fixes.patch | 234 +++++++++++++++++++++ staging/moc/PKGBUILD | 44 ++++ staging/moc/gcc-undefined-symbols.diff | 12 ++ staging/moc/moc-ffmpeg.patch | 26 +++ staging/openldap/PKGBUILD | 96 +++++++++ staging/openldap/ntlm.patch | 230 ++++++++++++++++++++ staging/openldap/openldap.install | 20 ++ staging/openldap/slapd | 49 +++++ staging/openldap/slapd.default | 6 + staging/php/PKGBUILD | 4 +- staging/redland/PKGBUILD | 6 +- staging/ruby/PKGBUILD | 46 ++++ 25 files changed, 1183 insertions(+), 7 deletions(-) create mode 100644 staging/claws-mail-extra-plugins/PKGBUILD create mode 100644 staging/cmake/PKGBUILD create mode 100644 staging/cmake/cmake.install create mode 100644 staging/evolution-data-server/PKGBUILD create mode 100644 staging/evolution-exchange/PKGBUILD create mode 100644 staging/evolution-exchange/evolution-exchange.install create mode 100644 staging/evolution-groupwise/PKGBUILD create mode 100644 staging/gvfs/PKGBUILD create mode 100644 staging/gvfs/gvfs-module.install create mode 100644 staging/gvfs/gvfs-smb.install create mode 100644 staging/gvfs/gvfs.install create mode 100644 staging/libarchive/PKGBUILD create mode 100644 staging/libarchive/release-2.8-fixes.patch create mode 100644 staging/moc/PKGBUILD create mode 100644 staging/moc/gcc-undefined-symbols.diff create mode 100644 staging/moc/moc-ffmpeg.patch create mode 100644 staging/openldap/PKGBUILD create mode 100644 staging/openldap/ntlm.patch create mode 100644 staging/openldap/openldap.install create mode 100755 staging/openldap/slapd create mode 100644 staging/openldap/slapd.default create mode 100644 staging/ruby/PKGBUILD (limited to 'staging') diff --git a/staging/apr-util/PKGBUILD b/staging/apr-util/PKGBUILD index 3f144c339..c5f9410df 100644 --- a/staging/apr-util/PKGBUILD +++ b/staging/apr-util/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145150 2011-12-18 04:37:39Z andrea $ +# $Id: PKGBUILD 145823 2012-01-02 11:42:51Z pierre $ # Maintainer: Jan de Groot # Maintainer: Pierre Schmitz pkgname=apr-util pkgver=1.3.12 -pkgrel=4 +pkgrel=5 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64') url="http://apr.apache.org/" diff --git a/staging/claws-mail-extra-plugins/PKGBUILD b/staging/claws-mail-extra-plugins/PKGBUILD new file mode 100644 index 000000000..801d7403c --- /dev/null +++ b/staging/claws-mail-extra-plugins/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 145839 2012-01-02 19:48:20Z dreisner $ +# Maintainer: Andreas Radke +# Contributor: Mildred + +pkgname=claws-mail-extra-plugins +pkgver=3.8.0 +pkgrel=2 +pkgdesc="Extra plugins for claws-mail" +url="http://www.claws-mail.org/plugins.php?branch=EXT" +license=('GPL3') +arch=('i686' 'x86_64') +depends=('claws-mail>=3.8.0') +makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' + 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' + 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') +optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' + 'perl: for perl plugin' + 'libnotify: for notification plugin' + 'libcanberra: for notification plugin' + 'dbus-core: for notification plugin' + 'libxml2: for gtkhtml2_viewer and rssyl plugins' + 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' + 'libarchive: for archive plugin' + 'libytnef: for tnef_parse plugin' + 'libwebkit: for the fancy webkit html plugin' + 'libsoup-gnome: for the fancy webkit html plugin' + 'python2: for python plugin' + 'libgdata: for gdata plugin') +conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' + 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' + 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' + 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') +replaces=('sylpheed-claws-extra-plugins') +options=('!libtool' '!strip') +source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2) +md5sums=('4776f6e0357a694f384349ac73b6da52') + +build() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + + # fix for python2 + export PYTHON="/usr/bin/python2" + + # fix gdata plugin build + sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure + + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && ( + cd $dir + + ./configure --prefix=/usr --disable-static + make + ) + done +} + +package() { + cd "$srcdir/claws-mail-extra-plugins-$pkgver" + for dir in */; do + [[ $dir != geolocation_plugin-* ]] && + make -C $dir DESTDIR="$pkgdir" install + done + + # fix fileconflict with libical, #11485 + rm -f "$pkgdir/usr/include/ical.h" +} diff --git a/staging/cmake/PKGBUILD b/staging/cmake/PKGBUILD new file mode 100644 index 000000000..a2972c813 --- /dev/null +++ b/staging/cmake/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 145835 2012-01-02 19:34:59Z dreisner $ +# Maintainer: Andrea Scarpino +# Contributor: Pierre Schmitz + +pkgname=cmake +pkgver=2.8.7 +pkgrel=2 +pkgdesc="A cross-platform open-source make system" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.cmake.org" +depends=('curl' 'libarchive' 'shared-mime-info') +makedepends=('qt') +optdepends=('qt: cmake-gui') +install="${pkgname}.install" +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('e1b237aeaed880f65dec9c20602452f6') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + ./bootstrap --prefix=/usr \ + --mandir=/share/man \ + --docdir=/share/doc/cmake \ + --system-libs \ + --qt-gui \ + --parallel=2 + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + vimpath="$pkgdir/usr/share/vim/vimfiles" + install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim + install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim + install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el + install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/staging/cmake/cmake.install b/staging/cmake/cmake.install new file mode 100644 index 000000000..55f6c843b --- /dev/null +++ b/staging/cmake/cmake.install @@ -0,0 +1,12 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/evolution-data-server/PKGBUILD b/staging/evolution-data-server/PKGBUILD new file mode 100644 index 000000000..b49dbed88 --- /dev/null +++ b/staging/evolution-data-server/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 145813 2012-01-02 10:05:49Z ibiru $ +# Maintainer: Jan de Groot + +pkgname=evolution-data-server +pkgver=3.2.2 +pkgrel=2 +pkgdesc="Centralized access to appointments and contacts" +arch=('i686' 'x86_64') +depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') +makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') +options=('!libtool') +url="http://www.gnome.org" +license=('GPL') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) +sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-openldap=yes \ + --libexecdir=/usr/lib/evolution-data-server \ + --with-krb5=/usr --with-libdb=/usr \ + --enable-vala-bindings + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/staging/evolution-exchange/PKGBUILD b/staging/evolution-exchange/PKGBUILD new file mode 100644 index 000000000..14d003a4d --- /dev/null +++ b/staging/evolution-exchange/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 145815 2012-01-02 10:16:37Z ibiru $ +# Maintainer: Jan de Groot + +pkgname=evolution-exchange +pkgver=3.2.1 +pkgrel=2 +pkgdesc="Ximian Connector Exchange plugin for Evolution" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.ximian.com" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +install=evolution-exchange.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static \ + --with-libdb=/usr --with-krb5=/usr + make +} + +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 evolution-exchange-3.2 $pkgdir/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas +} diff --git a/staging/evolution-exchange/evolution-exchange.install b/staging/evolution-exchange/evolution-exchange.install new file mode 100644 index 000000000..1179887f9 --- /dev/null +++ b/staging/evolution-exchange/evolution-exchange.install @@ -0,0 +1,17 @@ +pkgname=evolution-exchange + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/staging/evolution-groupwise/PKGBUILD b/staging/evolution-groupwise/PKGBUILD new file mode 100644 index 000000000..a5f6a12cc --- /dev/null +++ b/staging/evolution-groupwise/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 145817 2012-01-02 10:20:33Z ibiru $ +# Maintainer : Ionut Biru +# Contributor: György Balló + +pkgname=evolution-groupwise +pkgver=3.2.1 +pkgrel=2 +pkgdesc="GroupWise connector for evolution" +arch=(i686 x86_64) +url="http://projects.gnome.org/evolution/" +license=(LGPL) +depends=('evolution-data-server' 'gtkhtml4') +makedepends=(intltool evolution) +optdepends=('evolution: evolution plugin') +options=(!libtool) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) +sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf') + +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/staging/gvfs/PKGBUILD b/staging/gvfs/PKGBUILD new file mode 100644 index 000000000..5aca1f451 --- /dev/null +++ b/staging/gvfs/PKGBUILD @@ -0,0 +1,113 @@ +# $Id: PKGBUILD 145841 2012-01-02 19:54:43Z dreisner $ +# Maintainer: Jan de Groot + +pkgbase=gvfs +pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') +pkgver=1.10.1 +pkgrel=2 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf') +url="http://www.gnome.org" +options=(!libtool) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) +sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gvfs \ + --with-bash-completion-dir=/etc/bash_completion.d + make +} + +package_gvfs() { + pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" + depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf') + optdepends=('gvfs-afc: AFC (mobile devices) support' + 'gvfs-smb: SMB/CIFS (Windows client) support' + 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' + 'gvfs-obexftp: ObexFTP (bluetooth) support' + 'gvfs-afp: Apple Filing Protocol (AFP) support') + install=gvfs.install + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -e 's/^am__append_3/#am__append_3/' \ + -e 's/^am__append_4/#am__append_4/' \ + -i monitor/Makefile + make DESTDIR="${pkgdir}" install + + cd "${pkgdir}" + rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} + rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount + rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml + rm usr/share/GConf/gsettings/gvfs-smb.convert +} + +package_gvfs-smb() { + pkgdesc="SMB/CIFS (Windows client) backend for gvfs" + depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring') + install=gvfs-smb.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -m755 -d "${pkgdir}/usr/lib/gvfs" + install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" + + install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/" + install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" + + install -Dm644 org.gnome.system.smb.gschema.xml \ + "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" + install -Dm644 gvfs-smb.convert \ + "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert" +} + +package_gvfs-afc() { + pkgdesc="AFC (mobile devices) backend for gvfs" + depends=("gvfs=${pkgver}" 'libimobiledevice') + install=gvfs-module.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc" + install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount" + + cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc" + make DESTDIR="${pkgdir}" install +} + +package_gvfs-gphoto2() { + pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" + depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev') + install=gvfs-module.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2" + install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount" + + cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2" + make DESTDIR="${pkgdir}" install +} + +package_gvfs-obexftp() { + pkgdesc="ObexFTP (bluetooth) backend for gvfs" + depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server') + install=gvfs-module.install + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp" + install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount" +} + +package_gvfs-afp() { + pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" + depends=("gvfs=${pkgver}") + install=gvfs-module.install + install -m755 -d "${pkgdir}/usr/lib/gvfs" + install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" + + cd "${srcdir}/${pkgbase}-${pkgver}/daemon" + install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/" + install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" + +} diff --git a/staging/gvfs/gvfs-module.install b/staging/gvfs/gvfs-module.install new file mode 100644 index 000000000..09d1f11ec --- /dev/null +++ b/staging/gvfs/gvfs-module.install @@ -0,0 +1,7 @@ +post_install() { + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} diff --git a/staging/gvfs/gvfs-smb.install b/staging/gvfs/gvfs-smb.install new file mode 100644 index 000000000..0b8783c7b --- /dev/null +++ b/staging/gvfs/gvfs-smb.install @@ -0,0 +1,12 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/staging/gvfs/gvfs.install b/staging/gvfs/gvfs.install new file mode 100644 index 000000000..9458b1513 --- /dev/null +++ b/staging/gvfs/gvfs.install @@ -0,0 +1,14 @@ +post_install() { + usr/bin/gio-querymodules usr/lib/gio/modules + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + usr/bin/gio-querymodules usr/lib/gio/modules + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/staging/libarchive/PKGBUILD b/staging/libarchive/PKGBUILD new file mode 100644 index 000000000..ace8bb47e --- /dev/null +++ b/staging/libarchive/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 145831 2012-01-02 19:21:38Z dreisner $ +# Maintainer: Dan McGee +pkgname=libarchive +pkgver=3.0.2 +pkgrel=1 +pkgdesc="library that can create and read several streaming archive formats" +arch=('i686' 'x86_64') +url="http://libarchive.googlecode.com/" +license=('BSD') +depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') +source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz") +md5sums=('4df33cb107c9702c80473e0794ddf833') +sha256sums=('b27a10182f4fc3f69d01419a59ddb16fccf5df8c4b166008c04f41905e29fd74') + +# keep an upgrade path for older installations +PKGEXT='.pkg.tar.gz' + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --without-xml2 + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + # currently fails in a minor test involving atime updates (#60) + make check || : +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING +} diff --git a/staging/libarchive/release-2.8-fixes.patch b/staging/libarchive/release-2.8-fixes.patch new file mode 100644 index 000000000..c21eeaa7b --- /dev/null +++ b/staging/libarchive/release-2.8-fixes.patch @@ -0,0 +1,234 @@ +Index: build/cmake/config.h.in +=================================================================== +--- build/cmake/config.h.in (revision 3670) ++++ build/cmake/config.h.in (revision 3737) +@@ -1,5 +1,8 @@ + /* config.h. Generated from config.h.cmake by cmake configure */ + ++/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */ ++#cmakedefine ZLIB_WINAPI 1 ++ + /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */ + #cmakedefine ARCHIVE_HASH_MD5_LIBC + +Index: libarchive/archive_read_support_format_all.c +=================================================================== +--- libarchive/archive_read_support_format_all.c (revision 3670) ++++ libarchive/archive_read_support_format_all.c (revision 3737) +@@ -1,5 +1,5 @@ + /*- +- * Copyright (c) 2003-2007 Tim Kientzle ++ * Copyright (c) 2003-2011 Tim Kientzle + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without +@@ -39,5 +39,13 @@ + archive_read_support_format_tar(a); + archive_read_support_format_xar(a); + archive_read_support_format_zip(a); ++ ++ /* Note: We always return ARCHIVE_OK here, even if some of the ++ * above return ARCHIVE_WARN. The intent here is to enable ++ * "as much as possible." Clients who need specific ++ * compression should enable those individually so they can ++ * verify the level of support. */ ++ /* Clear any warning messages set by the above functions. */ ++ archive_clear_error(a); + return (ARCHIVE_OK); + } +Index: libarchive/archive_write_disk.c +=================================================================== +--- libarchive/archive_write_disk.c (revision 3670) ++++ libarchive/archive_write_disk.c (revision 3737) +@@ -1513,6 +1513,22 @@ + } + + #if defined(_WIN32) || defined(__CYGWIN__) ++static int ++guidword(const char *p, int n) ++{ ++ int i; ++ ++ for (i = 0; i < n; i++) { ++ if ((*p >= '0' && *p <= '9') || ++ (*p >= 'a' && *p <= 'f') || ++ (*p >= 'A' && *p <= 'F')) ++ p++; ++ else ++ return (-1); ++ } ++ return (0); ++} ++ + /* + * 1. Convert a path separator from '\' to '/' . + * We shouldn't check multi-byte character directly because some +@@ -1521,26 +1537,92 @@ + * 2. Replace unusable characters in Windows with underscore('_'). + * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx + */ +-static void ++static int + cleanup_pathname_win(struct archive_write_disk *a) + { + wchar_t wc; + char *p; + size_t alen, l; + +- alen = 0; +- l = 0; +- for (p = a->name; *p != '\0'; p++) { +- ++alen; +- if (*p == '\\') +- l = 1; ++ p = a->name; ++ /* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or ++ * "\\?\Volume{GUID}\" ++ * (absolute path prefixes used by Windows API) */ ++ if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) && ++ (p[2] == '.' || p[2] == '?') && (p[3] == '\\' || p[3] == '/')) ++ { ++ /* A path begin with "\\?\UNC\" */ ++ if (p[2] == '?' && ++ (p[4] == 'U' || p[4] == 'u') && ++ (p[5] == 'N' || p[5] == 'n') && ++ (p[6] == 'C' || p[6] == 'c') && ++ (p[7] == '\\' || p[7] == '/')) ++ p += 8; ++ /* A path begin with "\\?\Volume{GUID}\" */ ++ else if (p[2] == '?' && ++ (p[4] == 'V' || p[4] == 'v') && ++ (p[5] == 'O' || p[5] == 'o') && ++ (p[6] == 'L' || p[6] == 'l') && ++ (p[7] == 'U' || p[7] == 'u') && ++ (p[8] == 'M' || p[8] == 'm') && ++ (p[9] == 'E' || p[9] == 'e') && ++ p[10] == '{') { ++ if (guidword(p+11, 8) == 0 && p[19] == '-' && ++ guidword(p+20, 4) == 0 && p[24] == '-' && ++ guidword(p+25, 4) == 0 && p[29] == '-' && ++ guidword(p+30, 4) == 0 && p[34] == '-' && ++ guidword(p+35, 12) == 0 && p[47] == '}' && ++ (p[48] == '\\' || p[48] == '/')) ++ p += 49; ++ else ++ p += 4; ++ /* A path begin with "\\.\PhysicalDriveX" */ ++ } else if (p[2] == '.' && ++ (p[4] == 'P' || p[4] == 'p') && ++ (p[5] == 'H' || p[5] == 'h') && ++ (p[6] == 'Y' || p[6] == 'y') && ++ (p[7] == 'S' || p[7] == 's') && ++ (p[8] == 'I' || p[8] == 'i') && ++ (p[9] == 'C' || p[9] == 'c') && ++ (p[9] == 'A' || p[9] == 'a') && ++ (p[9] == 'L' || p[9] == 'l') && ++ (p[9] == 'D' || p[9] == 'd') && ++ (p[9] == 'R' || p[9] == 'r') && ++ (p[9] == 'I' || p[9] == 'i') && ++ (p[9] == 'V' || p[9] == 'v') && ++ (p[9] == 'E' || p[9] == 'e') && ++ (p[10] >= '0' && p[10] <= '9') && ++ p[11] == '\0') { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, ++ "Path is a physical drive name"); ++ return (ARCHIVE_FAILED); ++ } else ++ p += 4; ++ } ++ ++ /* Skip leading drive letter from archives created ++ * on Windows. */ ++ if (((p[0] >= 'a' && p[0] <= 'z') || ++ (p[0] >= 'A' && p[0] <= 'Z')) && ++ p[1] == ':') { ++ if (p[2] == '\0') { ++ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, ++ "Path is a drive name"); ++ return (ARCHIVE_FAILED); ++ } ++ if (p[2] == '\\' || p[2] == '/') ++ p += 3; ++ } ++ ++ for (; *p != '\0'; p++) { + /* Rewrite the path name if its character is a unusable. */ + if (*p == ':' || *p == '*' || *p == '?' || *p == '"' || + *p == '<' || *p == '>' || *p == '|') + *p = '_'; + } +- if (alen == 0 || l == 0) +- return; ++ alen = p - a->name; ++ if (alen == 0 || strchr(a->name, '\\') == NULL) ++ return (ARCHIVE_OK); + /* + * Convert path separator. + */ +@@ -1560,6 +1642,7 @@ + p += l; + alen -= l; + } ++ return (ARCHIVE_OK); + } + #endif + +@@ -1583,7 +1666,8 @@ + } + + #if defined(_WIN32) || defined(__CYGWIN__) +- cleanup_pathname_win(a); ++ if (cleanup_pathname_win(a) != ARCHIVE_OK) ++ return (ARCHIVE_FAILED); + #endif + /* Skip leading '/'. */ + if (*src == '/') +Index: libarchive/archive_util.c +=================================================================== +--- libarchive/archive_util.c (revision 3670) ++++ libarchive/archive_util.c (revision 3737) +@@ -155,6 +155,7 @@ + { + archive_string_empty(&a->error_string); + a->error = NULL; ++ a->archive_error_number = 0; + } + + void +Index: libarchive/archive_read_extract.c +=================================================================== +--- libarchive/archive_read_extract.c (revision 3670) ++++ libarchive/archive_read_extract.c (revision 3737) +@@ -108,7 +108,7 @@ + if (r != ARCHIVE_OK) + /* If _write_header failed, copy the error. */ + archive_copy_error(&a->archive, ad); +- else if (archive_entry_size(entry) > 0) ++ else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0) + /* Otherwise, pour data into the entry. */ + r = copy_data(_a, ad); + r2 = archive_write_finish_entry(ad); +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 3670) ++++ CMakeLists.txt (revision 3737) +@@ -154,6 +154,13 @@ + SET(HAVE_ZLIB_H 1) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES}) ++ IF(WIN32 AND NOT CYGWIN) ++ SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR}) ++ SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES}) ++ CHECK_C_SOURCE_Runs( ++ "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include \nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }" ++ ZLIB_WINAPI) ++ ENDIF(WIN32 AND NOT CYGWIN) + ENDIF(ZLIB_FOUND) + MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY) + +Property changes on: . +___________________________________________________________________ +Modified: svn:mergeinfo + Merged /trunk:r1989,3247,3722 + diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD new file mode 100644 index 000000000..1ed1f0303 --- /dev/null +++ b/staging/moc/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 145847 2012-01-02 21:43:42Z eric $ +# Maintainer: Eric Bélanger + +pkgname=moc +pkgver=20110528 +pkgrel=5 +pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" +arch=('i686' 'x86_64') +url="http://moc.daper.net/" +license=('GPL') +depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') +makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') +optdepends=('speex: for using the speex plugin' + 'ffmpeg: for using the ffmpeg plugin' + 'taglib: for using the musepack plugin' + 'libmpcdec: for using the musepack plugin' + 'wavpack: for using the wavpack plugin' + 'libmodplug: for using the modplug plugin') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \ + gcc-undefined-symbols.diff moc-ffmpeg.patch) +sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf' + 'a811a4ac7e049914aab528d3f06a6be6634c2720' + 'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d') + +build() { + cd "${srcdir}/${pkgname}" + patch -p0 -i ../gcc-undefined-symbols.diff + patch -p0 -i ../moc-ffmpeg.patch + +# Disabling aac to use the external ffmpeg to play them (FS#13164) + ./autogen.sh + ./configure --prefix=/usr --without-rcc --without-aac \ + --with-oss --with-alsa --with-jack --with-mp3 \ + --with-musepack --with-vorbis --with-flac --with-wavpack \ + --with-sndfile --with-modplug --with-ffmpeg --with-speex \ + --with-samplerate --with-curl --disable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/moc/gcc-undefined-symbols.diff b/staging/moc/gcc-undefined-symbols.diff new file mode 100644 index 000000000..09e9b8bda --- /dev/null +++ b/staging/moc/gcc-undefined-symbols.diff @@ -0,0 +1,12 @@ +--- decoder.c~ 2011-05-08 09:28:28.077137883 +0200 ++++ decoder.c 2011-05-10 21:40:48.887941968 +0200 +@@ -259,6 +259,9 @@ + for (i = 0; i < plugins_num; i++) + if (plugins[i].decoder->destroy) + plugins[i].decoder->destroy (); ++ for (i = 0; i < plugins_num; i++) ++ if (plugins[i].handle) ++ lt_dlclose(plugins[i].handle); + + if (lt_dlexit()) + logit ("lt_exit() failed: %s", lt_dlerror()); diff --git a/staging/moc/moc-ffmpeg.patch b/staging/moc/moc-ffmpeg.patch new file mode 100644 index 000000000..7554ea14e --- /dev/null +++ b/staging/moc/moc-ffmpeg.patch @@ -0,0 +1,26 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2307) ++++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) +@@ -28,12 +28,6 @@ + #include + #endif + +-/* libavformat's API will be changing at version 53, but at present there +- * appears to be no guidance on what will replace the deprecated fields. */ +-#ifndef FF_API_OLD_METADATA +-#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) +-#endif +- + /* FFmpeg also likes common names, without that, our common.h and log.h + * would not be included. */ + #undef COMMON_H +@@ -137,7 +131,7 @@ + av_read_play (data->ic); + for (i = 0; i < data->ic->nb_streams; i++) { + data->enc = data->ic->streams[i]->codec; +- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { ++ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { + audio_index = i; + break; + } diff --git a/staging/openldap/PKGBUILD b/staging/openldap/PKGBUILD new file mode 100644 index 000000000..7a0e367f7 --- /dev/null +++ b/staging/openldap/PKGBUILD @@ -0,0 +1,96 @@ +# $Id: PKGBUILD 145851 2012-01-03 02:45:43Z eric $ +# Maintainer: + +pkgbase=openldap +pkgname=('libldap' 'openldap') +pkgver=2.4.28 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.openldap.org/" +license=('custom') +makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux') +source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz + slapd slapd.default ntlm.patch) +sha1sums=('d888beae1723002a5a2ff5509d3040df40885774' + 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' + 'd89b8a533045123f1ab46c9c430cf132d58a20a4' + 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef') + +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}" 'libltdl' '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/staging/openldap/ntlm.patch b/staging/openldap/ntlm.patch new file mode 100644 index 000000000..6804b610d --- /dev/null +++ b/staging/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 ++#include ++ ++#include ++#include ++#include ++#include ++ ++#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/staging/openldap/openldap.install b/staging/openldap/openldap.install new file mode 100644 index 000000000..cf3cb9f25 --- /dev/null +++ b/staging/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/staging/openldap/slapd b/staging/openldap/slapd new file mode 100755 index 000000000..4f212da66 --- /dev/null +++ b/staging/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/staging/openldap/slapd.default b/staging/openldap/slapd.default new file mode 100644 index 000000000..72ae2a6a7 --- /dev/null +++ b/staging/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/staging/php/PKGBUILD b/staging/php/PKGBUILD index 43a5a069b..fa85df37b 100644 --- a/staging/php/PKGBUILD +++ b/staging/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145096 2011-12-16 21:32:24Z pierre $ +# $Id: PKGBUILD 145825 2012-01-02 11:52:31Z pierre $ # Maintainer: Pierre Schmitz pkgbase=php @@ -23,7 +23,7 @@ pkgname=('php' 'php-xsl') pkgver=5.3.8 _suhosinver=5.3.7-0.9.10 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' diff --git a/staging/redland/PKGBUILD b/staging/redland/PKGBUILD index cd9465524..cac90d2da 100644 --- a/staging/redland/PKGBUILD +++ b/staging/redland/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145106 2011-12-17 03:32:44Z eric $ +# $Id: PKGBUILD 145821 2012-01-02 11:29:29Z andrea $ # Maintainer: AndyRTR # Contributor: Francois Charette @@ -6,11 +6,11 @@ pkgbase=redland epoch=1 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') pkgver=1.0.15 -pkgrel=2 +pkgrel=3 url="http://librdf.org/" license=("GPL") arch=('i686' 'x86_64') -makedepends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +makedepends=('rasqal>=0.9.28' 'raptor>=2.0.6' 'db>=5.3' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') options=('!libtool') source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc} rpath.diff) diff --git a/staging/ruby/PKGBUILD b/staging/ruby/PKGBUILD new file mode 100644 index 000000000..702406e58 --- /dev/null +++ b/staging/ruby/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 145849 2012-01-03 02:35:43Z eric $ +# Maintainer: +# Contributor: Allan McRae +# Contributor: John Proctor +# Contributor: Jeramy Rutley + +pkgbase=ruby +pkgname=('ruby' 'ruby-docs') +pkgver=1.9.3_p0 +pkgrel=3 +pkgdesc="An object-oriented language for quick and easy programming" +arch=('i686' 'x86_64') +url="http://www.ruby-lang.org/en/" +license=('BSD' 'custom') +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2) +sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-shared --enable-pthread --disable-rpath + make +} + +package_ruby() { + depends=('openssl' 'libffi' 'libyaml') + provides=('rubygems' 'rake') + conflicts=('rake') + optdepends=('tk: for Ruby/TK') + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-nodoc + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" +} + +package_ruby-docs() { + pkgdesc="Documentation files for ruby" + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-doc install-capi + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" +} -- cgit v1.2.3-54-g00ecf