rpms/xinetd/devel xinetd-2.3.14-poll.patch, 1.1, 1.2 xinetd.spec, 1.63, 1.64

[Jan Zeleny]

Author: jzeleny

Update of /cvs/extras/rpms/xinetd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27388

Modified Files:
	xinetd-2.3.14-poll.patch xinetd.spec 
Log Message:
correction of last patch

xinetd-2.3.14-poll.patch:
 config.h.in        |    2 +
 configure.in       |    1 
 xinetd/child.c     |    3 -
 xinetd/conf.c      |    5 ++
 xinetd/defs.h      |    9 ++++
 xinetd/init.c      |   33 +++++++----------
 xinetd/intcommon.c |   36 +++++++++++++------
 xinetd/internals.c |   99 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 xinetd/main.c      |   76 ++++++++++++++++++++++++++++++++++++++--
 xinetd/redirect.c  |   35 ++++++++++++++++++
 xinetd/server.c    |    4 ++
 xinetd/service.c   |   47 ++++++++++++++++++++++++-
 xinetd/service.h   |   19 ++++++++++
 xinetd/state.h     |   13 +++++-
 xinetd/tcpint.c    |   81 +++++++++++++++++++++++++++++++++++++++++++
 xinetd/udpint.c    |   40 +++++++++++++++++++++
 xinetd/xmdns.c     |   19 ++++++++++
 xinetd/xpoll.h     |   23 ++++++++++++
 18 files changed, 500 insertions(+), 45 deletions(-)

Index: xinetd-2.3.14-poll.patch
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd-2.3.14-poll.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xinetd-2.3.14-poll.patch	14 Sep 2009 11:55:32 -0000	1.1
+++ xinetd-2.3.14-poll.patch	17 Sep 2009 20:38:05 -0000	1.2
@@ -57,6 +57,19 @@ diff -Nurp xinetd-2.3.14-orig/xinetd/def
   * When explicit values are given for enum's, that is because the structures 
   * that the enum's are in may be initialized by a memory clear operation.
   */
+diff -Nurp xinetd-2.3.14-orig/xinetd/child.c xinetd-2.3.14-poll/xinetd/child.c
+--- xinetd-2.3.14-orig/xinetd/child.c	2003-09-06 16:41:59.000000000 +0200
++++ xinetd-2.3.14-poll/xinetd/child.c	2009-09-02 11:30:27.000000000 +0200
+@@ -109,8 +109,7 @@ void exec_server( const struct server *s
+ 
+ 
+ #ifdef RLIMIT_NOFILE
+-   rl.rlim_max = ps.ros.orig_max_descriptors ;
+-   rl.rlim_cur = ps.ros.max_descriptors ;
++   rl.rlim_max = rl.rlim_cur = ps.ros.max_descriptors ;
+    (void) setrlimit( RLIMIT_NOFILE, &rl ) ;
+ #endif
+ #ifdef RLIMIT_AS
 diff -Nurp xinetd-2.3.14-orig/xinetd/init.c xinetd-2.3.14-poll/xinetd/init.c
 --- xinetd-2.3.14-orig/xinetd/init.c	2003-09-06 16:41:59.000000000 +0200
 +++ xinetd-2.3.14-poll/xinetd/init.c	2009-09-02 11:30:27.000000000 +0200
@@ -831,7 +844,15 @@ diff -Nurp xinetd-2.3.14-orig/xinetd/sta
  #include <sys/select.h>
  #endif
  
-@@ -58,8 +61,15 @@ struct read_write_state
+@@ -32,7 +35,6 @@
+ 
+ struct read_only_state
+ {
+-   rlim_t      orig_max_descriptors ; /* original soft rlimit                */
+    rlim_t      max_descriptors ;      /* original hard rlimit or OPEN_MAX    */
+    rlim_t      process_limit ;        /* if 0, there is no limit             */
+    int         cc_interval ;          /* # of seconds the cc gets invoked.   */
+@@ -58,8 +60,15 @@ struct read_write_state
     int              available_services ;   /* # of available services       */
     int              active_services ;      /* services with descriptors set */
                                             /* in socket mask                */


Index: xinetd.spec
===================================================================
RCS file: /cvs/extras/rpms/xinetd/devel/xinetd.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- xinetd.spec	14 Sep 2009 11:59:09 -0000	1.63
+++ xinetd.spec	17 Sep 2009 20:38:05 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
 Version: 2.3.14
-Release: 24%{?dist}
+Release: 25%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -119,6 +119,9 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Thu Sep 17 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-25
+- correction of last patch replacing select() with poll()
+
 * Mon Sep 14 2009 Jan Zeleny <jzeleny at redhat.com> - 2:2.3.14-24
 - select() function and it's supporting macros replaced by poll() and it's supporting macros
 - added patch of configure.in for clean compilation