Control: tags -1 + patch

I have hit the same problem (thanks for taking care of postfix again,
btw!)

The following patch fixes the issue on my test system. The patch is
noisier than it needs to be due to quilt refresh.

Best Regards,
Bernhard
commit 804869632f473ba918e766a57fb58c6d0d131813
Author: Bernhard Schmidt <be...@debian.org>
Date:   Thu Feb 18 12:54:29 2016 +0100

    Put postfix daemons into upstream-default /usr/libexec/postfix
    
    Closes: #815047

diff --git a/debian/patches/06_debian_paths.diff b/debian/patches/06_debian_paths.diff
index eb79317..3ecf574 100644
--- a/debian/patches/06_debian_paths.diff
+++ b/debian/patches/06_debian_paths.diff
@@ -1,6 +1,8 @@
---- a/conf/main.cf
-+++ b/conf/main.cf
-@@ -47,7 +47,7 @@
+Index: postfix/conf/main.cf
+===================================================================
+--- postfix.orig/conf/main.cf
++++ postfix/conf/main.cf
+@@ -47,7 +47,7 @@ compatibility_level = 2
  # See the files in examples/chroot-setup for setting up Postfix chroot
  # environments on different UNIX systems.
  #
@@ -9,16 +11,7 @@
  
  # The command_directory parameter specifies the location of all
  # postXXX commands.
-@@ -58,7 +58,7 @@
- # daemon programs (i.e. programs listed in the master.cf file). This
- # directory must be owned by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = /usr/lib/postfix
- 
- # The data_directory parameter specifies the location of Postfix-writable
- # data files (caches, random numbers). This directory must be owned
-@@ -465,8 +465,8 @@
+@@ -465,8 +465,8 @@ mynetworks = 127.0.0.0/8
  # IF YOU USE THIS TO DELIVER MAIL SYSTEM-WIDE, YOU MUST SET UP AN
  # ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
  #
@@ -29,9 +22,11 @@
  
  # The mailbox_transport specifies the optional transport in master.cf
  # to use after processing aliases and .forward files. This parameter
---- a/examples/smtpd-policy/greylist.pl
-+++ b/examples/smtpd-policy/greylist.pl
-@@ -73,7 +73,7 @@
+Index: postfix/examples/smtpd-policy/greylist.pl
+===================================================================
+--- postfix.orig/examples/smtpd-policy/greylist.pl
++++ postfix/examples/smtpd-policy/greylist.pl
+@@ -73,7 +73,7 @@ use Sys::Syslog qw(:DEFAULT setlogsock);
  # In case of database corruption, this script saves the database as
  # $database_name.time(), so that the mail system does not get stuck.
  #
@@ -40,9 +35,11 @@
  $greylist_delay=60;
  
  #
---- a/makedefs
-+++ b/makedefs
-@@ -447,11 +447,18 @@
+Index: postfix/makedefs
+===================================================================
+--- postfix.orig/makedefs
++++ postfix/makedefs
+@@ -447,11 +447,18 @@ case "$SYSTEM.$RELEASE" in
  			exit 1
  		    fi
  		    SYSLIBS="-ldb"
@@ -62,7 +59,7 @@
  		    do
  			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
  			    SYSLIBS="$SYSLIBS -l$name"
-@@ -526,11 +533,18 @@
+@@ -526,11 +533,18 @@ EOF
  			exit 1
  		    fi
  		    SYSLIBS="-ldb"
@@ -82,7 +79,7 @@
  		    do
  			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
  			    SYSLIBS="$SYSLIBS -l$name"
-@@ -564,11 +578,18 @@
+@@ -564,11 +578,18 @@ EOF
  			exit 1
  		    fi
  		    SYSLIBS="-ldb"
@@ -102,14 +99,15 @@
  		    do
  			test -e $lib/lib$name.a -o -e $lib/lib$name.so && {
  			    SYSLIBS="$SYSLIBS -l$name"
---- a/src/util/sys_defs.h
-+++ b/src/util/sys_defs.h
-@@ -786,7 +786,20 @@
- #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
+Index: postfix/src/util/sys_defs.h
+===================================================================
+--- postfix.orig/src/util/sys_defs.h
++++ postfix/src/util/sys_defs.h
+@@ -787,6 +787,17 @@ extern int initgroups(const char *, int)
  #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
  #define NATIVE_COMMAND_DIR "/usr/sbin"
+ #define NATIVE_DAEMON_DIR "/usr/libexec/postfix"
 +#ifdef DEBIAN
-+#define NATIVE_DAEMON_DIR	"/usr/lib/postfix"
 +#ifndef DEF_MANPAGE_DIR
 +#define DEF_MANPAGE_DIR		"/usr/share/man"
 +#endif
@@ -119,8 +117,6 @@
 +#ifndef DEF_README_DIR
 +#define DEF_README_DIR		"/usr/share/doc/postfix"
 +#endif
-+#else
- #define NATIVE_DAEMON_DIR "/usr/libexec/postfix"
 +#endif
  #ifdef __GLIBC_PREREQ
  #define HAVE_GLIBC_API_VERSION_SUPPORT(maj, min) __GLIBC_PREREQ(maj, min)
diff --git a/debian/postfix.dirs b/debian/postfix.dirs
index 040b1db..fddb0b5 100644
--- a/debian/postfix.dirs
+++ b/debian/postfix.dirs
@@ -11,6 +11,7 @@ etc/ufw/applications.d
 usr/bin
 usr/sbin
 usr/lib/postfix
+usr/libexec/postfix
 usr/share/doc/postfix
 usr/share/man/man1
 usr/share/man/man5
diff --git a/debian/rules b/debian/rules
index 34cbcf9..656ba64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -125,7 +125,7 @@ install: build
 	install lib/postfix-pgsql.so.1.0.1 ${base}-pgsql/${plibdir}
 	install lib/postfix-sqlite.so.1.0.1 ${base}/${plibdir}
 	install lib/postfix-cdb.so.1.0.1 ${base}-cdb/${plibdir}
-	install libexec/[a-z]* ${base}/${plibdir}
+	install libexec/[a-z]* ${base}/usr/libexec/postfix
 	install bin/[a-z]* ${base}/${sbindir}
 	install debian/postfix-add-filter ${base}/${sbindir}
 	install debian/postfix-add-policy ${base}/${sbindir}

Attachment: signature.asc
Description: Digital signature

Reply via email to