Merge pull request #12047 from phunehehe/postfix-shell

postfix: patch to stop hard coding SHELL
This commit is contained in:
Peter Simons 2015-12-31 12:49:32 +01:00
commit 7ec9ce56f4
4 changed files with 33 additions and 2 deletions

View file

@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "11riz8ggaa09pi8d6xv2807qp7yjn918mrylfvkfwmvcdlgwck0a";
};
patches = [ ./postfix-2.11.0.patch ];
patches = [
./postfix-2.11.0.patch
./postfix-script-shell.patch
];
buildInputs = [ makeWrapper gnused db openssl cyrus_sasl ];

View file

@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper gnused db openssl cyrus_sasl icu ];
patches = [ ./postfix-script-shell.patch ];
preBuild = ''
sed -e '/^PATH=/d' -i postfix-install

View file

@ -14,7 +14,12 @@ stdenv.mkDerivation rec {
buildInputs = [db openssl cyrus_sasl bison perl];
patches = [ ./postfix-2.2.9-db.patch ./postfix-2.2.9-lib.patch ./db-linux3.patch ];
patches = [
./postfix-2.2.9-db.patch
./postfix-2.2.9-lib.patch
./db-linux3.patch
./postfix-script-shell.patch
];
postPatch = ''
sed -i -e s,/usr/bin,/var/run/current-system/sw/bin, \

View file

@ -0,0 +1,21 @@
diff --git a/conf/postfix-script b/conf/postfix-script
index 19088a6..04fae23 100755
--- a/conf/postfix-script
+++ b/conf/postfix-script
@@ -43,7 +43,6 @@ FATAL="$LOGGER -p fatal"
PANIC="$LOGGER -p panic"
umask 022
-SHELL=/bin/sh
#
# Can't do much without these in place.
@@ -229,7 +228,7 @@ status)
check-fatal)
# This command is NOT part of the public interface.
- $SHELL $daemon_directory/post-install create-missing || {
+ $daemon_directory/post-install create-missing || {
$FATAL unable to create missing queue directories
exit 1
}