OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krb5?expand=0&rev=13

krb5-1.4-compile_pie.dif

@@ -1,362 +0,0 @@
-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@
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- 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 \
-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@
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- SRCS	= $(srcdir)/ftpd.c ftpcmd.c $(srcdir)/popen.c \
- 	  $(srcdir)/vers.c \
- 	  $(srcdir)/../ftp/glob.c \
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- 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 \
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- SRCS= $(srcdir)/gss-client.c $(srcdir)/gss-misc.c $(srcdir)/gss-server.c
- 
- OBJS= gss-client.o gss-misc.o gss-server.o
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- all:: sclient
- 
- sclient: sclient.o $(KRB5_BASE_DEPLIBS)
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- all:: sserver
- 
- sserver: sserver.o $(KRB5_BASE_DEPLIBS)
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- all:: sim_client
- 
- LOCALINCLUDES= -I.. -I$(srcdir)/..
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- all:: sim_server
- 
- sim_server: sim_server.o $(KRB5_BASE_DEPLIBS)
-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@
- 
-+CFLAGS += -fPIE
-+
- LIBBASE=telnet
- LIBMAJOR=0
- LIBMINOR=0
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- LIBS=	@TELNETD_LIBS@
- 
- SRCS=	$(srcdir)/telnetd.c \
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- LIBS=	@TELNET_LIBS@
- 
- SRCS=	$(srcdir)/authenc.c $(srcdir)/commands.c $(srcdir)/main.c $(srcdir)/network.c $(srcdir)/ring.c \
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- all:: uuclient uuserver
- 
- uuclient: client.o $(KRB5_BASE_DEPLIBS)
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- all-unix:: kdestroy
- all-windows:: $(OUTPRE)kdestroy.exe
- 
-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
-+
- ##WIN32##LOCALINCLUDES=-I$(BUILDTOP)\util\windows
- ##WIN32##DEFINES=-DGETOPT_LONG
- 
-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
-+
- all-unix:: klist
- all-windows:: $(OUTPRE)klist.exe
- 
-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
-+
- kpasswd: kpasswd.o $(KRB5_BASE_DEPLIBS)
- 	$(CC_LINK) -o kpasswd kpasswd.o $(KRB5_BASE_LIBS)
- 
-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@
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- SRCS = \
- 	$(srcdir)/krb_auth_su.c \
- 	$(srcdir)/ccache.c \
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- all-unix:: kvno
- all-windows:: $(OUTPRE)kvno.exe
- 
-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
-+
- PROG = kadmin
- OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o keytab.o
- 
-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 \
-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
-+
- OBJS= 	ktutil.o \
- 	ktutil_ct.o \
- 	ktutil_funcs.o
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- PROG = kadmind
- OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o server_glue_v1.o
- 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
-+
- all:: krb5kdc rtest $(FAKEKA)
- 
- # DEFINES = -DBACKWARD_COMPAT $(KRB4DEF)
-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)
- 
-+CFLAGS  += -fPIE
-+LDFLAGS += -pie
-+
- ##WIN32##!ifdef USE_ALTERNATE_KRB4_INCLUDES
- ##WIN32##KRB4_INCLUDES=-I$(USE_ALTERNATE_KRB4_INCLUDES)
- ##WIN32##!endif
-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
-+
- all::	kprop kpropd
- 
- CLIENTSRCS= $(srcdir)/kprop.c 
-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)
- 
-+CFLAGS += -fPIE
-+
- LIBBASE=pty
- LIBMAJOR=1
- LIBMINOR=2

krb5-1.6-patchlevel.dif

@@ -1,14 +0,0 @@
-Index: src/patchlevel.h
-===================================================================
---- src/patchlevel.h
-+++ src/patchlevel.h    2007/02/09 10:18:23
-@@ -53,6 +53,6 @@
- #define KRB5_MAJOR_RELEASE 1
- #define KRB5_MINOR_RELEASE 6
- #define KRB5_PATCHLEVEL 0
--/* #undef KRB5_RELTAIL */
-+#define KRB5_RELTAIL "postrelease"
- #define KRB5_RELDATE "20070109"
--#define KRB5_RELTAG "tags/krb5-1-6-final"
-+#define KRB5_RELTAG "branches/krb5-1-6"
-

krb5-1.6.1-beta1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4305cbd0f24e583b78897ed7aa4e909c8ec92768079b11baf47098e582d97b84
+size 13017061

krb5-1.6.1-compile_pie.dif

@@ -0,0 +1,27 @@
+Index: src/krb5-config.in
+===================================================================
+--- src/krb5-config.in.orig
++++ src/krb5-config.in
+@@ -186,6 +186,8 @@ if test -n "$do_libs"; then
+ 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+ 	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
+ 
++    lib_flags=`echo $lib_flags | sed -e "s#-fPIE##" -e "s#-pie##"`
++
+     if test $library = 'kdb'; then
+ 	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
+ 	library=krb5
+Index: src/config/shlib.conf
+===================================================================
+--- src/config/shlib.conf.orig
++++ src/config/shlib.conf
+@@ -378,7 +378,8 @@ mips-*-netbsd*)
+ 	SHLIB_EXPFLAGS='-Wl,-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+ 	PROFFLAGS=-pg
+ 	RPATH_FLAG='-Wl,-rpath -Wl,'
+-	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
++	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) -pie $(LDFLAGS)'
++	INSTALL_SHLIB='${INSTALL} -m755'
+ 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
+ 	RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH; '
+ 

krb5-1.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1986a5a7bc529291bab69a989eae43d121d1f9de1796c38dda36f332ba7c1e93
-size 10322183

krb5-doc.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Apr 16 14:39:40 CEST 2007 - mc@suse.de
+
+- update to version 1.6.1 Beta1
+- remove obsolete patches
+  (krb5-1.6-post.dif, krb5-1.6-patchlevel.dif)
+
 -------------------------------------------------------------------
 Mon Feb 19 14:00:49 CET 2007 - mc@suse.de
 

krb5-doc.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package krb5-doc (Version 1.6)
+# spec file for package krb5-doc (Version 1.6.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,19 +12,19 @@
 
 Name:           krb5-doc
 BuildRequires:  ghostscript-library latex2html te_ams
-Version:        1.6
+Version:        1.6.1
-Release:        22
+Release:        1
-%define srcRoot krb5-1.6
+%define srcRoot krb5-1.6.1-beta1
 Summary:        MIT Kerberos5 Implementation--Documentation
 License:        X11/MIT
 URL:            http://web.mit.edu/kerberos/www/
 Group:          Documentation/Other
-Source:         krb5-1.6.tar.bz2
+Source:         krb5-1.6.1-beta1.tar.bz2
 Source1:        README.Source
 Source2:        Makefile.kadm5
 Patch0:         krb5-1.3.5-perlfix.dif
-Patch1:         krb5-1.6-post.dif
+#Patch1:         krb5-1.6-post.dif
-Patch2:         krb5-1.6-patchlevel.dif
+#Patch2:         krb5-1.6-patchlevel.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArchitectures: noarch
 
@@ -46,8 +46,8 @@ Authors:
 %prep
 %setup -n %{srcRoot}
 %patch0
-%patch1
+#%patch1
-%patch2
+#%patch2
 cp %{_sourcedir}/Makefile.kadm5 %{_builddir}/%{srcRoot}/doc/kadm5/Makefile
 
 %build
@@ -90,6 +90,10 @@ rm -rf %{buildroot}
 %doc doc/html
 
 %changelog
+* Mon Apr 16 2007 - mc@suse.de
+- update to version 1.6.1 Beta1
+- remove obsolete patches
+  (krb5-1.6-post.dif, krb5-1.6-patchlevel.dif)
 * Mon Feb 19 2007 - mc@suse.de
 - add krb5-1.6-post.dif
 * Mon Jan 22 2007 - mc@suse.de

krb5-plugins.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 16 14:39:58 CEST 2007 - mc@suse.de
+
+- update to version 1.6.1 Beta1
+- remove obsolete patches
+  (krb5-1.6-post.dif, krb5-1.6-patchlevel.dif)
+- rework compile_pie patch
+
 -------------------------------------------------------------------
 Wed Apr 11 10:59:20 CEST 2007 - mc@suse.de
 

krb5-plugins.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package krb5-plugins (Version 1.6)
+# spec file for package krb5-plugins (Version 1.6.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,10 +12,10 @@
 # nodebuginfo
 
 Name:           krb5-plugins
-Version:        1.6
+Version:        1.6.1
-Release:        12
+Release:        1
 BuildRequires:  bison krb5-devel ncurses-devel openldap2-devel
-%define srcRoot krb5-1.6 
+%define srcRoot krb5-1.6.1-beta1 
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/krb5
 Requires:       krb5-server
@@ -23,16 +23,16 @@ Summary:        MIT Kerberos5 Implementation--Libraries
 License:        X11/MIT
 URL:            http://web.mit.edu/kerberos/www/
 Group:          Productivity/Networking/Security
-Source:         krb5-1.6.tar.bz2
+Source:         krb5-1.6.1-beta1.tar.bz2
 Source1:        vendor-files.tar.bz2
 Source2:        README.Source
 Source3:        spx.c
 Source4:        EncryptWithMasterKey.c
 Patch1:         krb5-1.5.1-fix-too-few-arguments.dif
-Patch2:         krb5-1.4-compile_pie.dif
+Patch2:         krb5-1.6.1-compile_pie.dif
 Patch3:         krb5-1.4-fix-segfault.dif
-Patch4:         krb5-1.6-post.dif 
+#Patch4:         krb5-1.6-post.dif 
-Patch5:         krb5-1.6-patchlevel.dif
+#Patch5:         krb5-1.6-patchlevel.dif
 Patch6:         trunk-EncryptWithMasterKey.dif
 Patch14:        warning-fix-lib-crypto-des.dif
 Patch15:        warning-fix-lib-crypto-dk.dif
@@ -95,8 +95,8 @@ fi
 %patch1
 %patch2
 %patch3
-%patch4
+#%patch4
-%patch5
+#%patch5
 %patch6
 %patch14
 %patch15
@@ -114,7 +114,7 @@ cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{srcRoot}/src/kadmin/dbuti
 cd src
 %{?suse_update_config:%{suse_update_config -f}}
 ./util/reconf
-CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -I/usr/include -I%{_builddir}/%{srcRoot}/src/lib/ -fno-strict-aliasing -D_GNU_SOURCE " \
+CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -I/usr/include -I%{_builddir}/%{srcRoot}/src/lib/ -fno-strict-aliasing -D_GNU_SOURCE -fPIC " \
 ./configure \
 	--prefix=/usr/lib/mit \
 	--sysconfdir=%{_sysconfdir} \
@@ -205,6 +205,11 @@ rm -rf %{buildroot}
 %{_mandir}/man8/*
 
 %changelog
+* Mon Apr 16 2007 - mc@suse.de
+- update to version 1.6.1 Beta1
+- remove obsolete patches
+  (krb5-1.6-post.dif, krb5-1.6-patchlevel.dif)
+- rework compile_pie patch
 * Wed Apr 11 2007 - mc@suse.de
 - update krb5-1.6-post.dif
   * fix kadmind stack overflow in krb5_klog_syslog

krb5.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 16 14:38:08 CEST 2007 - mc@suse.de
+
+- update to version 1.6.1 Beta1
+- remove obsolete patches 
+  (krb5-1.6-post.dif, krb5-1.6-patchlevel.dif)
+- rework compile_pie patch
+
 -------------------------------------------------------------------
 Wed Apr 11 10:58:09 CEST 2007 - mc@suse.de
 

krb5.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package krb5 (Version 1.6)
+# spec file for package krb5 (Version 1.6.1)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,13 +11,13 @@
 # norootforbuild
 
 Name:           krb5
-Version:        1.6
+Version:        1.6.1
-Release:        20
+Release:        1
 BuildRequires:  bison libcom_err ncurses-devel
 %if %{suse_version} > 1010
 BuildRequires:  keyutils keyutils-devel
 %endif
-%define srcRoot krb5-1.6 
+%define srcRoot krb5-1.6.1-beta1 
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/%{name}
 Provides:       heimdal-lib
@@ -26,16 +26,16 @@ Summary:        MIT Kerberos5 Implementation--Libraries
 License:        X11/MIT
 URL:            http://web.mit.edu/kerberos/www/
 Group:          Productivity/Networking/Security
-Source:         krb5-1.6.tar.bz2
+Source:         krb5-1.6.1-beta1.tar.bz2
 Source1:        vendor-files.tar.bz2
 Source2:        README.Source
 Source3:        spx.c
 Source4:        EncryptWithMasterKey.c
 Patch1:         krb5-1.5.1-fix-too-few-arguments.dif
-Patch2:         krb5-1.4-compile_pie.dif
+Patch2:         krb5-1.6.1-compile_pie.dif 
 Patch3:         krb5-1.4-fix-segfault.dif
-Patch4:         krb5-1.6-post.dif
+#Patch4:         krb5-1.6-post.dif
-Patch5:         krb5-1.6-patchlevel.dif
+#Patch5:         krb5-1.6-patchlevel.dif
 Patch6:         trunk-EncryptWithMasterKey.dif
 Patch14:        warning-fix-lib-crypto-des.dif
 Patch15:        warning-fix-lib-crypto-dk.dif
@@ -185,8 +185,8 @@ fi
 %patch1
 %patch2
 %patch3
-%patch4
+#%patch4
-%patch5
+#%patch5
 %patch6
 %patch14
 %patch15
@@ -204,7 +204,7 @@ cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{srcRoot}/src/kadmin/dbuti
 cd src
 %{?suse_update_config:%{suse_update_config -f}}
 ./util/reconf
-CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fno-strict-aliasing -D_GNU_SOURCE " \
+CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC " \
 ./configure \
 	--prefix=/usr/lib/mit \
 	--sysconfdir=%{_sysconfdir} \
@@ -492,6 +492,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/krb5-config.1*
 
 %changelog
+* Mon Apr 16 2007 - mc@suse.de
+- update to version 1.6.1 Beta1
+- remove obsolete patches
+  (krb5-1.6-post.dif, krb5-1.6-patchlevel.dif)
+- rework compile_pie patch
 * Wed Apr 11 2007 - mc@suse.de
 - update krb5-1.6-post.dif
   * fix kadmind stack overflow in krb5_klog_syslog

trunk-EncryptWithMasterKey.dif

@@ -1,6 +1,8 @@
---- src/kadmin/dbutil/Makefile.in
+Index: src/kadmin/dbutil/Makefile.in
-+++ src/kadmin/dbutil/Makefile.in	2006/06/02 11:40:51
+===================================================================
-@@ -22,21 +22,28 @@
+--- src/kadmin/dbutil/Makefile.in.orig
++++ src/kadmin/dbutil/Makefile.in
+@@ -19,21 +19,28 @@ SRCS = kdb5_util.c kdb5_create.c kadm5_c
  
  OBJS = kdb5_util.o kdb5_create.o kadm5_create.o string_table.o kdb5_destroy.o kdb5_stash.o import_err.o strtok.o dump.o ovload.o