OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 27-Nov-2009 22:52:20
Branch: HEAD Handle: 2009112721521900
Added files:
openpkg-src/patch patch.patch
Modified files:
openpkg-src/patch patch.spec
Log:
increase portability
Summary:
Revision Changes Path
1.1 +42 -0 openpkg-src/patch/patch.patch
1.42 +4 -1 openpkg-src/patch/patch.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/patch/patch.patch
============================================================================
$ cvs diff -u -r0 -r1.1 patch.patch
--- /dev/null 2009-11-27 22:52:12 +0100
+++ patch.patch 2009-11-27 22:52:20 +0100
@@ -0,0 +1,42 @@
+Index: gl/lib/xstrndup.c
+--- gl/lib/xstrndup.c.orig 2009-11-02 20:09:57 +0100
++++ gl/lib/xstrndup.c 2009-11-27 22:49:55 +0100
+@@ -23,13 +23,37 @@
+ #include <string.h>
+ #include "xalloc.h"
+
++static size_t
++my_strnlen(const char *s, size_t maxlen)
++{
++ size_t len;
++ for (len = 0; len < maxlen; len++, s++) {
++ if (!*s)
++ break;
++ }
++ return (len);
++}
++
++static char *
++my_strndup (char const *s, size_t n)
++{
++ size_t len = my_strnlen (s, n);
++ char *new = malloc (len + 1);
++
++ if (new == NULL)
++ return NULL;
++
++ new[len] = '\0';
++ return memcpy (new, s, len);
++}
++
+ /* Return a newly allocated copy of at most N bytes of STRING.
+ In other words, return a copy of the initial segment of length N of
+ STRING. */
+ char *
+ xstrndup (const char *string, size_t n)
+ {
+- char *s = strndup (string, n);
++ char *s = my_strndup (string, n);
+ if (! s)
+ xalloc_die ();
+ return s;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/patch/patch.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 patch.spec
--- openpkg-src/patch/patch.spec 13 Nov 2009 22:46:34 -0000 1.41
+++ openpkg-src/patch/patch.spec 27 Nov 2009 21:52:19 -0000 1.42
@@ -32,10 +32,11 @@
Group: Patching
License: GPL
Version: 2.6
-Release: 20091113
+Release: 20091127
# list of sources
Source0: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz
+Patch0: patch.patch
# build information
Prefix: %{l_prefix}
@@ -59,8 +60,10 @@
%prep
%setup -q
+ %patch -p0
%build
+ echo '#!' >update-version.sh
echo "ac_cv_func_setmode=\${ac_cv_func_setmode=no}" >config.cache
false=`%{l_shtool} path false`
echo "ac_cv_path_ed_PROGRAM=\${ac_cv_path_ed_PROGRAM=$false}"
>>config.cache
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
