From 451705ce9720ac0de5756436ea71fe21f21f6f7c Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 9 Jun 2020 10:48:41 +0200 Subject: [PATCH] Fix chroot since qmail is compiled with TLS support --- .../var/qmail/control/smtproutes/10localdomains | 2 +- .../root/var/qmail/control/tlshosts/exhaustivelist | 0 root/var/service/altqmail/run | 27 +++++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 root/var/service/altqmail/root/var/qmail/control/tlshosts/exhaustivelist diff --git a/root/etc/e-smith/templates/var/service/altqmail/root/var/qmail/control/smtproutes/10localdomains b/root/etc/e-smith/templates/var/service/altqmail/root/var/qmail/control/smtproutes/10localdomains index f43ad10..94846e9 100644 --- a/root/etc/e-smith/templates/var/service/altqmail/root/var/qmail/control/smtproutes/10localdomains +++ b/root/etc/e-smith/templates/var/service/altqmail/root/var/qmail/control/smtproutes/10localdomains @@ -13,6 +13,6 @@ next if ( $mail_server ne 'localhost' ); $emaildomain = $domain->key; - $OUT .= "$emaildomain:127.0.0.1\n"; + $OUT .= "$emaildomain:$SystemName.$DomainName\n"; } } diff --git a/root/var/service/altqmail/root/var/qmail/control/tlshosts/exhaustivelist b/root/var/service/altqmail/root/var/qmail/control/tlshosts/exhaustivelist new file mode 100644 index 0000000..e69de29 diff --git a/root/var/service/altqmail/run b/root/var/service/altqmail/run index d2c2ad7..4cba384 100644 --- a/root/var/service/altqmail/run +++ b/root/var/service/altqmail/run @@ -20,7 +20,6 @@ fi if [ -e /$LIBDIR/libc-2.12.so ]; then LIBC="2.12" fi - if [ ! -d root/$LIBDIR ]; then mkdir root/$LIBDIR cp -a /$LIBDIR/libc-$LIBC.so root/$LIBDIR @@ -35,6 +34,32 @@ if [ ! -d root/$LIBDIR ]; then ln -s libnss_files-$LIBC.so root/$LIBDIR/libnss_files.so.2 cp -a /$LIBDIR/libresolv-$LIBC.so root/$LIBDIR ln -s libresolv-$LIBC.so root/$LIBDIR/libresolv.so.2 + + cp -a /$LIBDIR/libgssapi_krb5.so.2.2 root/$LIBDIR + ln -s libgssapi_krb5.so.2.2 root/$LIBDIR/libgssapi_krb5.so.2 + cp -a /$LIBDIR/libkrb5.so.3.3 root/$LIBDIR + ln -s libkrb5.so.3.3 root/$LIBDIR/libkrb5.so.3 + cp -a /$LIBDIR/libcom_err.so.2.1 root/$LIBDIR + ln -s libcom_err.so.2.1 root/$LIBDIR/libcom_err.so.2 + cp -a /$LIBDIR/libk5crypto.so.3.1 root/$LIBDIR + ln -s libk5crypto.so.3.1 root/$LIBDIR/libk5crypto.so.3 + cp -a /$LIBDIR/libdl-$LIBC.so root/$LIBDIR + ln -s libdl-$LIBC.so root/$LIBDIR/libdl.so.2 + cp -a /$LIBDIR/libz.so.1.2.3 root/$LIBDIR + ln -s libz.so.1.2.3 root/$LIBDIR/libz.so.1 + cp -a /$LIBDIR/libkrb5support.so.0.1 root/$LIBDIR + ln -s libkrb5support.so.0.1 root/$LIBDIR/libkrb5support.so.0 + cp -a /$LIBDIR/libkeyutils.so.1.3 root/$LIBDIR + ln -s libkeyutils.so.1.3 root/$LIBDIR/libkeyutils.so.1 + cp -a /$LIBDIR/libpthread-$LIBC.so root/$LIBDIR + ln -s libpthread-$LIBC.so root/$LIBDIR/libpthread.so.0 + cp -a /$LIBDIR/libselinux.so.1 root/$LIBDIR +fi +if [ ! -d root/usr/$LIBDIR ]; then + cp -a /usr/$LIBDIR/libssl.so.1.0.1e root/usr/$LIBDIR + ln -s libssl.so.1.0.1e root/usr/$LIBDIR/libssl.so.10 + cp -a /usr/$LIBDIR/libcrypto.so.1.0.1e root/usr/$LIBDIR + ln -s libcrypto.so.1.0.1e root/usr/$LIBDIR/libcrypto.so.10 fi chown qmails:qmail root/var/qmail/queue/lock/trigger