From 245a65bbe11fb50b9906b070f1b18ab06eacb774 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 7 Jun 2021 14:22:32 +0200 Subject: gnu: isync: Update to 1.4.2. * gnu/packages/mail.scm (isync): Update to 1.4.2. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a8f4e0ed88..a6168d6524 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2064,14 +2064,14 @@ hashing scheme (such as scrypt) plug-in for @code{Dovecot}.") (define-public isync (package (name "isync") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/isync/isync/" version "/isync-" version ".tar.gz")) (sha256 (base32 - "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd")))) + "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit 1.4.1 From 16e23df1f969df4fd875ea25d8eccb8ef2435afc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 10 Jun 2021 17:41:48 +0200 Subject: gnu: libopensmtpd: Update to 0.7. * gnu/packages/mail.scm (libopensmtpd): Update to 0.7. [source]: URL-FETCH a release tarball. [arguments]: Remove obsolete 'create-output-directories, 'install-header-file, and 'install-man-page phases. [native-inputs]: Add mandoc. --- gnu/packages/mail.scm | 85 ++++++++++++++++++++------------------------------- 1 file changed, 33 insertions(+), 52 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index a6168d6524..eb6c4b2213 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3095,59 +3095,40 @@ for OpenSMTPD to extend its functionality.") (define libopensmtpd ;; Private source dependency of opensmtpd-filter-dkimsign (by the same ;; author), until any project actually uses it in its compiled form. - (let ((revision 48)) - (package - (name "libopensmtpd") - (version (format #f "0.0.0-~a" revision)) - (source - (origin - (method svn-fetch) - (uri (svn-reference - (url "http://imperialat.at/dev/libopensmtpd/") - (revision revision))) - (sha256 - (base32 "04fgibpi6q0c3468ww3z7gsvraz0gyfps0c2dj8mdyri636c0x0s")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `(#:make-flags - (list "-f" "Makefile.gnu" - (string-append "CC=" ,(cc-for-target)) - (string-append "LOCALBASE=" (assoc-ref %outputs "out"))) - #:tests? #f ; no test suite - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'inherit-ownership - (lambda _ - (substitute* "Makefile.gnu" - (("-o \\$\\{BINOWN\\} -g \\$\\{BINGRP\\}") "")) - #t)) - (delete 'configure) ; no configure script - (add-before 'install 'create-output-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/lib")) - #t))) - (add-after 'install 'install-header-file - (lambda* (#:key make-flags outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/include")) - (apply invoke "make" "includes" make-flags)))) - (add-after 'install 'install-man-page - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man3 (string-append out "/share/man/man3"))) - ;; There is no make target for this. - (install-file "osmtpd_run.3" man3) - #t)))))) - (inputs - `(("libevent" ,libevent))) - (home-page "http://imperialat.at/dev/libopensmtpd/") - (synopsis "OpenSMTPd filter C API") - (description - "The @code{osmtpd} API is an event-based C programming interface for + (package + (name "libopensmtpd") + (version "0.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://distfiles.sigtrap.nl/" + "libopensmtpd-" version ".tar.gz")) + (sha256 + (base32 "04x610mvwba7m0n9h0wbnsw58rb4khq44fm4blkgjqvh3bhxbmnd")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list "-f" "Makefile.gnu" + (string-append "CC=" ,(cc-for-target)) + (string-append "LOCALBASE=" (assoc-ref %outputs "out"))) + #:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'inherit-ownership + (lambda _ + (substitute* "Makefile.gnu" + (("-o \\$\\{...OWN\\} -g \\$\\{...GRP\\}") "")))) + (delete 'configure)))) ; no configure script + (native-inputs + `(("mandoc" ,mandoc))) ; silently installs empty man page without + (inputs + `(("libevent" ,libevent))) + (home-page "https://imperialat.at/dev/libopensmtpd/") + (synopsis "OpenSMTPd filter C API") + (description + "The @code{osmtpd} API is an event-based C programming interface for writing OpenSMTPd filters.") - (license license:expat)))) + (license license:expat))) (define-public opensmtpd-filter-dkimsign (package -- cgit 1.4.1 From 5b0f0c80efa1872e810c097d4e0c446b2d628661 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 10 Jun 2021 17:42:36 +0200 Subject: gnu: libopensmtpd: Make public. Now that it's a fancy official release and all. * gnu/packages/mail.scm (libopensmtpd): DEFINE-PUBLIC. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index eb6c4b2213..6f75ac7290 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3092,7 +3092,7 @@ for OpenSMTPD to extend its functionality.") (license (list license:bsd-2 license:bsd-3 ; openbsd-compat license:isc)))) ; everything else -(define libopensmtpd +(define-public libopensmtpd ;; Private source dependency of opensmtpd-filter-dkimsign (by the same ;; author), until any project actually uses it in its compiled form. (package -- cgit 1.4.1 From 809e5f76025a55f07a70f93021ecf860eaf096d8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 10 Jun 2021 19:13:57 +0200 Subject: gnu: opensmtpd-filter-dkimsign: Update to 0.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (opensmtpd-filter-dkimsign): Update to 0.5. [source]: Use the upstream release tarball now. [arguments]: Adjust #:make-flags to new upstream Makefile.gnu. Remove obsolete custom 'unpack and 'install phases. Add a new 'inherit-ownership phase. [native-inputs]: Remove Arch Linux Makefile. Add mandoc. Remove the libopensmtpd sources in favour of… [inputs]: …the real thing. --- gnu/packages/mail.scm | 56 +++++++++++++++------------------------------------ 1 file changed, 16 insertions(+), 40 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6f75ac7290..13f34155b3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3133,58 +3133,34 @@ writing OpenSMTPd filters.") (define-public opensmtpd-filter-dkimsign (package (name "opensmtpd-filter-dkimsign") - ;; The .arch repackaging provides not only a usable Makefile, but patches - ;; the source to actually build on GNU, e.g., by making pledge() optional. - ;; It's effectively the portable branch that upstream lacks at this time. - (version "0.2.arch2") ; also update both native-inputs + (version "0.5") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/de-vri-es/filter-dkimsign") - (commit (string-append "v" version)))) + (method url-fetch) + (uri (string-append "https://distfiles.sigtrap.nl/" + "filter-dkimsign-" version ".tar.gz")) (sha256 - (base32 "1dv6184h0gq2safnc7ln4za3arbafzc1xwkgwmiihqcjvdyxig0c")) - (file-name (git-file-name name version)))) + (base32 "0jwp47ixibnz8rghn193bk2hxh1j1zfrnidml18j7d7cylxfrd55")))) (build-system gnu-build-system) (arguments `(#:make-flags - (list (string-append "CC=" ,(cc-for-target))) + (list "-f" "Makefile.gnu" + (string-append "CC=" ,(cc-for-target)) + (string-append "LOCALBASE=" (assoc-ref %outputs "out"))) #:tests? #f ; no test suite #:phases (modify-phases %standard-phases - (replace 'unpack - (lambda* (#:key source inputs #:allow-other-keys) - (copy-recursively source "filter-dkimsign") - (copy-recursively (assoc-ref inputs "libopensmtpd-source") - "libopensmtpd") - (copy-file (assoc-ref inputs "Makefile") "Makefile") - #t)) - (delete 'configure) ; no configure script - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (libexec (string-append out "/libexec/opensmtpd")) - (man8 (string-append out "/share/man/man8"))) - (chdir "filter-dkimsign") - (install-file "filter-dkimsign" libexec) - (install-file "filter-dkimsign.8" man8) - #t)))))) + (add-after 'unpack 'inherit-ownership + (lambda _ + (substitute* "Makefile.gnu" + (("-o \\$\\{...OWN\\} -g \\$\\{...GRP\\}") "")))) + (delete 'configure)))) ; no configure script (native-inputs - `(("Makefile" - ,(origin - (method url-fetch) - (uri (string-append - "https://aur.archlinux.org/cgit/aur.git/plain/Makefile" - "?h=opensmtpd-filter-dkimsign" - "&id=58393470477a2ff2a58f9d72f5d851698067539f")) - (sha256 - (base32 "0da5qr9hfjkf07ybvfva967njmf2x0b82z020r6v5f93jzsbqx92")) - (file-name (string-append name "-" version "-Makefile")))) - ("libopensmtpd-source" ,(package-source libopensmtpd)))) + `(("mandoc" ,mandoc))) ; silently installs empty man page without (inputs `(("libevent" ,libevent) - ("libressl" ,libressl))) ; openssl works too but follow opensmtpd + ("libressl" ,libressl) ; openssl works too but follow opensmtpd + ("libopensmtpd" ,libopensmtpd))) (home-page "http://imperialat.at/dev/filter-dkimsign/") (synopsis "OpenSMTPd filter for signing mail with DKIM") (description -- cgit 1.4.1 From e7f1c55eb121f626dcd51a7e128a92060d9fabd5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 10 Jun 2021 19:23:35 +0200 Subject: gnu: opensmtpd-filter-dkimsign: Support ed25519 signatures. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (opensmtpd-filter-dkimsign)[arguments]: Define HAVE_ED25519 in #:make-flags. [arguments]: Rename 'inherit-ownership phase to 'patch-Makefile.gnu and patch a hard-coded ‘pkg-config’ command. [inputs]: Replace libressl with openssl. --- gnu/packages/mail.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 13f34155b3..18a0959eea 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3146,21 +3146,25 @@ writing OpenSMTPd filters.") `(#:make-flags (list "-f" "Makefile.gnu" (string-append "CC=" ,(cc-for-target)) + "HAVE_ED25519=yep-but-is-openssl-only" (string-append "LOCALBASE=" (assoc-ref %outputs "out"))) #:tests? #f ; no test suite #:phases (modify-phases %standard-phases - (add-after 'unpack 'inherit-ownership + (add-after 'unpack 'patch-Makefile.gnu (lambda _ (substitute* "Makefile.gnu" + (("pkg-config") ,(pkg-config-for-target)) (("-o \\$\\{...OWN\\} -g \\$\\{...GRP\\}") "")))) (delete 'configure)))) ; no configure script (native-inputs `(("mandoc" ,mandoc))) ; silently installs empty man page without (inputs `(("libevent" ,libevent) - ("libressl" ,libressl) ; openssl works too but follow opensmtpd - ("libopensmtpd" ,libopensmtpd))) + ("libopensmtpd" ,libopensmtpd) + ;; XXX Our OpenSMTPd package uses libressl, but this package currently + ;; supports HAVE_ED25519 only with openssl. Switch back when possible. + ("openssl" ,openssl))) (home-page "http://imperialat.at/dev/filter-dkimsign/") (synopsis "OpenSMTPd filter for signing mail with DKIM") (description -- cgit 1.4.1 From 7479124cd7030b9b303420cb28585bac4331daaf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 12 Jun 2021 11:29:58 +0200 Subject: gnu: libopensmtpd, opensmtpd-filter-dkimsign: Add source URI. * gnu/packages/mail.scm (libopensmtpd, opensmtpd-filter-dkimsign) [source]: Add a URI that might work in Tasmania and 's further upstream regardless. --- gnu/packages/mail.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 18a0959eea..ab914ca428 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3101,8 +3101,10 @@ for OpenSMTPD to extend its functionality.") (source (origin (method url-fetch) - (uri (string-append "https://distfiles.sigtrap.nl/" - "libopensmtpd-" version ".tar.gz")) + (uri (list (string-append "https://imperialat.at/releases/" + "libopensmtpd-" version ".tar.gz") + (string-append "https://distfiles.sigtrap.nl/" + "libopensmtpd-" version ".tar.gz"))) (sha256 (base32 "04x610mvwba7m0n9h0wbnsw58rb4khq44fm4blkgjqvh3bhxbmnd")))) (build-system gnu-build-system) @@ -3137,8 +3139,10 @@ writing OpenSMTPd filters.") (source (origin (method url-fetch) - (uri (string-append "https://distfiles.sigtrap.nl/" - "filter-dkimsign-" version ".tar.gz")) + (uri (list (string-append "https://imperialat.at/releases/" + "filter-dkimsign-" version ".tar.gz") + (string-append "https://distfiles.sigtrap.nl/" + "filter-dkimsign-" version ".tar.gz"))) (sha256 (base32 "0jwp47ixibnz8rghn193bk2hxh1j1zfrnidml18j7d7cylxfrd55")))) (build-system gnu-build-system) -- cgit 1.4.1 From 20ab92719e24b4286aeee715cd9bd07315708a82 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 17 Jun 2021 00:00:34 +0200 Subject: gnu: Add undbx. * gnu/packages/mail.scm (undbx): New variable. --- gnu/packages/mail.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu/packages/mail.scm') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index ab914ca428..5a1ca62a4f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4343,6 +4343,24 @@ score.") (home-page "https://www.rspamd.com/") (license license:asl2.0))) +(define-public undbx + (package + (name "undbx") + (version "0.21") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/undbx/undbx-" + version ".tar.gz")) + (sha256 + (base32 + "0ncs1dzhrn9nlaxpyap2ipf61fc7k9bkkqacp3w6bngfj2c0p6yj")))) + (build-system gnu-build-system) + (home-page "https://undbx.sourceforge.io/") + (synopsis "Extract email messages from Outlook Express .dbx files") + (description "This package provides a tool to extract, recover and +undelete email messages from Outlook Express .dbx files.") + (license license:gpl3+))) + (define-public crm114 (package (name "crm114") -- cgit 1.4.1