Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2012-10-06 08:19:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krb5", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/krb5/krb5-mini.changes 2012-06-13 17:07:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krb5.new/krb5-mini.changes 2012-10-06 08:19:21.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 5 15:50:38 CEST 2012 - [email protected] + +- add systemd service files for kadmind, krb5kdc and kpropd +- add sysconfig templates for kadmind and krb5kdc + +------------------------------------------------------------------- krb5.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-mini.spec ++++++ --- /var/tmp/diff_new_pack.r9DOkG/_old 2012-10-06 08:19:22.000000000 +0200 +++ /var/tmp/diff_new_pack.r9DOkG/_new 2012-10-06 08:19:22.000000000 +0200 @@ -30,6 +30,9 @@ BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif Version: 1.10.2 Release: 0 Summary: MIT Kerberos5 Implementation--Libraries @@ -89,6 +92,7 @@ Requires: cron Requires: logrotate Requires: perl-Date-Calc +%{?systemd_requires} PreReq: %insserv_prereq %fillup_prereq %description server @@ -235,15 +239,27 @@ 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 +%if 0%{?suse_version} >= 1210 +mkdir -p %{buildroot}%{_unitdir} +install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir} +install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir} +install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir} +%endif +# install sysconfig templates +mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates +install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/ +install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/ # install logrotate files mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server find . -type f -name '*.ps' -exec gzip -9 {} \; # create rc* links mkdir -p %{buildroot}/usr/bin/ -ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/bin/rckadmind -ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/bin/rckrb5kdc -ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/bin/rckpropd +mkdir -p %{buildroot}/usr/sbin/ +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/kpropd %{buildroot}/usr/sbin/rckpropd # 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/klist %{buildroot}/usr/bin/klist @@ -265,39 +281,80 @@ %if %{build_mini} %preun +%if 0%{?suse_version} >= 1210 +%service_del_preun krb5kdc.service kadmind.service kpropd.service +%else %stop_on_removal krb5kdc kadmind kpropd +%endif %postun /sbin/ldconfig +%if 0%{?suse_version} >= 1210 +%service_del_postun krb5kdc.service kadmind.service kpropd.service +%else %restart_on_update krb5kdc kadmind kpropd %{insserv_cleanup} +%endif + +%post +/sbin/ldconfig +%if 0%{?suse_version} >= 1210 +%service_add_post krb5kdc.service kadmind.service kpropd.service +%endif -%post -p /sbin/ldconfig %else ##################################################### # krb5 pre/post/postun ##################################################### -%post -p /sbin/ldconfig +%post +/sbin/ldconfig -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig -%preun server ##################################################### -# krb5-server preun/postun +# krb5-server preun/postun/pre/post ##################################################### + +%preun server +%if 0%{?suse_version} >= 1210 +%service_del_preun krb5kdc.service kadmind.service kpropd.service +%else %stop_on_removal krb5kdc kadmind kpropd +%endif %postun server +%if 0%{?suse_version} >= 1210 +%service_del_postun krb5kdc.service kadmind.service kpropd.service +%else %restart_on_update krb5kdc kadmind kpropd %{insserv_cleanup} +%endif + +%post server +%if 0%{?suse_version} >= 1210 +%service_add_post krb5kdc.service kadmind.service kpropd.service +%endif +%{fillup_only -n kadmind} +%{fillup_only -n krb5kdc} +%{fillup_only -n kpropd} + +%pre server +%if 0%{?suse_version} >= 1210 +%service_add_pre krb5kdc.service kadmind.service kpropd.service +%endif + ##################################################### # krb5-plugin-kdb-ldap post/postun ##################################################### -%post plugin-kdb-ldap -p /sbin/ldconfig +%post plugin-kdb-ldap +/sbin/ldconfig + +%postun plugin-kdb-ldap +/sbin/ldconfig -%postun plugin-kdb-ldap -p /sbin/ldconfig %endif ######################################################## @@ -327,6 +384,7 @@ %{_mandir}/man1/krb5-send-pr.1* %{_mandir}/man1/krb5-config.1* %{_datadir}/aclocal/ac_check_krb5.m4 + %if %{build_mini} %files @@ -352,7 +410,11 @@ %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* +%{_var}/adm/fillup-templates/sysconfig.* %{_sysconfdir}/init.d/* +%if 0%{?suse_version} >= 1210 +%{_unitdir}/*.service +%endif %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* %{_libdir}/libk5crypto.so.* @@ -395,7 +457,7 @@ /usr/lib/mit/bin/sim_client /usr/bin/kinit /usr/bin/klist -/usr/bin/rc* +/usr/sbin/rc* #%{_mandir}/man1/* %{_mandir}/man1/kvno.1* %{_mandir}/man1/kinit.1* @@ -446,6 +508,11 @@ %{_sysconfdir}/init.d/kadmind %{_sysconfdir}/init.d/krb5kdc %{_sysconfdir}/init.d/kpropd +%if 0%{?suse_version} >= 1210 +%{_unitdir}/kadmind.service +%{_unitdir}/krb5kdc.service +%{_unitdir}/kpropd.service +%endif %dir %{krb5docdir} %dir /usr/lib/mit %dir /usr/lib/mit/sbin @@ -458,7 +525,8 @@ %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* -/usr/bin/rc* +%{_var}/adm/fillup-templates/sysconfig.* +/usr/sbin/rc* /usr/lib/mit/sbin/kadmin.local /usr/lib/mit/sbin/kadmind /usr/lib/mit/sbin/kpropd ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.r9DOkG/_old 2012-10-06 08:19:22.000000000 +0200 +++ /var/tmp/diff_new_pack.r9DOkG/_new 2012-10-06 08:19:22.000000000 +0200 @@ -30,6 +30,9 @@ BuildRequires: libcom_err-devel BuildRequires: libselinux-devel BuildRequires: ncurses-devel +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif Version: 1.10.2 Release: 0 Summary: MIT Kerberos5 Implementation--Libraries @@ -89,6 +92,7 @@ Requires: cron Requires: logrotate Requires: perl-Date-Calc +%{?systemd_requires} PreReq: %insserv_prereq %fillup_prereq %description server @@ -235,15 +239,27 @@ 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 +%if 0%{?suse_version} >= 1210 +mkdir -p %{buildroot}%{_unitdir} +install -m 644 %{vendorFiles}/kadmind.service %{buildroot}%{_unitdir} +install -m 644 %{vendorFiles}/krb5kdc.service %{buildroot}%{_unitdir} +install -m 644 %{vendorFiles}/kpropd.service %{buildroot}%{_unitdir} +%endif +# install sysconfig templates +mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates +install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/ +install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/ # install logrotate files mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server find . -type f -name '*.ps' -exec gzip -9 {} \; # create rc* links mkdir -p %{buildroot}/usr/bin/ -ln -sf ../../etc/init.d/kadmind %{buildroot}/usr/bin/rckadmind -ln -sf ../../etc/init.d/krb5kdc %{buildroot}/usr/bin/rckrb5kdc -ln -sf ../../etc/init.d/kpropd %{buildroot}/usr/bin/rckpropd +mkdir -p %{buildroot}/usr/sbin/ +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/kpropd %{buildroot}/usr/sbin/rckpropd # 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/klist %{buildroot}/usr/bin/klist @@ -265,39 +281,80 @@ %if %{build_mini} %preun +%if 0%{?suse_version} >= 1210 +%service_del_preun krb5kdc.service kadmind.service kpropd.service +%else %stop_on_removal krb5kdc kadmind kpropd +%endif %postun /sbin/ldconfig +%if 0%{?suse_version} >= 1210 +%service_del_postun krb5kdc.service kadmind.service kpropd.service +%else %restart_on_update krb5kdc kadmind kpropd %{insserv_cleanup} +%endif + +%post +/sbin/ldconfig +%if 0%{?suse_version} >= 1210 +%service_add_post krb5kdc.service kadmind.service kpropd.service +%endif -%post -p /sbin/ldconfig %else ##################################################### # krb5 pre/post/postun ##################################################### -%post -p /sbin/ldconfig +%post +/sbin/ldconfig -%postun -p /sbin/ldconfig +%postun +/sbin/ldconfig -%preun server ##################################################### -# krb5-server preun/postun +# krb5-server preun/postun/pre/post ##################################################### + +%preun server +%if 0%{?suse_version} >= 1210 +%service_del_preun krb5kdc.service kadmind.service kpropd.service +%else %stop_on_removal krb5kdc kadmind kpropd +%endif %postun server +%if 0%{?suse_version} >= 1210 +%service_del_postun krb5kdc.service kadmind.service kpropd.service +%else %restart_on_update krb5kdc kadmind kpropd %{insserv_cleanup} +%endif + +%post server +%if 0%{?suse_version} >= 1210 +%service_add_post krb5kdc.service kadmind.service kpropd.service +%endif +%{fillup_only -n kadmind} +%{fillup_only -n krb5kdc} +%{fillup_only -n kpropd} + +%pre server +%if 0%{?suse_version} >= 1210 +%service_add_pre krb5kdc.service kadmind.service kpropd.service +%endif + ##################################################### # krb5-plugin-kdb-ldap post/postun ##################################################### -%post plugin-kdb-ldap -p /sbin/ldconfig +%post plugin-kdb-ldap +/sbin/ldconfig + +%postun plugin-kdb-ldap +/sbin/ldconfig -%postun plugin-kdb-ldap -p /sbin/ldconfig %endif ######################################################## @@ -327,6 +384,7 @@ %{_mandir}/man1/krb5-send-pr.1* %{_mandir}/man1/krb5-config.1* %{_datadir}/aclocal/ac_check_krb5.m4 + %if %{build_mini} %files @@ -352,7 +410,11 @@ %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* +%{_var}/adm/fillup-templates/sysconfig.* %{_sysconfdir}/init.d/* +%if 0%{?suse_version} >= 1210 +%{_unitdir}/*.service +%endif %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* %{_libdir}/libk5crypto.so.* @@ -395,7 +457,7 @@ /usr/lib/mit/bin/sim_client /usr/bin/kinit /usr/bin/klist -/usr/bin/rc* +/usr/sbin/rc* #%{_mandir}/man1/* %{_mandir}/man1/kvno.1* %{_mandir}/man1/kinit.1* @@ -446,6 +508,11 @@ %{_sysconfdir}/init.d/kadmind %{_sysconfdir}/init.d/krb5kdc %{_sysconfdir}/init.d/kpropd +%if 0%{?suse_version} >= 1210 +%{_unitdir}/kadmind.service +%{_unitdir}/krb5kdc.service +%{_unitdir}/kpropd.service +%endif %dir %{krb5docdir} %dir /usr/lib/mit %dir /usr/lib/mit/sbin @@ -458,7 +525,8 @@ %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* -/usr/bin/rc* +%{_var}/adm/fillup-templates/sysconfig.* +/usr/sbin/rc* /usr/lib/mit/sbin/kadmin.local /usr/lib/mit/sbin/kadmind /usr/lib/mit/sbin/kpropd ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/kadmind.init new/vendor-files/kadmind.init --- old/vendor-files/kadmind.init 2011-08-21 15:51:44.000000000 +0200 +++ new/vendor-files/kadmind.init 2012-10-05 15:16:35.000000000 +0200 @@ -42,6 +42,8 @@ # Reset status of this service rc_reset +. /etc/sysconfig/kadmind + # Shell functions to cut down on useless shell instances. start() { if [ ! -f $krbdir/principal ] ; then @@ -72,7 +74,7 @@ fi fi echo -n "Starting $prog" - startproc ${kadmind} + startproc ${kadmind} $KADMIND_ARGS # Remember status and be verbose rc_status -v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/kadmind.service new/vendor-files/kadmind.service --- old/vendor-files/kadmind.service 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/kadmind.service 2012-10-05 15:20:26.000000000 +0200 @@ -0,0 +1,14 @@ +[Unit] +Description=Kerberos 5 Password-changing and Administration +After=syslog.target network.target +ConditionPathExists=!/var/lib/kerberos/krb5kdc/kpropd.acl + +[Service] +Type=forking +PIDFile=/var/run/kadmind.pid +EnvironmentFile=-/etc/sysconfig/kadmind +ExecStart=/usr/sbin/kadmind -P /var/run/kadmind.pid $KADMIND_ARGS +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/kpropd.service new/vendor-files/kpropd.service --- old/vendor-files/kpropd.service 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/kpropd.service 2012-10-05 15:20:48.000000000 +0200 @@ -0,0 +1,11 @@ +[Unit] +Description=Kerberos 5 Propagation +After=syslog.target network.target +ConditionPathExists=/var/lib/kerberos/krb5kdc/kpropd.acl + +[Service] +Type=forking +ExecStart=/usr/sbin/kpropd -S + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/krb5kdc.init new/vendor-files/krb5kdc.init --- old/vendor-files/krb5kdc.init 2011-08-21 15:53:59.000000000 +0200 +++ new/vendor-files/krb5kdc.init 2012-10-05 15:15:35.000000000 +0200 @@ -40,6 +40,8 @@ # Reset status of this service rc_reset +. /etc/sysconfig/krb5kdc + # Shell functions to cut down on useless shell instances. start() { @@ -54,7 +56,7 @@ fi fi echo -n "Starting $prog" - startproc ${krb5kdc} + startproc ${krb5kdc} $KRB5KDC_ARGS # Remember status and be verbose rc_status -v diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/krb5kdc.service new/vendor-files/krb5kdc.service --- old/vendor-files/krb5kdc.service 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/krb5kdc.service 2012-10-05 15:11:08.000000000 +0200 @@ -0,0 +1,13 @@ +[Unit] +Description=Kerberos 5 KDC +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/krb5kdc.pid +EnvironmentFile=-/etc/sysconfig/krb5kdc +ExecStart=/usr/sbin/krb5kdc -P /var/run/krb5kdc.pid $KRB5KDC_ARGS +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/sysconfig.kadmind new/vendor-files/sysconfig.kadmind --- old/vendor-files/sysconfig.kadmind 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/sysconfig.kadmind 2012-10-05 15:10:43.000000000 +0200 @@ -0,0 +1,4 @@ +## Type: string +## Default: None +# Arguments to pass to kadmind +KADMIND_ARGS="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/sysconfig.krb5kdc new/vendor-files/sysconfig.krb5kdc --- old/vendor-files/sysconfig.krb5kdc 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/sysconfig.krb5kdc 2012-10-05 15:12:10.000000000 +0200 @@ -0,0 +1,4 @@ +## Type: string +## Default: None +# Arguments to pass to krb5kdc +KRB5KDC_ARGS="" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
