rpms/krb5
6
0
Fork 0
Code Issues Pull Requests Releases Activity

drop the kerberos-iv portreserve file

Browse Source 
drop the kerberos-iv portreserve file (long overdue), and drop the rest
on systemd systems, since we don't currently poke portreserve when we're
starting a service
This commit is contained in:
Nalin Dahyabhai 2013-02-27 18:15:26 -05:00
parent 460c5ab8b7
commit a47a2acb30
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -83,3 +83,4 @@ krb5-1.8.3-pdf.tar.gz
/krb5-1.11-beta2.tar.gz.asc /krb5-1.11-beta2.tar.gz.asc
/krb5-1.11.tar.gz /krb5-1.11.tar.gz
/krb5-1.11.tar.gz.asc /krb5-1.11.tar.gz.asc
/krb5-1.11.1-pdf.tar.xz

1
kerberos-iv.portreserve
View File

@ -1 +0,0 @@
kerberos-iv

30
krb5.spec
View File

@ -48,7 +48,6 @@ Source11: kadm5.acl
Source19: krb5kdc.sysconfig Source19: krb5kdc.sysconfig
Source20: kadmin.sysconfig Source20: kadmin.sysconfig
Source29: ksu.pamd Source29: ksu.pamd
Source30: kerberos-iv.portreserve
Source31: kerberos-adm.portreserve Source31: kerberos-adm.portreserve
Source32: krb5_prop.portreserve Source32: krb5_prop.portreserve
Source33: krb5kdc.logrotate Source33: krb5kdc.logrotate
@ -182,6 +181,8 @@ Requires(preun): systemd-units
Requires(postun): systemd-units Requires(postun): systemd-units
%else %else
Requires(preun): chkconfig Requires(preun): chkconfig
# portreserve is used by init scripts for kadmind, kpropd, and krb5kdc
Requires: portreserve
%endif %endif
Requires(post): initscripts Requires(post): initscripts
Requires(postun): initscripts Requires(postun): initscripts
@ -196,8 +197,6 @@ Requires(preun): initscripts
Requires: coreutils Requires: coreutils
# we specify /usr/share/dict/words as the default dict_file in kdc.conf # we specify /usr/share/dict/words as the default dict_file in kdc.conf
Requires: /usr/share/dict/words Requires: /usr/share/dict/words
# portreserve is used by init scripts for kadmind, kpropd, and krb5kdc
Requires: portreserve
%if %{WITH_SYSVERTO} %if %{WITH_SYSVERTO}
# for run-time, and for parts of the test suite # for run-time, and for parts of the test suite
BuildRequires: libverto-module-base BuildRequires: libverto-module-base
@ -417,7 +416,16 @@ for init in \
install -pm 755 ${init} \ install -pm 755 ${init} \
$RPM_BUILD_ROOT/etc/rc.d/init.d/${service%d} $RPM_BUILD_ROOT/etc/rc.d/init.d/${service%d}
done done
# portreserve configuration files.
mkdir -p $RPM_BUILD_ROOT/etc/portreserve
for portreserve in \
%{SOURCE31} \
%{SOURCE32} ; do
install -pm 644 ${portreserve} \
$RPM_BUILD_ROOT/etc/portreserve/`basename ${portreserve} .portreserve`
done
%endif %endif
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
for sysconfig in \ for sysconfig in \
%{SOURCE19}\ %{SOURCE19}\
@ -426,16 +434,6 @@ for sysconfig in \
$RPM_BUILD_ROOT/etc/sysconfig/`basename ${sysconfig} .sysconfig` $RPM_BUILD_ROOT/etc/sysconfig/`basename ${sysconfig} .sysconfig`
done done
# portreserve configuration files.
mkdir -p $RPM_BUILD_ROOT/etc/portreserve
for portreserve in \
%{SOURCE30} \
%{SOURCE31} \
%{SOURCE32} ; do
install -pm 644 ${portreserve} \
$RPM_BUILD_ROOT/etc/portreserve/`basename ${portreserve} .portreserve`
done
# logrotate configuration files # logrotate configuration files
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/ mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d/
for logrotate in \ for logrotate in \
@ -636,12 +634,11 @@ exit 0
/etc/rc.d/init.d/krb5kdc /etc/rc.d/init.d/krb5kdc
/etc/rc.d/init.d/kadmin /etc/rc.d/init.d/kadmin
/etc/rc.d/init.d/kprop /etc/rc.d/init.d/kprop
%config(noreplace) /etc/portreserve/kerberos-adm
%config(noreplace) /etc/portreserve/krb5_prop
%endif %endif
%config(noreplace) /etc/sysconfig/krb5kdc %config(noreplace) /etc/sysconfig/krb5kdc
%config(noreplace) /etc/sysconfig/kadmin %config(noreplace) /etc/sysconfig/kadmin
%config(noreplace) /etc/portreserve/kerberos-iv
%config(noreplace) /etc/portreserve/kerberos-adm
%config(noreplace) /etc/portreserve/krb5_prop
%config(noreplace) /etc/logrotate.d/krb5kdc %config(noreplace) /etc/logrotate.d/krb5kdc
%config(noreplace) /etc/logrotate.d/kadmind %config(noreplace) /etc/logrotate.d/kadmind
@ -798,6 +795,7 @@ exit 0
%changelog %changelog
* Wed Feb 27 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-2 * Wed Feb 27 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-2
- prebuild PDF docs to reduce multilib differences (internal tooling, #884065) - prebuild PDF docs to reduce multilib differences (internal tooling, #884065)
- drop the kerberos-iv portreserve file, and drop the rest on systemd systems
* Mon Feb 25 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-1 * Mon Feb 25 2013 Nalin Dahyabhai <nalin@redhat.com> 1.11.1-1
- update to 1.11.1 - update to 1.11.1