From 14b8b7248a8be82f4073da3a5b6658517ec44a0b Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Tue, 11 Sep 2012 01:58:27 +0000
Subject: [PATCH] Correction installation dans /usr/libexec et autres...

---
 stage2/pkg/coreutils   |  3 ++-
 stage3/hv-install-1    | 14 +++++++++++---
 stage3/packages-update |  3 +--
 stage3/pkg/cpio        |  5 +++++
 stage3/pkg/krb5        | 37 +++++--------------------------------
 5 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/stage2/pkg/coreutils b/stage2/pkg/coreutils
index 80fc9ca..53b8f5c 100644
--- a/stage2/pkg/coreutils
+++ b/stage2/pkg/coreutils
@@ -4,6 +4,7 @@ hvconfig_pre()
 {
     CONFIGURE_OPTS="\
         ${CONFIGURE_OPTS} \
+        --libexecdir=/usr/lib \
         --enable-no-install-program=kill,uptime"
 }
 
@@ -14,7 +15,7 @@ hvbuild_post()
     mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
 
     # Now specify new path to mv to eliminate error message:
-    #   "/usr/bin/mv: No such file or directory" 
+    #   "/usr/bin/mv: No such file or directory"
     /bin/mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin
     /bin/mv -v /usr/bin/chroot /usr/sbin
 
diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 8f0a3fa..a23118e 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -28,7 +28,11 @@ ipkg -s tcl ${TCL}
 CFLAGS="${CFLAGS} -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY=1" \
     ipkg ${SQLITE} "--enable-threadsafe --enable-readline --enable-dynamic-extensions"
 ipkg -j ${SUBVERSION} "--without-berkeley-db"
-ipkg ${SUDO}
+ipkg ${SUDO} "--libexecdir=/usr/lib/sudo \
+    --with-all-insults \
+    --with-env-editor \
+    --without-pam \
+    --without-sendmail"
 ipkg ${STRACE}
 ipkg ${PCRE} "--docdir=/usr/share/doc/pcre \
     --enable-utf8 \
@@ -68,7 +72,11 @@ fi
 ipkg -m noac ${ZIP}
 ipkg -m noac ${UNZIP}
 ipkg -m noac ${UNRAR}
-ipkg ${CPIO}
+ipkg ${CPIO} "\
+    --bindir=/bin \
+    --libexecdir=/tmp \
+    --enable-mt \
+    --with-rmt=/usr/sbin/rmt"
 
 ipkg ${SCREEN}
 
@@ -89,7 +97,7 @@ ipkg -m noac ${COLORDIFF}
 
 ipkg ${INTLTOOL}
 
-ipkg -m acnb ${GIT}
+ipkg -m acnb ${GIT} "--libexecdir=/usr/lib --with-gitconfig=/etc/gitconfig"
 
 # DocBook
 ipkg -m acnb ${SGML_COMMON}
diff --git a/stage3/packages-update b/stage3/packages-update
index 024dc97..dee5563 100755
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -90,8 +90,7 @@ fpkg -m sf ${OPENJADE}
 fpkg -m hv ${SGML_SPM}
 fpkg -m sf -s "docbook" ${DOCBOOK_DSSSL}
 fpkg -e "tar.gz" ${DOCBOOK_UTILS} \
-      "http://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES"
-##    "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES"
+    "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES"
 fpkg -e "tar.gz" ${LIBXML2} "http://xmlsoft.org/sources"
 fpkg -e "tar.gz" ${LIBXSLT} "http://xmlsoft.org/sources"
 fpkg -m hv ${DOCBOOK_XML}
diff --git a/stage3/pkg/cpio b/stage3/pkg/cpio
index 707d49c..1792478 100644
--- a/stage3/pkg/cpio
+++ b/stage3/pkg/cpio
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+hvconfig_pre()
+{
+    sed -i -e '/gets is a/d' ${LFS_TMP}/${PACKAGE}/gnu/stdio.in.h
+}
+
 hvbuild_post()
 {
     install -v -m755 ${SCRDIR}/misc/rpm2cpio /usr/bin
diff --git a/stage3/pkg/krb5 b/stage3/pkg/krb5
index e35383b..12ec8f7 100644
--- a/stage3/pkg/krb5
+++ b/stage3/pkg/krb5
@@ -20,6 +20,11 @@ hvconfig()
 
 hvbuild_post()
 {
+    for lib in gssapi_krb5 gssrpc k5crypto kadm5clnt_mit kadm5srv_mit kdb5 \
+        krb5 krb5support verto-k5ev verto ; do
+        chmod -v 755 /usr/lib/lib${lib}.so.*.*
+    done
+
     mv -v /usr/bin/ksu /bin
     chmod -v 755 /bin/ksu
 
@@ -30,36 +35,4 @@ hvbuild_post()
     ln -svfT ../../lib/libkrb5.so.3.3 /usr/lib/libkrb5.so
     ln -svfT ../../lib/libk5crypto.so.3.1 /usr/lib/libk5crypto.so
     ln -svfT ../../lib/libkrb5support.so.0.1 /usr/lib/libkrb5support.so
-
-    # Temporairement desactive car login krb5 ne marche pas.
-    #if [ ! -f /bin/login.shadow ]; then
-    #    mv -v /bin/login /bin/login.shadow
-    #fi
-    #install -v -m755 /usr/sbin/login.krb5 /bin/login
-
-########    mv -v /usr/lib/libdes425.so.3* /lib
-########    mv -v /usr/lib/libkrb4.so.2* /lib
-
-########    ln -svfT ../../lib/libdes425.so.3.0 /usr/lib/libdes425.so
-########    ln -svfT ../../lib/libkrb4.so.2.0 /usr/lib/libkrb4.so
-
-    cat > /etc/krb5.conf << EOF
-[libdefaults]
-    default_realm = <LFS.ORG>
-    encrypt = true
-
-[realms]
-    <LFS.ORG> = {
-        kdc = <belgarath.lfs.org>
-        admin_server = <belgarath.lfs.org>
-    }
-
-[domain_realm]
-    .<lfs.org> = <LFS.ORG>
-
-[logging]
-    kdc = SYSLOG[:INFO[:AUTH]]
-    admin_server = SYSLOG[INFO[:AUTH]]
-    default = SYSLOG[[:SYS]]
-EOF
 }
-- 
2.20.1