cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to OpenLDAP 2.3.11 and take maintainership.

Browse Source 
Support for sasl2 is now built by default.

ok bernd@
This commit is contained in:
mbalmer 2005-11-07 15:59:08 +00:00
parent ab90b0adcc
commit 1b612625c9
10 changed files with 109 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
databases/openldap/Makefile
View File

@ -1,17 +1,16 @@
# $OpenBSD: Makefile,v 1.55 2005/10/08 09:12:38 jakob Exp $
# $OpenBSD: Makefile,v 1.56 2005/11/07 15:59:08 mbalmer Exp $
COMMENT= "Open source LDAP software (client)"
COMMENT-server= "Open source LDAP software (server)"
VERSION= 2.2.29
DISTNAME= openldap-${VERSION}
FULLPKGNAME= openldap-client-${VERSION}
PKGNAME-server= openldap-server-${VERSION}
DISTNAME= openldap-2.3.11
FULLPKGNAME= ${DISTNAME:S/-/-client-/}
PKGNAME-server= ${DISTNAME:S/-/-server-/}
CATEGORIES= databases net
HOMEPAGE= http://www.openldap.org/
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
MAINTAINER= Marc Balmer <mbalmer@openbsd.org>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -44,7 +43,9 @@ CONFIGURE_ARGS+= \
--enable-cleartext \
--enable-crypt \
--enable-rewrite \
--enable-wrappers
--enable-wrappers \
--enable-sasl \
--enable-spasswd
# slapd modules
CONFIGURE_ARGS+= \
@ -66,38 +67,31 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/build
REGRESS_TARGET= test
FLAVORS= sasl bdb
FLAVORS= bdb
FLAVOR?=
MULTI_PACKAGES= -server
SUBPACKAGE?=
.if ${FLAVOR:L:Msasl}
CONFIGURE_ARGS+= --with-cyrus-sasl \
--enable-spasswd
LIB_DEPENDS+= sasl2::security/cyrus-sasl2
CPPFLAGS+= -I${LOCALBASE}/include/sasl
.else
CONFIGURE_ARGS+= --without-cyrus-sasl \
--disable-spasswd
.endif
.if ${FLAVOR:L:Mbdb}
CONFIGURE_ARGS+= --enable-bdb
CONFIGURE_ARGS+= --enable-bdb --enable-hdb
LIB_DEPENDS+= lib/db4/db.=4:db-4.*:databases/db/v4
CPPFLAGS+= -I${LOCALBASE}/include/db4
LDFLAGS+= -L${LOCALBASE}/lib/db4
LIBS+= -ldb
.else
CONFIGURE_ARGS+= --disable-bdb
CONFIGURE_ARGS+= --disable-bdb --disable-hdb
.endif
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
LIBS="${LIBS}"
.if ${SUBPACKAGE} == "-server"
RUN_DEPENDS= openldap:openldap-client-${VERSION}:databases/openldap
RUN_DEPENDS= openldap:${FULLPKGNAME}:databases/openldap
WANTLIB+= perl util wrap m pthread
.endif
@ -106,7 +100,8 @@ pre-build:
post-patch:
.if ${FLAVOR:L:Msasl}
perl -pi -e 's,KRB5_LIBS=,KRB5_LIBS="-lgssapi -lkrb5 -lasn1 -lcom_err",g' ${WRKSRC}/configure
perl -pi -e 's,KRB5_LIBS=,KRB5_LIBS="-lgssapi -lkrb5 -lasn1 -lcom_err",g' \
${WRKSRC}/configure
.endif
post-install:

8
databases/openldap/distinfo
View File

@ -1,4 +1,4 @@
MD5 (openldap-2.2.29.tgz) = 6c4c72a1336aa45b463e738034c078d6
RMD160 (openldap-2.2.29.tgz) = bc019e7f5e94d553d14db8caf57a71ae35c22b0c
SHA1 (openldap-2.2.29.tgz) = 3d74da4b905611b66319c1f23e5f9544d3e15382
SIZE (openldap-2.2.29.tgz) = 2631211
MD5 (openldap-2.3.11.tgz) = fbde128a8421b8d2ea587a25057a281e
RMD160 (openldap-2.3.11.tgz) = 4947c7f15b70dfd55ff30028228ec915064feba1
SHA1 (openldap-2.3.11.tgz) = e7a4a5b2d50b8138ed835b7e9e722814f1877806
SIZE (openldap-2.3.11.tgz) = 3657646

8
databases/openldap/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2003/12/26 10:44:10 jakob Exp $
--- Makefile.in.orig 2003-12-15 23:35:14.000000000 +0100
+++ Makefile.in 2003-12-15 23:36:00.000000000 +0100
@@ -32,3 +32,9 @@ distclean: veryclean FORCE
$OpenBSD: patch-Makefile_in,v 1.2 2005/11/07 15:59:08 mbalmer Exp $
--- Makefile.in.orig Mon Aug 29 21:04:23 2005
+++ Makefile.in Tue Oct 18 14:29:09 2005
@@ -36,3 +36,9 @@ distclean: veryclean FORCE
check: test
test: FORCE
cd tests; make test

54
databases/openldap/patches/patch-build_ltmain_sh
View File

@ -1,55 +1,55 @@
$OpenBSD: patch-build_ltmain_sh,v 1.1 2003/12/26 10:44:10 jakob Exp $
--- build/ltmain.sh.orig 2003-02-10 20:24:02.000000000 +0100
+++ build/ltmain.sh 2003-11-19 21:59:49.000000000 +0100
@@ -4024,10 +4024,6 @@ dlpreopen='$dlprefiles'
$OpenBSD: patch-build_ltmain_sh,v 1.2 2005/11/07 15:59:08 mbalmer Exp $
--- build/ltmain.sh.orig Mon Aug 29 20:46:16 2005
+++ build/ltmain.sh Tue Oct 18 14:27:55 2005
@@ -5394,10 +5394,6 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test $need_relink = yes; then
- if test "$installed" = no && test "$need_relink" = yes; then
- $echo >> $output "\
-relink_command=\"$relink_command\""
- fi
done
fi
@@ -4530,40 +4526,6 @@ relink_command=\"$relink_command\""
@@ -5962,40 +5958,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0
test "$show" = : && exit $EXIT_SUCCESS
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- $echo " $libdir"
- done
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- $echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- echo " - have your system administrator run these commands:$admincmds"
- $echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
;;

13
databases/openldap/patches/patch-build_version_var Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-build_version_var,v 1.1 2005/11/07 15:59:08 mbalmer Exp $
--- build/version.var.orig Thu Oct 20 13:06:49 2005
+++ build/version.var Thu Oct 20 13:07:22 2005
@@ -17,7 +17,7 @@ ol_major=2
ol_minor=3
ol_patch=11
ol_api_inc=20311
-ol_api_current=1
-ol_api_revision=6
+ol_api_current=8
+ol_api_revision=1
ol_api_age=1
ol_release_date="2005/10/13"

24
databases/openldap/patches/patch-configure
View File

@ -1,17 +1,17 @@
$OpenBSD: patch-configure,v 1.1 2003/12/26 10:44:10 jakob Exp $
--- configure.orig 2003-10-12 00:39:44.000000000 +0200
+++ configure 2003-11-19 22:48:20.000000000 +0100
@@ -6411,7 +6411,6 @@ openbsd*)
shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
$OpenBSD: patch-configure,v 1.2 2005/11/07 15:59:08 mbalmer Exp $
--- configure.orig Wed Oct 5 20:41:09 2005
+++ configure Tue Oct 18 14:30:27 2005
@@ -9443,7 +9443,6 @@ openbsd*)
*) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -19751,6 +19750,7 @@ echo "configure:19748: checking for TCP
#line 19752 "configure"
#include "confdefs.h"
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
case $host_os in
@@ -34518,6 +34517,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
#include <tcpd.h>

3
databases/openldap/pkg/DESCR-server
View File

@ -9,3 +9,6 @@ is distributed under a Perl-style "Artistic License".
This is the server portion of OpenLDAP, it provides the server as well as
various administrative binaries.
Flavors:
bdb enable the bdb and hdb backends

14
databases/openldap/pkg/PFRAG.shared
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PFRAG.shared,v 1.28 2005/10/08 09:12:38 jakob Exp $
@lib lib/liblber-2.2.so.7.22
@lib lib/liblber.so.7.22
@lib lib/libldap-2.2.so.7.22
@lib lib/libldap.so.7.22
@lib lib/libldap_r-2.2.so.7.22
@lib lib/libldap_r.so.7.22
@comment $OpenBSD: PFRAG.shared,v 1.29 2005/11/07 15:59:08 mbalmer Exp $
@lib lib/liblber-2.3.so.8.1
@lib lib/liblber.so.8.1
@lib lib/libldap-2.3.so.8.1
@lib lib/libldap.so.8.1
@lib lib/libldap_r-2.3.so.8.1
@lib lib/libldap_r.so.8.1

29
databases/openldap/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2005/06/29 13:25:19 msf Exp $
@comment $OpenBSD: PLIST,v 1.13 2005/11/07 15:59:08 mbalmer Exp $
bin/ldapadd
bin/ldapcompare
bin/ldapdelete
@ -114,11 +114,6 @@ lib/libldap_r.la
@man man/man3/ldap_get_values_len.3
@man man/man3/ldap_init.3
@man man/man3/ldap_is_ldap_url.3
@man man/man3/ldap_kerberos_bind1.3
@man man/man3/ldap_kerberos_bind1_s.3
@man man/man3/ldap_kerberos_bind2.3
@man man/man3/ldap_kerberos_bind2_s.3
@man man/man3/ldap_kerberos_bind_s.3
@man man/man3/ldap_matchingrule2name.3
@man man/man3/ldap_matchingrule2str.3
@man man/man3/ldap_matchingrule_free.3
@ -182,8 +177,30 @@ lib/libldap_r.la
@man man/man3/ldap_value_free_len.3
@man man/man5/ldap.conf.5
@man man/man5/ldif.5
@man man/man5/slapd-bdb.5
@man man/man5/slapd-ldif.5
@man man/man5/slapd-relay.5
@man man/man5/slapo-accesslog.5
@man man/man5/slapo-auditlog.5
@man man/man5/slapo-chain.5
@man man/man5/slapo-dynlist.5
@man man/man5/slapo-lastmod.5
@man man/man5/slapo-pcache.5
@man man/man5/slapo-ppolicy.5
@man man/man5/slapo-refint.5
@man man/man5/slapo-retcode.5
@man man/man5/slapo-rwm.5
@man man/man5/slapo-syncprov.5
@man man/man5/slapo-translucent.5
@man man/man5/slapo-unique.5
@man man/man5/slapo-valsort.5
@man man/man8/slapacl.8
@man man/man8/slapauth.8
sbin/slapacl
sbin/slapauth
share/examples/openldap/
@sample ${SYSCONFDIR}/openldap/
share/examples/openldap/ldap.conf
@sample ${SYSCONFDIR}/openldap/ldap.conf
%%SHARED%%
share/examples/openldap/schema/ppolicy.schema

12
databases/openldap/pkg/PLIST-server
View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST-server,v 1.10 2005/06/29 13:25:19 msf Exp $
@comment $OpenBSD: PLIST-server,v 1.11 2005/11/07 15:59:08 mbalmer Exp $
@newgroup _openldap:544
@newuser _openldap:544:_openldap:daemon:OpenLDAP Account:/nonexistent:/sbin/nologin
libexec/slapd
libexec/slurpd
@man man/man5/slapd-bdb.5
@man man/man5/slapd-dnssrv.5
@man man/man5/slapd-hdb.5
@man man/man5/slapd-ldap.5
@ -56,12 +55,3 @@ share/examples/openldap/schema/openldap.schema
@sample ${SYSCONFDIR}/openldap/schema/openldap.schema
share/examples/openldap/slapd.conf
@sample ${SYSCONFDIR}/openldap/slapd.conf
share/openldap/
share/openldap/ucdata/
share/openldap/ucdata/case.dat
share/openldap/ucdata/cmbcl.dat
share/openldap/ucdata/comp.dat
share/openldap/ucdata/ctype.dat
share/openldap/ucdata/decomp.dat
share/openldap/ucdata/kdecomp.dat
share/openldap/ucdata/num.dat