rpms/postfix
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New version

Browse Source 
Resolves: rhbz#845298
- Dropped biff-cloexec patch (upstreamed)
This commit is contained in:
Jaroslav Škarvada 2012-08-03 10:28:34 +02:00
parent 7816a22657
commit a51d38b329
3 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
postfix-2.3.3-biff-cloexec.patch
View File

@ -1,27 +0,0 @@
diff -up postfix-2.3.3/src/local/biff_notify.c.orig2 postfix-2.3.3/src/local/biff_notify.c
--- postfix-2.3.3/src/local/biff_notify.c.orig2 2005-07-13 22:46:18.000000000 +0200
+++ postfix-2.3.3/src/local/biff_notify.c 2012-07-02 18:17:28.694042972 +0200
@@ -46,6 +46,7 @@
/* Application-specific. */
+#include "iostuff.h"
#include <biff_notify.h>
/* biff_notify - notify recipient via the biff "protocol" */
@@ -81,9 +82,12 @@ void biff_notify(const char *text, ss
/*
* Open a socket, or re-use an existing one.
*/
- if (sock < 0 && (sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
- msg_warn("socket: %m");
- return;
+ if (sock < 0) {
+ if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+ msg_warn("socket: %m");
+ return;
+ }
+ close_on_exec(sock, CLOSE_ON_EXEC);
}
/*

13
postfix.spec
View File

@ -37,8 +37,8 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 2.9.3 Version: 2.9.4
Release: 3%{?dist} Release: 1%{?dist}
Epoch: 2 Epoch: 2
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.postfix.org URL: http://www.postfix.org
@ -79,8 +79,6 @@ Patch2: postfix-2.6.1-files.patch
Patch3: postfix-alternatives.patch Patch3: postfix-alternatives.patch
Patch8: postfix-large-fs.patch Patch8: postfix-large-fs.patch
Patch9: pflogsumm-1.1.3-datecalc.patch Patch9: pflogsumm-1.1.3-datecalc.patch
# Fix for FD leak in biff (accepted upstream)
Patch10: postfix-2.3.3-biff-cloexec.patch
# Optional patches - set the appropriate environment variables to include # Optional patches - set the appropriate environment variables to include
# them when building the package/spec file # them when building the package/spec file
@ -149,8 +147,6 @@ pushd pflogsumm-%{pflogsumm_ver}
popd popd
%endif %endif
%patch10 -p1 -b .biff-cloexec
for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
iconv -f iso8859-1 -t utf8 -o ${f}{_,} && iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
touch -r ${f}{,_} && mv -f ${f}{_,} touch -r ${f}{,_} && mv -f ${f}{_,}
@ -529,6 +525,11 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Thu Aug 2 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 2:2.9.4-1
- New version
Resolves: rhbz#845298
- Dropped biff-cloexec patch (upstreamed)
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:2.9.3-3 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:2.9.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

2
sources
View File

@ -1,2 +1,2 @@
230bc3c00c051946eccd850058d75f6c postfix-2.9.4.tar.gz
5e3fb28dfb5b7f4a8b6b9bf2abde9542 pflogsumm-1.1.3.tar.gz 5e3fb28dfb5b7f4a8b6b9bf2abde9542 pflogsumm-1.1.3.tar.gz
72cd4656d251fe635d9b8b065d6cc729 postfix-2.9.3.tar.gz