Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Opensmtpd backport fix #42322

Merged
merged 1 commit into from Jun 21, 2018
Merged

Opensmtpd backport fix #42322

merged 1 commit into from Jun 21, 2018

Conversation

Ekleog
Copy link
Member

@Ekleog Ekleog commented Jun 21, 2018 •
edited

Motivation for this change

#42168 (comment)

The total diff of #42168 and this is the following:

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index d2667597c62..80217ee3d6b 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, autoconf, automake, libtool, bison
+{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, libtool, bison
 , libasr, libevent, zlib, openssl, db, pam
 
 # opensmtpd requires root for no reason to encrypt passwords, this patch fixes it
@@ -21,7 +21,13 @@ stdenv.mkDerivation rec {
     sha256 = "1b4h64w45hpmfq5721smhg4s0shs64gbcjqjpx3fbiw4hz8bdy9a";
   };
 
-  patches = [ ./proc_path.diff ];
+  patches = [
+    ./proc_path.diff
+    (fetchpatch {
+      url = "https://github.com/Ekleog/OpenSMTPD/commit/80172fb0cd3c90c112bdd9c04fe05d84e6f562c6.diff";
+      sha256 = "1xgfm0mydhv70ndn212fsvlwaf3axl3wdg2v1nqnrbyl919y5a10";
+    })
+  ];
 
   postPatch = with builtins; with lib;
     optionalString (isString tag_char) ''
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Ekleog Ekleog mentioned this pull request Jun 21, 2018
Merged
8 tasks
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: opensmtpd

Partial log (click to expand)

shrinking /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/libexec/opensmtpd/encrypt
shrinking /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/libexec/opensmtpd/mail.local
shrinking /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/sbin/smtpctl
shrinking /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/sbin/smtpd
gzipping man pages under /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/share/man/
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/libexec  /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/bin  /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/sbin
patching script interpreter paths in /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1
checking for references to /build in /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1...
moving /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/sbin/* to /nix/store/gh8wihnmczln0zly5d4609mp1m8yzhi7-opensmtpd-6.0.2p1/bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: opensmtpd

Partial log (click to expand)

shrinking /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1/libexec/opensmtpd/mail.local
shrinking /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1/sbin/smtpctl
shrinking /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1/sbin/smtpd
gzipping man pages under /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1/share/man/
strip is /nix/store/ppn001bfygzlqx4h50n9zgxc3kqv2d6k-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1/libexec  /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1/bin  /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1/sbin
patching script interpreter paths in /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1
checking for references to /build in /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1...
moving /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1/sbin/* to /nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1/bin
/nix/store/13yrfk608hkq9y4hip2fm9kdqkyi66ls-opensmtpd-6.0.2p1

@Ekleog
Copy link
Member Author

Ekleog commented Jun 21, 2018

cc @obadz

@obadz obadz merged commit 68e02f8 into NixOS:release-18.03 Jun 21, 2018
@obadz
Copy link
Contributor

obadz commented Jun 21, 2018

Thanks

@Ekleog Ekleog deleted the opensmtpd-backport-fix branch June 21, 2018 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ekleog @GrahamcOfBorg @obadz