rpms/proftpd/devel proftpd-1.3.1rc3-open.patch, NONE, 1.1 proftpd.spec, 1.33, 1.34

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20521

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.1rc3-open.patch 
Log Message:
Include patch to fix open calls on F8.


proftpd-1.3.1rc3-open.patch:

--- NEW FILE proftpd-1.3.1rc3-open.patch ---
diff -Naupr proftpd-1.3.1rc3.orig/src/fsio.c proftpd-1.3.1rc3/src/fsio.c
--- proftpd-1.3.1rc3.orig/src/fsio.c	2007-05-22 22:54:09.000000000 +0200
+++ proftpd-1.3.1rc3/src/fsio.c	2007-08-19 18:30:27.000000000 +0200
@@ -2579,7 +2579,7 @@ pr_fh_t *pr_fsio_open_canon(const char *
 
   pr_trace_msg(trace_channel, 8, "using %s open() for path '%s'", fs->fs_name,
     name);
-  fh->fh_fd = fs->open(fh, deref, flags);
+  fh->fh_fd = (fs->open)(fh, deref, flags);
 
   if (fh->fh_fd == -1) {
     destroy_pool(fh->fh_pool);
@@ -2620,7 +2620,7 @@ pr_fh_t *pr_fsio_open(const char *name, 
 
   pr_trace_msg(trace_channel, 8, "using %s open() for path '%s'", fs->fs_name,
     name);
-  fh->fh_fd = fs->open(fh, name, flags);
+  fh->fh_fd = (fs->open)(fh, name, flags);
 
   if (fh->fh_fd == -1) {
     destroy_pool(fh->fh_pool);
diff -Naupr proftpd-1.3.1rc3.orig/src/netio.c proftpd-1.3.1rc3/src/netio.c
--- proftpd-1.3.1rc3.orig/src/netio.c	2007-05-15 19:35:05.000000000 +0200
+++ proftpd-1.3.1rc3/src/netio.c	2007-08-19 18:24:51.000000000 +0200
@@ -390,22 +390,22 @@ pr_netio_stream_t *pr_netio_open(pool *p
   if (strm_type == PR_NETIO_STRM_CTRL) {
     nstrm->strm_type = PR_NETIO_STRM_CTRL;
     nstrm->strm_mode = mode;
-    return ctrl_netio ? ctrl_netio->open(nstrm, fd, mode) :
-      core_ctrl_netio->open(nstrm, fd, mode);
+    return ctrl_netio ? (ctrl_netio->open)(nstrm, fd, mode) :
+      (core_ctrl_netio->open)(nstrm, fd, mode);
   }
 
   if (strm_type == PR_NETIO_STRM_DATA) {
     nstrm->strm_type = PR_NETIO_STRM_DATA;
     nstrm->strm_mode = mode;
-    return data_netio ? data_netio->open(nstrm, fd, mode) :
-      core_data_netio->open(nstrm, fd, mode);
+    return data_netio ? (data_netio->open)(nstrm, fd, mode) :
+      (core_data_netio->open)(nstrm, fd, mode);
   }
 
   if (strm_type == PR_NETIO_STRM_OTHR) {
     nstrm->strm_type = PR_NETIO_STRM_OTHR;
     nstrm->strm_mode = mode;
-    return othr_netio ? othr_netio->open(nstrm, fd, mode) :
-      core_othr_netio->open(nstrm, fd, mode);
+    return othr_netio ? (othr_netio->open)(nstrm, fd, mode) :
+      (core_othr_netio->open)(nstrm, fd, mode);
   }
 
   destroy_pool(nstrm->strm_pool);


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- proftpd.spec	19 Aug 2007 16:18:30 -0000	1.33
+++ proftpd.spec	19 Aug 2007 16:33:30 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.1
-Release: 0.1.%{prever}%{?dist}
+Release: 0.2.%{prever}%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -16,6 +16,7 @@
 Source6: proftpd.pam
 Patch0: proftpd-1.3.1rc3-configh.patch
 Patch1: proftpd-1.3.1rc3-mod_sql_mysql-fix.patch
+Patch2: proftpd-1.3.1rc3-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -68,6 +69,7 @@
 %setup -q -n %{name}-%{version}%{prever}
 %patch0 -p1 -b .configh
 %patch1 -p1 -b .mod_sql_mysql-fix
+%patch2 -p1 -b .open
 
 
 %build
@@ -192,7 +194,7 @@
 
 
 %changelog
-* Sun Aug 19 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-0.1.rc3
+* Sun Aug 19 2007 Matthias Saou <http://freshrpms.net/> 1.3.1-0.2.rc3
 - Update to 1.3.1rc3 (the only version to fix #237533 aka CVE-2007-2165).
 - Remove all patches, none are useful anymore.
 - Patch sstrncpy.c for config.h not being included (reported upstream #2964).
@@ -201,6 +203,7 @@
 - Clean up old leftover CVS strings from our extra files.
 - LSB-ize the init script (#247033).
 - Explicitly pass --enable-openssl since configure tells us "(default=no)".
+- Include patch to fix open calls on F8.
 
 * Sun Aug 12 2007 Matthias Saou <http://freshrpms.net/> 1.3.0a-8
 - Fix logrotate entry to silence error when proftpd isn't running (#246392).