CVS commit: [pkgsrc-2017Q4] pkgsrc/www

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Mar 30 11:14:01 UTC 2018

Modified Files:
        pkgsrc/www/drupal7 [pkgsrc-2017Q4]: Makefile PLIST distinfo
        pkgsrc/www/drupal8 [pkgsrc-2017Q4]: Makefile PLIST distinfo

Log Message:
Pullup ticket #5731 - requested by maya
www/drupal7: security fix
www/drupal8: security fix

Revisions pulled up:
- www/drupal7/Makefile                                          1.48
- www/drupal7/distinfo                                          1.36
- www/drupal8/Makefile: submitter provided patch
- www/drupal8/distinfo: submitter provided patch

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Wed Mar 28 21:22:18 UTC 2018

   Modified Files:
           pkgsrc/www/drupal7: Makefile distinfo

   Log Message:
   drupal7: update to 7.58

   Fixes remote code execution vulnerability (CVE-2018-7600)
   No other changes are included in this release.


To generate a diff of this commit:
cvs rdiff -u -r1.46.8.1 -r1.46.8.2 pkgsrc/www/drupal7/Makefile
cvs rdiff -u -r1.16 -r1.16.8.1 pkgsrc/www/drupal7/PLIST
cvs rdiff -u -r1.34.8.1 -r1.34.8.2 pkgsrc/www/drupal7/distinfo
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 pkgsrc/www/drupal8/Makefile \
    pkgsrc/www/drupal8/PLIST pkgsrc/www/drupal8/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/drupal7/Makefile
diff -u pkgsrc/www/drupal7/Makefile:1.46.8.1 pkgsrc/www/drupal7/Makefile:1.46.8.2
--- pkgsrc/www/drupal7/Makefile:1.46.8.1        Fri Mar  2 21:23:49 2018
+++ pkgsrc/www/drupal7/Makefile Fri Mar 30 11:14:01 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46.8.1 2018/03/02 21:23:49 spz Exp $
+# $NetBSD: Makefile,v 1.46.8.2 2018/03/30 11:14:01 bsiegert Exp $
 
-DISTNAME=      drupal-7.57
+DISTNAME=      drupal-7.58
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    www
 MASTER_SITES=  https://ftp.drupal.org/files/projects/

Index: pkgsrc/www/drupal7/PLIST
diff -u pkgsrc/www/drupal7/PLIST:1.16 pkgsrc/www/drupal7/PLIST:1.16.8.1
--- pkgsrc/www/drupal7/PLIST:1.16       Sat May 20 18:20:02 2017
+++ pkgsrc/www/drupal7/PLIST    Fri Mar 30 11:14:01 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2017/05/20 18:20:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.16.8.1 2018/03/30 11:14:01 bsiegert Exp $
 share/doc/drupal/CHANGELOG.txt
 share/doc/drupal/COPYRIGHT.txt
 share/doc/drupal/INSTALL.mysql.txt
@@ -67,6 +67,7 @@ share/drupal/includes/pager.inc
 share/drupal/includes/password.inc
 share/drupal/includes/path.inc
 share/drupal/includes/registry.inc
+share/drupal/includes/request-sanitizer.inc
 share/drupal/includes/session.inc
 share/drupal/includes/stream_wrappers.inc
 share/drupal/includes/tablesort.inc

Index: pkgsrc/www/drupal7/distinfo
diff -u pkgsrc/www/drupal7/distinfo:1.34.8.1 pkgsrc/www/drupal7/distinfo:1.34.8.2
--- pkgsrc/www/drupal7/distinfo:1.34.8.1        Fri Mar  2 21:23:49 2018
+++ pkgsrc/www/drupal7/distinfo Fri Mar 30 11:14:01 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.34.8.1 2018/03/02 21:23:49 spz Exp $
+$NetBSD: distinfo,v 1.34.8.2 2018/03/30 11:14:01 bsiegert Exp $
 
-SHA1 (drupal-7.57.tar.gz) = 0e11212a07c87f10706b80cbf19db18925791a49
-RMD160 (drupal-7.57.tar.gz) = fa1f711617ff9ac79e4c29904dc76fca1917f0d4
-SHA512 (drupal-7.57.tar.gz) = 79e7e38c605cf60e458b2846ef4ce95f82368954f86fac6e79c19357e7a4ff714367c5580836ae2e45b22029d9ba2f2566901887d37bfa1ec2ed94a5a370fa0e
-Size (drupal-7.57.tar.gz) = 3279405 bytes
+SHA1 (drupal-7.58.tar.gz) = b5bebe67682c24792316c4bb591c968f146e4799
+RMD160 (drupal-7.58.tar.gz) = ad215d4c53d05659a621065e30baa9b2abf50b8e
+SHA512 (drupal-7.58.tar.gz) = 13e437e0458d6b45723ceeca28ec9f82a67497b3dafff0152512e3ad07e1a9b53cdc39404565089ea1531495a047f803e3a1006ca218cbe3dcbbb7a6119e154e
+Size (drupal-7.58.tar.gz) = 3281269 bytes

Index: pkgsrc/www/drupal8/Makefile
diff -u pkgsrc/www/drupal8/Makefile:1.1.2.1 pkgsrc/www/drupal8/Makefile:1.1.2.2
--- pkgsrc/www/drupal8/Makefile:1.1.2.1 Fri Mar  2 21:23:28 2018
+++ pkgsrc/www/drupal8/Makefile Fri Mar 30 11:14:01 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.2.1 2018/03/02 21:23:28 spz Exp $
+# $NetBSD: Makefile,v 1.1.2.2 2018/03/30 11:14:01 bsiegert Exp $
 
-DISTNAME=      drupal-8.4.5
+DISTNAME=      drupal-8.4.6
 PKGNAME=       ${PHP_PKG_PREFIX}-${DISTNAME}
 CATEGORIES=    www
 MASTER_SITES=  http://ftp.drupal.org/files/projects/
Index: pkgsrc/www/drupal8/PLIST
diff -u pkgsrc/www/drupal8/PLIST:1.1.2.1 pkgsrc/www/drupal8/PLIST:1.1.2.2
--- pkgsrc/www/drupal8/PLIST:1.1.2.1    Fri Mar  2 21:23:28 2018
+++ pkgsrc/www/drupal8/PLIST    Fri Mar 30 11:14:01 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.2.1 2018/03/02 21:23:28 spz Exp $
+@comment $NetBSD: PLIST,v 1.1.2.2 2018/03/30 11:14:01 bsiegert Exp $
 share/drupal/.csslintrc
 share/drupal/.editorconfig
 share/drupal/.eslintignore
@@ -2174,6 +2174,7 @@ share/drupal/core/lib/Drupal/Core/Routin
 share/drupal/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
 share/drupal/core/lib/Drupal/Core/Routing/UrlMatcher.php
 share/drupal/core/lib/Drupal/Core/Routing/routing.api.php
+share/drupal/core/lib/Drupal/Core/Security/RequestSanitizer.php
 share/drupal/core/lib/Drupal/Core/Serialization/Yaml.php
 share/drupal/core/lib/Drupal/Core/Session/AccountInterface.php
 share/drupal/core/lib/Drupal/Core/Session/AccountProxy.php
Index: pkgsrc/www/drupal8/distinfo
diff -u pkgsrc/www/drupal8/distinfo:1.1.2.1 pkgsrc/www/drupal8/distinfo:1.1.2.2
--- pkgsrc/www/drupal8/distinfo:1.1.2.1 Fri Mar  2 21:23:28 2018
+++ pkgsrc/www/drupal8/distinfo Fri Mar 30 11:14:01 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.2.1 2018/03/02 21:23:28 spz Exp $
+$NetBSD: distinfo,v 1.1.2.2 2018/03/30 11:14:01 bsiegert Exp $
 
-SHA1 (drupal-8.4.5.tar.gz) = 8d5f7e055f86bf57d40f5c6eaf78acf352500446
-RMD160 (drupal-8.4.5.tar.gz) = f8761e8188acce152c2502cd5d057acd5bb62ba3
-SHA512 (drupal-8.4.5.tar.gz) = 105a6bce140b1f5965d42f46df4a8fa0f8802ae6b4efde5c095004f51beebe5f1c4d3064e3363f59f9a15f739ea598b2e9a03304630731113777b3639b3440d2
-Size (drupal-8.4.5.tar.gz) = 13414036 bytes
+SHA1 (drupal-8.4.6.tar.gz) = c68602277adb7f086bdb65f36c50fd955ffe260e
+RMD160 (drupal-8.4.6.tar.gz) = b20b91642f5ff1ba2915623ea565827be4aa44c6
+SHA512 (drupal-8.4.6.tar.gz) = ded7d5e9af8e01d098e1e436afebeadc69bf99a436a3516c4884af689c812770ec41609a55d2f41aaf226f8ad8e4318acb864af0bbf5d243a81cd373611d5795
+Size (drupal-8.4.6.tar.gz) = 13413996 bytes