From 071b9cc1bd33138d7371da6f1aecf1bf8756706070fcd00dd7b271e052b681cf Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Fri, 21 Jun 2013 12:43:11 +0000 Subject: [PATCH 1/2] Accepting request 180374 from home:elvigia:branches:network - remove fstack-protector-all from CFLAGS, just use the lighter/fast version already present in %optflags - Use LFS_CFLAGS to build in 32 bit archs. - remove fstack-protector-all from CFLAGS, just use the lighter/fast version already present in %optflags - Use LFS_CFLAGS to build in 32 bit archs. OBS-URL: https://build.opensuse.org/request/show/180374 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=107 --- krb5-mini.changes | 8 ++++++++ krb5-mini.spec | 2 +- krb5.changes | 8 ++++++++ krb5.spec | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index 24ed46f..adbeebe 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 21 02:12:03 UTC 2013 - crrodriguez@opensuse.org + +- remove fstack-protector-all from CFLAGS, just use the + lighter/fast version already present in %optflags + +- Use LFS_CFLAGS to build in 32 bit archs. + ------------------------------------------------------------------- Sun Jun 9 14:14:48 UTC 2013 - mc@suse.com diff --git a/krb5-mini.spec b/krb5-mini.spec index c23d6f4..54f3f96 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -196,7 +196,7 @@ cd src DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME ./configure \ CC="%{__cc}" \ - CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC -fstack-protector-all " \ + CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC $(getconf LFS_CFLAGS)" \ CPPFLAGS="-I%{_includedir}/et " \ SS_LIB="-lss" \ --prefix=/usr/lib/mit \ diff --git a/krb5.changes b/krb5.changes index 24ed46f..adbeebe 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 21 02:12:03 UTC 2013 - crrodriguez@opensuse.org + +- remove fstack-protector-all from CFLAGS, just use the + lighter/fast version already present in %optflags + +- Use LFS_CFLAGS to build in 32 bit archs. + ------------------------------------------------------------------- Sun Jun 9 14:14:48 UTC 2013 - mc@suse.com diff --git a/krb5.spec b/krb5.spec index 119d401..33ad24a 100644 --- a/krb5.spec +++ b/krb5.spec @@ -196,7 +196,7 @@ cd src DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME ./configure \ CC="%{__cc}" \ - CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC -fstack-protector-all " \ + CFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC $(getconf LFS_CFLAGS)" \ CPPFLAGS="-I%{_includedir}/et " \ SS_LIB="-lss" \ --prefix=/usr/lib/mit \ From 6ca487dd658eb5b8af8c0632a3e4d9251410ed25308c251d66650ee7643cfb93 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Mon, 24 Jun 2013 16:22:21 +0000 Subject: [PATCH 2/2] - install and enable systemd service files also in -mini package - install and enable systemd service files also in -mini package OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=108 --- krb5-mini.changes | 5 +++++ krb5-mini.spec | 41 +++++++++++++++++++++++++++++++++++++++-- krb5.changes | 5 +++++ krb5.spec | 41 +++++++++++++++++++++++++++++++++++++++-- 4 files changed, 88 insertions(+), 4 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index adbeebe..2804a46 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 24 16:21:07 UTC 2013 - mc@suse.com + +- install and enable systemd service files also in -mini package + ------------------------------------------------------------------- Fri Jun 21 02:12:03 UTC 2013 - crrodriguez@opensuse.org diff --git a/krb5-mini.spec b/krb5-mini.spec index 54f3f96..edfbde0 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -322,13 +322,45 @@ rm -rf %{buildroot}/usr/lib/mit/share/examples # krb5(-mini) pre/post/postun ##################################################### +%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 +%{fillup_only -n kadmind} +%{fillup_only -n krb5kdc} +%{fillup_only -n kpropd} + +%pre +%if 0%{?suse_version} >= 1210 +%service_add_pre krb5kdc.service kadmind.service kpropd.service +%endif + +%else + %post -p /sbin/ldconfig %postun /sbin/ldconfig -%if ! %{build_mini} - ##################################################### # krb5-server preun/postun/pre/post ##################################################### @@ -430,6 +462,11 @@ rm -rf %{buildroot}/usr/lib/mit/share/examples %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %{_var}/adm/fillup-templates/sysconfig.* %{_sysconfdir}/init.d/* +%if 0%{?suse_version} >= 1210 +%{_unitdir}/kadmind.service +%{_unitdir}/krb5kdc.service +%{_unitdir}/kpropd.service +%endif %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* %{_libdir}/libk5crypto.so.* diff --git a/krb5.changes b/krb5.changes index adbeebe..2804a46 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 24 16:21:07 UTC 2013 - mc@suse.com + +- install and enable systemd service files also in -mini package + ------------------------------------------------------------------- Fri Jun 21 02:12:03 UTC 2013 - crrodriguez@opensuse.org diff --git a/krb5.spec b/krb5.spec index 33ad24a..6420478 100644 --- a/krb5.spec +++ b/krb5.spec @@ -322,13 +322,45 @@ rm -rf %{buildroot}/usr/lib/mit/share/examples # krb5(-mini) pre/post/postun ##################################################### +%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 +%{fillup_only -n kadmind} +%{fillup_only -n krb5kdc} +%{fillup_only -n kpropd} + +%pre +%if 0%{?suse_version} >= 1210 +%service_add_pre krb5kdc.service kadmind.service kpropd.service +%endif + +%else + %post -p /sbin/ldconfig %postun /sbin/ldconfig -%if ! %{build_mini} - ##################################################### # krb5-server preun/postun/pre/post ##################################################### @@ -430,6 +462,11 @@ rm -rf %{buildroot}/usr/lib/mit/share/examples %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k* %{_var}/adm/fillup-templates/sysconfig.* %{_sysconfdir}/init.d/* +%if 0%{?suse_version} >= 1210 +%{_unitdir}/kadmind.service +%{_unitdir}/krb5kdc.service +%{_unitdir}/kpropd.service +%endif %{_libdir}/libgssapi_krb5.* %{_libdir}/libgssrpc.so.* %{_libdir}/libk5crypto.so.*