svn commit: r436377 - in branches/2017Q1/www: moodle29 moodle30 moodle31 moodle32

[Jason Unovitch]

Author: junovitch
Date: Sat Mar 18 02:24:56 2017
New Revision: 436377
URL: https://svnweb.freebsd.org/changeset/ports/436377

Log:
  MFH: r431045 r431057 (excluding www/py-django-crispy-forms) r436035
  
  - Update moodle to 3.0.9, 3.1.5 and 3.2.2
  - Adjust CONFLICTS
  - Mark DEPRECATED and adjust CONFLICTS (www/moodle29)
  
  Security:	CVE-2017-2576
  Security:	CVE-2017-2578
  Security:	CVE-2016-10045
  Security:	https://vuxml.FreeBSD.org/freebsd/f72d98d1-0b7e-11e7-970f-002590263bf5.html
  Security:	https://vuxml.FreeBSD.org/freebsd/df45b4bd-0b7f-11e7-970f-002590263bf5.html
  Approved by:	ports-secteam (with hat)

Modified:
  branches/2017Q1/www/moodle29/Makefile
  branches/2017Q1/www/moodle30/Makefile
  branches/2017Q1/www/moodle30/distinfo
  branches/2017Q1/www/moodle31/Makefile
  branches/2017Q1/www/moodle31/distinfo
  branches/2017Q1/www/moodle32/Makefile
  branches/2017Q1/www/moodle32/distinfo
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/www/moodle29/Makefile
==============================================================================
--- branches/2017Q1/www/moodle29/Makefile	Sat Mar 18 02:15:26 2017	(r436376)
+++ branches/2017Q1/www/moodle29/Makefile	Sat Mar 18 02:24:56 2017	(r436377)
@@ -12,7 +12,10 @@ COMMENT=	Course management system based 
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle32-3.2 moodle31-3.1.[0-9]* moodle30-3.0.[0-9]*
+DEPRECATED=	Upstream support EoL, please migrate to moodle32
+EXPIRATION_DATE=	2017-04-10
+
+CONFLICTS=	moodle32-3.2.[0-9]* moodle31-3.1.[0-9]* moodle30-3.0.[0-9]*
 
 USES=		cpe tar:tgz
 USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \

Modified: branches/2017Q1/www/moodle30/Makefile
==============================================================================
--- branches/2017Q1/www/moodle30/Makefile	Sat Mar 18 02:15:26 2017	(r436376)
+++ branches/2017Q1/www/moodle30/Makefile	Sat Mar 18 02:24:56 2017	(r436377)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.0.7
+PORTVERSION=	3.0.9
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable30/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
@@ -12,7 +12,7 @@ COMMENT=	Course management system based 
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle29-2.9.[0-9]* moodle31-3.1.[0-9]* moodle32-3.2
+CONFLICTS=	moodle29-2.9.[0-9]* moodle31-3.1.[0-9]* moodle32-3.2.[0-9]*
 
 USES=		cpe tar:tgz
 USE_PHP=	ctype curl dom gd hash iconv intl json mbstring opcache \

Modified: branches/2017Q1/www/moodle30/distinfo
==============================================================================
--- branches/2017Q1/www/moodle30/distinfo	Sat Mar 18 02:15:26 2017	(r436376)
+++ branches/2017Q1/www/moodle30/distinfo	Sat Mar 18 02:24:56 2017	(r436377)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479194501
-SHA256 (moodle-3.0.7.tgz) = 6d4f97fd6f8431a8a79eb8d49bdaf54b197c667d7b6d6185c4d7e568d69092b0
-SIZE (moodle-3.0.7.tgz) = 38213543
+TIMESTAMP = 1489368895
+SHA256 (moodle-3.0.9.tgz) = 48786ee7bba47603843c405be91e4bcb269b3864e532425620c15d216d2c311b
+SIZE (moodle-3.0.9.tgz) = 38216116

Modified: branches/2017Q1/www/moodle31/Makefile
==============================================================================
--- branches/2017Q1/www/moodle31/Makefile	Sat Mar 18 02:15:26 2017	(r436376)
+++ branches/2017Q1/www/moodle31/Makefile	Sat Mar 18 02:24:56 2017	(r436377)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.1.3
+PORTVERSION=	3.1.5
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable31/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
@@ -12,7 +12,7 @@ COMMENT=	Course management system based 
 
 LICENSE=	GPLv3
 
-CONFLICTS=	moodle29-2.9.[0-9]* moodle30-3.0.[0-9]* moodle32-3.2
+CONFLICTS=	moodle29-2.9.[0-9]* moodle30-3.0.[0-9]* moodle32-3.2.[0-9]*
 
 USES=		cpe tar:tgz
 USE_PHP=	ctype curl dom gd hash iconv intl json mbstring opcache \

Modified: branches/2017Q1/www/moodle31/distinfo
==============================================================================
--- branches/2017Q1/www/moodle31/distinfo	Sat Mar 18 02:15:26 2017	(r436376)
+++ branches/2017Q1/www/moodle31/distinfo	Sat Mar 18 02:24:56 2017	(r436377)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479193633
-SHA256 (moodle-3.1.3.tgz) = c0a4924ef66000fc1ac203276260789a43aab6a88283a45f1ce01002370a8ab2
-SIZE (moodle-3.1.3.tgz) = 37558330
+TIMESTAMP = 1489368316
+SHA256 (moodle-3.1.5.tgz) = 48b685e52bc65b3cb78930cb1331abff2a0153f2ac6606ac2969ff6011315f7f
+SIZE (moodle-3.1.5.tgz) = 37952408

Modified: branches/2017Q1/www/moodle32/Makefile
==============================================================================
--- branches/2017Q1/www/moodle32/Makefile	Sat Mar 18 02:15:26 2017	(r436376)
+++ branches/2017Q1/www/moodle32/Makefile	Sat Mar 18 02:24:56 2017	(r436377)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	moodle
-PORTVERSION=	3.2
+PORTVERSION=	3.2.2
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable32/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}

Modified: branches/2017Q1/www/moodle32/distinfo
==============================================================================
--- branches/2017Q1/www/moodle32/distinfo	Sat Mar 18 02:15:26 2017	(r436376)
+++ branches/2017Q1/www/moodle32/distinfo	Sat Mar 18 02:24:56 2017	(r436377)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480905982
-SHA256 (moodle-3.2.tgz) = ae6dcfdc0d300bcba518f10be7978049f0c4e400b4f2e4420f3b31c011cbeb41
-SIZE (moodle-3.2.tgz) = 38923254
+TIMESTAMP = 1489367309
+SHA256 (moodle-3.2.2.tgz) = 7d520e781756a020314d913521a612e4a1b188b074eec043dc29e897f66585cb
+SIZE (moodle-3.2.2.tgz) = 39465439