From owner-svn-ports-head@freebsd.org Thu Nov 7 11:35:36 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69DE71B0A92; Thu, 7 Nov 2019 11:35:36 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4781YN278hz4Wjw; Thu, 7 Nov 2019 11:35:36 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2C38ED1A7; Thu, 7 Nov 2019 11:35:36 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA7BZa4p023212; Thu, 7 Nov 2019 11:35:36 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA7BZZcL023207; Thu, 7 Nov 2019 11:35:35 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201911071135.xA7BZZcL023207@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 7 Nov 2019 11:35:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516964 - in head/devel/patch: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/devel/patch: . files X-SVN-Commit-Revision: 516964 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Nov 2019 11:35:36 -0000 Author: danfe Date: Thu Nov 7 11:35:34 2019 New Revision: 516964 URL: https://svnweb.freebsd.org/changeset/ports/516964 Log: - Pull in security patches from Debian while upstream still CBA to release a new version after almost a year since those bugs and vulnerabilities had been reported - Hook the test suite, which unfortunately requires bash(1), to our framework - Chase redirection in the WWW line of the port description Security: 791841a3-d484-4878-8909-92ef9ce424f4 PR: 233455 Modified: head/devel/patch/Makefile head/devel/patch/distinfo head/devel/patch/files/patch-lib__Makefile.in head/devel/patch/files/patch-lib__localcharset.c head/devel/patch/pkg-descr Modified: head/devel/patch/Makefile ============================================================================== --- head/devel/patch/Makefile Thu Nov 7 10:20:30 2019 (r516963) +++ head/devel/patch/Makefile Thu Nov 7 11:35:34 2019 (r516964) @@ -3,19 +3,34 @@ PORTNAME= patch PORTVERSION= 2.7.6 +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= GNU +MASTER_SITES= GNU DEBIAN_POOL:dp +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${PORTNAME}_${PORTVERSION}-6.debian${EXTRACT_SUFX}:dp MAINTAINER= danfe@FreeBSD.org COMMENT= GNU patch utility -LICENSE= GPLv3 +LICENSE= GPLv3+ +EXTRA_PATCHES= ${WRKDIR}/debian/patches/[^0]*.patch \ + ${WRKDIR}/debian/patches/0*.patch +PATCH_STRIP= -p1 + +TEST_DEPENDS= bash:shells/bash + USES= cpe charsetfix gmake tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-prefix=g CPE_VENDOR= gnu +TEST_TARGET= check + PLIST_FILES= bin/gpatch man/man1/gpatch.1.gz + +post-patch: + ${REINPLACE_CMD} -e '/^SHELL =/s,@SHELL@,bash,' \ + ${WRKSRC}/tests/Makefile.in .include Modified: head/devel/patch/distinfo ============================================================================== --- head/devel/patch/distinfo Thu Nov 7 10:20:30 2019 (r516963) +++ head/devel/patch/distinfo Thu Nov 7 11:35:34 2019 (r516964) @@ -1,3 +1,5 @@ TIMESTAMP = 1518689812 SHA256 (patch-2.7.6.tar.xz) = ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd SIZE (patch-2.7.6.tar.xz) = 783756 +SHA256 (patch_2.7.6-6.debian.tar.xz) = 75ea94b265763b65005381f1eceeaf3351a70ec5c3243bc161d702776414db02 +SIZE (patch_2.7.6-6.debian.tar.xz) = 14464 Modified: head/devel/patch/files/patch-lib__Makefile.in ============================================================================== --- head/devel/patch/files/patch-lib__Makefile.in Thu Nov 7 10:20:30 2019 (r516963) +++ head/devel/patch/files/patch-lib__Makefile.in Thu Nov 7 11:35:34 2019 (r516964) @@ -1,5 +1,5 @@ ---- lib/Makefile.in.orig 2018-02-03 13:33:56 UTC -+++ lib/Makefile.in +--- ./lib/Makefile.in.orig 2018-02-03 13:33:56 UTC ++++ ./lib/Makefile.in @@ -1603,7 +1603,7 @@ install-data: install-data-am uninstall: uninstall-am Modified: head/devel/patch/files/patch-lib__localcharset.c ============================================================================== --- head/devel/patch/files/patch-lib__localcharset.c Thu Nov 7 10:20:30 2019 (r516963) +++ head/devel/patch/files/patch-lib__localcharset.c Thu Nov 7 11:35:34 2019 (r516964) @@ -1,5 +1,5 @@ ---- lib/localcharset.c.orig 2018-02-03 12:42:20 UTC -+++ lib/localcharset.c +--- ./lib/localcharset.c.orig 2018-02-03 12:42:20 UTC ++++ ./lib/localcharset.c @@ -129,7 +129,7 @@ get_charset_aliases (void) cp = charset_aliases; if (cp == NULL) Modified: head/devel/patch/pkg-descr ============================================================================== --- head/devel/patch/pkg-descr Thu Nov 7 10:20:30 2019 (r516963) +++ head/devel/patch/pkg-descr Thu Nov 7 11:35:34 2019 (r516964) @@ -3,4 +3,4 @@ listing produced by the diff program and applies those differences to one or more original files, producing patched versions. -WWW: http://www.gnu.org/software/patch/patch.html +WWW: https://savannah.gnu.org/projects/patch/