rpm/krb5
SHA256
1
0
Fork 0
forked from pool/krb5
Code Pull Requests Activity

- don't deliver SysV init files to systemd distributions

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=119
This commit is contained in:
Christian Kornacker 2014-02-18 17:40:34 +00:00 committed by Git OBS Bridge
parent 869a682f2d
commit 5f3b47a9fc
4 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
krb5-mini.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 18 15:27:15 UTC 2014 - ckornacker@suse.com
- don't deliver SysV init files to systemd distributions
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 21 14:28:05 UTC 2014 - ckornacker@suse.com Tue Jan 21 14:28:05 UTC 2014 - ckornacker@suse.com

34
krb5-mini.spec
View File

@ -46,6 +46,7 @@ BuildRequires: python-libxml2
BuildRequires: python-lxml BuildRequires: python-lxml
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%endif %endif
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -287,17 +288,18 @@ do
done done
# and binaries too # and binaries too
chmod 0755 %{buildroot}/usr/lib/mit/bin/ksu chmod 0755 %{buildroot}/usr/lib/mit/bin/ksu
# install init scripts
mkdir -p %{buildroot}%{_sysconfdir}/init.d
install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind
install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc
install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd
# install systemd files # install systemd files
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir}
install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir}
install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir}
%else
# install init scripts
mkdir -p %{buildroot}%{_sysconfdir}/init.d
install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind
install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc
install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd
%endif %endif
# install sysconfig templates # install sysconfig templates
mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates
@ -310,9 +312,21 @@ find . -type f -name '*.ps' -exec gzip -9 {} \;
# create rc* links # create rc* links
mkdir -p %{buildroot}/usr/bin/ mkdir -p %{buildroot}/usr/bin/
mkdir -p %{buildroot}/usr/sbin/ mkdir -p %{buildroot}/usr/sbin/
%if 0%{?suse_version} >= 1210
%if 0%{?suse_version} > 1220
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckadmind
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckrb5kdc
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckpropd
%else
ln -s /sbin/service %{buildroot}%{_sbindir}/rckadmind
ln -s /sbin/service %{buildroot}%{_sbindir}/rckrb5kdc
ln -s /sbin/service %{buildroot}%{_sbindir}/rcpropd
%endif
%else
ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind
ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc
ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd
%endif
# create links for kinit and klist, because of the java ones # create links for kinit and klist, because of the java ones
ln -sf ../../usr/lib/mit/bin/kinit %{buildroot}/usr/bin/kinit ln -sf ../../usr/lib/mit/bin/kinit %{buildroot}/usr/bin/kinit
ln -sf ../../usr/lib/mit/bin/klist %{buildroot}/usr/bin/klist ln -sf ../../usr/lib/mit/bin/klist %{buildroot}/usr/bin/klist
@ -487,11 +501,12 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/otp.so
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
%{_var}/adm/fillup-templates/sysconfig.* %{_var}/adm/fillup-templates/sysconfig.*
%{_sysconfdir}/init.d/*
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%{_unitdir}/kadmind.service %{_unitdir}/kadmind.service
%{_unitdir}/krb5kdc.service %{_unitdir}/krb5kdc.service
%{_unitdir}/kpropd.service %{_unitdir}/kpropd.service
%else
%{_sysconfdir}/init.d/*
%endif %endif
%{_libdir}/libgssapi_krb5.* %{_libdir}/libgssapi_krb5.*
%{_libdir}/libgssrpc.so.* %{_libdir}/libgssrpc.so.*
@ -580,13 +595,14 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/otp.so
%defattr(-,root,root) %defattr(-,root,root)
%attr(0700,root,root) %dir /var/log/krb5 %attr(0700,root,root) %dir /var/log/krb5
%config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server %config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server
%{_sysconfdir}/init.d/kadmind
%{_sysconfdir}/init.d/krb5kdc
%{_sysconfdir}/init.d/kpropd
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%{_unitdir}/kadmind.service %{_unitdir}/kadmind.service
%{_unitdir}/krb5kdc.service %{_unitdir}/krb5kdc.service
%{_unitdir}/kpropd.service %{_unitdir}/kpropd.service
%else
%{_sysconfdir}/init.d/kadmind
%{_sysconfdir}/init.d/krb5kdc
%{_sysconfdir}/init.d/kpropd
%endif %endif
%dir %{krb5docdir} %dir %{krb5docdir}
%dir /usr/lib/mit %dir /usr/lib/mit

5
krb5.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 18 15:25:57 UTC 2014 - ckornacker@suse.com
- don't deliver SysV init files to systemd distributions
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 21 14:23:37 UTC 2014 - ckornacker@suse.com Tue Jan 21 14:23:37 UTC 2014 - ckornacker@suse.com

34
krb5.spec
View File

@ -46,6 +46,7 @@ BuildRequires: python-libxml2
BuildRequires: python-lxml BuildRequires: python-lxml
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%endif %endif
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
@ -287,17 +288,18 @@ do
done done
# and binaries too # and binaries too
chmod 0755 %{buildroot}/usr/lib/mit/bin/ksu chmod 0755 %{buildroot}/usr/lib/mit/bin/ksu
# install init scripts
mkdir -p %{buildroot}%{_sysconfdir}/init.d
install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind
install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc
install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd
# install systemd files # install systemd files
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir}
install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir}
install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir} install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir}
%else
# install init scripts
mkdir -p %{buildroot}%{_sysconfdir}/init.d
install -m 755 %{vendorFiles}/kadmind.init %{buildroot}%{_sysconfdir}/init.d/kadmind
install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb5kdc
install -m 755 %{vendorFiles}/kpropd.init %{buildroot}%{_sysconfdir}/init.d/kpropd
%endif %endif
# install sysconfig templates # install sysconfig templates
mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates
@ -310,9 +312,21 @@ find . -type f -name '*.ps' -exec gzip -9 {} \;
# create rc* links # create rc* links
mkdir -p %{buildroot}/usr/bin/ mkdir -p %{buildroot}/usr/bin/
mkdir -p %{buildroot}/usr/sbin/ mkdir -p %{buildroot}/usr/sbin/
%if 0%{?suse_version} >= 1210
%if 0%{?suse_version} > 1220
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckadmind
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckrb5kdc
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rckpropd
%else
ln -s /sbin/service %{buildroot}%{_sbindir}/rckadmind
ln -s /sbin/service %{buildroot}%{_sbindir}/rckrb5kdc
ln -s /sbin/service %{buildroot}%{_sbindir}/rcpropd
%endif
%else
ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/sbin/rckadmind
ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/sbin/rckrb5kdc
ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/sbin/rckpropd
%endif
# create links for kinit and klist, because of the java ones # create links for kinit and klist, because of the java ones
ln -sf ../../usr/lib/mit/bin/kinit %{buildroot}/usr/bin/kinit ln -sf ../../usr/lib/mit/bin/kinit %{buildroot}/usr/bin/kinit
ln -sf ../../usr/lib/mit/bin/klist %{buildroot}/usr/bin/klist ln -sf ../../usr/lib/mit/bin/klist %{buildroot}/usr/bin/klist
@ -487,11 +501,12 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/otp.so
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
%{_var}/adm/fillup-templates/sysconfig.* %{_var}/adm/fillup-templates/sysconfig.*
%{_sysconfdir}/init.d/*
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%{_unitdir}/kadmind.service %{_unitdir}/kadmind.service
%{_unitdir}/krb5kdc.service %{_unitdir}/krb5kdc.service
%{_unitdir}/kpropd.service %{_unitdir}/kpropd.service
%else
%{_sysconfdir}/init.d/*
%endif %endif
%{_libdir}/libgssapi_krb5.* %{_libdir}/libgssapi_krb5.*
%{_libdir}/libgssrpc.so.* %{_libdir}/libgssrpc.so.*
@ -580,13 +595,14 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/otp.so
%defattr(-,root,root) %defattr(-,root,root)
%attr(0700,root,root) %dir /var/log/krb5 %attr(0700,root,root) %dir /var/log/krb5
%config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server %config(noreplace) %{_sysconfdir}/logrotate.d/krb5-server
%{_sysconfdir}/init.d/kadmind
%{_sysconfdir}/init.d/krb5kdc
%{_sysconfdir}/init.d/kpropd
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%{_unitdir}/kadmind.service %{_unitdir}/kadmind.service
%{_unitdir}/krb5kdc.service %{_unitdir}/krb5kdc.service
%{_unitdir}/kpropd.service %{_unitdir}/kpropd.service
%else
%{_sysconfdir}/init.d/kadmind
%{_sysconfdir}/init.d/krb5kdc
%{_sysconfdir}/init.d/kpropd
%endif %endif
%dir %{krb5docdir} %dir %{krb5docdir}
%dir /usr/lib/mit %dir /usr/lib/mit