diff --git a/kprop-use-mkstemp.dif b/kprop-use-mkstemp.dif
index b4ad439..893c3ab 100644
--- a/kprop-use-mkstemp.dif
+++ b/kprop-use-mkstemp.dif
@@ -1,5 +1,5 @@
---- slave/kprop.c
-+++ slave/kprop.c	2006/06/21 12:38:34
+--- src/slave/kprop.c
++++ src/slave/kprop.c	2006/06/21 12:38:34
 @@ -215,6 +215,7 @@
  	krb5_error_code retval;
  	static char tkstring[] = "/tmp/kproptktXXXXXX";
diff --git a/krb5-1.4-compile_pie.dif b/krb5-1.4-compile_pie.dif
index 48f238b..5604b8f 100644
--- a/krb5-1.4-compile_pie.dif
+++ b/krb5-1.4-compile_pie.dif
@@ -1,6 +1,8 @@
---- src/appl/bsd/Makefile.in
-+++ src/appl/bsd/Makefile.in	2005/06/17 14:00:37
-@@ -15,6 +15,9 @@
+Index: src/appl/bsd/Makefile.in
+===================================================================
+--- src/appl/bsd/Makefile.in.orig
++++ src/appl/bsd/Makefile.in
+@@ -15,6 +15,9 @@ V4RCP=@V4RCP@
  V4RCPO=@V4RCPO@
  KRSHDLIBS=@KRSHDLIBS@
  
@@ -10,9 +12,11 @@
  SRCS= $(srcdir)/krcp.c $(srcdir)/krlogin.c $(srcdir)/krsh.c $(srcdir)/kcmd.c \
  	$(srcdir)/forward.c $(srcdir)/compat_recv.c \
  	$(srcdir)/login.c $(srcdir)/krshd.c $(srcdir)/krlogind.c \
---- src/appl/gssftp/ftpd/Makefile.in
-+++ src/appl/gssftp/ftpd/Makefile.in	2005/06/17 14:06:35
-@@ -15,6 +15,9 @@
+Index: src/appl/gssftp/ftpd/Makefile.in
+===================================================================
+--- src/appl/gssftp/ftpd/Makefile.in.orig
++++ src/appl/gssftp/ftpd/Makefile.in
+@@ -15,6 +15,9 @@ LIBOBJS=@LIBOBJS@
  COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
  FTPD_LIBS=@FTPD_LIBS@
  
@@ -22,9 +26,11 @@
  SRCS	= $(srcdir)/ftpd.c ftpcmd.c $(srcdir)/popen.c \
  	  $(srcdir)/vers.c \
  	  $(srcdir)/../ftp/glob.c \
---- src/appl/gssftp/ftp/Makefile.in
-+++ src/appl/gssftp/ftp/Makefile.in	2005/06/17 13:52:20
-@@ -9,6 +9,9 @@
+Index: src/appl/gssftp/ftp/Makefile.in
+===================================================================
+--- src/appl/gssftp/ftp/Makefile.in.orig
++++ src/appl/gssftp/ftp/Makefile.in
+@@ -9,6 +9,9 @@ DEFINES = -DGSSAPI -DFTP_BUFSIZ=65535
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -34,9 +40,11 @@
  SRCS	= $(srcdir)/cmds.c $(srcdir)/cmdtab.c $(srcdir)/domacro.c \
  	  $(srcdir)/ftp.c $(srcdir)/getpass.c $(srcdir)/glob.c \
  	  $(srcdir)/main.c $(srcdir)/radix.c \
---- src/appl/gss-sample/Makefile.in
-+++ src/appl/gss-sample/Makefile.in	2005/06/17 13:54:49
-@@ -6,6 +6,9 @@
+Index: src/appl/gss-sample/Makefile.in
+===================================================================
+--- src/appl/gss-sample/Makefile.in.orig
++++ src/appl/gss-sample/Makefile.in
+@@ -6,6 +6,9 @@ DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -46,9 +54,11 @@
  SRCS= $(srcdir)/gss-client.c $(srcdir)/gss-misc.c $(srcdir)/gss-server.c
  
  OBJS= gss-client.o gss-misc.o gss-server.o
---- src/appl/sample/sclient/Makefile.in
-+++ src/appl/sample/sclient/Makefile.in	2005/06/17 14:03:00
-@@ -6,6 +6,9 @@
+Index: src/appl/sample/sclient/Makefile.in
+===================================================================
+--- src/appl/sample/sclient/Makefile.in.orig
++++ src/appl/sample/sclient/Makefile.in
+@@ -6,6 +6,9 @@ BUILDTOP=$(REL)..$(S)..$(S)..
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -58,9 +68,11 @@
  all:: sclient
  
  sclient: sclient.o $(KRB5_BASE_DEPLIBS)
---- src/appl/sample/sserver/Makefile.in
-+++ src/appl/sample/sserver/Makefile.in	2005/06/17 14:13:52
-@@ -6,6 +6,9 @@
+Index: src/appl/sample/sserver/Makefile.in
+===================================================================
+--- src/appl/sample/sserver/Makefile.in.orig
++++ src/appl/sample/sserver/Makefile.in
+@@ -6,6 +6,9 @@ BUILDTOP=$(REL)..$(S)..$(S)..
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -70,9 +82,11 @@
  all:: sserver
  
  sserver: sserver.o $(KRB5_BASE_DEPLIBS)
---- src/appl/simple/client/Makefile.in
-+++ src/appl/simple/client/Makefile.in	2005/06/17 14:03:53
-@@ -5,6 +5,9 @@
+Index: src/appl/simple/client/Makefile.in
+===================================================================
+--- src/appl/simple/client/Makefile.in.orig
++++ src/appl/simple/client/Makefile.in
+@@ -5,6 +5,9 @@ BUILDTOP=$(REL)..$(S)..$(S)..
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -82,9 +96,11 @@
  all:: sim_client
  
  LOCALINCLUDES= -I.. -I$(srcdir)/..
---- src/appl/simple/server/Makefile.in
-+++ src/appl/simple/server/Makefile.in	2005/06/17 14:13:21
-@@ -8,6 +8,9 @@
+Index: src/appl/simple/server/Makefile.in
+===================================================================
+--- src/appl/simple/server/Makefile.in.orig
++++ src/appl/simple/server/Makefile.in
+@@ -8,6 +8,9 @@ LOCALINCLUDES= -I.. -I$(srcdir)/..
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -94,9 +110,11 @@
  all:: sim_server
  
  sim_server: sim_server.o $(KRB5_BASE_DEPLIBS)
---- src/appl/telnet/libtelnet/Makefile.in
-+++ src/appl/telnet/libtelnet/Makefile.in	2005/06/17 15:04:13
-@@ -32,6 +32,8 @@
+Index: src/appl/telnet/libtelnet/Makefile.in
+===================================================================
+--- src/appl/telnet/libtelnet/Makefile.in.orig
++++ src/appl/telnet/libtelnet/Makefile.in
+@@ -32,6 +32,8 @@ LIBOBJS=@LIBOBJS@
  SETENVSRC=@SETENVSRC@
  SETENVOBJ=@SETENVOBJ@
  
@@ -105,9 +123,11 @@
  LIBBASE=telnet
  LIBMAJOR=0
  LIBMINOR=0
---- src/appl/telnet/telnetd/Makefile.in
-+++ src/appl/telnet/telnetd/Makefile.in	2005/06/17 14:14:22
-@@ -33,6 +33,9 @@
+Index: src/appl/telnet/telnetd/Makefile.in
+===================================================================
+--- src/appl/telnet/telnetd/Makefile.in.orig
++++ src/appl/telnet/telnetd/Makefile.in
+@@ -33,6 +33,9 @@ ARPA_TELNET= $(srcdir)/../arpa/telnet.h
  PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -117,9 +137,11 @@
  LIBS=	@TELNETD_LIBS@
  
  SRCS=	$(srcdir)/telnetd.c \
---- src/appl/telnet/telnet/Makefile.in
-+++ src/appl/telnet/telnet/Makefile.in	2005/06/17 14:04:54
-@@ -33,6 +33,9 @@
+Index: src/appl/telnet/telnet/Makefile.in
+===================================================================
+--- src/appl/telnet/telnet/Makefile.in.orig
++++ src/appl/telnet/telnet/Makefile.in
+@@ -33,6 +33,9 @@ ARPA_TELNET= $(srcdir)/../arpa/telnet.h
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -129,9 +151,11 @@
  LIBS=	@TELNET_LIBS@
  
  SRCS=	$(srcdir)/authenc.c $(srcdir)/commands.c $(srcdir)/main.c $(srcdir)/network.c $(srcdir)/ring.c \
---- src/appl/user_user/Makefile.in
-+++ src/appl/user_user/Makefile.in	2005/06/17 14:06:03
-@@ -6,6 +6,9 @@
+Index: src/appl/user_user/Makefile.in
+===================================================================
+--- src/appl/user_user/Makefile.in.orig
++++ src/appl/user_user/Makefile.in
+@@ -6,6 +6,9 @@ DEFINES = -DDEBUG
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -141,9 +165,11 @@
  all:: uuclient uuserver
  
  uuclient: client.o $(KRB5_BASE_DEPLIBS)
---- src/clients/kdestroy/Makefile.in
-+++ src/clients/kdestroy/Makefile.in	2005/06/17 13:55:38
-@@ -6,6 +6,9 @@
+Index: src/clients/kdestroy/Makefile.in
+===================================================================
+--- src/clients/kdestroy/Makefile.in.orig
++++ src/clients/kdestroy/Makefile.in
+@@ -9,6 +9,9 @@ SRCS=kdestroy.c
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -153,11 +179,13 @@
  all-unix:: kdestroy
  all-windows:: $(OUTPRE)kdestroy.exe
  
---- src/clients/kinit/Makefile.in
-+++ src/clients/kinit/Makefile.in	2005/06/17 13:56:02
-@@ -6,6 +6,9 @@
- PROG_LIBPATH=-L$(TOPLIBD)
- PROG_RPATH=$(KRB5_LIBDIR)
+Index: src/clients/kinit/Makefile.in
+===================================================================
+--- src/clients/kinit/Makefile.in.orig
++++ src/clients/kinit/Makefile.in
+@@ -9,6 +9,9 @@ PROG_RPATH=$(KRB5_LIBDIR)
+ 
+ SRCS=kinit.c
  
 +CFLAGS  += -fPIE
 +LDFLAGS += -pie
@@ -165,11 +193,13 @@
  ##WIN32##LOCALINCLUDES=-I$(BUILDTOP)\util\windows
  ##WIN32##DEFINES=-DGETOPT_LONG
  
---- src/clients/klist/Makefile.in
-+++ src/clients/klist/Makefile.in	2005/06/17 13:56:46
-@@ -6,6 +6,9 @@
- PROG_LIBPATH=-L$(TOPLIBD)
- PROG_RPATH=$(KRB5_LIBDIR)
+Index: src/clients/klist/Makefile.in
+===================================================================
+--- src/clients/klist/Makefile.in.orig
++++ src/clients/klist/Makefile.in
+@@ -9,6 +9,9 @@ PROG_RPATH=$(KRB5_LIBDIR)
+ 
+ SRCS = klist.c
  
 +CFLAGS  += -fPIE
 +LDFLAGS += -pie
@@ -177,11 +207,13 @@
  all-unix:: klist
  all-windows:: $(OUTPRE)klist.exe
  
---- src/clients/kpasswd/Makefile.in
-+++ src/clients/kpasswd/Makefile.in	2005/06/17 13:57:19
-@@ -5,6 +5,9 @@
- PROG_LIBPATH=-L$(TOPLIBD)
- PROG_RPATH=$(KRB5_LIBDIR)
+Index: src/clients/kpasswd/Makefile.in
+===================================================================
+--- src/clients/kpasswd/Makefile.in.orig
++++ src/clients/kpasswd/Makefile.in
+@@ -8,6 +8,9 @@ DEFS=
+ 
+ SRCS=kpasswd.c ksetpwd.c
  
 +CFLAGS  += -fPIE
 +LDFLAGS += -pie
@@ -189,9 +221,11 @@
  kpasswd: kpasswd.o $(KRB5_BASE_DEPLIBS)
  	$(CC_LINK) -o kpasswd kpasswd.o $(KRB5_BASE_LIBS)
  
---- src/clients/ksu/Makefile.in
-+++ src/clients/ksu/Makefile.in	2005/06/17 13:59:09
-@@ -9,6 +9,9 @@
+Index: src/clients/ksu/Makefile.in
+===================================================================
+--- src/clients/ksu/Makefile.in.orig
++++ src/clients/ksu/Makefile.in
+@@ -10,6 +10,9 @@ PROG_RPATH=$(KRB5_LIBDIR)
  
  KSU_LIBS=@KSU_LIBS@
  
@@ -201,9 +235,11 @@
  SRCS = \
  	$(srcdir)/krb_auth_su.c \
  	$(srcdir)/ccache.c \
---- src/clients/kvno/Makefile.in
-+++ src/clients/kvno/Makefile.in	2005/06/17 13:59:27
-@@ -6,6 +6,9 @@
+Index: src/clients/kvno/Makefile.in
+===================================================================
+--- src/clients/kvno/Makefile.in.orig
++++ src/clients/kvno/Makefile.in
+@@ -9,6 +9,9 @@ SRCS=kvno.c
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -213,11 +249,13 @@
  all-unix:: kvno
  all-windows:: $(OUTPRE)kvno.exe
  
---- src/kadmin/cli/Makefile.in
-+++ src/kadmin/cli/Makefile.in	2005/06/17 14:07:57
-@@ -5,6 +5,9 @@
- PROG_LIBPATH=-L$(TOPLIBD)
- PROG_RPATH=$(KRB5_LIBDIR)
+Index: src/kadmin/cli/Makefile.in
+===================================================================
+--- src/kadmin/cli/Makefile.in.orig
++++ src/kadmin/cli/Makefile.in
+@@ -7,6 +7,9 @@ PROG_RPATH=$(KRB5_LIBDIR)
+ KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
+ DEFS=
  
 +CFLAGS  += -fPIE
 +LDFLAGS += -pie
@@ -225,23 +263,27 @@
  PROG = kadmin
  OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o keytab.o
  
---- src/kadmin/dbutil/Makefile.in
-+++ src/kadmin/dbutil/Makefile.in	2005/06/17 14:09:05
-@@ -7,6 +7,9 @@
- PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
+Index: src/kadmin/dbutil/Makefile.in
+===================================================================
+--- src/kadmin/dbutil/Makefile.in.orig
++++ src/kadmin/dbutil/Makefile.in
+@@ -9,6 +9,9 @@ PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH
  PROG_RPATH=$(KRB5_LIBDIR)
+ KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
  
 +CFLAGS  += -fPIE
 +LDFLAGS += -pie
 +
  PROG = kdb5_util
- OBJS	= kdb5_util.o dump.o dumpv4.o loadv4.o \
- 	kdb5_create.o kadm5_create.o string_table.o kdb5_stash.o \
---- src/kadmin/ktutil/Makefile.in
-+++ src/kadmin/ktutil/Makefile.in	2005/06/17 14:12:36
-@@ -6,6 +6,9 @@
- PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
+ ###OBJS	= kdb5_util.o dump.o dumpv4.o loadv4.o \
+ ###	kdb5_create.o kadm5_create.o string_table.o kdb5_stash.o \
+Index: src/kadmin/ktutil/Makefile.in
+===================================================================
+--- src/kadmin/ktutil/Makefile.in.orig
++++ src/kadmin/ktutil/Makefile.in
+@@ -7,6 +7,9 @@ PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH
  PROG_RPATH=$(KRB5_LIBDIR)
+ DEFS=
  
 +CFLAGS  += -fPIE
 +LDFLAGS += -pie
@@ -249,9 +291,11 @@
  OBJS= 	ktutil.o \
  	ktutil_ct.o \
  	ktutil_funcs.o
---- src/kadmin/server/Makefile.in
-+++ src/kadmin/server/Makefile.in	2005/06/17 14:08:29
-@@ -9,6 +9,9 @@
+Index: src/kadmin/server/Makefile.in
+===================================================================
+--- src/kadmin/server/Makefile.in.orig
++++ src/kadmin/server/Makefile.in
+@@ -11,6 +11,9 @@ LOCALINCLUDES = -I$(SRCTOP)/lib/gssapi/g
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -260,12 +304,14 @@
 +
  PROG = kadmind
  OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o server_glue_v1.o
- 
---- src/kdc/Makefile.in
-+++ src/kdc/Makefile.in	2005/06/17 14:12:04
-@@ -13,6 +13,9 @@
- PROG_RPATH=$(KRB5_LIBDIR)
+ SRCS = kadm_rpc_svc.c server_stubs.c ovsec_kadmd.c schpw.c misc.c server_glue_v1.c
+Index: src/kdc/Makefile.in
+===================================================================
+--- src/kdc/Makefile.in.orig
++++ src/kdc/Makefile.in
+@@ -15,6 +15,9 @@ PROG_RPATH=$(KRB5_LIBDIR)
  FAKEKA=@FAKEKA@
+ DEFS=-DLIBDIR=\"$(KRB5_LIBDIR)\"
  
 +CFLAGS  += -fPIE
 +LDFLAGS += -pie
@@ -273,9 +319,11 @@
  all:: krb5kdc rtest $(FAKEKA)
  
  # DEFINES = -DBACKWARD_COMPAT $(KRB4DEF)
---- src/krb524/Makefile.in
-+++ src/krb524/Makefile.in	2005/06/17 14:10:47
-@@ -27,6 +27,9 @@
+Index: src/krb524/Makefile.in
+===================================================================
+--- src/krb524/Makefile.in.orig
++++ src/krb524/Makefile.in
+@@ -30,6 +30,9 @@ DEFINES = -DUSE_MASTER -DKRB524_PRIVATE=
  PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
  PROG_RPATH=$(KRB5_LIBDIR)
  
@@ -285,11 +333,13 @@
  ##WIN32##!ifdef USE_ALTERNATE_KRB4_INCLUDES
  ##WIN32##KRB4_INCLUDES=-I$(USE_ALTERNATE_KRB4_INCLUDES)
  ##WIN32##!endif
---- src/slave/Makefile.in
-+++ src/slave/Makefile.in	2005/06/17 14:09:57
-@@ -5,6 +5,9 @@
- PROG_LIBPATH=-L$(TOPLIBD)
+Index: src/slave/Makefile.in
+===================================================================
+--- src/slave/Makefile.in.orig
++++ src/slave/Makefile.in
+@@ -6,6 +6,9 @@ PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
+ DEFS=
  
 +CFLAGS  += -fPIE
 +LDFLAGS += -pie
@@ -297,9 +347,11 @@
  all::	kprop kpropd
  
  CLIENTSRCS= $(srcdir)/kprop.c 
---- src/appl/libpty/Makefile.in
-+++ src/appl/libpty/Makefile.in	2005/06/17 14:44:50
-@@ -10,6 +10,8 @@
+Index: src/appl/libpty/Makefile.in
+===================================================================
+--- src/appl/libpty/Makefile.in.orig
++++ src/appl/libpty/Makefile.in
+@@ -10,6 +10,8 @@ KRB5_RUN_ENV= @KRB5_RUN_ENV@
  PROG_LIBPATH=-L$(TOPLIBD)
  PROG_RPATH=$(KRB5_LIBDIR)
  
diff --git a/krb5-1.5.1-fix-ftp-var-used-uninitialized.dif b/krb5-1.5.1-fix-ftp-var-used-uninitialized.dif
index 30b1120..c6e1357 100644
--- a/krb5-1.5.1-fix-ftp-var-used-uninitialized.dif
+++ b/krb5-1.5.1-fix-ftp-var-used-uninitialized.dif
@@ -1,6 +1,8 @@
---- src/appl/gssftp/ftp/ftp.c
-+++ src/appl/gssftp/ftp/ftp.c	2007/01/23 11:19:43
-@@ -1983,7 +1983,7 @@
+Index: src/appl/gssftp/ftp/ftp.c
+===================================================================
+--- src/appl/gssftp/ftp/ftp.c.orig
++++ src/appl/gssftp/ftp/ftp.c
+@@ -1986,7 +1986,7 @@ int do_auth()
  
  #ifdef GSSAPI
  	if (command("AUTH %s", "GSSAPI") == CONTINUE) {
diff --git a/krb5-1.5.1-fix-too-few-arguments.dif b/krb5-1.5.1-fix-too-few-arguments.dif
index 3d80329..32691a3 100644
--- a/krb5-1.5.1-fix-too-few-arguments.dif
+++ b/krb5-1.5.1-fix-too-few-arguments.dif
@@ -1,6 +1,8 @@
---- src/kadmin/dbutil/dump.c
-+++ src/kadmin/dbutil/dump.c	2006/09/13 08:27:05
-@@ -1986,7 +1986,7 @@
+Index: src/kadmin/dbutil/dump.c
+===================================================================
+--- src/kadmin/dbutil/dump.c.orig
++++ src/kadmin/dbutil/dump.c
+@@ -2028,7 +2028,7 @@ process_k5beta7_record(fname, kcontext, 
  				 linenop);
       else if (strcmp(rectype, "policy") == 0)
  	  process_k5beta7_policy(fname, kcontext, filep, verbose,
@@ -9,7 +11,7 @@
       else {
  	  fprintf(stderr, "unknown record type \"%s\" on line %d\n",
  		  rectype, *linenop);
-@@ -2022,7 +2022,7 @@
+@@ -2064,7 +2064,7 @@ process_ov_record(fname, kcontext, filep
  			       linenop);
       else if (strcmp(rectype, "policy") == 0)
  	  process_k5beta7_policy(fname, kcontext, filep, verbose,
diff --git a/krb5-doc.spec b/krb5-doc.spec
index 057f31f..c60bc78 100644
--- a/krb5-doc.spec
+++ b/krb5-doc.spec
@@ -13,7 +13,7 @@
 Name:           krb5-doc
 BuildRequires:  ghostscript-library latex2html te_ams
 Version:        1.6
-Release:        18
+Release:        19
 %define srcRoot krb5-1.6
 Summary:        MIT Kerberos5 Implementation--Documentation
 License:        X11/MIT
diff --git a/krb5-plugins.changes b/krb5-plugins.changes
index 7c1ceca..abecd46 100644
--- a/krb5-plugins.changes
+++ b/krb5-plugins.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 29 12:42:51 CEST 2007 - mc@suse.de
+
+- add ncurses-devel and bison to BuildRequires
+- rework some patches
+
 -------------------------------------------------------------------
 Mon Feb 19 14:00:34 CET 2007 - mc@suse.de
 
diff --git a/krb5-plugins.spec b/krb5-plugins.spec
index 0268280..86f98c6 100644
--- a/krb5-plugins.spec
+++ b/krb5-plugins.spec
@@ -13,8 +13,8 @@
 
 Name:           krb5-plugins
 Version:        1.6
-Release:        10
-BuildRequires:  krb5-devel openldap2-devel
+Release:        11
+BuildRequires:  bison krb5-devel ncurses-devel openldap2-devel
 %define srcRoot krb5-1.6 
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/krb5
@@ -98,14 +98,12 @@ fi
 %patch4
 %patch5
 %patch6
-cd %{_builddir}/%{srcRoot}/src
 %patch14
 %patch15
 %patch16
 %patch17
 %patch18
 %patch20
-cd -
 %patch21
 %patch22
 #%patch23
@@ -207,6 +205,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Thu Mar 29 2007 - mc@suse.de
+- add ncurses-devel and bison to BuildRequires
+- rework some patches
 * Mon Feb 19 2007 - mc@suse.de
 - update krb5-1.6-post.dif
 * Fri Feb 09 2007 - mc@suse.de
diff --git a/krb5.changes b/krb5.changes
index ec3052a..0d90bfc 100644
--- a/krb5.changes
+++ b/krb5.changes
@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
-Thu Mar 29 12:41:58 CEST 2007 - rguenther@suse.de
+Thu Mar 29 12:41:57 CEST 2007 - mc@suse.de
 
-- add bison and ncurses-devel BuildRequires
+- add ncurses-devel and bison to BuildRequires
+- rework some patches
 
 -------------------------------------------------------------------
 Mon Mar  5 11:01:20 CET 2007 - mc@suse.de
diff --git a/krb5.spec b/krb5.spec
index 5280e82..f3e11d2 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -12,7 +12,7 @@
 
 Name:           krb5
 Version:        1.6
-Release:        16
+Release:        17
 BuildRequires:  bison libcom_err ncurses-devel
 %if %{suse_version} > 1010
 BuildRequires:  keyutils keyutils-devel
@@ -188,14 +188,12 @@ fi
 %patch4
 %patch5
 %patch6
-cd %{_builddir}/%{srcRoot}/src
 %patch14
 %patch15
 %patch16
 %patch17
 %patch18
 %patch20
-cd -
 %patch21
 %patch22
 #%patch23
@@ -494,8 +492,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/krb5-config.1*
 
 %changelog
-* Thu Mar 29 2007 - rguenther@suse.de
-- add bison and ncurses-devel BuildRequires
+* Thu Mar 29 2007 - mc@suse.de
+- add ncurses-devel and bison to BuildRequires
+- rework some patches
 * Mon Mar 05 2007 - mc@suse.de
 - move SuSEFirewall service definitions to
   /etc/sysconfig/SuSEfirewall2.d/services
diff --git a/warning-fix-lib-crypto-des.dif b/warning-fix-lib-crypto-des.dif
index 1288c30..09b1d26 100644
--- a/warning-fix-lib-crypto-des.dif
+++ b/warning-fix-lib-crypto-des.dif
@@ -2,8 +2,8 @@
 # string2key.c: In function 'mit_des_string_to_key_int':
 # string2key.c:229: warning: pointer targets in passing argument 1 of 'mit_des_cbc_cksum' differ in signedness
 #
---- lib/crypto/des/string2key.c
-+++ lib/crypto/des/string2key.c	2006/06/21 08:16:12
+--- src/lib/crypto/des/string2key.c
++++ src/lib/crypto/des/string2key.c	2006/06/21 08:16:12
 @@ -44,7 +44,7 @@
      krb5_ui_4 x, y, z;
      unsigned char *p;
diff --git a/warning-fix-lib-crypto-dk.dif b/warning-fix-lib-crypto-dk.dif
index 21ec2c7..2812ffb 100644
--- a/warning-fix-lib-crypto-dk.dif
+++ b/warning-fix-lib-crypto-dk.dif
@@ -23,8 +23,8 @@
 # dk_encrypt.c:298: warning: pointer targets in assignment differ in signedness
 # dk_encrypt.c:308: warning: pointer targets in assignment differ in signedness
 # 
---- lib/crypto/dk/derive.c
-+++ lib/crypto/dk/derive.c	2006/06/21 10:13:47
+--- src/lib/crypto/dk/derive.c
++++ src/lib/crypto/dk/derive.c	2006/06/21 10:13:47
 @@ -60,10 +60,10 @@
  	return(ENOMEM);
      }
@@ -82,8 +82,8 @@
      }
  
      /* loop encrypting the blocks until enough key bytes are generated */
---- lib/crypto/dk/dk_decrypt.c
-+++ lib/crypto/dk/dk_decrypt.c	2006/06/21 10:13:47
+--- src/lib/crypto/dk/dk_decrypt.c
++++ src/lib/crypto/dk/dk_decrypt.c	2006/06/21 10:13:47
 @@ -150,7 +150,7 @@
  	    cn = (unsigned char *) d1.data + d1.length - blocksize;
  	else if (ivec_mode == 1) {
@@ -93,8 +93,8 @@
  	} else
  	    abort();
      } else
---- lib/crypto/dk/dk_encrypt.c
-+++ lib/crypto/dk/dk_encrypt.c	2006/06/21 10:19:00
+--- src/lib/crypto/dk/dk_encrypt.c
++++ src/lib/crypto/dk/dk_encrypt.c	2006/06/21 10:19:00
 @@ -95,7 +95,7 @@
  
      /* derive the keys */
diff --git a/warning-fix-lib-crypto-enc_provider.dif b/warning-fix-lib-crypto-enc_provider.dif
index f3b178e..f9036da 100644
--- a/warning-fix-lib-crypto-enc_provider.dif
+++ b/warning-fix-lib-crypto-enc_provider.dif
@@ -18,8 +18,8 @@
 # aes.c:154: warning: pointer targets in passing argument 1 of 'xorblock' differ in signedness
 # aes.c:154: warning: pointer targets in passing argument 2 of 'xorblock' differ in signedness
 #
---- lib/crypto/enc_provider/aes.c
-+++ lib/crypto/enc_provider/aes.c	2006/06/21 10:50:23
+--- src/lib/crypto/enc_provider/aes.c
++++ src/lib/crypto/enc_provider/aes.c	2006/06/21 10:50:23
 @@ -40,7 +40,7 @@
  #define enc(OUT, IN, CTX) (aes_enc_blk((IN),(OUT),(CTX)) == aes_good ? (void) 0 : abort())
  #define dec(OUT, IN, CTX) (aes_dec_blk((IN),(OUT),(CTX)) == aes_good ? (void) 0 : abort())
diff --git a/warning-fix-lib-crypto-yarrow_arcfour.dif b/warning-fix-lib-crypto-yarrow_arcfour.dif
index 9ac32f1..fe0baa5 100644
--- a/warning-fix-lib-crypto-yarrow_arcfour.dif
+++ b/warning-fix-lib-crypto-yarrow_arcfour.dif
@@ -3,8 +3,8 @@
 #
 # ycipher.c:77: warning: pointer targets in assignment differ in signedness
 #
---- lib/crypto/arcfour/arcfour_s2k.c
-+++ lib/crypto/arcfour/arcfour_s2k.c	2006/06/21 10:55:47
+--- src/lib/crypto/arcfour/arcfour_s2k.c
++++ src/lib/crypto/arcfour/arcfour_s2k.c	2006/06/21 10:55:47
 @@ -43,7 +43,7 @@
      return ENOMEM;
  
@@ -14,8 +14,8 @@
  
    /* the actual MD4 hash of the data */
    krb5_MD4Init(&md4_context);
---- lib/crypto/yarrow/ycipher.c
-+++ lib/crypto/yarrow/ycipher.c	2006/06/21 10:56:48
+--- src/lib/crypto/yarrow/ycipher.c
++++ src/lib/crypto/yarrow/ycipher.c	2006/06/21 10:56:48
 @@ -74,7 +74,7 @@
    const struct krb5_enc_provider *enc = &yarrow_enc_provider;
    ind.data = (char *) in;
diff --git a/warning-fix-lib-crypto.dif b/warning-fix-lib-crypto.dif
index 7c2338d..369c087 100644
--- a/warning-fix-lib-crypto.dif
+++ b/warning-fix-lib-crypto.dif
@@ -14,8 +14,8 @@
 #
 # prng.c:33: warning: 'init_error' defined but not used
 #
---- lib/crypto/old_api_glue.c
-+++ lib/crypto/old_api_glue.c	2006/06/21 10:23:07
+--- src/lib/crypto/old_api_glue.c
++++ src/lib/crypto/old_api_glue.c	2006/06/21 10:23:07
 @@ -46,7 +46,7 @@
  
      /* size is the length of the input cleartext data */
@@ -62,8 +62,8 @@
  
      if ((ret = krb5_c_verify_checksum(context, &key, 0, &input, cksum,
  				      &valid)))
---- lib/crypto/pbkdf2.c
-+++ lib/crypto/pbkdf2.c	2006/06/21 10:25:54
+--- src/lib/crypto/pbkdf2.c
++++ src/lib/crypto/pbkdf2.c	2006/06/21 10:25:54
 @@ -83,7 +83,7 @@
      krb5_data out;
      krb5_error_code err;
@@ -73,13 +73,4 @@
      pdata.length = pass->length;
  
  #if 0
---- lib/crypto/prng.c
-+++ lib/crypto/prng.c	2006/06/21 10:27:07
-@@ -30,7 +30,6 @@
- 
- #include "yarrow.h"
- static Yarrow_CTX y_ctx;
--static int init_error;
- #define yarrow_lock krb5int_yarrow_lock
- k5_mutex_t yarrow_lock = K5_MUTEX_PARTIAL_INITIALIZER;
- 
+