[149424] trunk/dports/editors/nano

[mps at macports.org]

Revision: 149424
          https://trac.macports.org/changeset/149424
Author:   mps at macports.org
Date:     2016-06-19 07:18:27 -0700 (Sun, 19 Jun 2016)
Log Message:
-----------
nano: update to version 2.6.0, remove obsolete patch files, and fix livecheck.

Modified Paths:
--------------
    trunk/dports/editors/nano/Portfile

Removed Paths:
-------------
    trunk/dports/editors/nano/files/PR-47307.patch
    trunk/dports/editors/nano/files/PR-51201-use-after-free.patch

Modified: trunk/dports/editors/nano/Portfile
===================================================================
--- trunk/dports/editors/nano/Portfile	2016-06-19 12:26:15 UTC (rev 149423)
+++ trunk/dports/editors/nano/Portfile	2016-06-19 14:18:27 UTC (rev 149424)
@@ -4,8 +4,7 @@
 PortSystem      1.0
 
 name            nano
-version         2.5.3
-revision        2
+version         2.6.0
 categories      editors
 platforms       darwin freebsd
 license         GPL-3
@@ -21,8 +20,8 @@
 homepage        http://www.nano-editor.org/
 master_sites    ${homepage}dist/v[strsed ${version} {/\.[0-9]*$//}]/ gnu
 
-checksums       rmd160  7f5d2bf718408d3a3c43e066ef66ba585b5e53ab \
-                sha256  b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee
+checksums       rmd160  4fd6a152e1e66f222b7c3434947d55b41711d64f \
+                sha256  d517a5fcaa9fa6ceda8a63e22be1d83dd7f4af13703c73b10a48e95a6e1178d3
 
 depends_lib     port:gettext \
                 port:libiconv \
@@ -30,9 +29,7 @@
                 port:ncurses \
                 port:zlib
 
-patchfiles      nawk.patch \
-                PR-47307.patch \
-                PR-51201-use-after-free.patch
+patchfiles      nawk.patch
 
 configure.args  --disable-wrapping-as-root \
                 --enable-nanorc \
@@ -53,6 +50,6 @@
 A sample configuration file is available at ${docdir}/nanorc.sample.
 "
 
-livecheck.url   ${homepage}
+livecheck.url   ${homepage}/download.php
 livecheck.type  regex
-livecheck.regex "(\\d+\\.\\d+\\.\\d+)</font>"
+livecheck.regex "${name}-(\\d+\\.\\d+\\.\\d+)"

Deleted: trunk/dports/editors/nano/files/PR-47307.patch
===================================================================
--- trunk/dports/editors/nano/files/PR-47307.patch	2016-06-19 12:26:15 UTC (rev 149423)
+++ trunk/dports/editors/nano/files/PR-47307.patch	2016-06-19 14:18:27 UTC (rev 149424)
@@ -1,13 +0,0 @@
-realpath(x, NULL) is not portable and will always crash on Leopard
-
---- src/color.c
-+++ src/color.c
-@@ -215,7 +215,7 @@ void color_update(void)
- 	    /* Concatenate the current working directory with the
- 	     * specified filename, and canonicalize the result. */
- 	    sprintf(joinednames, "%s/%s", currentdir, openfile->filename);
--	    fullname = realpath(joinednames, NULL);
-+	    fullname = get_full_path(joinednames);
- 	    free(currentdir);
- 	}
- 

Deleted: trunk/dports/editors/nano/files/PR-51201-use-after-free.patch
===================================================================
--- trunk/dports/editors/nano/files/PR-51201-use-after-free.patch	2016-06-19 12:26:15 UTC (rev 149423)
+++ trunk/dports/editors/nano/files/PR-51201-use-after-free.patch	2016-06-19 14:18:27 UTC (rev 149424)
@@ -1,18 +0,0 @@
-The pointer returned by dirname(3) is not to memory owned by the caller.  Thus,
-the true branch was setting parentdir to an owned region and the false region
-was not.  This change corrects the incorrect freeing of the pointer returned
-by dirname as well as the memory leak of the argument to dirname.
-
-See https://trac.macports.org/ticket/51201
-
---- src/files.c.orig	2016-02-25 12:47:10.000000000 -0800
-+++ src/files.c	2016-04-21 20:47:15.000000000 -0700
-@@ -43,7 +43,7 @@ bool has_valid_path(const char *filename
-     if (strrchr(filename, '/') == NULL)
- 	parentdir = mallocstrcpy(NULL, ".");
-     else
--	parentdir = dirname(mallocstrcpy(NULL, filename));
-+	parentdir = mallocstrcpy(NULL, dirname(filename));
- 
-     if (stat(parentdir, &parentinfo) == -1) {
- 	if (errno == ENOENT)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160619/bbc769fc/attachment.html>