forked from pool/postfix
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
96a57bfd3f
commit
6b45576ef5
17
ipv6_disabled.patch
Normal file
17
ipv6_disabled.patch
Normal file
@ -0,0 +1,17 @@
|
||||
--- postfix-2.2.9/src/util/inet_proto.c 2005-01-19 02:22:19.000000000 +0100
|
||||
+++ postfix-2.2.9/src/util/inet_proto.c 2007-01-25 13:22:25.000000000 +0100
|
||||
@@ -220,9 +220,11 @@
|
||||
pf->sa_family_list = make_uchar_vector(3, AF_INET, AF_INET6, 0);
|
||||
break;
|
||||
} else if (errno == EAFNOSUPPORT) {
|
||||
- msg_warn("%s: IPv6 support is disabled: %m", context);
|
||||
- msg_warn("%s: configuring for IPv4 support only", context);
|
||||
- /* FALLTHROUGH */
|
||||
+ /* remove waste warnings 2007-01-25 Peter Varkoly <varkoly@novell.com>
|
||||
+ * msg_warn("%s: IPv6 support is disabled: %m", context);
|
||||
+ * msg_warn("%s: configuring for IPv4 support only", context);
|
||||
+ * FALLTHROUGH
|
||||
+ */
|
||||
} else {
|
||||
msg_fatal("socket: %m");
|
||||
}
|
||||
78
pointer_to_literals.patch
Normal file
78
pointer_to_literals.patch
Normal file
@ -0,0 +1,78 @@
|
||||
Nur in postfix-2.3.2/: FILE_TO_FIX.
|
||||
Nur in postfix-2.3.2-orig/: postfix-2.3.0.
|
||||
diff -r -u postfix-2.3.2-orig/src/cleanup/cleanup_message.c postfix-2.3.2/src/cleanup/cleanup_message.c
|
||||
--- postfix-2.3.2-orig/src/cleanup/cleanup_message.c 2006-06-15 20:07:15.000000000 +0200
|
||||
+++ postfix-2.3.2/src/cleanup/cleanup_message.c 2007-03-05 18:10:32.000000000 +0100
|
||||
@@ -288,7 +288,7 @@
|
||||
while (*optional_text && ISSPACE(*optional_text))
|
||||
optional_text++;
|
||||
|
||||
-#define STREQUAL(x,y,l) (strncasecmp((x), (y), (l)) == 0 && (y)[l] == 0)
|
||||
+inline int STREQUAL(const char *x, const char *y, size_t l) { return (strncasecmp((x), (y), (l)) == 0 && (y)[l] == 0); }
|
||||
#define CLEANUP_ACT_DROP 0
|
||||
|
||||
/*
|
||||
diff -r -u postfix-2.3.2-orig/src/local/local_expand.c postfix-2.3.2/src/local/local_expand.c
|
||||
--- postfix-2.3.2-orig/src/local/local_expand.c 2005-05-31 15:44:14.000000000 +0200
|
||||
+++ postfix-2.3.2/src/local/local_expand.c 2007-03-05 17:59:03.000000000 +0100
|
||||
@@ -114,7 +114,7 @@
|
||||
{
|
||||
LOCAL_EXP *local = (LOCAL_EXP *) ptr;
|
||||
|
||||
-#define STREQ(x,y) (*(x) == *(y) && strcmp((x), (y)) == 0)
|
||||
+inline int STREQ(const char *x, const char *y) { return (*(x) == *(y) && strcmp((x), (y)) == 0); }
|
||||
|
||||
if (STREQ(name, "user")) {
|
||||
return (local->state->msg_attr.user);
|
||||
diff -r -u postfix-2.3.2-orig/src/smtpd/smtpd_check.c postfix-2.3.2/src/smtpd/smtpd_check.c
|
||||
--- postfix-2.3.2-orig/src/smtpd/smtpd_check.c 2006-07-07 22:32:43.000000000 +0200
|
||||
+++ postfix-2.3.2/src/smtpd/smtpd_check.c 2007-03-07 13:36:48.000000000 +0100
|
||||
@@ -353,6 +353,10 @@
|
||||
#define CONST_STR(x) ((const char *) vstring_str(x))
|
||||
#define UPDATE_STRING(ptr,val) { if (ptr) myfree(ptr); ptr = mystrdup(val); }
|
||||
|
||||
+inline int STREQ(const char *x, const char *y) { return (*(x) == *(y) && strcmp((x), (y)) == 0); }
|
||||
+inline int STREQUAL(const char *x, const char *y, size_t l) { return (strncasecmp((x), (y), (l)) == 0 && (y)[l] == 0); }
|
||||
+inline int STREQN(const char *x, const char *y, size_t n) { return (*(x) == *(y) && strncmp((x), (y), (n)) == 0); }
|
||||
+
|
||||
/*
|
||||
* If some decision can't be made due to a temporary error, then change
|
||||
* other decisions into deferrals.
|
||||
@@ -1928,8 +1932,6 @@
|
||||
if (msg_verbose)
|
||||
msg_info("%s: %s %s %s", myname, table, value, datum);
|
||||
|
||||
-#define STREQUAL(x,y,l) (strncasecmp((x), (y), (l)) == 0 && (y)[l] == 0)
|
||||
-
|
||||
/*
|
||||
* DUNNO means skip this table. Silently ignore optional text.
|
||||
*/
|
||||
@@ -2767,7 +2769,6 @@
|
||||
/*
|
||||
* "sender_name" or "recipient_name".
|
||||
*/
|
||||
-#define STREQ(x,y) (*(x) == *(y) && strcmp((x), (y)) == 0)
|
||||
|
||||
else if (STREQ(suffix, MAIL_ATTR_S_NAME)) {
|
||||
if (*addr) {
|
||||
@@ -2817,7 +2818,6 @@
|
||||
if (msg_verbose > 1)
|
||||
msg_info("smtpd_expand_lookup: ${%s}", name);
|
||||
|
||||
-#define STREQN(x,y,n) (*(x) == *(y) && strncmp((x), (y), (n)) == 0)
|
||||
#define CONST_LEN(x) (sizeof(x) - 1)
|
||||
|
||||
/*
|
||||
diff -r -u postfix-2.3.2-orig/src/util/dict_open.c postfix-2.3.2/src/util/dict_open.c
|
||||
--- postfix-2.3.2-orig/src/util/dict_open.c 2007-03-05 17:09:12.000000000 +0100
|
||||
+++ postfix-2.3.2/src/util/dict_open.c 2007-03-05 18:07:42.000000000 +0100
|
||||
@@ -454,7 +454,7 @@
|
||||
}
|
||||
|
||||
#ifndef NO_DYNAMIC_MAPS
|
||||
-#define STREQ(x,y) (x == y || (x[0] == y[0] && strcmp(x,y) == 0))
|
||||
+inline int STREQ(const char *x, const char *y) { return ( x == y || (*(x) == *(y) && strcmp((x), (y)) == 0)); }
|
||||
|
||||
void dict_open_dlinfo(const char *path)
|
||||
{
|
||||
Nur in postfix-2.3.2/: TOFIX.
|
||||
@ -5,6 +5,14 @@ Mon Feb 26 10:32:36 CET 2007 - varkoly@suse.de
|
||||
|
||||
- Move postfix.xml into the postfix-SuSE tarball
|
||||
|
||||
- #228479 - Postfix is configured for inet_protocols=all if
|
||||
selecting ipv4 only support during installation.
|
||||
Now we set both inet_protocols and inet_interfaces to all.
|
||||
This means the available interfaces and protocols will be used.
|
||||
To avoid bogus warnings inet_proto.c was patched.
|
||||
|
||||
- #251598 - postfix use pointers for literals
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 15 13:14:07 CET 2007 - varkoly@suse.de
|
||||
|
||||
|
||||
14
postfix.spec
14
postfix.spec
@ -22,11 +22,13 @@ Conflicts: sendmail exim
|
||||
Autoreqprov: on
|
||||
Summary: A fast, secure, and flexible mailer
|
||||
Version: 2.3.2
|
||||
Release: 37
|
||||
Release: 39
|
||||
Source: postfix-%{version}.tar.gz
|
||||
Source1: postfix-SuSE.tar.gz
|
||||
Patch: dynamic_maps.patch
|
||||
Patch1: dynamic_maps_pie.patch
|
||||
Patch2: pointer_to_literals.patch
|
||||
Patch3: ipv6_disabled.patch
|
||||
Prereq: /usr/sbin/useradd /usr/sbin/groupadd %insserv_prereq %fillup_prereq /bin/sed /bin/awk /bin/grep textutils sh-utils fileutils pcre openldap2-client netcfg /sbin/ip
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#
|
||||
@ -75,6 +77,8 @@ Prereq: postfix
|
||||
%setup -n postfix-%{version} -a 1
|
||||
%patch -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
%build
|
||||
@ -492,6 +496,8 @@ fi
|
||||
%config(noreplace) /etc/postfix/header_checks
|
||||
%config(noreplace) /etc/postfix/bounce.cf.default
|
||||
%config(noreplace) /etc/postfix/dynamicmaps.cf
|
||||
%dir /usr/share/SuSEfirewall2/
|
||||
%dir /usr/share/SuSEfirewall2/services/
|
||||
%config(noreplace) /usr/share/SuSEfirewall2/services/postfix
|
||||
%dir /etc/sasl2/
|
||||
%config(noreplace) /etc/sasl2/smtpd.conf
|
||||
@ -573,6 +579,12 @@ Authors:
|
||||
* Mon Feb 26 2007 - varkoly@suse.de
|
||||
- #247351 - postfix - Ports for SuSEfirewall added via packages
|
||||
- Move postfix.xml into the postfix-SuSE tarball
|
||||
- #228479 - Postfix is configured for inet_protocols=all if
|
||||
selecting ipv4 only support during installation.
|
||||
Now we set both inet_protocols and inet_interfaces to all.
|
||||
This means the available interfaces and protocols will be used.
|
||||
To avoid bogus warnings inet_proto.c was patched.
|
||||
- #251598 - postfix use pointers for literals
|
||||
* Mon Jan 15 2007 - varkoly@suse.de
|
||||
- #144104 - postfix does not start
|
||||
- Implementing Fate #301840: Postfix XML Service Description Document
|
||||
|
||||
Loading…
Reference in New Issue
Block a user