Browse Source

fix for gcc3.3 (varargs.h deprecated)

Michael van Elst 22 years ago
parent
commit
564ac686e0
2 changed files with 42 additions and 10 deletions
  1. 41 9
      tripwire/tripwire.patch
  2. 1 1
      tripwire/tripwire.spec

+ 41 - 9
tripwire/tripwire.patch

@@ -284,9 +284,9 @@
  	
  	size_t numChars = _tcsftime( szDate, countof( szDate ), szFormat, tm );
  	
---- src/core/stdcore.h.dist	Tue Jan 28 14:10:57 2003
-+++ src/core/stdcore.h	Wed Jan 29 21:31:59 2003
-@@ -46,12 +46,16 @@
+--- src/core/stdcore.h.dist	2003-01-28 14:10:57.000000000 +0100
++++ src/core/stdcore.h	2003-01-29 21:31:59.000000000 +0100
+@@ -46,6 +46,9 @@
  #include "platform.h"
  
  //--Where the configuration file is to be found
@@ -296,15 +296,16 @@
  #if IS_BSD
  # define CONFIG_FILE_ROOT	"/usr/local/etc/tripwire"
  #elif defined(USE_FHS)
- # define CONFIG_FILE_ROOT	"/etc/tripwire"
+@@ -53,6 +56,7 @@
  #else
  # undef CONFIG_FILE_ROOT	// Nowhere, just try current directoy
-+#endif
  #endif
++#endif
  
  //--Disable some level 4 warnings
---- src/core/platform.h.dist	Tue Jan 28 15:39:55 2003
-+++ src/core/platform.h	Tue Jan 28 15:42:30 2003
+ 
+--- src/core/platform.h.dist	2003-01-28 15:39:55.000000000 +0100
++++ src/core/platform.h	2003-01-28 15:42:30.000000000 +0100
 @@ -128,10 +128,18 @@
  #elif defined(_SOLARIS)
      #define OS                  OS_SOLARIS
@@ -326,8 +327,19 @@
          #define ARCH            ARCH_SPARC
      #endif
  
---- src/tw/twstrings.cpp.dist	Tue Jan 28 15:58:00 2003
-+++ src/tw/twstrings.cpp	Tue Jan 28 15:59:22 2003
+--- src/core/debug.h.dist	2003-05-16 13:01:43.000000000 +0200
++++ src/core/debug.h	2003-05-16 13:01:53.000000000 +0200
+@@ -43,7 +43,7 @@
+ 
+ 
+ #include <iostream>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include "types.h"
+ 
+ //
+--- src/tw/twstrings.cpp.dist	2003-01-28 15:58:00.000000000 +0100
++++ src/tw/twstrings.cpp	2003-01-28 15:59:22.000000000 +0100
 @@ -258,6 +258,9 @@
  #elif IS_BSD
  		TSS_StringEntry( tw::STR_VERSION,       TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" for BSD\n\n") TSS_COPYRIGHT_NOTICE  ),
@@ -338,3 +350,23 @@
  #else
  #	error Who the hell am I?
  #endif
+--- src/twparser/yylex.cpp.dist	2003-05-16 13:04:35.000000000 +0200
++++ src/twparser/yylex.cpp	2003-05-16 13:05:03.000000000 +0200
+@@ -31,17 +31,6 @@
+ //
+ #include "stdtwparser.h"
+ 
+-#if defined(__OpenBSD__)        /* OpenBSD's varargs seems wacky */
+-# undef va_start
+-# ifdef __GNUC__
+-#  define va_start(ap, last) \
+-        ((ap) = (va_list)__builtin_next_arg(last))
+-# else
+-#  define va_start(ap, last) \
+-        ((ap) = (va_list)&(last) + __va_size(last))
+-# endif
+-#endif /* __OpenBSD__ */
+-
+ /* ..\. -a -o yylex.cpp -D yylex.h -P ..\..\mkslexyacc\etc\yylex.cpp -LC tokens.l */
+ #define INITIAL 0
+ #define globals 2

+ 1 - 1
tripwire/tripwire.spec

@@ -39,7 +39,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Security
 License:      GPL
 Version:      %{V_openpkg}
-Release:      20030411
+Release:      20030516
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/tripwire/tripwire-%{V_vendor}.tar.gz