From 552f06b8e94d9956e52b2a50d2812337b8e11c57 Mon Sep 17 00:00:00 2001
From: landry <landry@openbsd.org>
Date: Mon, 30 May 2011 15:35:28 +0000
Subject: [PATCH] Security update to drupal 6.22, from wen heping.

Fixes SA-CORE-2011-001, see http://drupal.org/node/1168756 for details.
ok sthen@
---
 www/drupal6/core/Makefile  |  5 ++---
 www/drupal6/core/distinfo  | 10 +++++-----
 www/drupal6/core/pkg/PLIST |  4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/www/drupal6/core/Makefile b/www/drupal6/core/Makefile
index 8c1759a17bb..d9290764942 100644
--- a/www/drupal6/core/Makefile
+++ b/www/drupal6/core/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/22 08:36:47 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2011/05/30 15:35:28 landry Exp $
 
 COMMENT =	powerful content management system
  
-DISTNAME =	drupal-6.19
-REVISION =	1
+DISTNAME =	drupal-6.22
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 RUN_DEPENDS = 	www/php5/core \
diff --git a/www/drupal6/core/distinfo b/www/drupal6/core/distinfo
index 108e650e81a..c5d85016d0c 100644
--- a/www/drupal6/core/distinfo
+++ b/www/drupal6/core/distinfo
@@ -1,5 +1,5 @@
-MD5 (drupal6/drupal-6.19.tar.gz) = 9H939M+0Gxw4R/9KZO6SeQ==
-RMD160 (drupal6/drupal-6.19.tar.gz) = 8GeA1FGWpqot4ExTVq2sr+JxB8M=
-SHA1 (drupal6/drupal-6.19.tar.gz) = YIYrXFfgn+74UL3UJ/86i8344AI=
-SHA256 (drupal6/drupal-6.19.tar.gz) = sgZ7GECDIa+FlXFeLB+w6fIMGItCdrthbAZv9qsm7og=
-SIZE (drupal6/drupal-6.19.tar.gz) = 1095592
+MD5 (drupal6/drupal-6.22.tar.gz) = RHSQ87wVX9HVwtRygMmZpQ==
+RMD160 (drupal6/drupal-6.22.tar.gz) = QstkoyykV3eeSY747blS4E+LLIY=
+SHA1 (drupal6/drupal-6.22.tar.gz) = pnrNtgaqu9nabd0sAW1Du57BdDE=
+SHA256 (drupal6/drupal-6.22.tar.gz) = 1D2hhYv7ghGiatf3SczozDrnAf0osTUCz12u9R0x8CE=
+SIZE (drupal6/drupal-6.22.tar.gz) = 1100999
diff --git a/www/drupal6/core/pkg/PLIST b/www/drupal6/core/pkg/PLIST
index 5734c7a2887..ab3aeb7d5b5 100644
--- a/www/drupal6/core/pkg/PLIST
+++ b/www/drupal6/core/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2010/11/15 12:58:52 stephan Exp $
+@comment $OpenBSD: PLIST,v 1.7 2011/05/30 15:35:28 landry Exp $
 @option no-default-conflict
 @conflict drupal->=6,<7
 @owner ${DRUPAL_OWNER}
@@ -50,6 +50,7 @@ ${DRUPAL_ROOT}/includes/tablesort.inc
 ${DRUPAL_ROOT}/includes/theme.inc
 ${DRUPAL_ROOT}/includes/theme.maintenance.inc
 ${DRUPAL_ROOT}/includes/unicode.inc
+${DRUPAL_ROOT}/includes/unicode.entities.inc
 ${DRUPAL_ROOT}/includes/xmlrpc.inc
 ${DRUPAL_ROOT}/includes/xmlrpcs.inc
 ${DRUPAL_ROOT}/index.php
@@ -303,6 +304,7 @@ ${DRUPAL_ROOT}/modules/statistics/statistics.module
 ${DRUPAL_ROOT}/modules/statistics/statistics.pages.inc
 ${DRUPAL_ROOT}/modules/syslog/
 ${DRUPAL_ROOT}/modules/syslog/syslog.info
+${DRUPAL_ROOT}/modules/syslog/syslog.install
 ${DRUPAL_ROOT}/modules/syslog/syslog.module
 ${DRUPAL_ROOT}/modules/system/
 ${DRUPAL_ROOT}/modules/system/admin-rtl.css