From 4a7aa49e1ae6520bd3f0f769774358754c826678 Mon Sep 17 00:00:00 2001 From: git-bruh Date: Fri, 30 Sep 2022 13:46:17 +0530 Subject: [PATCH] mutt: unbundle cyrus-sasl --- extra/cyrus-sasl/build | 9 +++++++++ extra/cyrus-sasl/checksums | 1 + extra/cyrus-sasl/depends | 1 + extra/cyrus-sasl/sources | 1 + extra/cyrus-sasl/version | 1 + extra/mutt/build | 22 ++-------------------- extra/mutt/checksums | 1 - extra/mutt/depends | 1 + extra/mutt/sources | 1 - extra/mutt/version | 2 +- 10 files changed, 17 insertions(+), 23 deletions(-) create mode 100755 extra/cyrus-sasl/build create mode 100644 extra/cyrus-sasl/checksums create mode 100644 extra/cyrus-sasl/depends create mode 100644 extra/cyrus-sasl/sources create mode 100644 extra/cyrus-sasl/version diff --git a/extra/cyrus-sasl/build b/extra/cyrus-sasl/build new file mode 100755 index 00000000..79768ef9 --- /dev/null +++ b/extra/cyrus-sasl/build @@ -0,0 +1,9 @@ +#!/bin/sh -e + +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --sbindir=/usr/bin + +make +make DESTDIR="$1" install diff --git a/extra/cyrus-sasl/checksums b/extra/cyrus-sasl/checksums new file mode 100644 index 00000000..20bdffb6 --- /dev/null +++ b/extra/cyrus-sasl/checksums @@ -0,0 +1 @@ +7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c diff --git a/extra/cyrus-sasl/depends b/extra/cyrus-sasl/depends new file mode 100644 index 00000000..fa963ae1 --- /dev/null +++ b/extra/cyrus-sasl/depends @@ -0,0 +1 @@ +openssl diff --git a/extra/cyrus-sasl/sources b/extra/cyrus-sasl/sources new file mode 100644 index 00000000..476db72e --- /dev/null +++ b/extra/cyrus-sasl/sources @@ -0,0 +1 @@ +https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-VERSION/cyrus-sasl-VERSION.tar.gz diff --git a/extra/cyrus-sasl/version b/extra/cyrus-sasl/version new file mode 100644 index 00000000..5bb1e6e4 --- /dev/null +++ b/extra/cyrus-sasl/version @@ -0,0 +1 @@ +2.1.28 1 diff --git a/extra/mutt/build b/extra/mutt/build index 26541c81..3c927027 100755 --- a/extra/mutt/build +++ b/extra/mutt/build @@ -1,28 +1,10 @@ #!/bin/sh -e -out=$PWD/out -mkdir -p out - -( - cd cyrus-sasl - - ./configure \ - LIBS='-lssl -lcrypto' \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-shared \ - --sbindir=/usr/bin - - make - make DESTDIR="$out" install -) - # Remove perl dependency. sed 's/ doc contrib/ contrib/g' Makefile.in > _ mv -f _ Makefile.in ./configure \ - ac_cv_search_sasl_encode64=-lsasl2 \ --prefix=/usr \ --sysconfdir=/etc \ --disable-doc \ @@ -30,8 +12,8 @@ mv -f _ Makefile.in --enable-pop \ --enable-imap \ --enable-smtp \ - --with-ssl \ - --with-sasl="$out/usr" + --with-sasl \ + --with-ssl make make install-exec diff --git a/extra/mutt/checksums b/extra/mutt/checksums index 1daeda9f..ed183ba0 100644 --- a/extra/mutt/checksums +++ b/extra/mutt/checksums @@ -1,2 +1 @@ eb13858f58bb369f477bf652d90e9b6aaddd0d610acbea3455049e5efad36df1 -7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c diff --git a/extra/mutt/depends b/extra/mutt/depends index 35622105..0877aa07 100644 --- a/extra/mutt/depends +++ b/extra/mutt/depends @@ -1,3 +1,4 @@ +cyrus-sasl ncurses openssl zlib diff --git a/extra/mutt/sources b/extra/mutt/sources index 0c0db6d7..5e0afae2 100644 --- a/extra/mutt/sources +++ b/extra/mutt/sources @@ -1,2 +1 @@ https://bitbucket.org/mutt/mutt/downloads/mutt-VERSION.tar.gz -https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz cyrus-sasl diff --git a/extra/mutt/version b/extra/mutt/version index f9692b64..0e3df2b4 100644 --- a/extra/mutt/version +++ b/extra/mutt/version @@ -1 +1 @@ -2.2.7 1 +2.2.7 2