OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Sep-2005 20:32:40
Branch: HEAD Handle: 2005092319323900
Modified files:
openpkg-src/xinetd xinetd.patch xinetd.spec
Log:
workaround GCC 4.0 constraints
Summary:
Revision Changes Path
1.3 +29 -4 openpkg-src/xinetd/xinetd.patch
1.12 +1 -1 openpkg-src/xinetd/xinetd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xinetd/xinetd.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 xinetd.patch
--- openpkg-src/xinetd/xinetd.patch 2 Feb 2004 09:50:48 -0000 1.2
+++ openpkg-src/xinetd/xinetd.patch 23 Sep 2005 18:32:39 -0000 1.3
@@ -1,6 +1,6 @@
Index: xinetd/defs.h
---- xinetd/defs.h.orig 2003-05-08 16:52:24.000000000 +0200
-+++ xinetd/defs.h 2004-02-02 10:10:22.000000000 +0100
+--- xinetd/defs.h.orig 2003-05-08 16:52:24 +0200
++++ xinetd/defs.h 2005-09-23 20:27:16 +0200
@@ -108,7 +108,7 @@
/*
* Used for listen(2)
@@ -10,9 +10,34 @@
/*
* When explicit values are given for enum's, that is because the
structures
+Index: xinetd/service.c
+--- xinetd/service.c.orig 2003-11-16 13:44:10 +0100
++++ xinetd/service.c 2005-09-23 20:27:36 +0200
+@@ -764,8 +764,8 @@
+ return FAILED;
+
+ if ( last == NULL ) {
+- last = SAIN( SVC_LAST_DGRAM_ADDR(sp) ) =
+- SAIN( calloc( 1, sizeof(union xsockaddr) ) );
++ last = SAIN( calloc( 1, sizeof(union xsockaddr) ) );
++ SVC_LAST_DGRAM_ADDR(sp) = (void *)last;
+ }
+
+ (void) time( ¤t_time ) ;
+@@ -791,8 +791,8 @@
+ return FAILED;
+
+ if( last == NULL ) {
+- last = SAIN6(SVC_LAST_DGRAM_ADDR(sp)) =
+- SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
++ last = SAIN6(calloc( 1, sizeof(union xsockaddr) ) );
++ SVC_LAST_DGRAM_ADDR(sp) = (void *)last;
+ }
+
+ (void) time( ¤t_time ) ;
Index: xinetd/xconv.pl
---- xinetd/xconv.pl.orig 2003-02-27 23:16:25.000000000 +0100
-+++ xinetd/xconv.pl 2004-02-02 10:10:22.000000000 +0100
+--- xinetd/xconv.pl.orig 2003-02-27 23:16:25 +0100
++++ xinetd/xconv.pl 2005-09-23 20:27:16 +0200
@@ -45,7 +45,7 @@
} else {
print "\twait = yes\n";
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xinetd/xinetd.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 xinetd.spec
--- openpkg-src/xinetd/xinetd.spec 24 Mar 2005 11:20:45 -0000 1.11
+++ openpkg-src/xinetd/xinetd.spec 23 Sep 2005 18:32:39 -0000 1.12
@@ -33,7 +33,7 @@
Group: Network
License: GPL
Version: 2.3.13
-Release: 20041207
+Release: 20050923
# list of sources
Source0: http://www.xinetd.org/xinetd-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]