svn commit: r378598 - in branches/2015Q1/devel/patch: . files

[Johan van Selst]

Author: johans
Date: Sat Feb  7 15:34:57 2015
New Revision: 378598
URL: https://svnweb.freebsd.org/changeset/ports/378598
QAT: https://qat.redports.org/buildarchive/r378598/

Log:
  Update to GNU patch 2.7.4; bugfix release, patches CVE-2015-1196
  
  Approved by:	ports-secteam (erwin)
  MFH:		r378592

Modified:
  branches/2015Q1/devel/patch/Makefile
  branches/2015Q1/devel/patch/distinfo
  branches/2015Q1/devel/patch/files/patch-lib__localcharset.c

Modified: branches/2015Q1/devel/patch/Makefile
==============================================================================
--- branches/2015Q1/devel/patch/Makefile	Sat Feb  7 15:14:29 2015	(r378597)
+++ branches/2015Q1/devel/patch/Makefile	Sat Feb  7 15:34:57 2015	(r378598)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	patch
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.4
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 

Modified: branches/2015Q1/devel/patch/distinfo
==============================================================================
--- branches/2015Q1/devel/patch/distinfo	Sat Feb  7 15:14:29 2015	(r378597)
+++ branches/2015Q1/devel/patch/distinfo	Sat Feb  7 15:34:57 2015	(r378598)
@@ -1,2 +1,2 @@
-SHA256 (patch-2.7.1.tar.xz) = 9124ba46db0abd873d0995c2ca880e81252676bb6c03e0a37dfc5f608a9b0ceb
-SIZE (patch-2.7.1.tar.xz) = 675896
+SHA256 (patch-2.7.4.tar.xz) = 0eacbb07ce106fe4dcbfbe6c052e55b50bf3df8e1bb16228c9da77b6659ff109
+SIZE (patch-2.7.4.tar.xz) = 714392

Modified: branches/2015Q1/devel/patch/files/patch-lib__localcharset.c
==============================================================================
--- branches/2015Q1/devel/patch/files/patch-lib__localcharset.c	Sat Feb  7 15:14:29 2015	(r378597)
+++ branches/2015Q1/devel/patch/files/patch-lib__localcharset.c	Sat Feb  7 15:34:57 2015	(r378598)
@@ -4,8 +4,8 @@
    cp = charset_aliases;
    if (cp == NULL)
      {
--#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__)
-+#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined __FreeBSD__)
+-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2)
++#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2 || defined __FreeBSD__)
        const char *dir;
        const char *base = "charset.alias";
        char *file_name;