cvs commit: ports/mail/postfix/files patch-src::util::sys_defs.h

Giorgos Keramidas keramida at freebsd.org
Fri Jul 17 11:29:13 UTC 2009


On Thu, 16 Jul 2009 13:40:19 -0400, Adam McDougall <mcdouga9 at egr.msu.edu> wrote:
>> keramida    2009-07-09 13:15:07 UTC
>>
>>   FreeBSD ports repository (doc committer)
>>
>>   Added files:
>>     mail/postfix/files   patch-src::util::sys_defs.h
>>   Log:
>>   Patch the src/util/sys_defs.h file of Postfix to fix the build on
>>   FreeBSD-8.0 after the new closefrom() system call was added.
>>
>>   PR:             ports/136459
>>   Submitted by:   Eygene Ryabinkin
>>   Approved by:    erwin (portmgr), Sahil Tandon (maintainer)

> I think this is now needed on 7-stable as well as of svn 195694 (702104):
...
> /usr/include/unistd.h:329: error: conflicting types for 'closefrom'
> ./sys_defs.h:1404: error: previous declaration of 'closefrom' was here
> *** Error code 1
>
> Stop in /var/tmp/ports/usr/ports/mail/postfix/work/postfix-2.6.2/src/util.
> *** Error code 1

Yes, we have to use the same for stable/7 after change 195694:

% r195694 | jhb | 2009-07-14 22:48:31 +0300 (Tue, 14 Jul 2009) | 4 lines
%
% MFC: Add a new 'void closefrom(int lowfd)' system call.  When called, it
% closes any open file descriptors >= 'lowfd'.  Bump  __FreeBSD_version to
% 702104.

Erwin, does the following look ok for ports/mail/postfix?

%%%
Index: files/patch-src::util::sys_defs.h
===================================================================
RCS file: /home/ncvs/ports/mail/postfix/files/patch-src::util::sys_defs.h,v
retrieving revision 1.4
diff -u -r1.4 patch-src::util::sys_defs.h
--- files/patch-src::util::sys_defs.h	9 Jul 2009 13:15:07 -0000	1.4
+++ files/patch-src::util::sys_defs.h	17 Jul 2009 11:27:47 -0000
@@ -1,9 +1,13 @@
---- src/util/sys_defs.h.orig	2009-07-08 13:38:52.000000000 +0400
-+++ src/util/sys_defs.h	2009-07-08 13:46:41.000000000 +0400
-@@ -110,6 +110,15 @@
+--- src/util/sys_defs.h.orig	2009-05-11 03:45:27.000000000 +0300
++++ src/util/sys_defs.h	2009-07-17 14:27:26.471309371 +0300
+@@ -110,6 +110,19 @@
  #define HAS_DUPLEX_PIPE			/* 4.1 breaks with kqueue(2) */
  #endif
  
++#if __FreeBSD_version >= 702104
++#define HAS_CLOSEFROM			/* 7.x has closefrom() now */
++#endif
++
 +#if __FreeBSD_version >= 800100		/*
 +					 * Actually, slightly before,
 +					 * but we can't say precisely
%%%
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-all/attachments/20090717/b04c0c43/attachment.pgp


More information about the cvs-all mailing list