summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcvsdist <cvsdist@fedoraproject.org>2004-09-09 07:14:02 +0000
committercvsdist <cvsdist@fedoraproject.org>2004-09-09 07:14:02 +0000
commit1812066274161732c7aa76817632259766cc1fb8 (patch)
tree7388bee0c56748d265cb2bd600e76b73779e361c
parent933db597747d10fdee3aab5266fdbf0ec03a78d9 (diff)
downloadkrb5-1812066274161732c7aa76817632259766cc1fb8.tar.gz
krb5-1812066274161732c7aa76817632259766cc1fb8.tar.xz
krb5-1812066274161732c7aa76817632259766cc1fb8.zip
auto-import krb5-1.2.7-12 from krb5-1.2.7-12.src.rpmkrb5-1_2_7-12
-rw-r--r--.cvsignore1
-rw-r--r--krb5.spec22
-rw-r--r--sources1
3 files changed, 22 insertions, 2 deletions
diff --git a/.cvsignore b/.cvsignore
index aca1ef2..d798e6e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
+2003-004-krb4_patchkit.tar.gz
krb5-1.2.7.tar.gz
diff --git a/krb5.spec b/krb5.spec
index 53c7138..dfcd22e 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -4,7 +4,7 @@
Summary: The Kerberos network authentication system.
Name: krb5
Version: 1.2.7
-Release: 10
+Release: 12
Source0: krb5-%{version}.tar.gz
Source1: krb5-%{version}.tar.gz.asc
Source2: kpropd.init
@@ -25,6 +25,8 @@ Source16: kshell.xinetd
Source17: krb5-telnet.xinetd
Source18: gssftp.xinetd
Source19: statglue.c
+Source20: http://web.mit.edu/kerberos/www/advisories/2003-004-krb4_patchkit.tar.gz
+Source21: http://web.mit.edu/kerberos/www/advisories/2003-004-krb4_patchkit.sig
Patch0: krb5-1.1-db.patch
Patch1: krb5-1.1.1-tiocgltc.patch
Patch2: krb5-1.1.1-libpty.patch
@@ -55,6 +57,8 @@ Patch27: gssftp-patch
Patch28: krb5-1.2.7-princ_size.patch
Patch29: krb5-1.2.7-reject-bad-transited.patch
Patch30: krb5-1.2.7-underrun.patch
+Patch31: krb5-2003-004-krb4_patchkit-1.2.7.patch
+Patch32: http://web.mit.edu/kerberos/www/advisories/MITKRB5-SA-2003-003-xdr.txt
License: MIT, freely distributable.
URL: http://web.mit.edu/kerberos/www/
Group: System Environment/Libraries
@@ -116,6 +120,13 @@ network uses Kerberos, this package should be installed on every
workstation.
%changelog
+* Wed Mar 19 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.7-12
+- add patch included in MITKRB5-SA-2003-003 (CAN-2003-0028)
+
+* Mon Mar 17 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.7-11
+- add patches from patchkit from MITKRB5-SA-2003-004 (CAN-2003-0157 and
+ CAN-2003-0158)
+
* Thu Mar 6 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.7-10
- rebuild
@@ -547,7 +558,7 @@ workstation.
- added --force to makeinfo commands to skip errors during build
%prep
-%setup -q
+%setup -q -a 20
%patch0 -p0 -b .db
%patch1 -p0 -b .tciogltc
%patch2 -p0 -b .libpty
@@ -580,6 +591,13 @@ workstation.
%patch28 -p1 -b .princ_size.patch
%patch29 -p1 -b .reject-bad-transited.patch
%patch30 -p1 -b .underrun
+%patch31 -p0 -b .1.2.7
+pushd src
+patch -sp0 -b -z .2003-004-krb4 < ../2003-004-krb4_patchkit/patch.1.2.7
+popd
+pushd src/lib/rpc
+%patch32 -p0 -b .2003-003
+popd
cp src/krb524/README README.krb524
diff --git a/sources b/sources
index 8f150e2..0d9fd3f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+1bd7a191f12c6843a127c08b876261eb 2003-004-krb4_patchkit.tar.gz
854b52face2a8f771caf88166fa269d3 krb5-1.2.7.tar.gz