swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

mpack: Invoke /run/wrappers/bin/sendmail via execvp

Browse source 
Calling /run/current-sw/bin/sendmail fails under postfix because
setgid bits are not set. Switching the hardcoded path to an invocation
via execvp should cover both cases, when the sendmail binary is
setgid-wrapped and when it is not.
This commit is contained in:
Clemens Fruhwirth 2018-09-16 13:10:56 +02:00
parent 0e33c56662
commit 6d97096d8b
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/networking/mpack/default.nix
View file

@ -8,18 +8,13 @@ stdenv.mkDerivation rec {
sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97"; sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97";
}; };
patches = [ ./build-fix.patch ]; patches = [ ./build-fix.patch ./sendmail-via-execvp.diff ];
postPatch = '' postPatch = ''
for f in *.{c,man,pl,unix} ; do for f in *.{c,man,pl,unix} ; do
substituteInPlace $f --replace /usr/tmp /tmp substituteInPlace $f --replace /usr/tmp /tmp
done done
for f in unixpk.c ; do
substituteInPlace $f \
--replace /usr/sbin /run/current-system/sw/bin
done
# this just shuts up some warnings # this just shuts up some warnings
for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do
sed -i 'i#include <stdlib.h>' $f sed -i 'i#include <stdlib.h>' $f

12
pkgs/tools/networking/mpack/sendmail-via-execvp.diff Normal file
View file

@ -0,0 +1,12 @@
--- mpack-1.6/unixpk.c 2003-07-21 22:50:41.000000000 +0200
+++ mpack-1.6/unixpk.c 2018-09-16 12:57:14.104026964 +0200
@@ -254,8 +254,9 @@
#ifdef SCO
execv("/usr/lib/mail/execmail", addr+start);
#else
+ execvp("sendmail", addr+start);
execv("/usr/lib/sendmail", addr+start);
execv("/usr/sbin/sendmail", addr+start);
#endif
perror("execv");
_exit(1);