[arch-commits] Commit in libsasl (trunk trunk/PKGBUILD trunk/PKGBUILD)

2013-05-22 Thread Jan de Groot
Date: Wednesday, May 22, 2013 @ 13:02:55
  Author: jgc
Revision: 186232

Copy from cyrus-sasl... let's start over

Added:
  libsasl/trunk/
  libsasl/trunk/PKGBUILD
(from rev 186230, cyrus-sasl/trunk/PKGBUILD)
Deleted:
  libsasl/trunk/PKGBUILD

+
 /PKGBUILD  |  181 +++
 trunk/PKGBUILD |  179 --
 2 files changed, 181 insertions(+), 179 deletions(-)

Deleted: trunk/PKGBUILD
===
--- cyrus-sasl/trunk/PKGBUILD   2013-05-22 10:21:47 UTC (rev 186227)
+++ trunk/PKGBUILD  2013-05-22 11:02:55 UTC (rev 186232)
@@ -1,179 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot j...@archlinux.org
-
-# This package spans multiple repositories. 
-# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
-
-pkgbase=('cyrus-sasl')
-pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
-#pkgname=libsasl
-pkgver=2.1.26
-pkgrel=2
-pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
-arch=('i686' 'x86_64')
-url=http://cyrusimap.web.cmu.edu/;
-license=('custom')
-options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 
'sqlite2')
-source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
-cyrus-sasl-2.1.22-qa.patch
-cyrus-sasl-2.1.26-size_t.patch
-0010_maintainer_mode.patch
-0011_saslauthd_ac_prog_libtool.patch
-0025_ld_as_needed.patch
-0026_drop_krb5support_dependency.patch
-0030-dont_use_la_files_for_opening_plugins.patch
-saslauthd.service
-saslauthd.conf.d
-saslauthd
-tmpfiles.conf)
-md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
- '79b8a5e8689989e2afd4b7bda595a7b1'
- 'f45aa8c42b32e0569ab3d14a83485b37'
- 'f45d8b60e8f74dd7f7c2ec1665fa602a'
- '9d93880514cb5ff5da969f1ceb64a661'
- '62bf892fe4d1df41ff748e91a1afaf67'
- 'b7848957357e7c02d6490102be496bf9'
- '8e7106f32e495e9ade69014fd1b3352a'
- '3499dcd610ad1ad58e0faffde2aa7a23'
- '49219af5641150edec288a3fdb65e7c1'
- '75542f613185d5a90520ad0d7d926a20'
- '45bb0192d2f188066240b9a66ee6365f')
-
-build() {
-  export CFLAGS=$CFLAGS -fPIC
-
-  cd ${srcdir}/cyrus-sasl-${pkgver}
-  patch -Np1 -i ${srcdir}/cyrus-sasl-2.1.22-qa.patch
-  patch -Np1 -i ${srcdir}/cyrus-sasl-2.1.26-size_t.patch
-  patch -Np1 -i ${srcdir}/0010_maintainer_mode.patch
-  patch -Np1 -i ${srcdir}/0011_saslauthd_ac_prog_libtool.patch
-  patch -Np1 -i ${srcdir}/0025_ld_as_needed.patch
-  patch -Np1 -i ${srcdir}/0026_drop_krb5support_dependency.patch
-  patch -Np1 -i ${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch
-
-  sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I cmulocal
-  automake -a -c
-  autoheader
-  autoconf
-
-  pushd saslauthd
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I ../cmulocal -I ../config
-  automake -a -c
-  autoheader
-  autoconf
-  popd
-
-  ./configure --prefix=/usr \
-  --mandir=/usr/share/man \
-  --infodir=/usr/share/info \
-  --disable-static \
-  --enable-shared \
-  --enable-alwaystrue \
-  --enable-checkapop \
-  --enable-cram \
-  --enable-digest \
-  --disable-otp \
-  --disable-srp \
-  --disable-srp-setpass \
-  --disable-krb4 \
-  --enable-gssapi \
-  --enable-auth-sasldb \
-  --enable-plain \
-  --enable-anon \
-  --enable-login \
-  --enable-ntlm \
-  --disable-passdss \
-  --enable-sql \
-  --enable-ldapdb \
-  --disable-macos-framework \
-  --with-pam \
-  --with-saslauthd=/var/run/saslauthd \
-  --with-ldap \
-  --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
-  --sysconfdir=/etc \
-  --with-devrandom=/dev/urandom
-  make
-}
-
-package_libsasl() {
-  pkgdesc=Cyrus Simple Authentication Service Layer (SASL) Library
-  depends=('openssl')
-  conflicts=('cyrus-sasl-plugins')
-
-  cd ${srcdir}/cyrus-sasl-${pkgver}
-  for dir in include lib sasldb plugins utils; do
-pushd ${dir}
-make DESTDIR=${pkgdir} install
-popd
-  done
-  rm -f ${pkgdir}/usr/lib/sasl2/libsql.so*
-  rm -f ${pkgdir}/usr/lib/sasl2/libgssapiv2.so*
-  rm -f ${pkgdir}/usr/lib/sasl2/libldapdb.so*
-  install -m755 -d ${pkgdir}/usr/share/licenses/libsasl
-  install -m644 COPYING ${pkgdir}/usr/share/licenses/libsasl/
-}
-
-package_cyrus-sasl() {
-  depends=(libsasl=${pkgver} 'krb5')
-  pkgdesc=Cyrus saslauthd SASL authentication daemon
-  backup=('etc/conf.d/saslauthd')
-
-  cd 

[arch-commits] Commit in libsasl (trunk trunk/PKGBUILD)

2011-12-28 Thread Jan de Groot
Date: Wednesday, December 28, 2011 @ 10:11:22
  Author: jgc
Revision: 145715

Merge changes from cyrus-sasl

Modified:
  libsasl/trunk/(properties)
  libsasl/trunk/PKGBUILD

+
 trunk  |2 +-
 trunk/PKGBUILD |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: libsasl/trunk
===
--- trunk   2011-12-28 15:10:09 UTC (rev 145714)
+++ trunk   2011-12-28 15:11:22 UTC (rev 145715)

Property changes on: libsasl/trunk
___
Modified: svn:mergeinfo
## -1 +1 ##
-/cyrus-sasl/trunk:134435-134446,139562
+/cyrus-sasl/trunk:134435-134446,139562,145714
Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD  2011-12-28 15:10:09 UTC (rev 145714)
+++ trunk/PKGBUILD  2011-12-28 15:11:22 UTC (rev 145715)
@@ -11,7 +11,7 @@
 pkgrel=8
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
-url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
+url=http://cyrusimap.web.cmu.edu/;
 license=('custom')
 options=('!makeflags' '!libtool')
 makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')



[arch-commits] Commit in libsasl (trunk trunk/PKGBUILD)

2011-10-03 Thread Jan de Groot
Date: Monday, October 3, 2011 @ 09:31:31
  Author: jgc
Revision: 139565

upgpkg: libsasl 2.1.23-8

Remove cyrus-sasl-plugins provide

Modified:
  libsasl/trunk/(properties)
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


Property changes on: libsasl/trunk
___
Modified: svn:mergeinfo
   - /cyrus-sasl/trunk:134435-134446
   + /cyrus-sasl/trunk:134435-134446,139562

Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD  2011-10-03 13:29:22 UTC (rev 139564)
+++ trunk/PKGBUILD  2011-10-03 13:31:31 UTC (rev 139565)
@@ -8,7 +8,7 @@
 #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgname=libsasl
 pkgver=2.1.23
-pkgrel=7
+pkgrel=8
 pkgdesc=Cyrus Simple Authentication Service Layer (SASL) library
 arch=('i686' 'x86_64')
 url=http://cyrusimap.web.cmu.edu/downloads.html#sasl;
@@ -131,7 +131,6 @@
 package_libsasl() {
   pkgdesc=Cyrus Simple Authentication Service Layer (SASL) Library
   depends=('openssl')
-  provides=('cyrus-sasl-plugins')
   conflicts=('cyrus-sasl-plugins')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}



[arch-commits] Commit in libsasl (trunk trunk/PKGBUILD)

2011-08-03 Thread Jan de Groot
Date: Wednesday, August 3, 2011 @ 16:35:03
  Author: jgc
Revision: 134437

Merge changes from cyrus-sasl

Modified:
  libsasl/trunk/(properties)
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)


Property changes on: libsasl/trunk
___
Added: svn:mergeinfo
   + /cyrus-sasl/trunk:134435-134436

Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD  2011-08-03 20:33:18 UTC (rev 134436)
+++ trunk/PKGBUILD  2011-08-03 20:35:03 UTC (rev 134437)
@@ -143,10 +143,12 @@
   rm -f ${pkgdir}/usr/lib/sasl2/libsql.so*
   rm -f ${pkgdir}/usr/lib/sasl2/libgssapiv2.so*
   rm -f ${pkgdir}/usr/lib/sasl2/libldapdb.so*
+  install -m755 -d ${pkgdir}/usr/share/licenses/libsasl
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/libsasl/
 }
 
 package_cyrus-sasl() {
-  depends=('libsasl')
+  depends=(libsasl=${pkgver}-${pkgrel})
   pkgdesc=Cyrus saslauthd SASL authentication daemon
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
@@ -154,7 +156,10 @@
   install -m755 -d ${pkgdir}/etc/rc.d
   install -m755 -d ${pkgdir}/etc/conf.d
   install -m755 ${srcdir}/saslauthd ${pkgdir}/etc/rc.d/
-  install -m644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/
+  install -m644 ${srcdir}/saslauthd.conf.d ${pkgdir}/etc/conf.d/saslauthd
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl
+  ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl/
 }
 
 package_cyrus-sasl-gssapi() {
@@ -165,6 +170,9 @@
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
   install -m755 -d ${pkgdir}/usr/lib/sasl2
   cp -a .libs/libgssapiv2.so* ${pkgdir}/usr/lib/sasl2/
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi
+  ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/
 }
 
 package_cyrus-sasl-ldap() {
@@ -175,6 +183,9 @@
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
   install -m755 -d ${pkgdir}/usr/lib/sasl2
   cp -a .libs/libldapdb.so* ${pkgdir}/usr/lib/sasl2/
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-ldap
+  ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/
 }
 
 package_cyrus-sasl-sql() {
@@ -185,4 +196,7 @@
   cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
   install -m755 -d ${pkgdir}/usr/lib/sasl2
   cp -a .libs/libsql.so* ${pkgdir}/usr/lib/sasl2/
+
+  install -m755 -d ${pkgdir}/usr/share/licenses/cyrus-sasl-sql
+  ln -sf ../libsasl/COPYING ${pkgdir}/usr/share/licenses/cyrus-sasl-sql/
 }



[arch-commits] Commit in libsasl (trunk trunk/PKGBUILD)

2011-08-03 Thread Jan de Groot
Date: Wednesday, August 3, 2011 @ 16:49:15
  Author: jgc
Revision: 134451

Sync with cyrus-sasl

Modified:
  libsasl/trunk/(properties)
  libsasl/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)


Property changes on: libsasl/trunk
___
Modified: svn:mergeinfo
   - /cyrus-sasl/trunk:134435-134436
   + /cyrus-sasl/trunk:134435-134446

Modified: trunk/PKGBUILD
===
--- trunk/PKGBUILD  2011-08-03 20:47:17 UTC (rev 134450)
+++ trunk/PKGBUILD  2011-08-03 20:49:15 UTC (rev 134451)
@@ -150,6 +150,7 @@
 package_cyrus-sasl() {
   depends=(libsasl=${pkgver}-${pkgrel})
   pkgdesc=Cyrus saslauthd SASL authentication daemon
+  backup=('etc/conf.d/saslauthd')
 
   cd ${srcdir}/cyrus-sasl-${pkgver}/saslauthd
   make DESTDIR=${pkgdir} install