From f58f0e6b9f98dcae8747c336bcc68c31401eedda Mon Sep 17 00:00:00 2001 From: Malte Voos Date: Sun, 15 May 2022 20:03:49 +0200 Subject: [PATCH] opensmtpd-filter-dkimsign: init at 0.6 --- .../opensmtpd/filter-dkimsign/default.nix | 36 +++++++++++++++++++ .../no-chown-while-installing.patch | 24 +++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 61 insertions(+) create mode 100644 pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix create mode 100644 pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix b/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix new file mode 100644 index 000000000000..a5b6cf9228d5 --- /dev/null +++ b/pkgs/servers/mail/opensmtpd/filter-dkimsign/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, libopensmtpd +, openssl +, mandoc +}: +stdenv.mkDerivation rec { + pname = "opensmtpd-filter-dkimsign"; + version = "0.6"; + + src = fetchurl { + url = "https://imperialat.at/releases/filter-dkimsign-${version}.tar.gz"; + hash = "sha256-O18NtAuSNg82uKnUx+R4h3e1IBSElTrFWBBkr2AYNsM="; + }; + + patches = [ ./no-chown-while-installing.patch ]; + + buildInputs = [ libopensmtpd openssl ]; + + nativeBuildInputs = [ mandoc ]; + + makeFlags = [ + "-f Makefile.gnu" + "HAVE_ED25519=1" + "DESTDIR=$(out)" + "LOCALBASE=" + ]; + + meta = with lib; { + description = "OpenSMTPD filter for DKIM signing"; + homepage = "http://imperialat.at/dev/filter-dkimsign/"; + license = licenses.isc; + maintainers = with maintainers; [ malvo ]; + }; +} diff --git a/pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch b/pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch new file mode 100644 index 000000000000..8ed5fc153a36 --- /dev/null +++ b/pkgs/servers/mail/opensmtpd/filter-dkimsign/no-chown-while-installing.patch @@ -0,0 +1,24 @@ +diff --git a/Makefile.gnu b/Makefile.gnu +index 1f97bd2..807b692 100644 +--- a/Makefile.gnu ++++ b/Makefile.gnu +@@ -46,11 +46,7 @@ NEED_PLEDGE?= 1 + + MANFORMAT?= mangz + +-BINOWN?= root +-BINGRP?= root + BINPERM?= 755 +-MANOWN?= root +-MANGRP?= root + MANPERM?= 644 + + ifeq (${MANFORMAT}, mangz) +@@ -115,5 +111,5 @@ clean: + + .PHONY: install + install: ${PROG} +- ${INSTALL} -D -o ${BINOWN} -g ${BINGRP} -m ${BINPERM} ${PROG} ${DESTDIR}${BINDIR}/${PROG} +- ${INSTALL} -D -o ${MANOWN} -g ${MANGRP} -m ${MANPERM} ${TARGET_MAN} ${DESTDIR}${MANDIR}/${TARGET_MAN} ++ ${INSTALL} -D -m ${BINPERM} ${PROG} ${DESTDIR}${BINDIR}/${PROG} ++ ${INSTALL} -D -m ${MANPERM} ${TARGET_MAN} ${DESTDIR}${MANDIR}/${TARGET_MAN} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55817e7aaed1..0b7e375e64e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22085,6 +22085,7 @@ with pkgs; opensmtpd = callPackage ../servers/mail/opensmtpd { }; opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { }; + opensmtpd-filter-dkimsign = callPackage ../servers/mail/opensmtpd/filter-dkimsign { }; libopensmtpd = callPackage ../servers/mail/opensmtpd/libopensmtpd { }; openxr-loader = callPackage ../development/libraries/openxr-loader { };