Attachment 6929 Details for Bug 32982 – krb.spec: bootstrap+e2k tweaks

[patch] krb.spec: bootstrap+e2k tweaks

0001-1.14.2-alt2.1.patch (text/plain), 6.37 KB, created by Michael Shigorin on 2017-01-10 17:44:28 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2017-01-10 17:44:28 MSK

Size: 6.37 KB

patch

obsolete

>From 5c38261018f09bf9bf3fab138dfae7b173254559 Mon Sep 17 00:00:00 2001
>From: Michael Shigorin <mike@altlinux.org>
>Date: Tue, 10 Jan 2017 16:01:40 +0300
>Subject: [PATCH] 1.14.2-alt2.1
>
>- BOOTSTRAP:
>  + introduce doc, ldap, selinux, verto knobs (on by default)
>  + conditionally package bundled libverto
>- E2K: disable -Werror={pointer-arith,uninitialized} (lcc)
>---
> krb5.spec | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
> 1 file changed, 61 insertions(+), 10 deletions(-)
>
>diff --git a/krb5.spec b/krb5.spec
>index 3600975..7883cde 100644
>--- a/krb5.spec
>+++ b/krb5.spec
>@@ -1,7 +1,12 @@
>+%def_with doc
>+%def_with ldap
>+%def_with selinux
>+%def_with verto
>+%def_enable check
> 
> Name: krb5
> Version: 1.14.2
>-Release: alt2
>+Release: alt2.1
> 
> %define _docdir %_defaultdocdir/%name-%version
> 
>@@ -37,22 +42,27 @@ Patch165: krb5-1.15-kdc_hooks_test.patch
> 
> BuildRequires: /dev/pts /proc
> BuildRequires: flex libcom_err-devel libkeyutils-devel
>-BuildRequires: libldap-devel libsasl2-devel
>+%{?_with_ldap:BuildRequires: libldap-devel libsasl2-devel}
> BuildRequires: libncurses-devel libss-devel libssl-devel libtinfo-devel
>-BuildRequires: libverto-devel libselinux-devel
>+%{?_with_selinux:BuildRequires: libselinux-devel}
> BuildRequires: libpam-devel
>+%{?_with_verto:BuildRequires: libverto-devel}
> 
>+%if_with doc
> BuildRequires: python-module-sphinx
> BuildRequires: texlive-latex-base texlive-base-bin texlive-latex-recommended
>+%endif
> 
> %ifarch %{ix86} x86_64
>-BuildRequires: yasm
>+%{?!_with_bootstrap:BuildRequires: yasm}
> %endif
> 
>+%if_enabled check
> # for tests
> BuildRequires: libverto-libev python-modules gcc-c++
> # dejagnu tests disabled
> # BuildRequires: dejagnu tcl-devel
>+%endif
> 
> %description
> Kerberos V5 is a trusted-third-party network authentication system,
>@@ -75,13 +85,24 @@ Requires: lib%name = %version-%release
> Summary: Development files needed to compile Kerberos 5 programs
> Group: System/Libraries
> Requires: lib%name = %version-%release
>-Requires: lib%name-ldap = %version-%release
>+%{?_with_ldap:Requires: lib%name-ldap = %version-%release}
> Requires: libcom_err-devel
> Provides: %name-services = %version-%release
> Provides: %name-clients = %version-%release
> Obsoletes: %name-services < %version-%release
> Obsoletes: %name-clients < %version-%release
> 
>+%if_without verto
>+%package -n libverto
>+Version: 0.0.%version
>+Summary: verto shared libraries (bootstrap build)
>+Group: System/Legacy libraries
>+
>+%description -n libverto
>+This is a temporary libverto package built within krb5;
>+only used for bootstrap.
>+%endif
>+
> %package kdc
> Group: System/Servers
> Summary: The Kerberos 5 Key Distribution Center
>@@ -175,6 +196,11 @@ MIT Kerberos.
> %patch164 -p1 -b .kdc_send_receive_hooks
> %patch165 -p1 -b .kdc_hooks_test
> 
>+%ifarch e2k
>+sed -r -i 's, error=(pointer-arith|uninitialized),,g' \
>+	src/aclocal.m4 src/configure*
>+%endif
>+
> %build
> # Go ahead and supply tcl info, because configure doesn't know how to find it.
> # . %_libdir/tclConfig.sh
>@@ -194,17 +220,19 @@ util/reconf --verbose --force
> 	--localstatedir=%_localstatedir/kerberos \
> 	--with-system-et \
> 	--with-system-ss \
>-	--with-system-verto \
>-	--with-ldap \
>+	%{?_with_verto:--with-system-verto} \
>+	%{subst_with ldap} \
>+	%{subst_with selinux} \
> 	--enable-dns-for-realm \
> 	--with-dirsrv-account-locking \
> 	--enable-pkinit \
>+%if_without bootstrap
> 	--with-pkinit-crypto-impl=openssl \
> 	--with-tls-impl=openssl \
>+%endif
> 	--with-pam \
> 	--with-netlib=-lresolv \
> 	--disable-rpath \
>-	--with-selinux
> 	#
> 
> # dejagnu tests disabled
>@@ -219,6 +247,7 @@ if test "$configured_kdcrundir" != %_runtimedir/krb5kdc ; then
>     exit 1
> fi
> 
>+%if_with doc
> # Build the docs.
> make -C src/doc paths.py version.py
> cp src/doc/paths.py doc/
>@@ -231,6 +260,7 @@ sphinx-build -a -b latex -t pathsubs doc build-pdf
> for pdf in admin appdev basic build plugindev user ; do
>     test -s build-pdf/$pdf.pdf || make -C build-pdf
> done
>+%endif
> 
> %check
> make -C src runenv.py
>@@ -278,11 +308,13 @@ mkdir -m 755 -p %buildroot%_sysconfdir/gss
> # hard-coded in g_initialize.c.
> mkdir -m 755 -p %buildroot%_sysconfdir/gss/mech.d
> 
>+%if_with doc
> # Install docs
> mkdir -p %buildroot%_docdir/pdf
> cp build-pdf/*.pdf %buildroot%_docdir/pdf/
> cp -R build-html/ %buildroot/%_docdir/
> cp -p src/plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} %buildroot%_docdir/
>+%endif
> 
> # cleanups
> rm -rf %buildroot%_datadir/gnats
>@@ -291,6 +323,7 @@ touch %buildroot%_sysconfdir/krb5.keytab
> 
> %find_lang mit-krb5
> 
>+%if_without bootstrap
> %post kdc
> %post_service krb5kdc
> %post_service kadmin
>@@ -300,6 +333,7 @@ touch %buildroot%_sysconfdir/krb5.keytab
> %preun_service krb5kdc
> %preun_service kadmin
> %preun_service kprop
>+%endif
> 
> %files -n lib%name -f mit-krb5.lang
> %config(noreplace) %_sysconfdir/krb5.conf
>@@ -331,9 +365,11 @@ touch %buildroot%_sysconfdir/krb5.keytab
> 
> %_man5dir/krb5.conf.5*
> 
>+%if_with ldap
> %files -n lib%name-ldap
> %_libdir/libkdb_ldap.so.*
> %_libdir/%name/plugins/kdb/kldap.so
>+%endif
> 
> %files -n lib%name-devel
> %_includedir/*
>@@ -353,6 +389,12 @@ touch %buildroot%_sysconfdir/krb5.keytab
> %_man8dir/sserver.8*
> %_pkgconfigdir/*
> 
>+%if_without verto
>+%files -n libverto
>+%_prefix/lib*/libverto.so.*
>+%endif
>+
>+%if_without bootstrap
> %files kdc
> %dir %_localstatedir/kerberos/krb5kdc
> %config(noreplace) %_localstatedir/kerberos/krb5kdc/kdc.conf
>@@ -372,7 +414,7 @@ touch %buildroot%_sysconfdir/krb5.keytab
> %_sbindir/kadmin.local
> %_sbindir/kadmind
> %_sbindir/kdb5_util
>-%_sbindir/kdb5_ldap_util
>+%{?_with_ldap:%_sbindir/kdb5_ldap_util}
> %_sbindir/kprop
> %_sbindir/kproplog
> %_sbindir/kpropd
>@@ -383,11 +425,12 @@ touch %buildroot%_sysconfdir/krb5.keytab
> %_man8dir/kadmin.local.8*
> %_man8dir/kadmind.8*
> %_man8dir/kdb5_util.8*
>-%_man8dir/kdb5_ldap_util.8*
>+%{?_with_ldap:%_man8dir/kdb5_ldap_util.8*}
> %_man8dir/kprop.8*
> %_man8dir/kproplog.8*
> %_man8dir/kpropd.8*
> %_man8dir/krb5kdc.8*
>+%endif
> 
> %files kadmin
> %_bindir/kadmin
>@@ -421,12 +464,20 @@ touch %buildroot%_sysconfdir/krb5.keytab
> %_man5dir/.k5identity.5*
> %_man5dir/k5identity.5*
> 
>+%if_with doc
> %files doc
> %doc %_docdir
>+%endif
> 
> # {{{ changelog
> 
> %changelog
>+* Fri Jan 06 2017 Michael Shigorin <mike@altlinux.org> 1.14.2-alt2.1
>+- BOOTSTRAP:
>+  + introduce doc, ldap, selinux, verto knobs (on by default)
>+  + conditionally package bundled libverto
>+- E2K: disable -Werror={pointer-arith,uninitialized} (lcc)
>+
> * Thu Jun 09 2016 Anton V. Boyarshinov <boyarsh@altlinux.org> 1.14.2-alt2
> - krb5kdc.service: start after slapd
> 
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 32982: 6929