OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jun-2007 12:29:29
Branch: HEAD Handle: 2007060611292800
Modified files:
openpkg-src/kerberos kerberos.patch kerberos.spec
Log:
upgrade to Kerberos 1.6.1 and add a first cut for LDAP support (still
doesn't fully work as expected)
Summary:
Revision Changes Path
1.19 +69 -23 openpkg-src/kerberos/kerberos.patch
1.89 +39 -5 openpkg-src/kerberos/kerberos.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 kerberos.patch
--- openpkg-src/kerberos/kerberos.patch 14 Jan 2007 13:07:47 -0000
1.18
+++ openpkg-src/kerberos/kerberos.patch 6 Jun 2007 10:29:28 -0000
1.19
@@ -1,15 +1,17 @@
Index: src/Makefile.in
---- src/Makefile.in.orig 2006-12-19 01:12:32 +0100
-+++ src/Makefile.in 2007-01-14 11:12:48 +0100
-@@ -5,7 +5,6 @@
+--- src/Makefile.in.orig 2007-03-29 23:36:26 +0200
++++ src/Makefile.in 2007-06-06 12:22:37 +0200
+@@ -4,8 +4,7 @@
+ myfulldir=.
mydir=.
# Don't build sample by default: plugins/locate/python plugins/preauth/wpse
plugins/preauth/cksum_body
- SUBDIRS=util include lib @krb524@ kdc kadmin @ldap_plugin_dir@ slave
clients \
+-SUBDIRS=util include lib @krb524@ kdc kadmin @ldap_plugin_dir@ slave
clients \
- plugins/kdb/db2 \
++SUBDIRS=util include lib @krb524@ kdc kadmin slave clients \
appl tests \
config-files gen-manpages
BUILDTOP=$(REL)$(C)
-@@ -98,7 +97,6 @@
+@@ -99,7 +98,6 @@
done
(w=`pwd`; cd util && $(MAKE) install DESTDIR="$$w/util/fakedest")
(w=`pwd`; cd lib && $(MAKE) install DESTDIR="$$w/util/fakedest")
@@ -19,7 +21,7 @@
Index: src/appl/Makefile.in
--- src/appl/Makefile.in.orig 2004-03-08 08:20:55 +0100
-+++ src/appl/Makefile.in 2007-01-14 11:12:48 +0100
++++ src/appl/Makefile.in 2007-06-06 12:22:37 +0200
@@ -3,5 +3,6 @@
mydir=.
BUILDTOP=$(REL)..
@@ -29,8 +31,8 @@
+MY_SUBDIRS= gss-sample
Index: src/appl/configure
---- src/appl/configure.orig 2007-01-10 01:12:22 +0100
-+++ src/appl/configure 2007-01-14 11:12:48 +0100
+--- src/appl/configure.orig 2007-04-21 01:40:32 +0200
++++ src/appl/configure 2007-06-06 12:22:37 +0200
@@ -315,7 +315,7 @@
# include <unistd.h>
#endif"
@@ -51,7 +53,7 @@
ac_config_files="$ac_config_files
./Makefile:$srcdir/../config/pre.in:./Makefile.in:$srcdir/../config/post.in"
Index: src/config/pre.in
--- src/config/pre.in.orig 2006-10-15 20:19:28 +0200
-+++ src/config/pre.in 2007-01-14 11:12:48 +0100
++++ src/config/pre.in 2007-06-06 12:22:37 +0200
@@ -187,7 +187,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -62,18 +64,29 @@
## ${prefix}.
[EMAIL PROTECTED]@
Index: src/configure
---- src/configure.orig 2007-01-10 01:12:41 +0100
-+++ src/configure 2007-01-14 11:12:48 +0100
-@@ -317,7 +317,7 @@
+--- src/configure.orig 2007-04-21 01:40:48 +0200
++++ src/configure 2007-06-06 12:22:37 +0200
+@@ -316,8 +316,7 @@
+ #endif"
ac_subdirs_all="$ac_subdirs_all util/ss"
- ac_subdirs_all="$ac_subdirs_all plugins/kdb/ldap/libkdb_ldap"
+-ac_subdirs_all="$ac_subdirs_all plugins/kdb/ldap/libkdb_ldap"
-ac_subdirs_all="$ac_subdirs_all lib/apputils plugins/kdb/db2
plugins/preauth/wpse plugins/preauth/cksum_body appl tests"
+ac_subdirs_all="$ac_subdirs_all lib/apputils plugins/preauth/wpse
plugins/preauth/cksum_body appl tests"
ac_subdirs_all="$ac_subdirs_all plugins/locate/python"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EXTRA_FILES
CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT HAVE_GCC CPP LD KRB4_INCLUDES
KRB4_LIBPATH KRB4_LIB KRB4_DEPLIB KRB_ERR_H_DEP DES425_DEPLIB DES425_LIB
compile_et COM_ERR_VERSION SS_LIB SS_VERSION DB_HEADER DB_LIB DB_VERSION
DB_HEADER_VERSION KDB5_DB_LIB HESIOD_DEFS HESIOD_LIBS MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT CONFIG_RELTOPDIR subdirs OPENLDAP_PLUGIN build
build_cpu build_vendor build_os host host_cpu host_vendor host_os krb5_cv_host
acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS THREAD_SUPPORT DL_LIB
EGREP KRB5_VERSION TCL_INCLUDES TCL_LIBS TCL_LIBPATH TCL_RPATH TCL_MAYBE_RPATH
KRB4 krb524 OBJLISTS STOBJEXT SHOBJEXT PFOBJEXT PICFLAGS PROFFLAGS LN_S RANLIB
ac_ct_RANLIB ARCHIVE ARADD INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR PERL
LIBLIST LIBLINKS MAKE_SHLIB_COMMAND SHLIB_EXPFLAGS SHLIB_EXPORT_FILE_DEP
DYNOBJ_EXPDEPS DYNOBJ_EXPFLAGS INSTALL_SHLIB STLIBEXT SHLIBEXT SHLIBVEXT
SHLIBSEXT DEPLIBEXT PFLIBEXT LIBINSTLIST DYNOBJEXT MAKE_DYNOBJ_COMMAND GEN_LIB
CC_LINK RPATH_FLAG LIBUTIL AWK FAKEKA KRB5_RUN_ENV LEX LEXLIB LEX_OUTPUT_ROOT
KSU_LIBS SETENVOBJ KRB5_RCTMPDIR maybe_kerberosIV DO_TCL YACC have_RUNTEST
have_PERL DO_TEST DO_V4_TEST RBUILD S_TOP PERL_PATH EXPECT DO_ALL PRIOCNTL_HACK
RUNTEST KRB_ERR_TXT KRB_ERR KRB_ERR_C include_stdint include_inttypes
include_xom rpcent_define GSSRPC__SYS_SELECT_H GSSRPC__SYS_TIME_H
GSSRPC__UNISTD_H GSSRPC__SYS_PARAM_H GSSRPC__NETDB_H GSSRPC__STDINT_H
GSSRPC__INTTYPES_H GSSRPC__FAKE_UINT32 GSSRPC__BSD_TYPEALIASES PASS HOST_TYPE
SUPPORTLIB_MAJOR ldap_plugin_dir LIBOBJS LTLIBOBJS'
ac_subst_files='lib_frag libobj_frag libnover_frag'
-@@ -20360,7 +20360,7 @@
+@@ -20344,9 +20343,7 @@
+ LIBS="$old_LIBS"
+
+
+-subdirs="$subdirs plugins/kdb/ldap/libkdb_ldap"
+
+- ac_config_files="$ac_config_files
plugins/kdb/ldap/Makefile:$srcdir/./config/pre.in:plugins/kdb/ldap/Makefile.in:$srcdir/./config/post.in"
+
+
+
+@@ -20360,7 +20357,7 @@
@@ -84,7 +97,7 @@
Index: src/krb5-config.in
--- src/krb5-config.in.orig 2006-06-16 02:26:49 +0200
-+++ src/krb5-config.in 2007-01-14 12:55:32 +0100
++++ src/krb5-config.in 2007-06-06 12:22:37 +0200
@@ -217,7 +217,7 @@
fi
@@ -95,32 +108,32 @@
echo $lib_flags
Index: src/lib/krb5/os/hst_realm.c
---- src/lib/krb5/os/hst_realm.c.orig 2006-10-15 15:23:48 +0200
-+++ src/lib/krb5/os/hst_realm.c 2007-01-14 11:12:48 +0100
+--- src/lib/krb5/os/hst_realm.c.orig 2007-04-10 23:52:23 +0200
++++ src/lib/krb5/os/hst_realm.c 2007-06-06 12:22:37 +0200
@@ -302,7 +302,7 @@
return EAFNOSUPPORT;
case EAI_MEMORY:
return ENOMEM;
--#if EAI_NODATA != EAI_NONAME
+-#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
+#if (defined EAI_NODATA) && (defined EAI_NONAME) && (EAI_NODATA !=
EAI_NONAME)
case EAI_NODATA:
return KRB5_EAI_NODATA;
#endif
Index: src/lib/krb5/os/locate_kdc.c
---- src/lib/krb5/os/locate_kdc.c.orig 2006-11-16 22:18:50 +0100
-+++ src/lib/krb5/os/locate_kdc.c 2007-01-14 11:12:48 +0100
+--- src/lib/krb5/os/locate_kdc.c.orig 2007-04-10 23:52:23 +0200
++++ src/lib/krb5/os/locate_kdc.c 2007-06-06 12:22:37 +0200
@@ -157,7 +157,7 @@
#ifdef EAI_ADDRFAMILY
case EAI_ADDRFAMILY:
#endif
--#if EAI_NODATA != EAI_NONAME
+-#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
+#if (defined EAI_NODATA) && (defined EAI_NONAME) && (EAI_NODATA !=
EAI_NONAME)
case EAI_NODATA:
#endif
case EAI_NONAME:
Index: src/plugins/kdb/db2/Makefile.in
--- src/plugins/kdb/db2/Makefile.in.orig 2006-10-06 23:17:56 +0200
-+++ src/plugins/kdb/db2/Makefile.in 2007-01-14 11:12:48 +0100
++++ src/plugins/kdb/db2/Makefile.in 2007-06-06 12:22:37 +0200
@@ -30,10 +30,7 @@
RELDIR=../plugins/kdb/db2
# Depends on libk5crypto and libkrb5
@@ -133,9 +146,42 @@
SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB)
$(SUPPORT_LIB) $(LIBS)
SHLIB_DIRS=-L$(TOPLIBD)
+Index: src/plugins/kdb/ldap/ldap_util/Makefile.in
+--- src/plugins/kdb/ldap/ldap_util/Makefile.in.orig 2007-01-04 01:27:06
+0100
++++ src/plugins/kdb/ldap/ldap_util/Makefile.in 2007-06-06 12:22:37
+0200
+@@ -19,7 +19,7 @@
+
+ $(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS) $(GETDATE)
+ $(CC_LINK) -o $(PROG) $(OBJS) $(GETDATE) \
+- $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB4COMPAT_LIBS)
++ $(KDB_DEP_LIB) $(KADMSRV_LIBS) $(KRB4COMPAT_LIBS)
+
+ install::
+ $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
+Index: src/plugins/kdb/ldap/libkdb_ldap/configure
+--- src/plugins/kdb/ldap/libkdb_ldap/configure.orig 2007-04-21 01:39:07
+0200
++++ src/plugins/kdb/ldap/libkdb_ldap/configure 2007-06-06 12:22:37
+0200
+@@ -7617,7 +7617,7 @@
+
+
+
+- ac_config_files="$ac_config_files
./Makefile:$srcdir/../../../../config/pre.in:./Makefile.in:$srcdir/../../../../config/post.in"
++ ac_config_files="$ac_config_files
./Makefile:$srcdir/../../../../config/pre.in:./Makefile.in:../Makefile.in:../ldap_util/Makefile.in:$srcdir/../../../../config/post.in"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -8170,7 +8170,7 @@
+ do
+ case "$ac_config_target" in
+ # Handling of arguments.
+- "./Makefile" ) CONFIG_FILES="$CONFIG_FILES
./Makefile:$srcdir/../../../../config/pre.in:./Makefile.in:$srcdir/../../../../config/post.in"
;;
++ "./Makefile" ) CONFIG_FILES="$CONFIG_FILES
./Makefile:$srcdir/../../../../config/pre.in:./Makefile.in:../Makefile.in:../ldap_util/Makefile.in:$srcdir/../../../../config/post.in"
;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target"
>&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
Index: src/util/ss/pager.c
--- src/util/ss/pager.c.orig 2003-01-06 00:28:05 +0100
-+++ src/util/ss/pager.c 2007-01-14 11:12:48 +0100
++++ src/util/ss/pager.c 2007-06-06 12:22:37 +0200
@@ -11,6 +11,7 @@
#include "copyright.h"
#include <errno.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.spec
============================================================================
$ cvs diff -u -r1.88 -r1.89 kerberos.spec
--- openpkg-src/kerberos/kerberos.spec 18 Apr 2007 21:46:01 -0000
1.88
+++ openpkg-src/kerberos/kerberos.spec 6 Jun 2007 10:29:28 -0000
1.89
@@ -22,9 +22,11 @@
## SUCH DAMAGE.
##
+# FIXME: rse: with_ldap still defunct
+
# package version
%define V_major 1.6
-%define V_minor %nil
+%define V_minor 1
# package information
Name: kerberos
@@ -36,12 +38,13 @@
Class: BASE
Group: Cryptography
License: MIT subject to US EAR
-Version: %{V_major}
-Release: 20070418
+Version: %{V_major}.%{V_minor}
+Release: 20070606
# package options
%option with_fsl yes
%option with_server yes
+%option with_ldap no
# list of sources
Source0:
http://web.mit.edu/kerberos/dist/krb5/%{V_major}/krb5-%{version}-signed.tar
@@ -61,6 +64,10 @@
BuildPreReq: fsl >= 1.2.0
PreReq: fsl >= 1.2.0
%endif
+%if "%{with_ldap}" == "yes"
+BuildPreReq: openldap
+PreReq: openldap
+%endif
AutoReq: no
AutoReqProv: no
Conflicts: heimdal
@@ -92,7 +99,7 @@
-e 's/if test "$enable_static" = yes; then/if false; then/' \
-e 's/if test "$enable_shared" != yes; then/if false; then/' \
-e 's/if test "$enable_static" = no && test "$krb5_force_static" !=
yes; then/if false; then/' \
- `find . -name configure -type f -print | grep -v plugins/kdb/db2`
+ `find . -name configure -type f -print | grep -v plugins/kdb/db2 |
grep -v plugins/kdb/ldap`
%{l_shtool} subst \
-e
's;/etc/krb5\.conf:@SYSCONFDIR/krb5.conf;@SYSCONFDIR/kerberos/krb5.conf;g' \
-e
's;FILE:/etc/krb5\.keytab;FILE:@SYSCONFDIR/kerberos/krb5.keytab;g' \
@@ -106,6 +113,7 @@
cd src
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_fsl_ldflags}" \
LIBS="%{l_fsl_libs}" \
./configure \
@@ -121,7 +129,7 @@
# build toolkit
%{l_make} %{l_mflags}
- # configure and rebuild database plugin DSO
+ # configure and build database plugin DSO
%if "%{with_server}" == "yes"
( cd plugins/kdb/db2
CC="%{l_cc}" \
@@ -135,6 +143,32 @@
) || exit $?
%endif
+ # configure and build LDAP plugin DSO
+%if "%{with_server}" == "yes" && "%{with_ldap}" == "yes"
+ ( cd plugins/kdb/ldap/libkdb_ldap
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_fsl_ldflags}" \
+ LIBS="%{l_fsl_libs} -lldap -llber -lssl -lcrypto" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --includedir=%{l_prefix}/include/kerberos \
+ --libdir=%{l_prefix}/lib/kerberos \
+ --enable-dns-for-realm \
+ --without-tcl \
+ --without-krb4 \
+ --with-ldap \
+ --disable-static \
+ --enable-shared
+ ./config.status --file ../Makefile
+ ./config.status --file ../ldap_util/Makefile
+ ) || exit $?
+ ( cd plugins/kdb/ldap
+ %{l_make} %{l_mflags} kldap.so
+ ) || exit $?
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
