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 14:07:48
Branch: HEAD Handle: 2007011413074700
Modified files:
openpkg-src/kerberos kerberos.patch kerberos.spec
Log:
fix client linking by adding the missing libkrb5support.a to the
krb5-config output; add support for a client-only installation by
providing a with_server option which can be disabled
Summary:
Revision Changes Path
1.18 +12 -0 openpkg-src/kerberos/kerberos.patch
1.85 +64 -8 openpkg-src/kerberos/kerberos.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 kerberos.patch
--- openpkg-src/kerberos/kerberos.patch 14 Jan 2007 10:21:28 -0000
1.17
+++ openpkg-src/kerberos/kerberos.patch 14 Jan 2007 13:07:47 -0000
1.18
@@ -82,6 +82,18 @@
if false; then
+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
+@@ -217,7 +217,7 @@
+ fi
+
+ if test $library = 'krb5'; then
+- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS
$DL_LIB"
++ lib_flags="$lib_flags -lkrb5 -lk5crypto -lkrb5support -lcom_err
$GEN_LIB $LIBS $DL_LIB"
+ fi
+
+ 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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.spec
============================================================================
$ cvs diff -u -r1.84 -r1.85 kerberos.spec
--- openpkg-src/kerberos/kerberos.spec 14 Jan 2007 11:49:31 -0000
1.84
+++ openpkg-src/kerberos/kerberos.spec 14 Jan 2007 13:07:47 -0000
1.85
@@ -40,7 +40,8 @@
Release: 20070114
# package options
-%option with_fsl yes
+%option with_fsl yes
+%option with_server yes
# list of sources
Source0:
http://web.mit.edu/kerberos/dist/krb5/%{V_major}/krb5-%{version}-signed.tar
@@ -121,6 +122,7 @@
%{l_make} %{l_mflags}
# configure and rebuild database plugin DSO
+%if "%{with_server}" == "yes"
( cd plugins/kdb/db2
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ -131,72 +133,120 @@
--enable-shared
%{l_make} %{l_mflags} db2.so
) || exit $?
+%endif
%install
- # install toolkit
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/var/kerberos
+
+ # install toolkit
( cd src
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
# install database plugin DSO
+%if "%{with_server}" == "yes"
( cd src/plugins/kdb/db2
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
+%endif
# create additional directories
%{l_shtool} mkdir -p -m 755 \
+%if "%{with_server}" == "yes"
$RPM_BUILD_ROOT%{l_prefix}/var/kerberos/log \
$RPM_BUILD_ROOT%{l_prefix}/var/kerberos/run \
$RPM_BUILD_ROOT%{l_prefix}/var/kerberos/db \
$RPM_BUILD_ROOT%{l_prefix}/share/kerberos \
- $RPM_BUILD_ROOT%{l_prefix}/etc/kerberos \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
- $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
+ $RPM_BUILD_ROOT%{l_prefix}/etc/fsl \
+%endif
+ $RPM_BUILD_ROOT%{l_prefix}/etc/kerberos
# 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 -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/krb5-send-pr.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
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/kerberos/kerberosIV
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
+ # strip down installation (server-related only)
+%if "%{with_server}" != "yes"
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/kerberos/krb5
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/kerberos/libkadm5srv.a
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/kerberos/libkdb5.a
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man5/kdc.conf.5
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/k5srvutil.8
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/kadmin.local.8
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/kadmind.8
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/kdb5_util.8
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/kprop.8
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/kpropd.8
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/krb5kdc.8
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man8/ktutil.8
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/gss-server
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/k5srvutil
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/kadmin.local
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/kadmind
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/kdb5_util
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/kerberos-setup
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/kprop
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/kpropd
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/krb5-send-pr
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/krb5kdc
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/sbin/ktutil
+%endif
+
# install setup script
+%if "%{with_server}" == "yes"
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE kerberos-setup.sh} \
$RPM_BUILD_ROOT%{l_prefix}/sbin/kerberos-setup
+%endif
# install run-command script
+%if "%{with_server}" == "yes"
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.kerberos} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+%endif
# install default configuration files
%{l_shtool} install -c -m 644 %{l_value -s -a} \
- %{SOURCE krb5.conf} %{SOURCE kdc.conf} \
+ %{SOURCE krb5.conf} \
$RPM_BUILD_ROOT%{l_prefix}/etc/kerberos/
+%if "%{with_server}" == "yes"
+ %{l_shtool} install -c -m 644 %{l_value -s -a} \
+ %{SOURCE kdc.conf} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/kerberos/
+%endif
# install OSSP fsl configuration
+%if "%{with_server}" == "yes"
%{l_shtool} install -c -m 644 %{l_value -s -a} \
%{SOURCE fsl.kerberos} \
$RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
+%endif
# install documentation
+%if "%{with_server}" == "yes"
%{l_shtool} install -c -m 644 %{l_value -s -a} \
doc/install-guide.ps doc/admin-guide.ps doc/user-guide.ps \
$RPM_BUILD_ROOT%{l_prefix}/share/kerberos/
+%endif
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
+%if "%{with_server}" == "yes"
'%not %dir %{l_prefix}/etc/fsl' \
'%config %{l_prefix}/etc/fsl/fsl.kerberos' \
- '%config %{l_prefix}/etc/kerberos/*.conf' \
'%doc %{l_prefix}/share/kerberos/*.ps' \
+%endif
+ '%config %{l_prefix}/etc/kerberos/*.conf' \
'%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/ksu'
%files -f files
@@ -206,13 +256,16 @@
%pre
# before upgrade, save status and stop service
+%if "%{with_server}" == "yes"
[ $1 -eq 2 ] || exit 0
eval `%{l_rc} kerberos status 2>/dev/null | tee %{l_tmpfile}`
%{l_rc} kerberos stop 2>/dev/null
exit 0
+%endif
%post
# initial hints
+%if "%{with_server}" == "yes"
if [ $1 -eq 1 ]; then
# display information about next steps
( echo "Before you can use Kerberos you have to choose the"
@@ -243,9 +296,11 @@
eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
[ ".$kerberos_active" = .yes ] && %{l_rc} kerberos start
exit 0
+%endif
%preun
# before erase, stop service and remove log files
+%if "%{with_server}" == "yes"
[ $1 -eq 0 ] || exit 0
%{l_rc} kerberos stop 2>/dev/null
rm -f $RPM_INSTALL_PREFIX/var/kerberos/log/*.log* >/dev/null 2>&1 || true
@@ -253,4 +308,5 @@
rm -f $RPM_INSTALL_PREFIX/var/kerberos/db/* >/dev/null 2>&1 || true
rm -f $RPM_INSTALL_PREFIX/var/kerberos/db/.k5.* >/dev/null 2>&1 || true
exit 0
+%endif
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
