cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

postfix: upgrade to version 3.0.0

Browse Source 
Signed-off-by: Denis Shulyaka <Shulyaka@gmail.com>
This commit is contained in:
Denis Shulyaka
2015-02-16 01:17:45 +03:00
parent 1e6a5606bc
commit b7bc73104c
11 changed files with 120 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/postfix/patches/100-fsstat.patch
+1 -1
View File
@@ -1,7 +1,7 @@
diff -rupN postfix-2.8.1/src/smtpd/smtpd_check.c postfix-2.8.1_patched/src/smtpd/smtpd_check.c
--- postfix-2.8.1/src/smtpd/smtpd_check.c 2011-01-04 22:03:50.000000000 +0300
+++ postfix-2.8.1_patched/src/smtpd/smtpd_check.c 2011-03-06 19:35:39.000000000 +0300
@@ -4894,7 +4894,7 @@ char *smtpd_check_queue(SMTPD_STATE *s
@@ -5277,7 +5277,7 @@ char *smtpd_check_queue(SMTPD_STATE *s
*/
#define BLOCKS(x) ((x) / fsbuf.block_size)
mail/postfix/patches/200-manpages.patch
+15 -15
View File
@@ -1,7 +1,7 @@
diff -Naur postfix-2.10.2/conf/post-install postfix-2.10.2_patched/conf/post-install
--- postfix-2.10.2/conf/post-install 2013-06-13 18:07:46.000000000 +0400
+++ postfix-2.10.2_patched/conf/post-install 2013-11-19 21:17:49.572820573 +0400
@@ -350,10 +350,10 @@
@@ -359,10 +359,10 @@
# Sanity checks
@@ -16,28 +16,28 @@ diff -Naur postfix-2.10.2/conf/post-install postfix-2.10.2_patched/conf/post-ins
case $setgid_group in
no) echo $0: Error: setgid_group no longer accepts \"no\" values. 1>&2
@@ -361,7 +361,7 @@
@@ -370,7 +370,7 @@
esac
for path in "$daemon_directory" "$command_directory" "$queue_directory" \
- "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory"
+ "$sendmail_path" "$newaliases_path" "$mailq_path"
- "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \
+ "$sendmail_path" "$newaliases_path" "$mailq_path" \
"$meta_directory"
do
case "$path" in
/*) ;;
@@ -369,7 +369,7 @@
@@ -379,7 +379,7 @@
esac
done
-for path in "$html_directory" "$readme_directory"
+for path in "$html_directory" "$readme_directory" "$manpage_directory"
-for path in "$html_directory" "$readme_directory" "$shlib_directory"
+for path in "$html_directory" "$readme_directory" "$shlib_directory" "$manpage_directory"
do
case "$path" in
/*) ;;
diff -Naur postfix-2.10.2/postfix-install postfix-2.10.2_patched/postfix-install
--- postfix-2.10.2/postfix-install 2012-05-22 23:40:29.000000000 +0400
+++ postfix-2.10.2_patched/postfix-install 2013-11-19 21:12:20.694160734 +0400
@@ -481,13 +481,13 @@
@@ -543,13 +543,13 @@
exit 1;;
esac
@@ -56,18 +56,18 @@ diff -Naur postfix-2.10.2/postfix-install postfix-2.10.2_patched/postfix-install
+# exit 1;;
+#esac
for path in "$html_directory" "$readme_directory"
for path in "$html_directory" "$readme_directory" "$shlib_directory"
do
@@ -500,7 +500,7 @@
@@ -562,7 +562,7 @@
done
for path in "$daemon_directory" "$data_directory" "$command_directory" "$queue_directory" \
- "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory"
+ "$sendmail_path" "$newaliases_path" "$mailq_path"
- "$sendmail_path" "$newaliases_path" "$mailq_path" "$manpage_directory" \
+ "$sendmail_path" "$newaliases_path" "$mailq_path" \
"$meta_directory"
do
case "$path" in
/*) ;;
@@ -680,8 +680,8 @@
@@ -758,8 +758,8 @@
compare_or_replace $mode "$owner" "$group" html/$file \
$HTML_DIRECTORY/$file || exit 1;;
'$manpage_directory')
mail/postfix/patches/300-bdb_hash_segfault.patch
+3 -3
View File
@@ -1,7 +1,7 @@
diff -Naur postfix-2.11.3/src/util/dict_db.c postfix-2.11.3_patched/src/util/dict_db.c
--- postfix-2.11.3/src/util/dict_db.c 2012-01-25 04:41:08.000000000 +0400
+++ postfix-2.11.3_patched/src/util/dict_db.c 2014-11-01 12:36:44.287641712 +0300
@@ -691,8 +691,8 @@
@@ -687,8 +687,8 @@
msg_panic("db_create null result");
if ((errno = db->set_cachesize(db, 0, dict_db_cache_size, 0)) != 0)
msg_fatal("set DB cache size %d: %m", dict_db_cache_size);
@@ -9,6 +9,6 @@ diff -Naur postfix-2.11.3/src/util/dict_db.c postfix-2.11.3_patched/src/util/dic
- msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
+// if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
+// msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
#if DB_VERSION_MAJOR == 6 || DB_VERSION_MAJOR == 5 || \
(DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags,
mail/postfix/patches/400-cdb.patch
+1 -1
View File
@@ -1,7 +1,7 @@
diff -Naur postfix-2.11.1/src/util/sys_defs.h postfix-2.11.1.patched/src/util/sys_defs.h
--- postfix-2.11.1/src/util/sys_defs.h 2013-09-30 00:51:55.000000000 +0400
+++ postfix-2.11.1.patched/src/util/sys_defs.h 2014-09-29 03:11:48.962277971 +0400
@@ -767,9 +767,8 @@
@@ -768,9 +768,8 @@
#define INTERNAL_LOCK MYFLOCK_STYLE_FLOCK
#define DEF_MAILBOX_LOCK "fcntl, dotlock" /* RedHat >= 4.x */
#define HAS_FSYNC
mail/postfix/patches/500-crosscompile.patch
+2 -2
View File
@@ -1,6 +1,6 @@
--- postfix-2.10.2/makedefs 2013-02-04 05:33:13.000000000 +0400
+++ postfix-2.10.2_patched/makedefs 2013-11-19 22:48:50.528560454 +0400
@@ -107,9 +107,9 @@
@@ -190,9 +190,9 @@
case $# in
# Officially supported usage.
@@ -13,7 +13,7 @@
case "$VERSION" in
dcosx*) SYSTEM=$VERSION;;
esac;;
@@ -384,9 +384,9 @@
@@ -522,9 +522,9 @@
esac
for name in nsl resolv
do
mail/postfix/patches/600-nopostconf.patch
+7 -3
View File
@@ -1,9 +1,9 @@
diff -Naur postfix-2.11.1/postfix-install postfix-2.11.1.patched/postfix-install
--- postfix-2.11.1/postfix-install 2014-10-05 20:43:58.598876904 +0400
+++ postfix-2.11.1.patched/postfix-install 2014-10-05 20:47:36.076700082 +0400
@@ -729,21 +729,21 @@
# Postfix releases, and software should not suddenly be installed in
# the wrong place when Postfix is being upgraded.
@@ -830,23 +830,23 @@
esac
done
-bin/postconf -c $CONFIG_DIRECTORY -e \
- "daemon_directory = $daemon_directory" \
@@ -19,6 +19,8 @@ diff -Naur postfix-2.11.1/postfix-install postfix-2.11.1.patched/postfix-install
- "manpage_directory = $manpage_directory" \
- "sample_directory = $sample_directory" \
- "readme_directory = $readme_directory" \
- "shlib_directory = $shlib_directory" \
- "meta_directory = $meta_directory" \
-|| exit 1
+#bin/postconf -c $CONFIG_DIRECTORY -e \
+# "daemon_directory = $daemon_directory" \
@@ -34,6 +36,8 @@ diff -Naur postfix-2.11.1/postfix-install postfix-2.11.1.patched/postfix-install
+# "manpage_directory = $manpage_directory" \
+# "sample_directory = $sample_directory" \
+# "readme_directory = $readme_directory" \
+# "shlib_directory = $shlib_directory" \
+# "meta_directory = $meta_directory" \
+#|| exit 1
# If Postfix is being installed locally from source code, do the
mail/postfix/patches/700-defaultconfig.patch
+2 -2
View File
@@ -1,7 +1,7 @@
diff -Naur postfix-2.11.1/conf/main.cf postfix-2.11.1.patched/conf/main.cf
--- postfix-2.11.1/conf/main.cf 2013-12-24 18:57:25.000000000 +0400
+++ postfix-2.11.1.patched/conf/main.cf 2014-10-05 21:35:53.427534410 +0400
@@ -21,43 +21,8 @@
@@ -40,43 +40,8 @@
#
#soft_bounce = no
@@ -45,7 +45,7 @@ diff -Naur postfix-2.11.1/conf/main.cf postfix-2.11.1.patched/conf/main.cf
# The default_privs parameter specifies the default rights used by
# the local delivery agent for delivery to external file or command.
# These rights are used in the absence of a recipient user context.
@@ -613,45 +578,4 @@
@@ -632,45 +597,4 @@
# -dmS $process_name gdb $daemon_directory/$process_name
# $process_id & sleep 1
mail/postfix/patches/800-fmt.patch
+1 -1
View File
@@ -1,7 +1,7 @@
diff -Naur postfix-2.11.1/conf/post-install postfix-2.11.1.patched/conf/post-install
--- postfix-2.11.1/conf/post-install 2014-10-05 20:43:58.597876946 +0400
+++ postfix-2.11.1.patched/conf/post-install 2014-10-11 16:28:01.258874097 +0400
@@ -310,7 +310,7 @@
@@ -319,7 +319,7 @@
case `uname -s` in
HP-UX*) FMT=cat;;
SunOS*) FMT=fake_fmt;;