From debb0893afcda68f530af0b770d324729e69dde0 Mon Sep 17 00:00:00 2001 From: Krejzi Date: Fri, 1 Mar 2013 10:38:56 +0000 Subject: [PATCH] Krb5 1.11.1, fix At-Spi2 deps. git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11030 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 8 ++++---- postlfs/security/mitkrb.xml | 31 ++++++++++++++++++++++--------- x/lib/at-spi2-atk.xml | 5 ++--- x/lib/at-spi2-core.xml | 3 ++- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/general.ent b/general.ent index f0b7603de8..87513288c1 100644 --- a/general.ent +++ b/general.ent @@ -3,13 +3,13 @@ $LastChangedBy$ $Date$ --> - - + + - + @@ -185,7 +185,7 @@ export -f as_root - + diff --git a/postlfs/security/mitkrb.xml b/postlfs/security/mitkrb.xml index 4fcda3b9e3..0a9d2703d7 100644 --- a/postlfs/security/mitkrb.xml +++ b/postlfs/security/mitkrb.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -80,8 +80,9 @@ (required to run the testsuite), , - and - (used during the testsuite). + , + (used during the testsuite) and + (used during the testsuite) @@ -113,7 +114,7 @@ After unpacking the distribution tarball and if you have installed, you can authenticate the package. First, check the contents of the file - krb5-1.10.3.tar.gz.asc. + krb5-&mitkrb-version;.tar.gz.asc. gpg --verify krb5-&mitkrb-version;.tar.gz.asc krb5-&mitkrb-version;.tar.gz @@ -142,6 +143,12 @@ gpg: Can't check signature: public key not found cd src && +sed -e "s@python2.5/Python.h@& python2.7/Python.h@g" \ + -e "s@-lpython2.5]@&,\n AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7])@g" \ + -i configure.in && +sed -e "s@interp->result@Tcl_GetStringResult(interp)@g" \ + -i kadmin/testing/util/tcl_kadm5.c && +autoconf && ./configure CPPFLAGS="-I/usr/include/et -I/usr/include/ss" \ --prefix=/usr \ --localstatedir=/var/lib \ @@ -162,8 +169,8 @@ make make install && for LIBRARY in gssapi_krb5 gssrpc k5crypto kadm5clnt_mit kadm5srv_mit \ - kdb5 krb5 krb5support verto ; do - chmod -v 755 /usr/lib/lib$LIBRARY.so.*.* + kdb5 kdb_ldap krb5 krb5support verto ; do + [ -e /usr/lib/lib$LIBRARY.so.*.* ] && chmod -v 755 /usr/lib/lib$LIBRARY.so.*.* done && mv -v /usr/lib/libkrb5.so.3* /lib && @@ -192,6 +199,12 @@ unset LIBRARY Command Explanations + + sed -e ...: First sed fixes + Python detection and second one fixes + build with Tcl 8.6. + + : This switch allows realms to be resolved using the DNS server. @@ -424,7 +437,7 @@ EOF For additional information consult - Documentation for krb-&mitkrb-version; on which the above + Documentation for krb5-&mitkrb-version; on which the above instructions are based. diff --git a/x/lib/at-spi2-atk.xml b/x/lib/at-spi2-atk.xml index 8c700f8718..5ad2ea50e4 100644 --- a/x/lib/at-spi2-atk.xml +++ b/x/lib/at-spi2-atk.xml @@ -76,9 +76,8 @@ Required - , - and - + and + User Notes: diff --git a/x/lib/at-spi2-core.xml b/x/lib/at-spi2-core.xml index de0f8c3683..08e16a7bff 100644 --- a/x/lib/at-spi2-core.xml +++ b/x/lib/at-spi2-core.xml @@ -79,7 +79,8 @@ Required , - and + , + and