From 60d8090bddc7ea460d58112a4dea5cfd94391145 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 11 Sep 2019 12:48:55 +0200 Subject: [PATCH 1/2] Mailx: Update to version 12.5 convert to be0 file remove openssl support, because mailx isn't compatible with new openssl version I think it will only used internal --- mailx.be0 | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 mailx.be0 diff --git a/mailx.be0 b/mailx.be0 new file mode 100755 index 000000000..066af33af --- /dev/null +++ b/mailx.be0 @@ -0,0 +1,64 @@ +#!/bin/env beesh + +# BEE_VERSION mailx-12.5-0 + +SRCURL[0]="http://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_${PKGVERSION}.orig.tar.gz" + +# EXCLUDE="" + +build_in_sourcedir + +#mee_extract() { +# bee_extract ${@} +#} + +#mee_patch() { +# bee_patch ${@} +#} + +mee_configure() { + start_cmd sh ./makeconfig +} + +mee_build_pre() { +#remove openssl bindings +patch -p0 --verbose <<'EOF' +--- config.h 2019-09-11 12:44:39.000000000 +0200 ++++ config.h 2019-09-11 12:45:48.000000000 +0200 +@@ -45,10 +45,8 @@ + /* #define USE_SSL + #define USE_NSS */ + /* checked for sufficiently recent OpenSSL */ +-#define USE_SSL +-#define USE_OPENSSL +-/* checked for STACK_OF() */ +-#define HAVE_STACK_OF ++/* #define USE_SSL ++#define USE_OPENSSL */ + /* checked for GSSAPI in libgss */ + /* #define USE_GSSAPI */ + /* checked for GSSAPI in libgssapi_krb5 */ +EOF +} + +mee_build() { + bee_build SENDMAIL=/usr/sbin/sendmail +} + +mee_install() { + bee_install PREFIX=${PREFIX} UCBINSTALL=/usr/bin/install + + ln -sv mailx ${D}${BINDIR}/mail + ln -sv mailx ${D}${BINDIR}/nail + + ln -sv mailx.1 ${D}${MANDIR}/man1/nail.1 + ln -sv mailx.1 ${D}${MANDIR}/man1/mail.1 + + # setup + + mv -v ${D}/etc/nail{,-molgen}.rc + cat >>${D}/etc/nail-molgen.rc <<-EOF + set smtp=harry.molgen.mpg.de + set hostname=molgen.mpg.de + EOF +} From a7d8ec9320ab303a1234992821f471fd40d2c483 Mon Sep 17 00:00:00 2001 From: david Date: Wed, 11 Sep 2019 14:03:39 +0200 Subject: [PATCH 2/2] mailx: remove old bee-file --- mailx-12.4-1.bee | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100755 mailx-12.4-1.bee diff --git a/mailx-12.4-1.bee b/mailx-12.4-1.bee deleted file mode 100755 index a4d741c38..000000000 --- a/mailx-12.4-1.bee +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/env beesh - -SRCURL[0]="http://downloads.sourceforge.net/heirloom/mailx-12.4.tar.bz2" - -PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/mailx-12.4-openssl_1.0.0_build_fix-1.patch" - -BEE_CONFIGURE=none - -# EXCLUDE="" - -B=${S} - -mee_extract() { - bee_extract ${@} -} - -mee_patch() { - bee_patch ${@} -} - -mee_configure() { - bee_configure -} - -mee_build() { - bee_build SENDMAIL=/usr/sbin/sendmail -} - -mee_install() { - bee_install PREFIX=${PREFIX} UCBINSTALL=/usr/bin/install - - ln -sv mailx ${D}${BINDIR}/mail - ln -sv mailx ${D}${BINDIR}/nail - - ln -sv mailx.1 ${D}${MANDIR}/man1/nail.1 - ln -sv mailx.1 ${D}${MANDIR}/man1/mail.1 - - # setup - - mv -v ${D}/etc/nail{,-molgen}.rc - cat >>${D}/etc/nail-molgen.rc <<-EOF - set smtp=harry.molgen.mpg.de - set hostname=molgen.mpg.de - EOF -}