SHA256
1
0
forked from pool/krb5

Accepting request 180770 from network

- install and enable systemd service files also in -mini package

- 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.

- install and enable systemd service files also in -mini package

- 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/180770
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/krb5?expand=0&rev=94
This commit is contained in:
Stephan Kulow 2013-06-25 07:22:45 +00:00 committed by Git OBS Bridge
commit 36be5ba0fe
4 changed files with 106 additions and 6 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- 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 Sun Jun 9 14:14:48 UTC 2013 - mc@suse.com

View File

@ -196,7 +196,7 @@ cd src
DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME
./configure \ ./configure \
CC="%{__cc}" \ 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 " \ CPPFLAGS="-I%{_includedir}/et " \
SS_LIB="-lss" \ SS_LIB="-lss" \
--prefix=/usr/lib/mit \ --prefix=/usr/lib/mit \
@ -322,13 +322,45 @@ rm -rf %{buildroot}/usr/lib/mit/share/examples
# krb5(-mini) pre/post/postun # 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 %post -p /sbin/ldconfig
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%if ! %{build_mini}
##################################################### #####################################################
# krb5-server preun/postun/pre/post # 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* %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
%{_var}/adm/fillup-templates/sysconfig.* %{_var}/adm/fillup-templates/sysconfig.*
%{_sysconfdir}/init.d/* %{_sysconfdir}/init.d/*
%if 0%{?suse_version} >= 1210
%{_unitdir}/kadmind.service
%{_unitdir}/krb5kdc.service
%{_unitdir}/kpropd.service
%endif
%{_libdir}/libgssapi_krb5.* %{_libdir}/libgssapi_krb5.*
%{_libdir}/libgssrpc.so.* %{_libdir}/libgssrpc.so.*
%{_libdir}/libk5crypto.so.* %{_libdir}/libk5crypto.so.*

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- 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 Sun Jun 9 14:14:48 UTC 2013 - mc@suse.com

View File

@ -196,7 +196,7 @@ cd src
DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME DEFCCNAME=DIR:/run/user/%%{uid}/krb5cc; export DEFCCNAME
./configure \ ./configure \
CC="%{__cc}" \ 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 " \ CPPFLAGS="-I%{_includedir}/et " \
SS_LIB="-lss" \ SS_LIB="-lss" \
--prefix=/usr/lib/mit \ --prefix=/usr/lib/mit \
@ -322,13 +322,45 @@ rm -rf %{buildroot}/usr/lib/mit/share/examples
# krb5(-mini) pre/post/postun # 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 %post -p /sbin/ldconfig
%postun %postun
/sbin/ldconfig /sbin/ldconfig
%if ! %{build_mini}
##################################################### #####################################################
# krb5-server preun/postun/pre/post # 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* %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
%{_var}/adm/fillup-templates/sysconfig.* %{_var}/adm/fillup-templates/sysconfig.*
%{_sysconfdir}/init.d/* %{_sysconfdir}/init.d/*
%if 0%{?suse_version} >= 1210
%{_unitdir}/kadmind.service
%{_unitdir}/krb5kdc.service
%{_unitdir}/kpropd.service
%endif
%{_libdir}/libgssapi_krb5.* %{_libdir}/libgssapi_krb5.*
%{_libdir}/libgssrpc.so.* %{_libdir}/libgssrpc.so.*
%{_libdir}/libk5crypto.so.* %{_libdir}/libk5crypto.so.*