OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-Oct-2006 09:19:54
Branch: HEAD Handle: 2006101608195300
Modified files:
openpkg-src/kerberos kerberos.patch kerberos.spec
Log:
modifying package: kerberos-1.5.1 20061013 -> 20061016
Summary:
Revision Changes Path
1.15 +15 -0 openpkg-src/kerberos/kerberos.patch
1.77 +7 -2 openpkg-src/kerberos/kerberos.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 kerberos.patch
--- openpkg-src/kerberos/kerberos.patch 12 Oct 2006 16:04:43 -0000
1.14
+++ openpkg-src/kerberos/kerberos.patch 16 Oct 2006 07:19:53 -0000
1.15
@@ -90,3 +90,18 @@
build_dynobj=yes
ac_reltopdir="../../.."
if test ! -r "$srcdir/../../../aclocal.m4"; then
+Index: src/plugins/kdb/db2/Makefile.in
+--- src/plugins/kdb/db2/Makefile.in.orig 2006-08-24 02:14:09 +0200
++++ src/plugins/kdb/db2/Makefile.in 2006-10-16 09:00:47 +0200
+@@ -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
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.spec
============================================================================
$ cvs diff -u -r1.76 -r1.77 kerberos.spec
--- openpkg-src/kerberos/kerberos.spec 13 Oct 2006 17:29:12 -0000
1.76
+++ openpkg-src/kerberos/kerberos.spec 16 Oct 2006 07:19:53 -0000
1.77
@@ -39,7 +39,7 @@
Group: Cryptography
License: MIT subject to US EAR
Version: %{V_major}.%{V_minor}
-Release: 20061013
+Release: 20061016
# package options
%option with_fsl yes
@@ -88,13 +88,14 @@
%{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`
%{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' \
-e 's;@LOCALSTATEDIR/krb5kdc;@LOCALSTATEDIR/kerberos;g' \
-e 's;DEFAULT_KDC_PROFILE."@LOCALSTATEDIR;DEFAULT_KDC_PROFILE
"@SYSCONFDIR;g' \
- src/include/krb5/stock/osconf.h
+ src/include/stock/osconf.h
%{l_shtool} subst \
-e 's;/etc/krb5\.keytab;%{l_prefix}/etc/kerberos/krb5.keytab;' \
src/kadmin/cli/k5srvutil.sh \
@@ -116,6 +117,10 @@
--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`
%{l_make} %{l_mflags}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
