[csw-devel] SF.net SVN: gar:[8481] csw/mgar/pkg/patch/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8481
          http://gar.svn.sourceforge.net/gar/?rev=8481&view=rev
Author:   dmichelsen
Date:     2010-02-11 09:25:11 +0000 (Thu, 11 Feb 2010)

Log Message:
-----------
patch: Update to 2.6.1

Modified Paths:
--------------
    csw/mgar/pkg/patch/trunk/Makefile
    csw/mgar/pkg/patch/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/patch/trunk/files/
    csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch

Modified: csw/mgar/pkg/patch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/patch/trunk/Makefile	2010-02-11 09:12:46 UTC (rev 8480)
+++ csw/mgar/pkg/patch/trunk/Makefile	2010-02-11 09:25:11 UTC (rev 8481)
@@ -1,5 +1,5 @@
 GARNAME = patch
-GARVERSION = 2.6
+GARVERSION = 2.6.1
 CATEGORIES = utils
 
 DESCRIPTION = GNU patch utility
@@ -9,15 +9,21 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz 
+PATCHFILES = 0001-Add-missing-strnlen.c-from-GNUlib.patch
 
 PACKAGES = CSWgpatch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+DEP_PKGS = CSWlibgnugetopt
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --program-prefix=g
 
+EXTRA_LINKER_FLAGS = -lgnugetopt
+BUILD_ARGS = SHELL=bash
+
 INSTALL_OVERRIDE_DIRS = prefix exec_prefix bindir mandir
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/patch/trunk/checksums
===================================================================
--- csw/mgar/pkg/patch/trunk/checksums	2010-02-11 09:12:46 UTC (rev 8480)
+++ csw/mgar/pkg/patch/trunk/checksums	2010-02-11 09:25:11 UTC (rev 8481)
@@ -1 +1,2 @@
-bc71d33c35004db3768465bcaf9ed23c  patch-2.6.tar.gz
+d976e6d1af14d714cffa3e6579cf7afa  0001-Add-missing-strnlen.c-from-GNUlib.patch
+d758eb96d3f75047efc004a720d33daf  patch-2.6.1.tar.gz

Added: csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch
===================================================================
--- csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch	                        (rev 0)
+++ csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch	2010-02-11 09:25:11 UTC (rev 8481)
@@ -0,0 +1,50 @@
+From 301697b91b91d3b08059a9e18ce8154040762d63 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 11 Feb 2010 10:19:05 +0100
+Subject: [PATCH] Add missing strnlen.c from GNUlib
+
+---
+ gl/lib/strnlen.c |   31 +++++++++++++++++++++++++++++++
+ 1 files changed, 31 insertions(+), 0 deletions(-)
+ create mode 100644 gl/lib/strnlen.c
+
+diff --git a/gl/lib/strnlen.c b/gl/lib/strnlen.c
+new file mode 100644
+index 0000000..d346d32
+--- /dev/null
++++ b/gl/lib/strnlen.c
+@@ -0,0 +1,31 @@
++/* Find the length of STRING, but scan at most MAXLEN characters.
++   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
++   Written by Simon Josefsson.
++
++   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.
++
++   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.
++
++   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 <config.h>
++
++#include <string.h>
++
++/* 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;
++}
+-- 
+1.6.6
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.