rpms/krb5/F-7 krb5-any-fixup-patch.txt, NONE, 1.1 .cvsignore, 1.23, 1.24 krb5.spec, 1.110, 1.111 sources, 1.25, 1.26 krb5-1.3-manpage-paths.patch, 1.2, NONE krb5-1.6-CVE-2007-0956-prelim.patch, 1.1, NONE krb5-1.6-CVE-2007-0957-prelim.patch, 1.1, NONE krb5-1.6-CVE-2007-1216-prelim.patch, 1.1, NONE krb5-1.6-fix-sendto_kdc-memset.dif, 1.1, NONE
Nalin Somabhai Dahyabhai (nalin)
fedora-extras-commits at redhat.com
Wed Jun 27 18:29:37 UTC 2007
Author: nalin
Update of /cvs/pkgs/rpms/krb5/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4556
Modified Files:
.cvsignore krb5.spec sources
Added Files:
krb5-any-fixup-patch.txt
Removed Files:
krb5-1.3-manpage-paths.patch
krb5-1.6-CVE-2007-0956-prelim.patch
krb5-1.6-CVE-2007-0957-prelim.patch
krb5-1.6-CVE-2007-1216-prelim.patch
krb5-1.6-fix-sendto_kdc-memset.dif
Log Message:
- preprocess kerberos.ldif into a format FDS will like better, and include
that as a doc file as well (from 1.6.1-4)
- drop old, incomplete SELinux patch (from 1.6.1-4)
- add patch from Greg Hudson to make srvtab routines report missing-file
errors at same point that "file" keytab routines do (from 1.6.1-4, #241805)
--- NEW FILE krb5-any-fixup-patch.txt ---
Index: kt_srvtab.c
===================================================================
RCS file: /afs/dev.mit.edu/source/repository/third/krb5/src/lib/krb5/keytab/kt_srvtab.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- kt_srvtab.c 27 Feb 2004 04:00:00 -0000 1.1.1.1
+++ kt_srvtab.c 27 Feb 2004 09:56:29 -0000 1.2
@@ -117,13 +117,6 @@
krb5_ktsrvtab_resolve(krb5_context context, const char *name, krb5_keytab *id)
{
krb5_ktsrvtab_data *data;
- FILE *fp;
-
- /* Make sure we can open the srvtab file for reading. */
- fp = fopen(name, "r");
- if (!fp)
- return(errno);
- fclose(fp);
if ((*id = (krb5_keytab) malloc(sizeof(**id))) == NULL)
return(ENOMEM);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 23 Jan 2007 22:14:15 -0000 1.23
+++ .cvsignore 27 Jun 2007 18:29:01 -0000 1.24
@@ -16,3 +16,6 @@
krb5-1.6.tar.gz
krb5-1.6.tar.gz.asc
krb5-1.6-pdf.tar.gz
+krb5-1.6.1.tar.gz
+krb5-1.6.1.tar.gz.asc
+krb5-1.6.1-pdf.tar.gz
Index: krb5.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/krb5.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- krb5.spec 27 Jun 2007 18:15:41 -0000 1.110
+++ krb5.spec 27 Jun 2007 18:29:01 -0000 1.111
@@ -1,7 +1,3 @@
-%if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
-%define WITH_SELINUX 0
-%endif
-
%define WITH_LDAP 1
%define krb5prefix %{_prefix}/kerberos
@@ -82,6 +78,8 @@
Patch56: krb5-1.6.1-get_opt_fixup.patch
Patch57: krb5-1.6.1-ftp-nospew.patch
+Patch62: krb5-any-fixup-patch.txt
+
License: MIT, freely distributable.
URL: http://web.mit.edu/kerberos/www/
Group: System Environment/Libraries
@@ -195,6 +193,13 @@
%endif
%changelog
+* Wed Jun 27 2007 Nalin Dahyabhai <nalin at redhat.com>
+- preprocess kerberos.ldif into a format FDS will like better, and include
+ that as a doc file as well (from 1.6.1-4)
+- drop old, incomplete SELinux patch (from 1.6.1-4)
+- add patch from Greg Hudson to make srvtab routines report missing-file errors
+ at same point that "file" keytab routines do (from 1.6.1-4, #241805)
+
* Wed Jun 27 2007 Nalin Dahyabhai <nalin at redhat.com> 1.6.1-2.0
- pull up from devel HEAD's 1.6.1-2
@@ -1091,6 +1096,9 @@
%prep
%setup -q -a 23
%patch2 -p1 -b .manpage-paths
+pushd src/lib/krb5/keytab
+%patch62 -p0 -b .any-fixup
+popd
%patch3 -p1 -b .netkit-rsh
%patch4 -p1 -b .rlogind-environ
%patch5 -p1 -b .ksu-access
@@ -1102,9 +1110,6 @@
%patch14 -p1 -b .ftp-glob
%patch16 -p1 -b .buildconf
%patch18 -p1 -b .reject-bad-transited
-%if %{WITH_SELINUX}
-%patch21 -p1 -b .selinux
-%endif
%patch23 -p1 -b .dns
%patch25 -p1 -b .null
# Removes a malloc(0) case, nothing more.
@@ -1152,6 +1157,15 @@
doc/kadm5 api-server-design
EOF
+# Generate an FDS-compatible LDIF file.
+inldif=src/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif
+cat > 60kerberos.ldif << EOF
+# This is a variation on kerberos.ldif which Fedora Directory Server will like.
+dn: cn=schema
+EOF
+egrep -iv '(^$|^dn:|^changetype:|^add:)' $inldif >> 60kerberos.ldif
+touch -r $inldif 60kerberos.ldif
+
# Rebuild the configure scripts.
cd src
top=`pwd`
@@ -1555,6 +1569,7 @@
%docdir %{krb5prefix}/man
%doc src/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif
%doc src/plugins/kdb/ldap/libkdb_ldap/kerberos.schema
+%doc 60kerberos.ldif
%dir %{_libdir}/krb5
%dir %{_libdir}/krb5/plugins
%dir %{_libdir}/krb5/plugins/kdb
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/krb5/F-7/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 23 Jan 2007 22:14:15 -0000 1.25
+++ sources 27 Jun 2007 18:29:01 -0000 1.26
@@ -1,6 +1,3 @@
-fe62bcd315fe4139e4fa05732ce8abde krb5-1.5.tar.gz
-86a3c9ef729920279a45d0573055bf99 krb5-1.5.tar.gz.asc
-18da410f1e0a4500b0f3d4020567ce99 krb5-1.5-pdf.tar.gz
-b84d437c4a67240c70e370f557f561de krb5-1.6.tar.gz
-4b79615e695c55216f25058a03f6dfde krb5-1.6.tar.gz.asc
-64195de6ac63f8fe8ecfc6a410219c9d krb5-1.6-pdf.tar.gz
+165bfd13e77d63e623810a3abe43ad61 krb5-1.6.1.tar.gz
+8249f522570f8b17f056bc8a5408678d krb5-1.6.1.tar.gz.asc
+06835fe8a0ac3455dfaf9c6073f1f54c krb5-1.6.1-pdf.tar.gz
--- krb5-1.3-manpage-paths.patch DELETED ---
--- krb5-1.6-CVE-2007-0956-prelim.patch DELETED ---
--- krb5-1.6-CVE-2007-0957-prelim.patch DELETED ---
--- krb5-1.6-CVE-2007-1216-prelim.patch DELETED ---
--- krb5-1.6-fix-sendto_kdc-memset.dif DELETED ---
More information about the fedora-extras-commits
mailing list