summaryrefslogtreecommitdiff
path: root/postfix
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /postfix
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'postfix')
-rw-r--r--postfix/postfix-2.0.15/install.patch63
-rw-r--r--postfix/postfix-2.0.15/makedefs.patch16
2 files changed, 79 insertions, 0 deletions
diff --git a/postfix/postfix-2.0.15/install.patch b/postfix/postfix-2.0.15/install.patch
index e69de29bb2..baffcce0e8 100644
--- a/postfix/postfix-2.0.15/install.patch
+++ b/postfix/postfix-2.0.15/install.patch
@@ -0,0 +1,63 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- postfix-2.0.15/postfix-install~install.patch
++++ postfix-2.0.15/postfix-install
+@@ -187,8 +187,8 @@
+ exit 1
+ }
+
+-test -x bin/postconf || {
+- echo $0: Error: no bin/postconf file. Did you forget to run \"make\"? 1>&2
++test -x $POSTCONF || {
++ echo $0: Error: no $POSTCONF file. Did you forget to run \"make\"? 1>&2
+ exit 1
+ }
+
+@@ -336,7 +336,7 @@
+
+ : ${install_root=/}
+ : ${tempdir=`pwd`}
+-: ${config_directory=`bin/postconf -h -d config_directory`}
++: ${config_directory=`$POSTCONF -h -d config_directory`}
+
+ # Find out the location of installed configuration files.
+
+@@ -399,7 +399,7 @@
+ case "$junk" in
+ "") eval unset $name;;
+ esac
+- eval : \${$name=\`bin/postconf -c $CONFIG_DIRECTORY -h $name\`} ||
++ eval : \${$name=\`$POSTCONF -c $CONFIG_DIRECTORY -h $name\`} ||
+ exit 1
+ done
+ }
+@@ -414,7 +414,7 @@
+ case "$junk" in
+ "") eval unset $name;;
+ esac
+- eval : \${$name=\`bin/postconf -d -h $name\`} || exit 1
++ eval : \${$name=\`$POSTCONF -d -h $name\`} || exit 1
+ done
+
+ # Override settings manually.
+@@ -521,6 +521,8 @@
+ SAMPLE_DIRECTORY=$install_root$sample_directory
+ README_DIRECTORY=$install_root$readme_directory
+
++test "x$POSTCONF" != "x" || POSTCONF="bin/postconf"
++
+ # Avoid repeated tests for existence of these; default permissions suffice.
+
+ test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1
+@@ -639,7 +641,7 @@
+ # Postfix releases, and software should not suddenly be installed in
+ # the wrong place when Postfix is being upgraded.
+
+-bin/postconf -c $CONFIG_DIRECTORY -e \
++$POSTCONF -c $CONFIG_DIRECTORY -e \
+ "daemon_directory = $daemon_directory" \
+ "command_directory = $command_directory" \
+ "queue_directory = $queue_directory" \
diff --git a/postfix/postfix-2.0.15/makedefs.patch b/postfix/postfix-2.0.15/makedefs.patch
index e69de29bb2..433b171e5a 100644
--- a/postfix/postfix-2.0.15/makedefs.patch
+++ b/postfix/postfix-2.0.15/makedefs.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- postfix-2.0.15/makedefs~makedefs
++++ postfix-2.0.15/makedefs
+@@ -189,7 +189,7 @@
+ echo "No <db.h> include file found." 1>&2
+ echo "Install the appropriate db*-devel package first." 1>&2
+ echo "See the RELEASE_NOTES file for more information." 1>&2
+- exit 1
++ #exit 1
+ fi
+ # GDBM locks the DBM .pag file after open. This breaks postmap.
+ # if [ -f /usr/include/gdbm-ndbm.h ]