[CVS] OpenPKG: openpkg-src/patch/ patch.patch patch.spec
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: 30-Dec-2009 22:22:17
Branch: HEAD Handle: 2009123021221700
Modified files:
openpkg-src/patch patch.patch patch.spec
Log:
upgrading package: patch 2.6 -> 2.6.1
Summary:
RevisionChanges Path
1.3 +36 -53 openpkg-src/patch/patch.patch
1.45+2 -2 openpkg-src/patch/patch.spec
patch -p0 <<'@@ .'
Index: openpkg-src/patch/patch.patch
$ cvs diff -u -r1.2 -r1.3 patch.patch
--- openpkg-src/patch/patch.patch 3 Dec 2009 07:51:04 - 1.2
+++ openpkg-src/patch/patch.patch 30 Dec 2009 21:22:17 - 1.3
@@ -1,17 +1,7 @@
Index: Makefile.in
Makefile.in.orig 2009-11-02 20:09:57 +0100
-+++ Makefile.in 2009-12-03 08:44:32 +0100
-@@ -45,9 +45,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- STDBOOL_H = @STDBOOL_H@
--ifneq (@GETOPT_H@,)
- GETOPT_H = gl/lib/@GETOPT_H@
--endif
- HAVE__BOOL = @HAVE__BOOL@
- ENABLE_MERGE = @ENABLE_MERGE@
-
-@@ -107,9 +105,7 @@
+--- Makefile.in.orig 2009-12-30 13:56:30 +0100
Makefile.in 2009-12-30 22:09:02 +0100
+@@ -105,9 +105,7 @@
src/util.c \
src/version.c
@@ -21,9 +11,9 @@
OBJS = $(LIBOBJS) $(MERGEOBJ) \
src/inp.$(OBJEXT) \
-@@ -222,9 +218,7 @@
+@@ -221,9 +219,7 @@
@echo "[...@]"
- @srcdir=$(srcdir)/tests $(TEST_SHELL) $@
+ @srcdir=$(srcdir)/tests $(TEST_SHELL) $(srcdir)/$@
-ifeq ($(ENABLE_MERGE),1)
DEFINE_ENABLE_MERGE = -DENABLE_MERGE
@@ -31,45 +21,38 @@
COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \
$(DEFINE_ENABLE_MERGE) -I. -I$(srcdir)/src -I$(srcdir)/gl/lib $(CFLAGS)
-Index: gl/lib/xstrndup.c
gl/lib/xstrndup.c.orig 2009-11-02 20:09:57 +0100
-+++ gl/lib/xstrndup.c2009-12-03 08:42:53 +0100
-@@ -23,13 +23,37 @@
- #include
- #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);
-+}
+Index: gl/lib/strnlen.c
+--- gl/lib/strnlen.c.orig2009-12-30 22:16:59 +0100
gl/lib/strnlen.c 2009-12-30 22:15:51 +0100
+@@ -0,0 +1,31 @@
++/* Find the length of STRING, but scan at most MAXLEN characters.
++ Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
++ Written by Simon Josefsson.
+
-+static char *
-+my_strndup (char const *s, size_t n)
-+{
-+ size_t len = my_strnlen (s, n);
-+ char *new = malloc (len + 1);
++ This program is free software; you can redistribute it and/or modify
++ it under the terms of the GNU General Public License as published by
++ the Free Software Foundation; either version 2, or (at your option)
++ any later version.
+
-+ if (new == NULL)
-+return NULL;
++ This program is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ GNU General Public License for more details.
+
-+ new[len] = '\0';
-+ return memcpy (new, s, len);
-+}
++ You should have received a copy of the GNU General Public License
++ along with this program; if not, write to the Free Software Foundation,
++ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
++
++#include
++
++#include
+
- /* 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;
++/* Find the length of STRING, but scan at most MAXLEN characters.
++ If no '\0' terminator is found in that many characters, return MAXLEN.
*/
++
++size_t
++strnlen (const char *string, size_t maxlen)
++{
++ const char *end = memchr (string, '\0', maxlen);
++ return end ? (size_t) (end - string) : maxlen;
++}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/patch/patch.spec
$ cvs diff -u -r1.44 -r1.45 patch.spec
--- openpkg-src/patch/patch.spec 3 Dec 2009 07:51:04 - 1.44
+++ openp
[CVS] OpenPKG: openpkg-src/patch/ patch.patch patch.spec
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: 03-Dec-2009 08:51:04
Branch: HEAD Handle: 2009120307510400
Modified files:
openpkg-src/patch patch.patch patch.spec
Log:
enable merge functionality
Summary:
RevisionChanges Path
1.2 +34 -1 openpkg-src/patch/patch.patch
1.44+2 -1 openpkg-src/patch/patch.spec
patch -p0 <<'@@ .'
Index: openpkg-src/patch/patch.patch
$ cvs diff -u -r1.1 -r1.2 patch.patch
--- openpkg-src/patch/patch.patch 27 Nov 2009 21:52:19 - 1.1
+++ openpkg-src/patch/patch.patch 3 Dec 2009 07:51:04 - 1.2
@@ -1,6 +1,39 @@
+Index: Makefile.in
+--- Makefile.in.orig 2009-11-02 20:09:57 +0100
Makefile.in 2009-12-03 08:44:32 +0100
+@@ -45,9 +45,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ STDBOOL_H = @STDBOOL_H@
+-ifneq (@GETOPT_H@,)
+ GETOPT_H = gl/lib/@GETOPT_H@
+-endif
+ HAVE__BOOL = @HAVE__BOOL@
+ ENABLE_MERGE = @ENABLE_MERGE@
+
+@@ -107,9 +105,7 @@
+ src/util.c \
+ src/version.c
+
+-ifeq ($(ENABLE_MERGE),1)
+ MERGEOBJ = src/merge.$(OBJEXT)
+-endif
+
+ OBJS = $(LIBOBJS) $(MERGEOBJ) \
+ src/inp.$(OBJEXT) \
+@@ -222,9 +218,7 @@
+ @echo "[...@]"
+ @srcdir=$(srcdir)/tests $(TEST_SHELL) $@
+
+-ifeq ($(ENABLE_MERGE),1)
+ DEFINE_ENABLE_MERGE = -DENABLE_MERGE
+-endif
+ COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \
+ $(DEFINE_ENABLE_MERGE) -I. -I$(srcdir)/src -I$(srcdir)/gl/lib $(CFLAGS)
+
Index: gl/lib/xstrndup.c
--- gl/lib/xstrndup.c.orig 2009-11-02 20:09:57 +0100
-+++ gl/lib/xstrndup.c2009-11-27 22:49:55 +0100
gl/lib/xstrndup.c2009-12-03 08:42:53 +0100
@@ -23,13 +23,37 @@
#include
#include "xalloc.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/patch/patch.spec
$ cvs diff -u -r1.43 -r1.44 patch.spec
--- openpkg-src/patch/patch.spec 27 Nov 2009 21:55:15 - 1.43
+++ openpkg-src/patch/patch.spec 3 Dec 2009 07:51:04 - 1.44
@@ -32,7 +32,7 @@
Group:Patching
License: GPL
Version: 2.6
-Release: 20091127
+Release: 20091203
# list of sources
Source0: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz
@@ -74,6 +74,7 @@
--cache-file=./config.cache \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
+--enable-merge \
--disable-largefile
%{l_make} %{l_mflags -O}
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/patch/ patch.patch patch.spec
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:
RevisionChanges 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.c2009-11-27 22:49:55 +0100
+@@ -23,13 +23,37 @@
+ #include
+ #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 - 1.41
+++ openpkg-src/patch/patch.spec 27 Nov 2009 21:52:19 - 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
