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: 14-Jan-2007 11:21:28
Branch: HEAD Handle: 2007011410212800
Modified files:
openpkg-src/kerberos kerberos.patch kerberos.spec
Log:
repair run-time by unlinking database plugin from static
build-environment and then stand-alone building it dynamically; also
remove the compile_et stuff (except for com_err.h as it mainly is
required by Kerberos includes) as it is a Kerberos build-time
functionality only
Summary:
Revision Changes Path
1.17 +59 -30 openpkg-src/kerberos/kerberos.patch
1.81 +27 -10 openpkg-src/kerberos/kerberos.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 kerberos.patch
--- openpkg-src/kerberos/kerberos.patch 10 Jan 2007 07:37:28 -0000
1.16
+++ openpkg-src/kerberos/kerberos.patch 14 Jan 2007 10:21:28 -0000
1.17
@@ -1,6 +1,25 @@
+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 @@
+ 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 \
+- plugins/kdb/db2 \
+ appl tests \
+ config-files gen-manpages
+ BUILDTOP=$(REL)$(C)
+@@ -98,7 +97,6 @@
+ done
+ (w=`pwd`; cd util && $(MAKE) install DESTDIR="$$w/util/fakedest")
+ (w=`pwd`; cd lib && $(MAKE) install DESTDIR="$$w/util/fakedest")
+- (w=`pwd`; cd plugins/kdb/db2 && $(MAKE) install
DESTDIR="$$w/util/fakedest")
+
+ # (w=`pwd`; cd plugins/locate/python && $(MAKE) install
DESTDIR="$$w/util/fakedest")
+
Index: src/appl/Makefile.in
--- src/appl/Makefile.in.orig 2004-03-08 08:20:55 +0100
-+++ src/appl/Makefile.in 2007-01-10 08:31:00 +0100
++++ src/appl/Makefile.in 2007-01-14 11:12:48 +0100
@@ -3,5 +3,6 @@
mydir=.
BUILDTOP=$(REL)..
@@ -11,7 +30,7 @@
Index: src/appl/configure
--- src/appl/configure.orig 2007-01-10 01:12:22 +0100
-+++ src/appl/configure 2007-01-10 08:32:25 +0100
++++ src/appl/configure 2007-01-14 11:12:48 +0100
@@ -315,7 +315,7 @@
# include <unistd.h>
#endif"
@@ -32,7 +51,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-10 08:31:00 +0100
++++ src/config/pre.in 2007-01-14 11:12:48 +0100
@@ -187,7 +187,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -42,9 +61,30 @@
## This is needed because autoconf will sometimes define @exec_prefix@ to be
## ${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 @@
+
+ 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 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 @@
+
+
+
+-subdirs="$subdirs lib/apputils plugins/kdb/db2 plugins/preauth/wpse
plugins/preauth/cksum_body appl tests"
++subdirs="$subdirs lib/apputils plugins/preauth/wpse
plugins/preauth/cksum_body appl tests"
+
+ if false; then
+
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-10 08:31:00 +0100
++++ src/lib/krb5/os/hst_realm.c 2007-01-14 11:12:48 +0100
@@ -302,7 +302,7 @@
return EAFNOSUPPORT;
case EAI_MEMORY:
@@ -56,7 +96,7 @@
#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-10 08:31:00 +0100
++++ src/lib/krb5/os/locate_kdc.c 2007-01-14 11:12:48 +0100
@@ -157,7 +157,7 @@
#ifdef EAI_ADDRFAMILY
case EAI_ADDRFAMILY:
@@ -68,33 +108,22 @@
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-10 08:31:00 +0100
-@@ -64,7 +64,10 @@
- pol_xdr.o \
- db2_exp.o
-
--all-unix:: $(LIBBASE)$(SO_EXT)
-+install-static:
-+db2.a: OBJS.ST
-+
-+all-unix:: $(LIBBASE).a
- install-unix:: install-libs
- clean-unix:: clean-libs clean-libobjs
-
-Index: src/plugins/kdb/db2/configure
---- src/plugins/kdb/db2/configure.orig 2007-01-10 01:11:11 +0100
-+++ src/plugins/kdb/db2/configure 2007-01-10 08:31:00 +0100
-@@ -1368,6 +1368,7 @@
-
- build_dynobj=no
- enable_shared=yes
-+enable_static=yes
- build_dynobj=yes
- ac_reltopdir="../../.."
- if test ! -r "$srcdir/../../../aclocal.m4"; then
++++ src/plugins/kdb/db2/Makefile.in 2007-01-14 11:12:48 +0100
+@@ -30,10 +30,7 @@
+ RELDIR=../plugins/kdb/db2
+ # Depends on libk5crypto and libkrb5
+ # Also on gssrpc, for xdr stuff.
+-SHLIB_EXPDEPS = \
+- $(GSSRPC_DEPLIBS) \
+- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
+- $(TOPLIBD)/libkrb5$(SHLIBEXT)
++SHLIB_EXPDEPS =
+ SHLIB_EXPLIBS= $(GSSRPC_LIBS) -lkrb5 -lcom_err -lk5crypto $(KDB5_DB_LIB)
$(SUPPORT_LIB) $(LIBS)
+
+ SHLIB_DIRS=-L$(TOPLIBD)
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-10 08:31:00 +0100
++++ src/util/ss/pager.c 2007-01-14 11:12:48 +0100
@@ -11,6 +11,7 @@
#include "copyright.h"
#include <errno.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.spec
============================================================================
$ cvs diff -u -r1.80 -r1.81 kerberos.spec
--- openpkg-src/kerberos/kerberos.spec 13 Jan 2007 20:50:35 -0000
1.80
+++ openpkg-src/kerberos/kerberos.spec 14 Jan 2007 10:21:28 -0000
1.81
@@ -23,7 +23,6 @@
##
# FIXME: rse: missing run-command support for kprop/kpropd based
master/slave replication
-# FIXME: rse: database backend broken because of DSO stuff
# package version
%define V_major 1.6
@@ -40,7 +39,7 @@
Group: Cryptography
License: MIT subject to US EAR
Version: %{V_major}
-Release: 20070113
+Release: 20070114
# package options
%option with_fsl yes
@@ -86,11 +85,14 @@
%{l_tar} xf %{SOURCE krb5-%{version}-signed.tar}
%{l_gzip} -d -c krb5-%{version}.tar.gz | (cd .. && %{l_tar} xf -) ||
exit $?
%patch -p0
+
+%build
+ # configure toolkit
%{l_shtool} subst \
-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`
+ `find . -name configure -type f -print | grep -v plugins/kdb/db2`
%{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' \
@@ -101,9 +103,6 @@
-e 's;/etc/krb5\.keytab;%{l_prefix}/etc/kerberos/krb5.keytab;' \
src/kadmin/cli/k5srvutil.sh \
src/kadmin/cli/kadmin.c
-
-%build
- # build toolkit
cd src
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O} -D_GNU_SOURCE" \
@@ -118,12 +117,22 @@
--without-krb4 \
--enable-static \
--disable-shared
- %{l_shtool} subst \
- -e 's;^\(OBJLISTS *= *OBJS.SH\);\1 OBJS.ST;' \
- -e 's;^\(LIBINSTLIST\) *=.*$;\1=install-static;' \
- `find plugins/kdb/db2/ -name Makefile`
+
+ # build toolkit
%{l_make} %{l_mflags}
+ # configure and rebuild database plugin DSO
+ ( cd plugins/kdb/db2
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --libdir=%{l_prefix}/lib/kerberos \
+ --disable-static \
+ --enable-shared
+ %{l_make} %{l_mflags} db2.so
+ ) || exit $?
+
%install
# install toolkit
rm -rf $RPM_BUILD_ROOT
@@ -133,6 +142,11 @@
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
+ # install database plugin
+ ( cd src/plugins/kdb/db2
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+ ) || exit $?
+
# create additional directories
%{l_shtool} mkdir -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/var/kerberos/log \
@@ -144,6 +158,9 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl
# strip down installation
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/compile_et
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/compile_et.1
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/et
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gnats
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/examples
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
