OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Jun-2004 18:39:03
Branch: HEAD Handle: 2004060317390300
Added files:
openpkg-src/samba samba.patch
Modified files:
openpkg-src/samba samba.spec
Log:
do not (possibly not) define the VA_COPY macro conditionally, if we
later use it unconditionally
Summary:
Revision Changes Path
1.2 +32 -0 openpkg-src/samba/samba.patch
1.64 +3 -1 openpkg-src/samba/samba.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.patch
============================================================================
$ cvs diff -u -r0 -r1.2 samba.patch
--- /dev/null 2004-06-03 18:39:03.000000000 +0200
+++ samba.patch 2004-06-03 18:39:03.000000000 +0200
@@ -0,0 +1,32 @@
+--- source/lib/snprintf.c.orig 2004-06-03 18:25:15.528789873 +0200
++++ source/lib/snprintf.c 2004-06-03 18:25:23.137645553 +0200
+@@ -81,6 +81,14 @@
+ #include <stdlib.h>
+ #endif
+
++#ifndef VA_COPY
++#ifdef HAVE_VA_COPY
++#define VA_COPY(dest, src) __va_copy(dest, src)
++#else
++#define VA_COPY(dest, src) (dest) = (src)
++#endif
++#endif
++
+ #if defined(HAVE_SNPRINTF) && defined(HAVE_VSNPRINTF) &&
defined(HAVE_C99_VSNPRINTF)
+ /* only include stdio.h if we are not re-defining snprintf or vsnprintf */
+ #include <stdio.h>
+@@ -105,14 +113,6 @@
+ #define SAFE_FREE(x) do { if ((x) != NULL) {free((x)); (x)=NULL;} } while(0)
+ #endif
+
+-#ifndef VA_COPY
+-#ifdef HAVE_VA_COPY
+-#define VA_COPY(dest, src) __va_copy(dest, src)
+-#else
+-#define VA_COPY(dest, src) (dest) = (src)
+-#endif
+-#endif
+-
+ static size_t dopr(char *buffer, size_t maxlen, const char *format,
+ va_list args_in);
+ static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/samba/samba.spec
============================================================================
$ cvs diff -u -r1.63 -r1.64 samba.spec
--- openpkg-src/samba/samba.spec 1 Apr 2004 13:13:28 -0000 1.63
+++ openpkg-src/samba/samba.spec 3 Jun 2004 16:39:03 -0000 1.64
@@ -34,7 +34,7 @@
Group: Filesystem
License: GPL
Version: 2.2.8a
-Release: 20040401
+Release: 20040603
# package options
%option with_pam no
@@ -45,6 +45,7 @@
Source1: smb.conf
Source2: smb.hosts
Source3: rc.samba
+Patch0: samba.patch
# build information
Prefix: %{l_prefix}
@@ -75,6 +76,7 @@
%prep
%setup -q
+ %patch -p0
%build
cd source
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
