From c40856bcf84d4704a5678d35456ee17e7168da4e Mon Sep 17 00:00:00 2001 From: gobo72 Date: Sun, 27 Mar 2011 07:32:38 +0000 Subject: [PATCH] -Deplace les paquets de securite du stage5 au stage3 --- config/dependencies | 16 ++++-- config/packages-list | 13 ++--- {stage5 => stage3}/bootscripts/openldap | 0 {stage5 => stage3}/bootscripts/saslauthd | 0 {stage5 => stage3}/bootscripts/sendmail | 0 stage3/hv-install-1 | 27 ++++++++++ stage3/packages-update | 25 +++++++++ {stage5 => stage3}/pkg/ckermit | 0 stage3/pkg/cyrus-sasl | 36 +++++++++++++ stage3/pkg/krb5 | 64 ++++++++++++++++++++++++ stage3/pkg/openldap | 48 ++++++++++++++++++ {stage5 => stage3}/pkg/sendmail | 0 stage3/pkg/ssmtp | 7 +++ stage5/hv-install-1 | 28 ++--------- stage5/packages-update | 16 ------ stage5/pkg/krb5 | 48 ------------------ stage5/pkg/openldap | 45 ----------------- stage5/pkg/sasl2 | 35 ------------- stage6/ipkg.def | 4 ++ 19 files changed, 235 insertions(+), 177 deletions(-) rename {stage5 => stage3}/bootscripts/openldap (100%) rename {stage5 => stage3}/bootscripts/saslauthd (100%) rename {stage5 => stage3}/bootscripts/sendmail (100%) rename {stage5 => stage3}/pkg/ckermit (100%) create mode 100644 stage3/pkg/cyrus-sasl create mode 100644 stage3/pkg/krb5 create mode 100644 stage3/pkg/openldap rename {stage5 => stage3}/pkg/sendmail (100%) create mode 100644 stage3/pkg/ssmtp delete mode 100644 stage5/pkg/krb5 delete mode 100644 stage5/pkg/openldap delete mode 100644 stage5/pkg/sasl2 diff --git a/config/dependencies b/config/dependencies index 728d50b..c3dbe97 100644 --- a/config/dependencies +++ b/config/dependencies @@ -27,9 +27,6 @@ ${GNASH}: ${AGG} ${FIREFOX}: ${SQLITE} -${PROCMAIL}: ${SENDMAIL} -${FETCHMAIL}: ${OPENSSL} ${PROCMAIL} - ${FUSE}: ${UDEV} ${JASPER}: ${LIBJPEG} ${XORG} ${MESALIB} @@ -115,3 +112,16 @@ ${LIBSOUP}: ${GNUTLS} ${GNOME_KEYRING} ${LIBPROXY} ${SQLITE} ${LIBXML2} ${LTSP}: ${PERL_MOD_LWP} ${PERL_MOD_LWP}: ${PERL_MOD_URI} + +# Circular dependency SASL2 - OPENLDAP (KERBEROS5) +${SASL2}: ${OPENLDAP} ${OPENSSL} ${PAM} ${KERBEROS5} +${OPENLDAP}: ${GDBM} ${SASL2} ${OPENSSL} ${TCPWRAPPERS} +${KERBEROS5}: ${PAM} ${OPENLDAP} + +${PROCMAIL}: +${FETCHMAIL}: ${OPENSSL} ${PROCMAIL} +${SENDMAIL}: ${KERBEROS5} + +# MTA = ${SENDMAIL} or ${SSMTP} +${GNUPG}: ${OPENLDAP} ${LIBUSB_COMPAT} ${MTA} +${MUTT}: ${GNUPG} ${OPENSSL} ${MTA} ${KERBEROS5} ${SASL2} diff --git a/config/packages-list b/config/packages-list index 8dd3dc0..99065d3 100644 --- a/config/packages-list +++ b/config/packages-list @@ -194,7 +194,7 @@ GNUTLS="gnutls-2.10.2" GOBJECT_INSTROSPECTION="gobject-introspection-0.6.14" GOFFICE="goffice-0.2.2" GNUMERIC="gnumeric-1.6.3" -GNUPG="gnupg-1.4.9" +GNUPG="gnupg-1.4.11" GREP="grep-2.6.3" GRIP="grip-3.3.1" GROFF="groff-1.20.1" @@ -236,7 +236,7 @@ JADETEX="jadetex-3.13" JASPER="jasper-1.900.1" KBD="kbd-1.15.2" -KERBEROS5="krb5-1.4.1" +KERBEROS5="krb5-1.6" KERNEL="linux-2.6.37.3" NOUVEAU_NVIDIA_KERNEL="linux-2.6.38-rc7-g3d3d123-nouveau-git" KVM="kvm-84" @@ -307,7 +307,7 @@ MILTER_SPF="smf-spf-2.0.1" MODULE_INIT_TOOLS="module-init-tools-3.12" MPC="mpc-0.8.2" MPFR="mpfr-3.0.0" -MUTT="mutt-1.5.20" +MUTT="mutt-1.5.21" MYSQL="mysql-5.1.52" NANO="nano-2.2.6" @@ -319,7 +319,7 @@ NMAP="nmap-4.20" NSS="nss-3.12-with-nspr-4.7" OPENJADE="openjade-1.3.2" -OPENLDAP="openldap-2.3.38" +OPENLDAP="openldap-2.4.23" OPENSP="OpenSP-1.5.2" OPENSSH="openssh-5.8p1" OPENSSL="openssl-1.0.0b" @@ -374,9 +374,9 @@ RSYNC="rsync-3.0.7" SAMBA="samba-3.0.21c" SANE_BACKENDS="sane-backends-1.0.22" XSANE="xsane-0.996" -SASL2="cyrus-sasl-2.1.21" +SASL2="cyrus-sasl-2.1.23" SED="sed-4.2.1" -SENDMAIL="sendmail-8.13.6" +SENDMAIL="sendmail-8.14.4" SENDMAIL_GID="bin" SGML_COMMON="sgml-common-0.6.3" SGML_DTD3_VER="3.1" @@ -392,6 +392,7 @@ SPLINT="splint-3.1.1" SPLIX="splix-2.0.0" SQLITE="sqlite-3.6.22" SQUIRRELMAIL="squirrelmail-1.5.1" +SSMTP="ssmtp-2.64" STARTUP_NOTIFICATION="startup-notification-0.9" STRACE="strace-4.5.20" SUBVERSION="subversion-1.6.6" diff --git a/stage5/bootscripts/openldap b/stage3/bootscripts/openldap similarity index 100% rename from stage5/bootscripts/openldap rename to stage3/bootscripts/openldap diff --git a/stage5/bootscripts/saslauthd b/stage3/bootscripts/saslauthd similarity index 100% rename from stage5/bootscripts/saslauthd rename to stage3/bootscripts/saslauthd diff --git a/stage5/bootscripts/sendmail b/stage3/bootscripts/sendmail similarity index 100% rename from stage5/bootscripts/sendmail rename to stage3/bootscripts/sendmail diff --git a/stage3/hv-install-1 b/stage3/hv-install-1 index a1837be..1cecdba 100755 --- a/stage3/hv-install-1 +++ b/stage3/hv-install-1 @@ -119,6 +119,33 @@ ipkg -m noac ${LIBMNG} ipkg ${FREETYPE} ipkg ${FONTCONFIG} +ipkg -m noac ${CKERMIT} + +ipkg ${LIBTASN1} +ipkg ${GUILE} \ + --enable-posix \ + --disable-static \ + --enable-networking \ + --enable-regex +ipkg ${LIBGPG_ERROR} +ipkg ${LIBGCRYPT} +ipkg -m acnb ${GNUTLS} + +# Mail +ipkg -l "${SASL2}-pass1" -s "cyrus-sasl" ${SASL2} +ipkg ${OPENLDAP} +ipkg -l "${SASL2}-pass2" -s "cyrus-sasl" ${SASL2} +ipkg -s "krb5" ${KERBEROS5} + +if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then + ipkg -m noac ${SENDMAIL} +else + ipkg -m acnb ${SSMTP} +fi + +ipkg ${GNUPG} "--libexecdir=/usr/lib" +ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl" + write_completed_stage display_stage_build_stats diff --git a/stage3/packages-update b/stage3/packages-update index 7f3d7c0..1e23c16 100755 --- a/stage3/packages-update +++ b/stage3/packages-update @@ -109,4 +109,29 @@ fpkg -m sf ${LIBMNG} fpkg -m sf ${FREETYPE} fpkg -e "tar.gz" ${FONTCONFIG} "http://fontconfig.org/release" +# Using HV-repackaged version, because Ckermit decompresses all of its files in +# the current directory. +fpkg -m hv ${CKERMIT} + +fpkg -m gnu ${LIBTASN1} +fpkg -m gnu ${GUILE} +fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL} +fpkg -s "libgcrypt" ${LIBGCRYPT} ${GNUPG_URL} +fpkg -s "gnutls" ${GNUTLS} ${GNUPG_URL} + +fpkg -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail" +fpkg -e "tgz" ${OPENLDAP} \ + "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release" +fpkg -m hv ${KERBEROS5} + +if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then + fpkg -e "tar.gz" -f "sendmail.$(get_pkg_ver ${SENDMAIL})" ${SENDMAIL} \ + "ftp://ftp.sendmail.org/pub/sendmail" +else + fpkg -m hv ${SSMTP} +fi + +fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt" +fpkg -m sf ${MUTT} + exit $? diff --git a/stage5/pkg/ckermit b/stage3/pkg/ckermit similarity index 100% rename from stage5/pkg/ckermit rename to stage3/pkg/ckermit diff --git a/stage3/pkg/cyrus-sasl b/stage3/pkg/cyrus-sasl new file mode 100644 index 0000000..e7b84ff --- /dev/null +++ b/stage3/pkg/cyrus-sasl @@ -0,0 +1,36 @@ +#!/bin/bash + +hvconfig_pre() +{ + sed -i 's/#elif WITH_DES/#elif defined(WITH_DES)/' \ + ${LFS_TMP}/${PACKAGE}/plugins/digestmd5.c + + CONFIGURE_OPTS=" \ + ${CONFIGURE_OPTS} \ + --with-dbpath=/var/lib/sasl/sasldb2 \ + --with-saslauthd=/var/run/saslauthd \ + --with-dblib=gdbm" + + if [ "x${HVLABEL}" = "x${PACKAGE}-pass2" ]; then + CONFIGURE_OPTS=" \ + ${CONFIGURE_OPTS} \ + --with-ldap \ + --enable-ldapdb" + fi +} + +hvbuild_post() +{ + if [ "x${HVLABEL}" = "x${PACKAGE}-pass1" ]; then + cd ${LFS_TMP}/${PACKAGE} + + install -v -m700 -d /var/lib/sasl + install -v -m711 -d /var/run/saslauthd + + # Bootscript + install -v -m740 ${SCRDIR}/bootscripts/saslauthd /etc/rc.d/init.d + + # Is it necessary to run the saslauthd server? + #bootscript_add_rc3 saslauthd 50 40 + fi +} diff --git a/stage3/pkg/krb5 b/stage3/pkg/krb5 new file mode 100644 index 0000000..74d9db1 --- /dev/null +++ b/stage3/pkg/krb5 @@ -0,0 +1,64 @@ +#!/bin/bash + +hvconfig_pre() +{ + CONFIGURE_OPTS="\ + ${CONFIGURE_OPTS} \ + --localstatedir=/var/lib \ + --mandir=/usr/share/man \ + --with-system-et \ + --with-system-ss \ + --enable-dns-for-realm" +} + +hvconfig() +{ + cd ${LFS_TMP}/${PACKAGE}/src + ./configure CPPFLAGS="-I/usr/include/et -I/usr/include/ss -DEAI_NODATA=EAI_NONAME" \ + ${CONFIGURE_OPTS} +} + +hvbuild_post() +{ + mv -v /usr/bin/ksu /bin + chmod -v 755 /bin/ksu + + mv -v /usr/lib/libkrb5.so.3* /lib + mv -v /usr/lib/libk5crypto.so.3* /lib + mv -v /usr/lib/libkrb5support.so.0* /lib + + 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 + + if [ ! -f /bin/login.shadow ]; then + mv -v /bin/login /bin/login.shadow + fi + install -m755 -v /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 = + encrypt = true + +[realms] + = { + kdc = + admin_server = + } + +[domain_realm] + . = + +[logging] + kdc = SYSLOG[:INFO[:AUTH]] + admin_server = SYSLOG[INFO[:AUTH]] + default = SYSLOG[[:SYS]] +EOF +} diff --git a/stage3/pkg/openldap b/stage3/pkg/openldap new file mode 100644 index 0000000..b233e6c --- /dev/null +++ b/stage3/pkg/openldap @@ -0,0 +1,48 @@ +#!/bin/bash + +hvconfig_pre() +{ + # --enable-spasswd: for SASL2 plugin + # --disable-bdb --disable-hdb --with-ldbm-api=gdbm: To use GBDM + # --disable-sql --disable-ndb: If MySQL is NOT installed + CONFIGURE_OPTS=" \ + ${CONFIGURE_OPTS} \ + --libexecdir=/usr/sbin \ + --localstatedir=/srv/ldap \ + --disable-debug \ + --enable-dynamic \ + --enable-crypt \ + --enable-modules \ + --enable-rlookups \ + --enable-backends \ + --enable-overlays \ + --disable-sql \ + --disable-ndb \ + --enable-spasswd \ + --disable-bdb \ + --disable-hdb \ + --with-ldbm-api=gdbm" +} + +hvconfig_post() +{ + make depend +} + +hvbuild_post() +{ + for LINK in lber ldap ldap_r; do + chmod -v 0755 /usr/lib/$(readlink /usr/lib/lib${LINK}.so) + done + + # To utilize GDBM as the database backend: + sed -e "s!\(database\s*\)bdb!\1gdbm!" -i /etc/openldap/slapd.conf + + # Bootscript + install -v -m740 ${SCRDIR}/bootscripts/openldap /etc/rc.d/init.d + + if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then + # Activate bootscript + bootscript_add_rc3 openldap 60 30 + fi +} diff --git a/stage5/pkg/sendmail b/stage3/pkg/sendmail similarity index 100% rename from stage5/pkg/sendmail rename to stage3/pkg/sendmail diff --git a/stage3/pkg/ssmtp b/stage3/pkg/ssmtp new file mode 100644 index 0000000..d973fa4 --- /dev/null +++ b/stage3/pkg/ssmtp @@ -0,0 +1,7 @@ +#!/bin/bash + +hvconfig_pre() +{ + sed -e "s!read\ mailname!mailname=${DOMAIN}!" -i ${LFS_TMP}/${PACKAGE}/generate_config + sed -e "s!read\ smtpport!smtpport=25!" -i ${LFS_TMP}/${PACKAGE}/generate_config +} diff --git a/stage5/hv-install-1 b/stage5/hv-install-1 index c36d410..3cee4c2 100755 --- a/stage5/hv-install-1 +++ b/stage5/hv-install-1 @@ -42,16 +42,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \ ipkg ${ISO_CODES} ipkg ${LIBXKLAVIER} ipkg ${LIBGLADE} - ipkg ${LIBTASN1} - ipkg ${GUILE} \ - --enable-posix \ - --disable-static \ - --enable-networking \ - --enable-regex - ipkg ${LIBGPG_ERROR} - ipkg ${LIBGCRYPT} - ipkg -m acnb ${GNUTLS} - ipkg ${LIBIDL} + ipkg ${LIBIDL} # Dépendence de quoi?? # GNOME-2.X configuration rscr mult "Configuring ${GNOME2_VER}" ./cis-gnome-config @@ -175,15 +166,6 @@ fi ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin" ipkg ${PCMANFM} -# Mail -ipkg ${SASL2} -if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then - ipkg ${OPENLDAP} -fi -ipkg ${KERBEROS5} -ipkg -m noac ${SENDMAIL} # Replace by SSMTP for workstation... -ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl" - if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then ipkg -m noac ${PROCMAIL} ipkg -m noac ${LIBSPF2} @@ -212,9 +194,10 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then # Subversion server (client was already installed in stage2) ipkg ${SUBVERSION} - ipkg ${INDENT} fi +ipkg ${INDENT} + if [ "x${USE_SAMBA}" = "xyes" ]; then ipkg ${SAMBA} fi @@ -228,12 +211,9 @@ ipkg -m acnb ${KVM} ipkg -m acnb ${BRIDGE_UTILS} ipkg ${UML_UTILITIES} -ipkg -s ckermit ${CKERMIT} - ipkg ${TRANSMISSION} "--disable-daemon" -ipkg ${GNUPG} "--libexecdir=/usr/lib" - +# Électronique ipkg ${LIBGEDA} ipkg ${GEDA_SYMBOLS} ipkg ${GEDA_GSCHEM} diff --git a/stage5/packages-update b/stage5/packages-update index 4ae8ea3..5689758 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -37,11 +37,6 @@ fpkg -m gnome ${LIBWNCK} fpkg ${ISO_CODES} "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes" fpkg -m sf -s "gswitchit" ${LIBXKLAVIER} fpkg -m gnome ${LIBGLADE} -fpkg -m gnu ${LIBTASN1} -fpkg -m gnu ${GUILE} -fpkg -s "libgpg-error" ${LIBGPG_ERROR} ${GNUPG_URL} -fpkg -s "libgcrypt" ${LIBGCRYPT} ${GNUPG_URL} -fpkg -s "gnutls" ${GNUTLS} ${GNUPG_URL} fpkg -m gnome ${LIBIDL} fpkg -m gnome ${ORBIT2} fpkg -m gnome ${GCONF} @@ -142,17 +137,11 @@ fpkg -f "${FIREFOX}.source" ${FIREFOX} \ fpkg -e "tar.gz" ${AGG} "http://www.antigrain.com" fpkg ${GNASH} "http://ftp.gnu.org/pub/gnu/gnash/$(get_pkg_ver ${GNASH})" -fpkg -e "tar.gz" ${SASL2} "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail" -fpkg -e "tgz" -f "openldap-stable-20070831" ${OPENLDAP} "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-stable" -fpkg -m hv ${KERBEROS5} - -fpkg -e "tar.gz" -f "sendmail.$(get_pkg_ver ${SENDMAIL})" ${SENDMAIL} "ftp://ftp.sendmail.org/pub/sendmail" fpkg -e "tar.gz" ${LIBSPF2} "http://libspf2.org/spf" fpkg -e "tgz" ${MILTER_GREYLIST} "ftp://ftp.espci.fr/pub/milter-greylist" fpkg -m hv ${MILTER_SPF} fpkg -e "tar.gz" ${PROCMAIL} "http://www.ring.gr.jp/archives/net/mail/procmail" fpkg ${FETCHMAIL} "http://download.berlios.de/fetchmail" -fpkg -m sf ${MUTT} fpkg -m sf ${CLAMAV} fpkg -m pm -s "G/GR/GRANTM" ${PERL_MOD_XML_SIMPLE} @@ -187,15 +176,10 @@ fpkg -m hv ${UML_UTILITIES} fpkg ${TRANSMISSION} "http://mirrors.m0k.org/transmission/files" -# Ckermit decompresses all of its files in the current directory, so created a proper archive on hv server. -fpkg -m hv ${CKERMIT} - fpkg -e "tar.gz" ${LIBGAMIN} "http://www.gnome.org/~veillard/gamin/sources" fpkg -m sf ${PCMANFM} -fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt" - #fpkg_mis ${SPLINT} "${SPLINT}.src" "http://splint.org/downloads" GEDA_BASE_URL=http://geda.seul.org/release/v$(get_pkg_ver2 ${LIBGEDA})/$(get_pkg_ver ${LIBGEDA}) diff --git a/stage5/pkg/krb5 b/stage5/pkg/krb5 deleted file mode 100644 index 064c505..0000000 --- a/stage5/pkg/krb5 +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -hvconfig() -{ - cd ${LFS_TMP}/${PACKAGE}/src - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --mandir=/usr/share/man \ - --enable-dns \ - --enable-static -} - -hvbuild_post() -{ - mv -v /usr/bin/ksu /bin - mv -v /usr/lib/libkrb5.so.3* /lib - mv -v /usr/lib/libkrb4.so.2* /lib - mv -v /usr/lib/libdes425.so.3* /lib - mv -v /usr/lib/libk5crypto.so.3* /lib - mv -v /usr/lib/libcom_err.so.3* /lib - ln -v -sf ../../lib/libkrb5.so.3 /usr/lib/libkrb5.so - ln -v -sf ../../lib/libkrb4.so.2 /usr/lib/libkrb4.so - ln -v -sf ../../lib/libdes425.so.3 /usr/lib/libdes425.so - ln -v -sf ../../lib/libk5crypto.so.3 /usr/lib/libk5crypto.so - ln -v -sf ../../lib/libcom_err.so.3 /usr/lib/libcom_err.so - - cat > /etc/krb5.conf << EOF -[libdefaults] - default_realm = - encrypt = true - -[realms] - = { - kdc = - admin_server = - } - -[domain_realm] - . = - -[logging] - kdc = SYSLOG[:INFO[:AUTH]] - admin_server = SYSLOG[INFO[:AUTH]] - default = SYSLOG[[:SYS]] -EOF -} diff --git a/stage5/pkg/openldap b/stage5/pkg/openldap deleted file mode 100644 index 45a4e04..0000000 --- a/stage5/pkg/openldap +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -hvconfig_pre() -{ - CONFIGURE_OPTS=" \ - ${CONFIGURE_OPTS} \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc \ - --localstatedir=/srv/ldap \ - --disable-debug \ - --enable-dynamic \ - --enable-crypt \ - --enable-modules \ - --enable-rlookups \ - --enable-backends \ - --enable-overlays" -} - -hvconfig_post() -{ - make depend -} - -hvbuild_post() -{ - for LINK in lber ldap ldap_r; do - chmod -v 0755 /usr/lib/$(readlink /usr/lib/lib${LINK}.so) - done - - cd ${LFS_TMP}/${PACKAGE} - install -v -m755 -d /usr/share/doc/${PACKAGE}/{drafts,guide,rfc} - install -v -m644 doc/drafts/* /usr/share/doc/${PACKAGE}/drafts - install -v -m644 doc/rfc/* /usr/share/doc/${PACKAGE}/rfc - cp -v -R doc/guide/* /usr/share/doc/${PACKAGE}/guide - - # Only the slapd daemon is needed. - # The slurpd daemon is used for coordinating multiple LDAP servers so they - # cooperate in a hierarchy, much like DNS servers. - - # Bootscript - install -v -m740 ${SCRDIR}/bootscripts/openldap /etc/rc.d/init.d - - # script-name start stop - bootscript_add_rc3 openldap 60 30 -} diff --git a/stage5/pkg/sasl2 b/stage5/pkg/sasl2 deleted file mode 100644 index 8478861..0000000 --- a/stage5/pkg/sasl2 +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -hvconfig_pre() -{ - # Fixes an issue when compiling Cyrus SASL with GCC-4: - sed -i '/sasl_global/s/^static //' ${LFS_TMP}/${PACKAGE}/lib/client.c - - # Puts the saslauthd man page in a more standard location: - sed -i 's/cat8/man8/' ${LFS_TMP}/${PACKAGE}/saslauthd/Makefile.in - - CONFIGURE_OPTS=" \ - ${CONFIGURE_OPTS} \ - --with-dbpath=/var/lib/sasl/sasldb2 \ - --with-saslauthd=/var/run" -} - -hvbuild_post() -{ - cd ${LFS_TMP}/${PACKAGE} - install -v -m755 -d /usr/share/doc/${PACKAGE} - install -v -m644 doc/{*.{html,txt,fig},ONEWS,TODO} \ - saslauthd/LDAP_SASLAUTHD /usr/share/doc/${PACKAGE} - install -v -m700 -d /var/lib/sasl - - # Creating SASL configuration file for Sendmail: - cat > /usr/lib/sasl2/Sendmail.conf << "EOF" -pwcheck_method:saslauthd -EOF - - # Bootscript - install -v -m740 ${SCRDIR}/bootscripts/saslauthd /etc/rc.d/init.d - - # script-name start stop - bootscript_add_rc3 saslauthd 50 40 -} diff --git a/stage6/ipkg.def b/stage6/ipkg.def index 135c8da..1fc03b0 100644 --- a/stage6/ipkg.def +++ b/stage6/ipkg.def @@ -5,3 +5,7 @@ CONFIGURE_OPTS="\ --prefix=/usr \ --sysconfdir=/etc \ ${CONFIGURE_OPTS}" + +#--prefix=/usr \ +#--sysconfdir=/etc/gnome/2.30.2 \ +#--libexecdir=/usr/lib/PACKAGE_NAME -- 2.20.1