Attachment 144465 Details for Bug 220895 – Contains a spec file patch and an OS patch to enable smbk5pwd on openldap-2.3.27-4.src.rpm

[patch] Contains a spec file patch and an OS patch to enable smbk5pwd on openldap-2.3.27-4.src.rpm

smbk5pwd.patch (text/plain), 7.56 KB, created by Johnny Hughes on 2006-12-28 14:39:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johnny Hughes

Created: 2006-12-28 14:39:46 UTC

Size: 7.56 KB

patch

obsolete

>Index: trunk/rpms/openldap/SOURCES/openldap-2.3.27-smbk5pwd-enable.patch
>===================================================================
>---  (revision )
>+++ trunk/rpms/openldap/SOURCES/openldap-2.3.27-smbk5pwd-enable.patch (revision 23)
>@@ -1,0 +1,122 @@
>+diff -uNrp openldap-2.3.27.orig/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/smbk5pwd.c openldap-2.3.27/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/smbk5pwd.c
>+--- openldap-2.3.27.orig/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/smbk5pwd.c	2005-12-20 17:49:50.000000000 -0600
>++++ openldap-2.3.27/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/smbk5pwd.c	2006-12-25 05:25:37.000000000 -0600
>+@@ -1,5 +1,5 @@
>+ /* smbk5pwd.c - Overlay for managing Samba and Heimdal passwords */
>+-/* $OpenLDAP: pkg/ldap/contrib/slapd-modules/smbk5pwd/smbk5pwd.c,v 1.1.2.9 2005/12/20 23:49:50 kurt Exp $ */
>++/* $OpenLDAP: /contrib/slapd-modules/smbk5pwd/smbk5pwd.c,v 1.1.2.10 2006/12/15 15:39:35 hyc Exp $ */
>+ /*
>+  * Copyright 2004-2005 by Howard Chu, Symas Corp.
>+  * All rights reserved.
>+@@ -818,20 +818,32 @@ smbk5pwd_modules_init( smbk5pwd_t *pi )
>+ 		ret = krb5_init_context(&context);
>+ 		if (ret) {
>+ 			Debug( LDAP_DEBUG_ANY, "smbk5pwd: "
>+-				"unable to initialize krb5 context.\n",
>+-				0, 0, 0 );
>++				"unable to initialize krb5 context (%d).\n",
>++				ret, 0, 0 );
>+ 			oc_krb5KDCEntry = NULL;
>+ 			return -1;
>+ 		}
>+ 
>+-		/* FIXME: check return code? */
>+ 		ret = kadm5_s_init_with_password_ctx( context,
>+ 			KADM5_ADMIN_SERVICE,
>+ 			NULL,
>+ 			KADM5_ADMIN_SERVICE,
>+ 			&conf, 0, 0, &kadm_context );
>++		if (ret) {
>++			char *err_str, *err_msg = "<unknown error>";
>++			err_str = krb5_get_error_string( context );
>++			if (!err_str)
>++				err_msg = krb5_get_err_text( context, ret );
>++			Debug( LDAP_DEBUG_ANY, "smbk5pwd: "
>++				"unable to initialize krb5 admin context: %s (%d).\n",
>++				err_str ? err_str : err_msg, ret, 0 );
>++			if (err_str)
>++				krb5_free_error_string( context, err_str );
>++			krb5_free_context( context );
>++			oc_krb5KDCEntry = NULL;
>++			return -1;
>++		}
>+ 
>+-		/* FIXME: check return code? */
>+ 		db = _kadm5_s_get_db( kadm_context );
>+ 	}
>+ #endif /* DO_KRB5 */
>+diff -uNrp openldap-2.3.27.orig/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/Makefile openldap-2.3.27/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/Makefile
>+--- openldap-2.3.27.orig/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/Makefile	2004-04-02 05:06:38.000000000 -0600
>++++ openldap-2.3.27/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/Makefile	2006-12-25 05:33:07.000000000 -0600
>+@@ -9,29 +9,32 @@
>+ # top-level directory of the distribution or, alternatively, at
>+ # <http://www.OpenLDAP.org/license.html>.
>+ 
>+-LIBTOOL=../../../libtool
>++LIBTOOL=/usr/bin/libtool
>+ OPT=-g -O2
>+ CC=gcc
>+ 
>+ # Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
>+-DEFS=-DDO_KRB5 -DDO_SAMBA
>++DEFS=-DDO_SAMBA
>+ 
>+-HEIMDAL_INC=-I/usr/heimdal/include
>+-SSL_INC=
>+-LDAP_INC=-I../../../include -I../../../servers/slapd
>+-INCS=$(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
>++HEIMDAL_INC=
>++SSL_INC=-I/usr/include/openssl
>++LDAP_INC=-I../../../build-servers/include -I../../../build-servers/servers/slapd -I../../../include -I../../../servers/slapd
>++INCS=$(LDAP_INC) $(SSL_INC)
>+ 
>+-HEIMDAL_LIB=-L/usr/heimdal/lib -lkrb5 -lkadm5srv
>++HEIMDAL_LIB=
>+ SSL_LIB=-lcrypto
>+ LDAP_LIB=-lldap_r -llber
>+-LIBS=$(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
>++LIBS=$(LDAP_LIB) $(SSL_LIB)
>+ 
>+ all:	smbk5pwd.la
>+ 
>+ 
>+ smbk5pwd.lo:	smbk5pwd.c
>+-	$(LIBTOOL) --mode=compile $(CC) $(OPT) $(DEFS) $(INCS) -c $?
>++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(OPT) $(DEFS) $(INCS) -c $?
>+ 
>+ smbk5pwd.la:	smbk5pwd.lo
>+-	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
>+-	-rpath /usr/local/libexec/openldap -module -o $@ $? $(LIBS)
>++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(OPT) -version-info 0:0:0 \
>++	-rpath /usr/lib -module -o $@ $? $(LIBS)
>++
>++clean: 
>++	rm -rf ~* *.lo *.o *.so *.la .libs
>+--- openldap-2.3.27.orig/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/README	2005-11-14 12:06:04.000000000 -0600
>++++ openldap-2.3.27.built/openldap-2.3.27/contrib/slapd-modules/smbk5pwd/README	2006-12-25 08:55:57.000000000 -0600
>+@@ -88,3 +88,25 @@ If you need to build the overlay statica
>+ slapd/overlays directory and edit the Makefile and overlays.c to reference
>+ it. You will also have to define SLAPD_OVER_SMBK5PWD to SLAPD_MOD_STATIC,
>+ and add the relevant libraries to the main slapd link command.
>++
>++-------------------------------------------------------------------------
>++                             CentOS NOTES
>++-------------------------------------------------------------------------
>++1. This package was compiled WITHOUT Kerberos support, as it requires a
>++   version of Kerberos (Heimdal) not provided in CentOS.
>++
>++2. Instructions above concerning Kerberos can be ignored.
>++
>++3. The module is built dynamically, so information above on statically
>++   compiled overlays can be ignored.
>++
>++4. The following need to be in your /etc/openldap/slapd.conf file to use
>++   smbk5pwd with openldap and samba:
>++ 
>++	include /etc/openldap/schema/samba.schema
>++
>++	moduleload /usr/lib/smbk5pwd.so
>++
>++	database bdb
>++
>++	overlay smbk5pwd
>Index: trunk/rpms/openldap/SPECS/openldap.spec
>===================================================================
>--- trunk/rpms/openldap/SPECS/openldap.spec (revision 22)
>+++ trunk/rpms/openldap/SPECS/openldap.spec (revision 23)
>@@ -14,5 +14,5 @@
> Name: openldap
> Version: %{version_23}
>-Release: 4
>+Release: 4%{?dist}
> License: OpenLDAP
> Group: System Environment/Daemons
>@@ -62,9 +62,11 @@
> Patch401: db-4.4.20-2.patch
> 
>+Patch1000: openldap-2.3.27-smbk5pwd-enable.patch
>+
> URL: http://www.openldap.org/
> BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
> BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
> BuildPreReq: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers,
>-BuildPreReq: unixODBC-devel, bind-libbind-devel, libtool-ltdl-devel
>+BuildPreReq: unixODBC-devel
> Requires: glibc >= 2.2.3-48, mktemp
> 
>@@ -228,4 +230,6 @@
> autoconf
> popd
>+
>+%patch1000 -p1 -b .smbk5pwd
> 
> %build
>@@ -401,4 +405,10 @@
> popd
> 
>+#build smbk5pwd
>+pushd openldap-%{version_23}/contrib/slapd-modules/smbk5pwd
>+make
>+mv README README.smbk5pwd
>+popd
>+
> %install
> [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
>@@ -515,4 +525,10 @@
> rm -f $RPM_BUILD_ROOT/%{_libdir}/slap{acl,add,auth,cat,dn,index,passwd,test}
> for X in acl add auth cat dn index passwd test; do ln -s slapd $RPM_BUILD_ROOT/%{_sbindir}/slap$X ; done
>+
>+#copy smbk5pwd into place
>+pushd openldap-%{version_23}/contrib/slapd-modules/smbk5pwd
>+cp -a .libs/smbk5pwd*.so*  $RPM_BUILD_ROOT/%{_libdir}/
>+cp -a .libs/smbk5pwd*.a $RPM_BUILD_ROOT/%{_libdir}/
>+popd
> 
> # Tweak permissions on the libraries to make sure they're correct.
>@@ -630,4 +646,5 @@
> %doc README.migration
> %doc TOOLS.migration
>+%doc openldap-%{version_23}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd
> %doc $RPM_SOURCE_DIR/README.upgrading $RPM_SOURCE_DIR/guide.html
> %ghost %config %{_sysconfdir}/pki/tls/certs/slapd.pem
>@@ -656,4 +673,5 @@
> %attr(0755,ldap,ldap) %dir /var/run/openldap
> %attr(0755,root,root) %{_libdir}/libslapd_db-*.*.so
>+%attr(0755,root,root) %{_libdir}/smbk5pwd*
> %ifarch %{nptl_arches}
> %ifnarch %{ix86}
>@@ -693,4 +711,10 @@
> 
> %changelog
>+* Mon Dec 25 2006 Johnny Hughes <johnny@centos.org> - 2.3.27-4.el4.centos
>+- modifed BuildRequires for CentOS-4.
>+- added patch openldap-2.3.27-smbk5pwd-enable.patch to build smbk5pwd
>+  and upgrade smbk5pwd.c to version 1.1.2.10.
>+- Modified the spec file to incoporate the changes.
>+
> * Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 2.3.27-4
> - rebuilt for unwind info generation, broken in gcc-4.1.1-21

Actions: View | Diff

Attachments on bug 220895: 144465