Update www/geeklog package to 1.6.1.

Geeklog 1.6.1

New Features and Improvements

  * Geeklog now lets you enter meta descriptions and meta keywords for the main
    page, for stories, topics, static pages, and polls. Please note that these
    meta tags may not be used by some search engines.
  * You can now have one featured story per topic (for stories set to "Show
    only in Topic").
  * New autotags now allow you to embed polls in stories and everywhere else
    where autotags are allowed.
  * The Migrate option in the install script can now also be applied to an
    existing database (i.e. you don't need to import a database dump to update
    your URLs and paths).
  * The Database Backup admin panel now includes options to optimize the
    database and convert tables to InnoDB (MySQL only).
  * Improved timezone support and let users actually set their own timezone.
  * Minor security enhancements:
      + "Important" cookies (like the session cookies) are now created with the
        HttpOnly flag set. This will help avoid some XSS attacks, provided your
        browser supports this flag.
      + Template errors will now trigger the standard error handler instead of
        exposing the template path.
      + Fixed inclusion protection for some of the Spam-X class files.

Please also see the list of theme changes.

Bugfixes

  * Fixed automatic closing of stories for comments after a certain amount of
    days. If you need to re-open comments on stories that were closed due to
    this bug, you can use this SQL request:
    UPDATE gl_stories SET commentcode = 0, comment_expire = 0 WHERE commentcode
    = 1;
  * The comment speed limit was being ignored.
  * Fixed a bug in the Group Editor that didn't let you add groups to other
    groups (this problem was only introduced in Geeklog 1.6.0).
  * The admin group for the Static Pages plugin was created with a wrong name
    in Geeklog 1.6.0 (fresh installs only).
  * Several tweaks and minor fixes (e.g. compatibility with PHP 4) in the
    search.

9 files changed, 22 insertions, 103 deletions

diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index ef6b3b2e4c2..9a1762e20e6 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2009/09/15 10:48:46 taca Exp $
+# $NetBSD: Makefile,v 1.25 2009/11/30 15:44:45 taca Exp $
 #
 
 DISTNAME=	geeklog-${VER}
@@ -19,7 +19,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-mysql>=4.3.0:../../databases/php-mysql
 
 USE_TOOLS+=	pax
 
-VER=		1.6.0sr2
+VER=		1.6.1
 NO_BUILD=	YES
 
 PKG_GROUPS_VARS+=	APACHE_GROUP
diff --git a/www/geeklog/PLIST b/www/geeklog/PLIST
index ba1c575eadf..9da76439794 100644
--- a/www/geeklog/PLIST
+++ b/www/geeklog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/09/15 10:48:46 taca Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/11/30 15:44:45 taca Exp $
 ${GEEKLOG_BASE}/emailgeeklogstories
 ${GEEKLOG_BASE}/language/afrikaans.php
 ${GEEKLOG_BASE}/language/afrikaans_utf-8.php
@@ -106,7 +106,9 @@ ${GEEKLOG_BASE}/plugins/calendar/language/ukrainian.php
 ${GEEKLOG_BASE}/plugins/calendar/language/ukrainian_koi8-u.php
 ${GEEKLOG_BASE}/plugins/calendar/language/ukrainian_utf-8.php
 ${GEEKLOG_BASE}/plugins/calendar/sql/mssql_install.php
+${GEEKLOG_BASE}/plugins/calendar/sql/mssql_updates.php
 ${GEEKLOG_BASE}/plugins/calendar/sql/mysql_install.php
+${GEEKLOG_BASE}/plugins/calendar/sql/mysql_updates.php
 ${GEEKLOG_BASE}/plugins/calendar/templates/addevent.thtml
 ${GEEKLOG_BASE}/plugins/calendar/templates/addeventoption.thtml
 ${GEEKLOG_BASE}/plugins/calendar/templates/addremoveevent.thtml
@@ -321,7 +323,9 @@ ${GEEKLOG_BASE}/plugins/staticpages/language/ukrainian_koi8-u.php
 ${GEEKLOG_BASE}/plugins/staticpages/language/ukrainian_utf-8.php
 ${GEEKLOG_BASE}/plugins/staticpages/services.inc.php
 ${GEEKLOG_BASE}/plugins/staticpages/sql/mssql_install.php
+${GEEKLOG_BASE}/plugins/staticpages/sql/mssql_updates.php
 ${GEEKLOG_BASE}/plugins/staticpages/sql/mysql_install.php
+${GEEKLOG_BASE}/plugins/staticpages/sql/mysql_updates.php
 ${GEEKLOG_BASE}/plugins/staticpages/templates/admin/editor.thtml
 ${GEEKLOG_BASE}/plugins/staticpages/templates/admin/editor_advanced.thtml
 ${GEEKLOG_BASE}/plugins/staticpages/templates/centerblock.thtml
@@ -347,6 +351,7 @@ ${GEEKLOG_BASE}/sql/updates/mssql_1.4.1_to_1.5.0.php
 ${GEEKLOG_BASE}/sql/updates/mssql_1.5.0_to_1.5.1.php
 ${GEEKLOG_BASE}/sql/updates/mssql_1.5.1_to_1.5.2.php
 ${GEEKLOG_BASE}/sql/updates/mssql_1.5.2_to_1.6.0.php
+${GEEKLOG_BASE}/sql/updates/mssql_1.6.0_to_1.6.1.php
 ${GEEKLOG_BASE}/sql/updates/mysql_1.2.5-1_to_1.3.php
 ${GEEKLOG_BASE}/sql/updates/mysql_1.3.10_to_1.3.11.php
 ${GEEKLOG_BASE}/sql/updates/mysql_1.3.11_to_1.4.0.php
@@ -364,6 +369,7 @@ ${GEEKLOG_BASE}/sql/updates/mysql_1.4.1_to_1.5.0.php
 ${GEEKLOG_BASE}/sql/updates/mysql_1.5.0_to_1.5.1.php
 ${GEEKLOG_BASE}/sql/updates/mysql_1.5.1_to_1.5.2.php
 ${GEEKLOG_BASE}/sql/updates/mysql_1.5.2_to_1.6.0.php
+${GEEKLOG_BASE}/sql/updates/mysql_1.6.0_to_1.6.1.php
 ${GEEKLOG_BASE}/system/classes/authentication/LDAP.auth.class.php
 ${GEEKLOG_BASE}/system/classes/authentication/LiveJournal.auth.class.php
 ${GEEKLOG_BASE}/system/classes/authentication/ldap/config.php
@@ -396,6 +402,7 @@ ${GEEKLOG_BASE}/system/classes/syndication/rdf.feed.class.php
 ${GEEKLOG_BASE}/system/classes/syndication/rss.feed.class.php
 ${GEEKLOG_BASE}/system/classes/template.class.php
 ${GEEKLOG_BASE}/system/classes/timer.class.php
+${GEEKLOG_BASE}/system/classes/timezoneconfig.class.php
 ${GEEKLOG_BASE}/system/classes/unpacker.class.php
 ${GEEKLOG_BASE}/system/classes/upload.class.php
 ${GEEKLOG_BASE}/system/classes/url.class.php
@@ -422,6 +429,7 @@ ${GEEKLOG_BASE}/system/pear/Auth/SASL/Anonymous.php
 ${GEEKLOG_BASE}/system/pear/Auth/SASL/Common.php
 ${GEEKLOG_BASE}/system/pear/Auth/SASL/CramMD5.php
 ${GEEKLOG_BASE}/system/pear/Auth/SASL/DigestMD5.php
+${GEEKLOG_BASE}/system/pear/Auth/SASL/External.php
 ${GEEKLOG_BASE}/system/pear/Auth/SASL/Login.php
 ${GEEKLOG_BASE}/system/pear/Auth/SASL/Plain.php
 ${GEEKLOG_BASE}/system/pear/Console/Getopt.php
@@ -811,7 +819,6 @@ ${GL_ADMIN}/install/lib-install.php
 ${GL_ADMIN}/install/lib-upgrade.php
 ${GL_ADMIN}/install/migrate.php
 ${GL_ADMIN}/install/success.php
-${GL_ADMIN}/install/toinnodb.php
 ${GL_ADMIN}/mail.php
 ${GL_ADMIN}/moderation.php
 ${GL_ADMIN}/plugins.php
@@ -1304,9 +1311,13 @@ ${GEEKLOG_PUB}/fckeditor/license.txt
 ${GEEKLOG_PUB}/fckeditor/myconfig.js
 ${GEEKLOG_PUB}/getimage.php
 ${GEEKLOG_PUB}/help/advancedsearch.html
+${GEEKLOG_PUB}/help/cccommentsubmission.html
+${GEEKLOG_PUB}/help/ccdraftsubmission.html
 ${GEEKLOG_PUB}/help/cceventsubmission.html
 ${GEEKLOG_PUB}/help/cclinksubmission.html
 ${GEEKLOG_PUB}/help/ccstorysubmission.html
+${GEEKLOG_PUB}/help/ccusersubmission.html
+${GEEKLOG_PUB}/help/index.html
 ${GEEKLOG_PUB}/help/submitevent.html
 ${GEEKLOG_PUB}/help/submitlink.html
 ${GEEKLOG_PUB}/help/submitstory.html
@@ -1495,6 +1506,7 @@ ${GEEKLOG_PUB}/layout/professional/images/print.png
 ${GEEKLOG_PUB}/layout/professional/images/sendping.png
 ${GEEKLOG_PUB}/layout/professional/images/smallcamera.png
 ${GEEKLOG_PUB}/layout/professional/images/sysmessage.png
+${GEEKLOG_PUB}/layout/professional/images/update.png
 ${GEEKLOG_PUB}/layout/professional/leftblocks.thtml
 ${GEEKLOG_PUB}/layout/professional/list.thtml
 ${GEEKLOG_PUB}/layout/professional/listitem.thtml
diff --git a/www/geeklog/distinfo b/www/geeklog/distinfo
index e463b67988f..b373eca02ee 100644
--- a/www/geeklog/distinfo
+++ b/www/geeklog/distinfo
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.11 2009/09/15 10:48:46 taca Exp $
+$NetBSD: distinfo,v 1.12 2009/11/30 15:44:45 taca Exp $
 
-SHA1 (geeklog-1.6.0sr2.tar.gz) = d952972544d944f0227679edb8b210b7918aae9c
-RMD160 (geeklog-1.6.0sr2.tar.gz) = 31894548a2e5c61031dd4c6ae64a27e7efdd1199
-Size (geeklog-1.6.0sr2.tar.gz) = 4935165 bytes
+SHA1 (geeklog-1.6.1.tar.gz) = f95e5d9d241e6b190ea0a50e759e825e9dc44f61
+RMD160 (geeklog-1.6.1.tar.gz) = 9e3c91caae7c293fc0ceaae6fa0a585cb7192a82
+Size (geeklog-1.6.1.tar.gz) = 5040246 bytes
 SHA1 (patch-aa) = 61cc381e4c3def555806ed4589446f466f6f8368
-SHA1 (patch-aj) = 2a98edcd7120778227137d6e642c10951ec74c88
+SHA1 (patch-aj) = 2960d225a690fe6af0819d69a27615425291b921
 SHA1 (patch-ak) = 387f14ace88c0390a2647453a08491500b099c78
-SHA1 (patch-al) = d6af94edcc576b9977f4ee67ae621922a51d4c94
-SHA1 (patch-am) = 782fb7b541fd3212cb909bfbea774e62e86584f6
-SHA1 (patch-an) = 127173971cd95a08c1d7e2e3c93873592fa94300
-SHA1 (patch-ao) = 1207692e32a4355be686eddba050372519184e59
-SHA1 (patch-ap) = ffce2ef3702aab1a444f7493db5498a2f7365244
diff --git a/www/geeklog/patches/patch-aj b/www/geeklog/patches/patch-aj
index f4ec87d8243..c92fde450d4 100644
--- a/www/geeklog/patches/patch-aj
+++ b/www/geeklog/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.3 2009/09/15 10:48:46 taca Exp $
+$NetBSD: patch-aj,v 1.4 2009/11/30 15:44:45 taca Exp $
 
 * Change for pkgsrc.
 * Output Content-Type header explicitly.
@@ -24,11 +24,3 @@ $NetBSD: patch-aj,v 1.3 2009/09/15 10:48:46 taca Exp $
  
  $html_path          = INST_getHtmlPath();
  $siteconfig_path    = '../../siteconfig.php';
-@@ -1242,6 +1234,7 @@ $display .= '<br' . XHTML . '><br' . XHT
-     . '</body>' . LB 
-     . '</html>';
- 
-+header('Content-Type: text/html; charset=' . $LANG_CHARSET);
- echo $display;
- 
- ?>
diff --git a/www/geeklog/patches/patch-al b/www/geeklog/patches/patch-al
deleted file mode 100644
index 56ab284e4cf..00000000000
--- a/www/geeklog/patches/patch-al
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-al,v 1.2 2009/09/15 10:48:46 taca Exp $
-
-* Output Content-Type header explicitly.
-
---- public_html/admin/install/help.php.orig	2009-07-29 20:41:47.000000000 +0900
-+++ public_html/admin/install/help.php
-@@ -109,6 +109,7 @@ $display .= '
- </body>
- </html>' . LB;
- 
-+header('Content-Type: text/html; charset=' . $LANG_CHARSET);
- echo $display;
- 
- ?>
diff --git a/www/geeklog/patches/patch-am b/www/geeklog/patches/patch-am
deleted file mode 100644
index d6080256c01..00000000000
--- a/www/geeklog/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.1 2009/09/15 10:48:46 taca Exp $
-
-* Output Content-Type header explicitly.
-
---- public_html/admin/install/bigdump.php.orig	2009-07-29 20:41:47.000000000 +0900
-+++ public_html/admin/install/bigdump.php
-@@ -88,6 +88,7 @@ define ('TESTMODE',false);           // 
- @ini_set('auto_detect_line_endings', true);
- @set_time_limit(0);
- 
-+header('Content-Type: text/html; charset=' . $LANG_CHARSET);
- echo INST_getHeader($LANG_MIGRATE[17]);
- 
- $error = false;
diff --git a/www/geeklog/patches/patch-an b/www/geeklog/patches/patch-an
deleted file mode 100644
index 28d0208e326..00000000000
--- a/www/geeklog/patches/patch-an
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-an,v 1.1 2009/09/15 10:48:46 taca Exp $
-
-* Output Content-Type header explicitly.
-
---- public_html/admin/install/install-plugins.php.orig	2009-07-29 20:41:47.000000000 +0900
-+++ public_html/admin/install/install-plugins.php
-@@ -527,6 +527,7 @@ if (INST_phpOutOfDate()) {
-     } // End switch ($step)
- } // end if (php_v())
- 
-+header('Content-Type: text/html; charset=' . COM_getCharset());
- $display .= INST_getFooter();
- 
- echo $display;
diff --git a/www/geeklog/patches/patch-ao b/www/geeklog/patches/patch-ao
deleted file mode 100644
index 8fb34494b14..00000000000
--- a/www/geeklog/patches/patch-ao
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2009/09/15 10:48:46 taca Exp $
-
-* Inherit proper language parameter.
-
---- public_html/admin/install/lib-install.php.orig	2009-08-30 22:39:19.000000000 +0900
-+++ public_html/admin/install/lib-install.php
-@@ -609,7 +609,8 @@ function INST_getAlertMsg($mMessage, $mT
-  */
- function INST_checkPost150Upgrade($dbconfig_path, $siteconfig_path)
- {
--    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass;
-+    global $_CONF, $_TABLES, $_DB, $_DB_dbms, $_DB_host, $_DB_user, $_DB_pass,
-+        $language;
- 
-     require $dbconfig_path;
-     require $siteconfig_path;
-@@ -658,6 +659,7 @@ function INST_checkPost150Upgrade($dbcon
-             // current version is at least 1.5.0, so upgrade directly
-             $req_string = 'index.php?mode=upgrade&step=3'
-                         . '&dbconfig_path=' . $dbconfig_path
-+                        . '&language=' . $language
-                         . '&version=' . $version;
- 
-             header('Location: ' . $req_string);
diff --git a/www/geeklog/patches/patch-ap b/www/geeklog/patches/patch-ap
deleted file mode 100644
index b1c92a226b7..00000000000
--- a/www/geeklog/patches/patch-ap
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2009/09/15 10:48:46 taca Exp $
-
-* Output Content-Type header explicitly.
-
---- public_html/admin/install/migrate.php.orig	2009-07-29 20:41:47.000000000 +0900
-+++ public_html/admin/install/migrate.php
-@@ -1011,6 +1011,7 @@ if (INST_phpOutOfDate()) {
- 
- $display .= INST_getFooter();
- 
-+header('Content-Type: text/html; charset=' . $LANG_CHARSET);
- echo $display;
- 
- ?>