Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/utils
In directory vz-cvs-3.sog:/tmp/cvs-serv6066/10.4-EOL/utils
Modified Files:
patch.info patch.patch
Log Message:
Reactivated GNU patch package, great thanks go to David Fang for doing all the
hard work
Index: patch.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/utils/patch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- patch.patch 11 Jul 2011 04:05:50 -0000 1.1
+++ patch.patch 16 Sep 2011 07:54:52 -0000 1.2
@@ -1,13 +1,35 @@
-diff -ru patch-2.5.4-orig/config.hin patch-2.5.4/config.hin
---- patch-2.5.4-orig/config.hin Mon Aug 30 08:53:17 1999
-+++ patch-2.5.4/config.hin Fri Feb 16 18:15:58 2001
-@@ -86,9 +86,6 @@
- /* Define if you have the rmdir function. */
- #undef HAVE_RMDIR
-
--/* Define if you have the setmode function. */
--#undef HAVE_SETMODE
--
- /* Define if you have the sigaction function. */
- #undef HAVE_SIGACTION
-
+diff --git a/gl/lib/strnlen.c b/gl/lib/strnlen.c
+--- /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;
++}
Index: patch.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/utils/patch.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- patch.info 11 Jul 2011 04:05:50 -0000 1.1
+++ patch.info 16 Sep 2011 07:54:52 -0000 1.2
@@ -15,16 +15,37 @@
# maintainership of) the affected package.
Package: patch
-Version: 2.5.4
-Revision: 2
-Distribution: 10.4
+Version: 2.6.1
+Revision: 1
Maintainer: Max Horn <m...@quendi.de>
-Source: gnu
-UpdateConfigGuess: true
BuildDepends: fink (>= 0.24.12-1)
+Source: gnu
+Source-MD5: d758eb96d3f75047efc004a720d33daf
PatchFile: %n.patch
-PatchFile-MD5: 48368120cfe16eac8ff3f01d4224dbc5
-Source-MD5: ee5ae84d115f051d87fcaaef3b4ae782
+PatchFile-MD5: 6690768e0e48fe2fa18cc9aab3a84f64
+PatchScript: <<
+ #!/bin/sh -ev
+ %{default_script}
+ sed -i.orig -e '/^\.c/i\
+.SUFFIXES: .c .$(OBJEXT)' Makefile.in
+ # bunch of tests require coreutils versions of commands
+ for f in `grep -lr seq tests/`
+ do sed -i.orig -e 's|\<seq\>|gseq|' $f
+ done
+ for f in `grep -lr -e 'cat -A' tests/`
+ do sed -i.orig -e 's|\<cat\>|gcat|' $f
+ done
+ for f in `grep -lr 'date' tests/`
+ do sed -i.orig -e 's|\<date\>|gdate|' $f
+ done
+ for f in `grep -lr -e 'touch -d' tests/`
+ do sed -i.orig -e 's|\<touch\>|gtouch|' $f
+ done
+<<
+InfoTest: <<
+ TestDepends: coreutils
+ TestScript: make -k check || exit 2
+<<
InstallScript: make install prefix=%i mandir=%i/share/man
DocFiles: README COPYING AUTHORS NEWS
#
@@ -34,10 +55,10 @@
and applies them to a file or a whole source tree.
<<
DescPort: <<
-Uses autoconf and checks the host type - the usual fix. Tries to use a
-function called setmode() which is supposed to do something else than
-the setmode(3) in *BSD. The patch removes the define from config.hin
-(and thus from config.h).
+On Mac OS X 10.4 and 10.5, the function strnlen is missing, so we add
+an implementation for it.
+
+Test depends on coreutils for 'seq' and 'cat' (named 'gseq' and 'gcat').
<<
License: GPL
Homepage: http://www.gnu.org/software/patch/patch.html
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
