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: 12-Oct-2006 18:04:43
Branch: HEAD Handle: 2006101217044300
Modified files:
openpkg-src/kerberos kerberos.patch kerberos.spec
Log:
blind upgrade to security-fixed Kerberos 1.5 in order to hand it over
Summary:
Revision Changes Path
1.14 +63 -48 openpkg-src/kerberos/kerberos.patch
1.75 +7 -3 openpkg-src/kerberos/kerberos.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 kerberos.patch
--- openpkg-src/kerberos/kerberos.patch 16 Jan 2006 18:52:18 -0000
1.13
+++ openpkg-src/kerberos/kerberos.patch 12 Oct 2006 16:04:43 -0000
1.14
@@ -1,41 +1,6 @@
-Index: src/lib/krb5/os/hst_realm.c
---- src/lib/krb5/os/hst_realm.c.orig 2002-10-16 00:51:50.000000000 +0200
-+++ src/lib/krb5/os/hst_realm.c 2004-04-10 12:36:57.000000000 +0200
-@@ -366,7 +366,7 @@
- return EAFNOSUPPORT;
- case EAI_MEMORY:
- return ENOMEM;
--#if 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 2004-01-06 03:30:15.000000000
+0100
-+++ src/lib/krb5/os/locate_kdc.c 2004-04-10 12:36:57.000000000 +0200
-@@ -186,7 +186,7 @@
- #ifdef EAI_ADDRFAMILY
- case EAI_ADDRFAMILY:
- #endif
--#if EAI_NODATA != EAI_NONAME
-+#if (defined EAI_NODATA) && (defined EAI_NONAME) && (EAI_NODATA !=
EAI_NONAME)
- case EAI_NODATA:
- #endif
- case EAI_NONAME:
-Index: src/util/ss/pager.c
---- src/util/ss/pager.c.orig 2003-01-06 00:28:05.000000000 +0100
-+++ src/util/ss/pager.c 2004-04-10 12:36:57.000000000 +0200
-@@ -11,6 +11,7 @@
- #include "copyright.h"
- #include <errno.h>
- #include <stdio.h>
-+#include <errno.h>
- #include <sys/types.h>
- #include <sys/file.h>
- #include <signal.h>
Index: src/appl/Makefile.in
--- src/appl/Makefile.in.orig 2004-03-08 08:20:55 +0100
-+++ src/appl/Makefile.in 2005-12-25 20:46:56 +0100
++++ src/appl/Makefile.in 2006-08-27 11:24:46 +0200
@@ -3,5 +3,6 @@
mydir=.
BUILDTOP=$(REL)..
@@ -45,28 +10,30 @@
+MY_SUBDIRS= gss-sample
Index: src/appl/configure
---- src/appl/configure.orig 2005-11-16 23:47:41 +0100
-+++ src/appl/configure 2005-12-25 20:47:39 +0100
-@@ -300,7 +300,6 @@
+--- src/appl/configure.orig 2006-08-24 02:21:57 +0200
++++ src/appl/configure 2006-08-27 11:24:46 +0200
+@@ -315,7 +315,7 @@
# include <unistd.h>
#endif"
--ac_subdirs_all="$ac_subdirs_all bsd gssftp telnet"
+-ac_subdirs_all="$ac_subdirs_all libpty bsd gssftp telnet"
++ac_subdirs_all="$ac_subdirs_all libpty"
+ 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 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA GEN_LIB CC_LINK RPATH_FLAG
DEPLIBEXT LIBOBJS LTLIBOBJS'
+ ac_subst_files='lib_frag libobj_frag libnover_frag'
- # Initialize some variables set by options.
- ac_init_help=
-@@ -6418,7 +6417,6 @@
+@@ -7346,7 +7346,7 @@
--subdirs="$subdirs bsd gssftp telnet"
+-subdirs="$subdirs libpty bsd gssftp telnet"
++subdirs="$subdirs libpty"
- ac_config_files="$ac_config_files
./Makefile:$krb5_pre_in:./Makefile.in:$krb5_post_in"
+ 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 2004-11-19 22:47:51 +0100
-+++ src/config/pre.in 2006-01-16 19:46:48 +0100
-@@ -180,7 +180,7 @@
+--- src/config/pre.in.orig 2006-06-16 00:21:58 +0200
++++ src/config/pre.in 2006-08-27 11:24:46 +0200
+@@ -187,7 +187,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -75,3 +42,51 @@
## This is needed because autoconf will sometimes define @exec_prefix@ to be
## ${prefix}.
[EMAIL PROTECTED]@
+Index: src/lib/krb5/os/hst_realm.c
+--- src/lib/krb5/os/hst_realm.c.orig 2006-06-16 08:58:42 +0200
++++ src/lib/krb5/os/hst_realm.c 2006-08-27 11:24:46 +0200
+@@ -365,7 +365,7 @@
+ return EAFNOSUPPORT;
+ case EAI_MEMORY:
+ return ENOMEM;
+-#if 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-05-24 23:19:23 +0200
++++ src/lib/krb5/os/locate_kdc.c 2006-08-27 11:24:46 +0200
+@@ -157,7 +157,7 @@
+ #ifdef EAI_ADDRFAMILY
+ case EAI_ADDRFAMILY:
+ #endif
+-#if EAI_NODATA != EAI_NONAME
++#if (defined EAI_NODATA) && (defined EAI_NONAME) && (EAI_NODATA !=
EAI_NONAME)
+ case EAI_NODATA:
+ #endif
+ case EAI_NONAME:
+Index: src/util/ss/pager.c
+--- src/util/ss/pager.c.orig 2003-01-06 00:28:05 +0100
++++ src/util/ss/pager.c 2006-08-27 11:24:46 +0200
+@@ -11,6 +11,7 @@
+ #include "copyright.h"
+ #include <errno.h>
+ #include <stdio.h>
++#include <errno.h>
+ #include <sys/types.h>
+ #include <sys/file.h>
+ #include <signal.h>
+Index: src/plugins/kdb/db2/configure
+--- src/plugins/kdb/db2/configure.orig 2006-08-27 11:54:48 +0200
++++ src/plugins/kdb/db2/configure 2006-08-27 12:10:15 +0200
+@@ -1365,7 +1365,8 @@
+
+
+ build_dynobj=no
+-enable_shared=yes
++enable_shared=yes
++enable_static=yes
+ build_dynobj=yes
+ ac_reltopdir="../../.."
+ if test ! -r "$srcdir/../../../aclocal.m4"; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/kerberos/kerberos.spec
============================================================================
$ cvs diff -u -r1.74 -r1.75 kerberos.spec
--- openpkg-src/kerberos/kerberos.spec 25 Aug 2006 19:17:03 -0000
1.74
+++ openpkg-src/kerberos/kerberos.spec 12 Oct 2006 16:04:43 -0000
1.75
@@ -25,8 +25,8 @@
# FIXME: rse: missing run-command support for kprop/kpropd based
master/slave replication
# package version
-%define V_major 1.4
-%define V_minor 3
+%define V_major 1.5
+%define V_minor 1
# package information
Name: kerberos
@@ -39,7 +39,7 @@
Group: Cryptography
License: MIT subject to US EAR
Version: %{V_major}.%{V_minor}
-Release: 20060825
+Release: 20061012
# package options
%option with_fsl yes
@@ -86,6 +86,10 @@
%{l_gzip} -d -c krb5-%{version}.tar.gz | (cd .. && %{l_tar} xf -) ||
exit $?
%patch -p0
%{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/' \
+ `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' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
