Attachment 199463 Details for Bug 233419 – update to bc42dfb790 g20181122

[patch] update to bc42dfb790 g20181122

0001-Update-to-commit-bc42dfb790-g20181122.patch (text/plain), 6.29 KB, created by Derek Schrock on 2018-11-23 00:26:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2018-11-23 00:26:18 UTC

Size: 6.29 KB

patch

obsolete

>From 12abd5dd9850f491b2e8f584eea9201578cf4e23 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Thu, 22 Nov 2018 19:13:51 -0500
>Subject: [PATCH] Update to commit bc42dfb790 g20181122
>
>Update to commit bc42dfb790 g20181122 that removes [1] phpmailer
>due to CVE-2018-19296 [2] in favor of php's mail().
>
>Also, move USES* section around to appease portlint.
>
>[1] https://discourse.tt-rss.org/t/phpmailer-cve-2018-19296-update/1635/2?u=derekschrock
>[2] https://github.com/PHPMailer/PHPMailer/releases/tag/v5.2.27
>---
> www/tt-rss/Makefile  | 13 +++++-----
> www/tt-rss/distinfo  |  6 ++---
> www/tt-rss/pkg-plist | 57 +-------------------------------------------
> 3 files changed, 11 insertions(+), 65 deletions(-)
>
>diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
>index eafce357948e..fe413b049c7b 100644
>--- a/www/tt-rss/Makefile
>+++ b/www/tt-rss/Makefile
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tt-rss
>-PORTVERSION=	g20180908
>+PORTVERSION=	g20181122
> PORTEPOCH=	1
> CATEGORIES=	www
> MASTER_SITES=	https://git.tt-rss.org/git/tt-rss/archive/
>@@ -14,17 +14,18 @@ COMMENT=	Tiny Tiny RSS: web-based news feed (RSS/Atom) aggregator
> 
> LICENSE=	GPLv2
> 
>-GIT_TAGNAME=	5a35b31b89
>-
>-NO_BUILD=	yes
>-NO_ARCH=	yes
>-
> USES=		php:cli,web shebangfix gettext-tools
> USE_PHP=	ctype dom fileinfo hash json mbstring pcntl posix session xmlrpc
>+
> REINPLACE_ARGS=	-i ""
> SHEBANG_FILES=	lib/dojo-src/rebuild-dojo.sh utils/extract-i18n-js.pl
> WRKSRC=		${WRKDIR}/tt-rss
> 
>+GIT_TAGNAME=	bc42dfb790
>+
>+NO_BUILD=	yes
>+NO_ARCH=	yes
>+
> USE_RC_SUBR=	ttrssd
> 
> OPTIONS_DEFINE=	CURL GD
>diff --git a/www/tt-rss/distinfo b/www/tt-rss/distinfo
>index 866a9d9a73c1..6e3ea0caf52f 100644
>--- a/www/tt-rss/distinfo
>+++ b/www/tt-rss/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1536400837
>-SHA256 (tt-rss/5a35b31b89.tar.gz) = aa8da2cbc145b2533b0d601338a32967a316f62958a7fbb066ab1b07742bb15f
>-SIZE (tt-rss/5a35b31b89.tar.gz) = 2958264
>+TIMESTAMP = 1542931209
>+SHA256 (tt-rss/bc42dfb790.tar.gz) = 56ba82b1d9f269f30da13db44bd51ebb37ea646281676d2a6543f0c09ac0b962
>+SIZE (tt-rss/bc42dfb790.tar.gz) = 2897866
>diff --git a/www/tt-rss/pkg-plist b/www/tt-rss/pkg-plist
>index f8857b591f45..46eec93fc53a 100644
>--- a/www/tt-rss/pkg-plist
>+++ b/www/tt-rss/pkg-plist
>@@ -44,6 +44,7 @@
> %%WWWDIR%%/classes/logger/sql.php
> %%WWWDIR%%/classes/logger/stdout.php
> %%WWWDIR%%/classes/logger/syslog.php
>+%%WWWDIR%%/classes/mailer.php
> %%WWWDIR%%/classes/opml.php
> %%WWWDIR%%/classes/plugin.php
> %%WWWDIR%%/classes/pluginhandler.php
>@@ -56,7 +57,6 @@
> %%WWWDIR%%/classes/pref/users.php
> %%WWWDIR%%/classes/rpc.php
> %%WWWDIR%%/classes/rssutils.php
>-%%WWWDIR%%/classes/ttrssmailer.php
> @mode 0400
> @sample %%WWWDIR%%/config.php.sample
> @mode
>@@ -1847,59 +1847,6 @@
> %%WWWDIR%%/lib/gettext/streams.php
> %%WWWDIR%%/lib/index.html
> %%WWWDIR%%/lib/jimIcon.php
>-%%WWWDIR%%/lib/phpmailer/class.phpmailer.php
>-%%WWWDIR%%/lib/phpmailer/class.smtp.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-am.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-ar.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-az.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-be.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-bg.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-br.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-ca.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-ch.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-cs.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-cz.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-da.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-de.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-dk.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-el.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-eo.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-es.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-et.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-fa.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-fi.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-fo.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-fr.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-gl.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-he.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-hr.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-hu.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-id.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-it.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-ja.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-ka.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-ko.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-lt.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-lv.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-ms.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-nb.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-nl.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-no.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-pl.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-pt.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-pt_br.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-ro.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-ru.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-se.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-sk.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-sl.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-sr.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-sv.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-tr.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-uk.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-vi.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-zh.php
>-%%WWWDIR%%/lib/phpmailer/language/phpmailer.lang-zh_cn.php
> %%WWWDIR%%/lib/phpqrcode/CHANGELOG
> %%WWWDIR%%/lib/phpqrcode/INSTALL
> %%WWWDIR%%/lib/phpqrcode/README
>@@ -2925,8 +2872,6 @@
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/phpqrcode/bindings/tcpdf
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/phpqrcode/bindings
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/phpqrcode
>-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/phpmailer/language
>-@dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/phpmailer
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/gettext
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/dojo/store/util
> @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/lib/dojo/store/api
>-- 
>2.19.1
>

Actions: View | Diff

Attachments on bug 233419: 199463