summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@fedoraproject.org>2010-01-22 16:17:58 +0000
committerNalin Dahyabhai <nalin@fedoraproject.org>2010-01-22 16:17:58 +0000
commit1c6c0fc92ce133225e46b5d9de92daed178e4948 (patch)
tree0f8931340052fa4c57e4b912b677f17533769da4
parent55968244fe3859144583e7c51fec25ec98ee86ff (diff)
downloadkrb5-1c6c0fc92ce133225e46b5d9de92daed178e4948.tar.gz
krb5-1c6c0fc92ce133225e46b5d9de92daed178e4948.tar.xz
krb5-1c6c0fc92ce133225e46b5d9de92daed178e4948.zip
- use portreserve correctly -- portrelease takes the basename of the file
whose entries should be released, so we need three files, not one
-rw-r--r--kerberos-adm.portreserve (renamed from krb5.portreserve)0
-rw-r--r--kerberos-iv.portreserve3
-rw-r--r--krb5.spec18
-rw-r--r--krb5_prop.portreserve3
4 files changed, 20 insertions, 4 deletions
diff --git a/krb5.portreserve b/kerberos-adm.portreserve
index 8e1e0d7..8e1e0d7 100644
--- a/krb5.portreserve
+++ b/kerberos-adm.portreserve
diff --git a/kerberos-iv.portreserve b/kerberos-iv.portreserve
new file mode 100644
index 0000000..8e1e0d7
--- /dev/null
+++ b/kerberos-iv.portreserve
@@ -0,0 +1,3 @@
+kerberos-adm/tcp
+kerberos-iv
+krb5_prop/tcp
diff --git a/krb5.spec b/krb5.spec
index 8e047b7..1744336 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -16,7 +16,7 @@
Summary: The Kerberos network authentication system.
Name: krb5
Version: 1.6.3
-Release: 24%{?dist}
+Release: 25%{?dist}
# Maybe we should explode from the now-available-to-everybody tarball instead?
# http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
Source0: krb5-%{version}.tar.gz
@@ -50,7 +50,9 @@ Source25: krb5-trunk-manpaths.txt
Source26: gssftp.pamd
Source27: kshell.pamd
Source28: ekshell.pamd
-Source29: krb5.portreserve
+Source29: kerberos-iv.portreserve
+Source30: kerberos-adm.portreserve
+Source31: krb5_prop.portreserve
Patch3: krb5-1.3-netkit-rsh.patch
Patch4: krb5-1.3-rlogind-environ.patch
@@ -239,6 +241,10 @@ to obtain initial credentials from a KDC using a private key and a
certificate.
%changelog
+* Fri Jan 22 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.6.3-25
+- use portreserve correctly -- portrelease takes the basename of the file
+ whose entries should be released, so we need three files, not one
+
* Thu Jan 14 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.6.3-24
- use portreserve to make sure the KDC can always bind to the kerberos-iv
port, kpropd can always bind to the krb5_prop port, and that kadmind can
@@ -1585,7 +1591,9 @@ install -pm 644 $RPM_SOURCE_DIR/krb5kdc.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/
install -pm 644 $RPM_SOURCE_DIR/kadmin.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/kadmin
install -pm 644 $RPM_SOURCE_DIR/krb524.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/krb524
mkdir -p $RPM_BUILD_ROOT/etc/portreserve
-install -pm 644 $RPM_SOURCE_DIR/krb5.portreserve $RPM_BUILD_ROOT/etc/portreserve/krb5
+install -pm 644 $RPM_SOURCE_DIR/kerberos-iv.portreserve $RPM_BUILD_ROOT/etc/portreserve/kerberos-iv
+install -pm 644 $RPM_SOURCE_DIR/kerberos-adm.portreserve $RPM_BUILD_ROOT/etc/portreserve/kerberos-adm
+install -pm 644 $RPM_SOURCE_DIR/krb5_prop.portreserve $RPM_BUILD_ROOT/etc/portreserve/krb5_prop
# Xinetd configuration files.
mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d/
@@ -1848,7 +1856,9 @@ exit 0
%config(noreplace) /etc/sysconfig/krb5kdc
%config(noreplace) /etc/sysconfig/kadmin
%config(noreplace) /etc/sysconfig/krb524
-%config(noreplace) /etc/portreserve/krb5
+%config(noreplace) /etc/portreserve/kerberos-iv
+%config(noreplace) /etc/portreserve/kerberos-adm
+%config(noreplace) /etc/portreserve/krb5_prop
%doc doc/admin*.ps.gz
%doc doc/krb425*.ps.gz
diff --git a/krb5_prop.portreserve b/krb5_prop.portreserve
new file mode 100644
index 0000000..8e1e0d7
--- /dev/null
+++ b/krb5_prop.portreserve
@@ -0,0 +1,3 @@
+kerberos-adm/tcp
+kerberos-iv
+krb5_prop/tcp