SF.net SVN: gar:[26485] csw/mgar/pkg/mtools/trunk

[dmichelsen at users.sourceforge.net]

Revision: 26485
          http://sourceforge.net/p/gar/code/26485
Author:   dmichelsen
Date:     2018-11-11 19:58:03 +0000 (Sun, 11 Nov 2018)
Log Message:
-----------
mtools/trunk: Update to 4.0.20

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

Removed Paths:
-------------
    csw/mgar/pkg/mtools/trunk/files/0001-Use-workaround-for-strndup.patch

Modified: csw/mgar/pkg/mtools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mtools/trunk/Makefile	2018-11-01 13:34:21 UTC (rev 26484)
+++ csw/mgar/pkg/mtools/trunk/Makefile	2018-11-11 19:58:03 UTC (rev 26485)
@@ -1,5 +1,5 @@
 NAME = mtools
-VERSION = 4.0.19
+VERSION = 4.0.20
 GARTYPE = v2
 
 DESCRIPTION = Read/write/list/format DOS disks under Unix
@@ -13,10 +13,6 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES += $(DISTNAME).tar.lz
 
-# Use patch until this is fixed
-#   https://lists.gnu.org/archive/html/info-mtools/2013-01/msg00003.html
-PATCHFILES += 0001-Use-workaround-for-strndup.patch
-
 RUNTIME_DEP_PKGS_CSWmtools += CSWlibiconv2
 
 EXTRA_LINKER_FLAGS = -liconv -lnsl

Modified: csw/mgar/pkg/mtools/trunk/checksums
===================================================================
--- csw/mgar/pkg/mtools/trunk/checksums	2018-11-01 13:34:21 UTC (rev 26484)
+++ csw/mgar/pkg/mtools/trunk/checksums	2018-11-11 19:58:03 UTC (rev 26485)
@@ -1 +1 @@
-19000d13d859f4a8d7381a90c34fb9a5  mtools-4.0.19.tar.lz
+0914652b4e91367159506a35cb48bd2d  mtools-4.0.20.tar.lz

Deleted: csw/mgar/pkg/mtools/trunk/files/0001-Use-workaround-for-strndup.patch
===================================================================
--- csw/mgar/pkg/mtools/trunk/files/0001-Use-workaround-for-strndup.patch	2018-11-01 13:34:21 UTC (rev 26484)
+++ csw/mgar/pkg/mtools/trunk/files/0001-Use-workaround-for-strndup.patch	2018-11-11 19:58:03 UTC (rev 26485)
@@ -1,42 +0,0 @@
-From 77581d3bfd7d1f2fe4a16584b97332a2c1ef421a Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 6 Nov 2014 10:24:58 +0100
-Subject: [PATCH] Use workaround for strndup
-
----
- config.c | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/config.c b/config.c
-index f086883..2a7a05b 100644
---- a/config.c
-+++ b/config.c
-@@ -173,6 +173,25 @@ static switches_t dswitches[]= {
-     { "CODEPAGE", OFFS(codepage), T_UINT }
- };
- 
-+char *strndup( const char *s, size_t n )
-+{
-+    size_t nAvail;
-+    char *p;
-+                                                                                                                                                             
-+    if ( !s )
-+        return 0;
-+                                                                                                                                                             
-+    nAvail = min( strlen(s) + 1, n + 1 );
-+    p      = malloc( nAvail );
-+    memcpy( p, s, nAvail );
-+    p[nAvail - 1] = '\0';
-+                                                                                                                                                             
-+/*
-+printf( "[PAH][%s][%d] nAvail=%d p=(%s)\n", __FILE__, __LINE__, nAvail, p );
-+*/
-+    return p;
-+}
-+
- static void maintain_default_drive(char drive)
- {
-     if(default_drive == ':')
--- 
-2.0.3
-

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