Am 21.09.2014 um 02:30 schrieb Wietse Venema:
> [email protected]:
>> thank you - looks promising!
>>
>> could you attach this as unified diff-file?
>
> The patch is unified diff format. It just does not have some of the
> garbage that some version control systems add around it. Let me know
> if this is a problem.
rpmbuild refuses :-(
maybe a tarball of postfix-2.11.1.tar.gz + the patch would be possible?
____________________________________________________
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
____________________________________________________
[builduser@buildserver:/rpmbuild/SPECS]$ rpmbuild -bb postfix.spec
Ausführung(%prep): /bin/sh -e /var/tmp/rpm-tmp.rWjoJE
+ umask 022
+ cd /home/builduser/rpmbuild/BUILD
+ cd /home/builduser/rpmbuild/BUILD
+ rm -rf postfix-2.11.1
+ /usr/bin/gzip -dc /home/builduser/rpmbuild/SOURCES/postfix-2.11.1.tar.gz
+ /usr/bin/tar -xf -
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ cd postfix-2.11.1
+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
+ echo 'Patch #1 (postfix-ptr.patch):'
Patch #1 (postfix-ptr.patch):
+ /usr/bin/cat /home/builduser/rpmbuild/SOURCES/postfix-ptr.patch
+ /usr/bin/patch -p1 --fuzz=0
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- src/smtpd/smtpd_check.c- 2014-09-17 12:31:07.000000000 -0400
|+++ src/smtpd/smtpd_check.c 2014-09-20 19:55:29.000000000 -0400
--------------------------
File to patch: ^C
[builduser@buildserver:/rpmbuild/SPECS]$ nano /rpmbuild/SOURCES/postfix
postfix-2.11.1.tar.gz postfix-pam.conf postfix-ptr.patch
postfix.service
[builduser@buildserver:/rpmbuild/SPECS]$ nano
/rpmbuild/SOURCES/postfix-ptr.patch
[builduser@buildserver:/rpmbuild/SPECS]$ rpmbuild -bs postfix.spec
Erstellt:
/home/builduser/rpmbuild/SRPMS/postfix-2.11.1-6.fc20.20140921.rh.src.rpm
[builduser@buildserver:/rpmbuild/SPECS]$ rpmbuild -bb postfix.spec
Ausführung(%prep): /bin/sh -e /var/tmp/rpm-tmp.SVG5Zq
+ umask 022
+ cd /home/builduser/rpmbuild/BUILD
+ cd /home/builduser/rpmbuild/BUILD
+ rm -rf postfix-2.11.1
+ /usr/bin/gzip -dc /home/builduser/rpmbuild/SOURCES/postfix-2.11.1.tar.gz
+ /usr/bin/tar -xf -
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ cd postfix-2.11.1
+ /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
+ echo 'Patch #1 (postfix-ptr.patch):'
Patch #1 (postfix-ptr.patch):
+ /usr/bin/cat /home/builduser/rpmbuild/SOURCES/postfix-ptr.patch
+ /usr/bin/patch -p1 --fuzz=0
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- src/smtpd/smtpd_check.c 2014-09-17 12:31:07.000000000 -0400
|+++ src/smtpd/smtpd_check.c 2014-09-20 19:55:29.000000000 -0400
--------------------------
File to patch:
>> that makes it easy to include it in rpmbuild for test/feedback
>> copy&paste usually damages something in patches
>>
>> Am 21.09.2014 um 02:08 schrieb Wietse Venema:
>>> Does the following address the problem? This fixes the responses for:
>>>
>>> check_reverse_client_hostname_access
>>> check_reverse_client_hostname_a_access
>>> check_reverse_client_hostname_mx_access
>>> check_reverse_client_hostname_ns_access
>>>
>>> Basically, with all SMTP server responses of the form
>>>
>>> 5XX 5.X.X <stuff>: Unverified Client host rejected: ....
>>>
>>> the stuff should contain the unverified client hostname, not the
>>> verified client hostname (which may be "unknown") and IP address.
>>>
>>> Wietse
>>>
>>> --- src/smtpd/smtpd_check.c- 2014-09-17 12:31:07.000000000 -0400
>>> +++ src/smtpd/smtpd_check.c 2014-09-20 19:55:29.000000000 -0400
>>> @@ -3941,7 +3941,7 @@
>>> SMTPD_NAME_CLIENT, def_acl);
>>> } else if (is_map_command(state, name, CHECK_REVERSE_CLIENT_ACL, &cpp))
>>> {
>>> status = check_namadr_access(state, *cpp, state->reverse_name,
>>> state->addr,
>>> - FULL, &found, state->namaddr,
>>> + FULL, &found, state->reverse_name,
>>> SMTPD_NAME_REV_CLIENT, def_acl);
>>> forbid_whitelist(state, name, status, state->reverse_name);
>>> } else if (strcasecmp(name, REJECT_MAPS_RBL) == 0) {
>>> @@ -4031,21 +4031,21 @@
>>> } else if (is_map_command(state, name, CHECK_REVERSE_CLIENT_NS_ACL,
>>> &cpp)) {
>>> if (strcasecmp(state->reverse_name, "unknown") != 0) {
>>> status = check_server_access(state, *cpp, state->reverse_name,
>>> - T_NS, state->namaddr,
>>> + T_NS, state->reverse_name,
>>> SMTPD_NAME_REV_CLIENT, def_acl);
>>> forbid_whitelist(state, name, status, state->reverse_name);
>>> }
>>> } else if (is_map_command(state, name, CHECK_REVERSE_CLIENT_MX_ACL,
>>> &cpp)) {
>>> if (strcasecmp(state->reverse_name, "unknown") != 0) {
>>> status = check_server_access(state, *cpp, state->reverse_name,
>>> - T_MX, state->namaddr,
>>> + T_MX, state->reverse_name,
>>> SMTPD_NAME_REV_CLIENT, def_acl);
>>> forbid_whitelist(state, name, status, state->reverse_name);
>>> }
>>> } else if (is_map_command(state, name, CHECK_REVERSE_CLIENT_A_ACL,
>>> &cpp)) {
>>> if (strcasecmp(state->reverse_name, "unknown") != 0) {
>>> status = check_server_access(state, *cpp, state->reverse_name,
>>> - T_A, state->namaddr,
>>> + T_A, state->reverse_name,
>>> SMTPD_NAME_REV_CLIENT, def_acl);
>>> forbid_whitelist(state, name, status, state->reverse_name);
>>> }
>>>
