pyrox.dev
lol
Merge pull request #72390 from flokli/bump-opensmtpd
opensmtpd: 6.4.2p1 -> 6.6.1p1
authored by
Florian Klink
and committed by
GitHub
848399f4
9b51c514
+6
-12
nixos/modules/services/mail/opensmtpd.nix
+6
-12
nixos/modules/services/mail/opensmtpd.nix
···
101
101
};
102
102
};
103
103
104
+
systemd.tmpfiles.rules = [
105
+
"d /var/spool/smtpd 711 root - - -"
106
+
"d /var/spool/smtpd/offline 770 root smtpq - -"
107
+
"d /var/spool/smtpd/purge 700 smtpq root - -"
108
+
];
109
+
104
110
systemd.services.opensmtpd = let
105
111
procEnv = pkgs.buildEnv {
106
112
name = "opensmtpd-procs";
···
110
116
in {
111
117
wantedBy = [ "multi-user.target" ];
112
118
after = [ "network.target" ];
113
-
preStart = ''
114
-
mkdir -p /var/spool/smtpd
115
-
chmod 711 /var/spool/smtpd
116
-
117
-
mkdir -p /var/spool/smtpd/offline
118
-
chown root.smtpq /var/spool/smtpd/offline
119
-
chmod 770 /var/spool/smtpd/offline
120
-
121
-
mkdir -p /var/spool/smtpd/purge
122
-
chown smtpq.root /var/spool/smtpd/purge
123
-
chmod 700 /var/spool/smtpd/purge
124
-
'';
125
119
serviceConfig.ExecStart = "${cfg.package}/sbin/smtpd -d -f ${conf} ${args}";
126
120
environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
127
121
};
+13
-13
nixos/tests/opensmtpd.nix
+13
-13
nixos/tests/opensmtpd.nix
···
1
-
import ./make-test.nix {
1
+
import ./make-test-python.nix {
2
2
name = "opensmtpd";
3
3
4
4
nodes = {
···
102
102
};
103
103
104
104
testScript = ''
105
-
startAll;
105
+
start_all()
106
106
107
-
$client->waitForUnit("network-online.target");
108
-
$smtp1->waitForUnit('opensmtpd');
109
-
$smtp2->waitForUnit('opensmtpd');
110
-
$smtp2->waitForUnit('dovecot2');
107
+
client.wait_for_unit("network-online.target")
108
+
smtp1.wait_for_unit("opensmtpd")
109
+
smtp2.wait_for_unit("opensmtpd")
110
+
smtp2.wait_for_unit("dovecot2")
111
111
112
112
# To prevent sporadic failures during daemon startup, make sure
113
113
# services are listening on their ports before sending requests
114
-
$smtp1->waitForOpenPort(25);
115
-
$smtp2->waitForOpenPort(25);
116
-
$smtp2->waitForOpenPort(143);
114
+
smtp1.wait_for_open_port(25)
115
+
smtp2.wait_for_open_port(25)
116
+
smtp2.wait_for_open_port(143)
117
117
118
-
$client->succeed('send-a-test-mail');
119
-
$smtp1->waitUntilFails('smtpctl show queue | egrep .');
120
-
$smtp2->waitUntilFails('smtpctl show queue | egrep .');
121
-
$client->succeed('check-mail-landed >&2');
118
+
client.succeed("send-a-test-mail")
119
+
smtp1.wait_until_fails("smtpctl show queue | egrep .")
120
+
smtp2.wait_until_fails("smtpctl show queue | egrep .")
121
+
client.succeed("check-mail-landed >&2")
122
122
'';
123
123
124
124
meta.timeout = 30;
+2
-4
pkgs/servers/mail/opensmtpd/default.nix
+2
-4
pkgs/servers/mail/opensmtpd/default.nix
···
4
4
5
5
stdenv.mkDerivation rec {
6
6
pname = "opensmtpd";
7
-
version = "6.4.2p1";
7
+
version = "6.6.1p1";
8
8
9
9
nativeBuildInputs = [ autoconf automake libtool bison ];
10
10
buildInputs = [ libasr libevent zlib libressl db pam ];
11
11
12
12
src = fetchurl {
13
13
url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
14
-
sha256 = "0pgv080ai7d98l9340jadp9wjiaqj2qvgpqhilcz0kps2mdiawbd";
14
+
sha256 = "1ngil8j13m2rq07g94j4yjr6zmaimzy8wbfr17shi7rxnazys6zb";
15
15
};
16
16
17
17
patches = [
···
21
21
# See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap`
22
22
# requirement
23
23
postPatch = ''
24
-
substituteInPlace smtpd/parse.y \
25
-
--replace "/usr/libexec/" "$out/libexec/opensmtpd/"
26
24
substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true"
27
25
substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555"
28
26
sh bootstrap