diff --git a/cyrus-sasl-login.scm b/cyrus-sasl-login.scm deleted file mode 100644 index ec5fba7..0000000 --- a/cyrus-sasl-login.scm +++ /dev/null @@ -1,84 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès -;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2019 Mathieu Laparie -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (matf-private cyrus-sasl-login) - #:use-module (gnu packages) - #:use-module (gnu packages autotools) - #:use-module (gnu packages dbm) - #:use-module (gnu packages kerberos) - #:use-module (gnu packages tls) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu)) - -(define-public cyrus-sasl-login - (package - (name "cyrus-sasl-login") - (version "2.1.27") - (source (origin - (method url-fetch) - (uri (list (string-append - "https://cyrusimap.org/releases/cyrus-sasl-" - version ".tar.gz") - (string-append - "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" - version ".tar.gz"))) - (sha256 (base32 - "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")) - (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch" - "cyrus-sasl-CVE-2019-19906.patch")))) - (build-system gnu-build-system) - (native-inputs - (list autoconf automake libtool)) - (inputs (list gdbm openssl)) - (propagated-inputs - (list ;; cyrus-sasl.pc refers to -lkrb5, so propagate it. - mit-krb5)) - (arguments - '(#:configure-flags (list (string-append "--enable-login" - "--with-plugindir=" - (assoc-ref %outputs "out") - "/lib/sasl2")) - - ;; The 'plugins' directory has shared source files, such as - ;; 'plugin_common.c'. When building the shared libraries there, libtool - ;; ends up doing "ln -s plugin_common.lo plugin_common.o", which can - ;; fail with EEXIST when building things in parallel. - #:parallel-build? #f - - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (invoke "autoreconf" "-vif")))))) - (synopsis "Simple Authentication Security Layer implementation") - (description - "SASL (Simple Authentication Security Layer) is an Internet -standards-track method for remote computers to authenticate. The Cyrus SASL -library makes supporting various SASL mechanisms easy for both client and -server writers.") - (license (license:non-copyleft "file://COPYING" - "See COPYING in the distribution.")) - (home-page "https://cyrusimap.org/sasl/"))) - -cyrus-sasl-login diff --git a/matf-private/cyrus-sasl-login.scm b/matf-private/cyrus-sasl-login.scm deleted file mode 100644 index ec5fba7..0000000 --- a/matf-private/cyrus-sasl-login.scm +++ /dev/null @@ -1,84 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès -;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2019 Mathieu Othacehe -;;; Copyright © 2019 Mathieu Laparie -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (matf-private cyrus-sasl-login) - #:use-module (gnu packages) - #:use-module (gnu packages autotools) - #:use-module (gnu packages dbm) - #:use-module (gnu packages kerberos) - #:use-module (gnu packages tls) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix build-system gnu)) - -(define-public cyrus-sasl-login - (package - (name "cyrus-sasl-login") - (version "2.1.27") - (source (origin - (method url-fetch) - (uri (list (string-append - "https://cyrusimap.org/releases/cyrus-sasl-" - version ".tar.gz") - (string-append - "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" - version ".tar.gz"))) - (sha256 (base32 - "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")) - (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch" - "cyrus-sasl-CVE-2019-19906.patch")))) - (build-system gnu-build-system) - (native-inputs - (list autoconf automake libtool)) - (inputs (list gdbm openssl)) - (propagated-inputs - (list ;; cyrus-sasl.pc refers to -lkrb5, so propagate it. - mit-krb5)) - (arguments - '(#:configure-flags (list (string-append "--enable-login" - "--with-plugindir=" - (assoc-ref %outputs "out") - "/lib/sasl2")) - - ;; The 'plugins' directory has shared source files, such as - ;; 'plugin_common.c'. When building the shared libraries there, libtool - ;; ends up doing "ln -s plugin_common.lo plugin_common.o", which can - ;; fail with EEXIST when building things in parallel. - #:parallel-build? #f - - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (invoke "autoreconf" "-vif")))))) - (synopsis "Simple Authentication Security Layer implementation") - (description - "SASL (Simple Authentication Security Layer) is an Internet -standards-track method for remote computers to authenticate. The Cyrus SASL -library makes supporting various SASL mechanisms easy for both client and -server writers.") - (license (license:non-copyleft "file://COPYING" - "See COPYING in the distribution.")) - (home-page "https://cyrusimap.org/sasl/"))) - -cyrus-sasl-login diff --git a/matf-private/nmail-login.scm b/matf-private/mail.scm similarity index 58% rename from matf-private/nmail-login.scm rename to matf-private/mail.scm index dbdbf9b..1040b4e 100644 --- a/matf-private/nmail-login.scm +++ b/matf-private/mail.scm @@ -1,73 +1,12 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès -;;; Copyright © 2014, 2015, 2017, 2020 Mark H Weaver -;;; Copyright © 2014 Ian Denhardt -;;; Copyright © 2014 Sou Bunnbu -;;; Copyright © 2014, 2019 Julien Lepiller -;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015, 2016, 2018 Eric Bavier -;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner -;;; Copyright © 2016 Christine Lemmer-Webber -;;; Copyright © 2016 Al McElrath -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari -;;; Copyright © 2016 Lukas Gradl -;;; Copyright © 2016 Alex Kost -;;; Copyright © 2016, 2017 Troy Sankey -;;; Copyright © 2016, 2017, 2018 Nikita -;;; Copyright © 2016 Clément Lassieur -;;; Copyright © 2016–2022 Arun Isaac -;;; Copyright © 2016 John Darrington -;;; Copyright © 2016, 2018 Marius Bakke -;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017 Kyle Meyer -;;; Copyright © 2017–2022 Tobias Geerinckx-Rice -;;; Copyright © 2017, 2018, 2020 Rene Saavedra -;;; Copyright © 2018, 2019, 2020, 2021, 2022 Pierre Langlois -;;; Copyright © 2018 Alex Vong -;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018, 2019, 2020, 2021, 2022 Ricardo Wurmus -;;; Copyright © 2019–2022 Tanguy Le Carrour -;;; Copyright © 2020 Vincent Legoll -;;; Copyright © 2020 Justus Winter -;;; Copyright © 2020 Eric Brown -;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer -;;; Copyright © 2020 Michael Rohleder -;;; Copyright © 2020, 2021 Alexey Abramov -;;; Copyright © 2020 Tim Gesthuizen -;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton -;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2020 B. Wilson -;;; Copyright © 2020 divoplade -;;; Copyright © 2021 Xinglu Chen -;;; Copyright © 2021 Benoit Joly -;;; Copyright © 2021 Morgan Smith -;;; Copyright © 2021 Philip McGrath -;;; Copyright © 2022 Andrew Tropin -;;; Copyright © 2022 Justin Veilleux -;;; Copyright © 2022 Thiago Jung Bauermann -;;; Copyright © 2022 Guillaume Le Vaillant -;;; Copyright © 2022 muradm -;;; Copyright © 2022 jgart -;;; Copyright © 2022 Mathieu Laparie -;;; -;;; This file is part of GNU Guix. -;;; -;;; GNU Guix is free software; you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation; either version 3 of the License, or (at -;;; your option) any later version. -;;; -;;; GNU Guix is distributed in the hope that it will be useful, but -;;; WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with GNU Guix. If not, see . - -(define-module (matf-private nmail-login) +(define-module (matf-private mail) + #:use-module (gnu packages) + #:use-module (gnu packages autotools) + #:use-module (gnu packages dbm) + #:use-module (gnu packages kerberos) + #:use-module (gnu packages tls) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) @@ -188,7 +127,58 @@ #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1) - #:use-module (ice-9 match)) + #:use-module (ice-9 match) + #:use-module (guix build-system gnu)) + +(define-public cyrus-sasl-login + (package + (name "cyrus-sasl-login") + (version "2.1.27") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://cyrusimap.org/releases/cyrus-sasl-" + version ".tar.gz") + (string-append + "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" + version ".tar.gz"))) + (sha256 (base32 + "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")) + (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch" + "cyrus-sasl-CVE-2019-19906.patch")))) + (build-system gnu-build-system) + (native-inputs + (list autoconf automake libtool)) + (inputs (list gdbm openssl)) + (propagated-inputs + (list ;; cyrus-sasl.pc refers to -lkrb5, so propagate it. + mit-krb5)) + (arguments + '(#:configure-flags (list (string-append "--enable-login" + "--with-plugindir=" + (assoc-ref %outputs "out") + "/lib/sasl2")) + + ;; The 'plugins' directory has shared source files, such as + ;; 'plugin_common.c'. When building the shared libraries there, libtool + ;; ends up doing "ln -s plugin_common.lo plugin_common.o", which can + ;; fail with EEXIST when building things in parallel. + #:parallel-build? #f + + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (invoke "autoreconf" "-vif")))))) + (synopsis "Simple Authentication Security Layer implementation") + (description + "SASL (Simple Authentication Security Layer) is an Internet +standards-track method for remote computers to authenticate. The Cyrus SASL +library makes supporting various SASL mechanisms easy for both client and +server writers.") + (license (license:non-copyleft "file://COPYING" + "See COPYING in the distribution.")) + (home-page "https://cyrusimap.org/sasl/"))) (define-public nmail-login (package @@ -227,4 +217,3 @@ a @code{ncurses} user interface similar to @code{alpine} and @code{pine}.") (license license:expat))) -nmail-login diff --git a/matf-private/nnn-ctx8-git.scm b/nnn-ctx8-git.scm similarity index 100% rename from matf-private/nnn-ctx8-git.scm rename to nnn-ctx8-git.scm diff --git a/matf-private/no-easy-delete.patch b/no-easy-delete.patch similarity index 100% rename from matf-private/no-easy-delete.patch rename to no-easy-delete.patch