rpms/coda/F-9 coda-6.9.4-rc2-no-default-krb.patch, NONE, 1.1 coda.spec, 1.5, 1.6

[Adam Goode]

Author: agoode

Update of /cvs/extras/rpms/coda/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11184

Modified Files:
	coda.spec 
Added Files:
	coda-6.9.4-rc2-no-default-krb.patch 
Log Message:
* Sun Sep 14 2008 Adam Goode <adam at spicenitz.org> - 6.9.4-0.3.rc2
- Do not change the default behavior of clog when building with krb5
  (rh 462179)


coda-6.9.4-rc2-no-default-krb.patch:

--- NEW FILE coda-6.9.4-rc2-no-default-krb.patch ---
diff -ur coda-6.9.4~rc2~/coda-src/auth2/clog.c coda-6.9.4~rc2/coda-src/auth2/clog.c
--- coda-6.9.4~rc2~/coda-src/auth2/clog.c	2007-12-17 11:26:57.000000000 -0500
+++ coda-6.9.4~rc2/coda-src/auth2/clog.c	2008-09-14 00:20:03.000000000 -0400
@@ -106,15 +106,6 @@
     char *fromfile = NULL;
     char *runas = NULL;
 
-/* Make intelligent default decisions, depending on how we were built..
-		-- Troy <hozer at drgw.net> */
-#ifdef HAVE_KRB4
-    authmethod = AUTH_METHOD_KERBEROS4;
-#endif
-#ifdef HAVE_KRB5
-    authmethod = AUTH_METHOD_KERBEROS5;
-#endif 
-
     i = 1;
     while (i < argc) {
 	    if (U_GetAuthMethod(argv[i], &authmethod)) {
Only in coda-6.9.4~rc2/coda-src/auth2: clog.c~


Index: coda.spec
===================================================================
RCS file: /cvs/extras/rpms/coda/F-9/coda.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coda.spec	9 Sep 2008 17:36:19 -0000	1.5
+++ coda.spec	14 Sep 2008 04:59:09 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           coda
 Version:        6.9.4
-Release:        0.2.%{rcver}%{?dist}
+Release:        0.3.%{rcver}%{?dist}
 Summary:        Coda distributed file system
 Group:          System Environment/Daemons
 License:        GPLv2
@@ -15,6 +15,7 @@
 Patch0:         coda-6.9.3-codasrv-sigterm.patch
 Patch1:         coda-6.9.3-sudo.patch
 Patch2:         coda-6.9.3-client-fhs.patch
+Patch3:		coda-6.9.4-rc2-no-default-krb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  lwp-devel rpc2-devel rvm-devel rvm-tools readline-devel
 BuildRequires:  fltk-devel fltk-fluid flex bison python perl krb5-devel
@@ -83,9 +84,11 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
+# note: remove the -I and -l here when upstream releases fix for krb5 building
 export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -I/usr/include/et"
 export LIBS="-lkrb5 -lcom_err -lstdc++"
 %configure --with-vcodacon --with-krb5
@@ -292,6 +295,10 @@
 
 
 %changelog
+* Sun Sep 14 2008 Adam Goode <adam at spicenitz.org> - 6.9.4-0.3.rc2
+- Do not change the default behavior of clog when building with krb5
+  (rh 462179)
+
 * Tue Sep 09 2008 Neil Horman <nhorman at redhat.com> 6.9.4-0.2.rc2
 - Enabling krb5 support (bz 461041)
 
@@ -300,7 +307,7 @@
 
 * Tue May 20 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 6.9.3-2
 - Make coda-client package put everything in FHS locations like Debian does,
-  rename coda-client initscript / service from venus to coda-client (rh 446653)    
+  rename coda-client initscript / service from venus to coda-client (rh 446653)
 
 * Mon May 12 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 6.9.3-1
 - Initial Fedora package