Update to 6.8

* Create user/group

Changelog:
* [bp/r43638][SEC] unserialize: More complete check for objects in serialized data when it's not the first item
* And more bugfixes

3 files changed, 38 insertions, 107 deletions

diff --git a/www/php-tiki6/Makefile b/www/php-tiki6/Makefile
index 5a5f7b07d2d..fcd82d0f724 100644
--- a/www/php-tiki6/Makefile
+++ b/www/php-tiki6/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2012/10/28 06:30:58 asau Exp $
+# $NetBSD: Makefile,v 1.10 2012/12/24 01:59:45 ryoon Exp $
 #
 
-DISTNAME=	tiki-6.7
+DISTNAME=	tiki-6.8
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/tiki-/tiki6-/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tikiwiki/}
@@ -28,6 +28,16 @@ BUILD_DEFS+=	APACHE_GROUP APACHE_USER
 TIKIDIR=		share/tiki6
 INSTALLATION_DIRS=	${TIKIDIR}
 
+.include "../../mk/bsd.prefs.mk"
+
+APACHE_USER?=	www
+APACHE_GROUP?=	www
+PKG_GROUPS=	${APACHE_GROUP}
+PKG_USERS=	${APACHE_USER}:${APACHE_GROUP}
+
+PKG_USERS_VARS=		APACHE_USER
+PKG_GROUPS_VARS=	APACHE_GROUP
+
 FILES_SUBST+=	WWWGRP=${APACHE_GROUP} WWWOWN=${APACHE_USER} \
 		TIKIDIR=${TIKIDIR}
 
diff --git a/www/php-tiki6/PLIST b/www/php-tiki6/PLIST
index 9db80903e67..170f29f3385 100644
--- a/www/php-tiki6/PLIST
+++ b/www/php-tiki6/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/04/19 15:12:00 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/12/24 01:59:45 ryoon Exp $
 share/tiki6/INSTALL
 share/tiki6/README
 share/tiki6/_htaccess
@@ -33,6 +33,7 @@ share/tiki6/db/index.php
 share/tiki6/db/tiki-db-adodb.php
 share/tiki6/db/tiki-db-pdo.php
 share/tiki6/db/tiki-db.php
+share/tiki6/db/tiki-secdb_6.7_mysql.sql
 share/tiki6/db/tiki-secdb_${PKGVERSION}_mysql.sql
 share/tiki6/db/tiki.sql
 share/tiki6/db/tiki_1.8to1.9.sql
@@ -5760,6 +5761,7 @@ share/tiki6/lib/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-id.min.js
 share/tiki6/lib/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-is.min.js
 share/tiki6/lib/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-it.min.js
 share/tiki6/lib/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ja.min.js
+share/tiki6/lib/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ka.min.js
 share/tiki6/lib/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-kk.min.js
 share/tiki6/lib/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-km.min.js
 share/tiki6/lib/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ko.min.js
@@ -7152,106 +7154,6 @@ share/tiki6/lib/jquery/jquery.sheet/jquery-ui/theme/jquery.ui.selectable.css
 share/tiki6/lib/jquery/jquery.sheet/jquery-ui/theme/jquery.ui.slider.css
 share/tiki6/lib/jquery/jquery.sheet/jquery-ui/theme/jquery.ui.tabs.css
 share/tiki6/lib/jquery/jquery.sheet/jquery-ui/theme/jquery.ui.theme.css
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery-ui-i18n.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-af.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ar-DZ.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ar.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-az.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-bg.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-bs.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ca.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-cs.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-cy-GB.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-da.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-de.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-el.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-en-AU.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-en-GB.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-en-NZ.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-eo.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-es.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-et.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-eu.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-fa.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-fi.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-fo.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-fr-CH.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-fr.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-gl.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-he.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-hi.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-hr.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-hu.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-hy.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-id.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-is.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-it.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ja.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-kk.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-km.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ko.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-lb.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-lt.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-lv.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-mk.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ml.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ms.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-nl-BE.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-nl.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-no.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-pl.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-pt-BR.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-pt.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-rm.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ro.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ru.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-sk.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-sl.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-sq.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-sr-SR.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-sr.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-sv.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-ta.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-th.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-tj.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-tr.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-uk.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-vi.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-zh-CN.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-zh-HK.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/i18n/jquery.ui.datepicker-zh-TW.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery-ui.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.blind.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.bounce.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.clip.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.core.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.drop.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.explode.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.fade.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.fold.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.highlight.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.pulsate.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.scale.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.shake.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.slide.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.effects.transfer.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.accordion.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.autocomplete.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.button.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.core.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.datepicker.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.dialog.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.draggable.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.droppable.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.mouse.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.position.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.progressbar.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.resizable.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.selectable.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.slider.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.sortable.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.tabs.min.js
-share/tiki6/lib/jquery/jquery.sheet/jquery-ui/ui/jquery.ui.widget.min.js
 share/tiki6/lib/jquery/jquery.sheet/jquery.sheet.advancedfn.js
 share/tiki6/lib/jquery/jquery.sheet/jquery.sheet.css
 share/tiki6/lib/jquery/jquery.sheet/jquery.sheet.financefn.js
@@ -8161,6 +8063,25 @@ share/tiki6/lib/phplayers_tiki/templates/layersmenu-sub_menu.ihtml
 share/tiki6/lib/phplayers_tiki/templates/layersmenu-vertical_menu-galaxy.ihtml
 share/tiki6/lib/phplayers_tiki/templates/layersmenu-vertical_menu.ihtml
 share/tiki6/lib/phplayers_tiki/tiki-phplayers.php
+share/tiki6/lib/phpsec/.gitignore
+share/tiki6/lib/phpsec/CHANGELOG.md
+share/tiki6/lib/phpsec/LICENSE
+share/tiki6/lib/phpsec/README.md
+share/tiki6/lib/phpsec/phpsec.class.php
+share/tiki6/lib/phpsec/phpsec/phpsec.cache.php
+share/tiki6/lib/phpsec/phpsec/phpsec.crypt.php
+share/tiki6/lib/phpsec/phpsec/phpsec.filter.php
+share/tiki6/lib/phpsec/phpsec/phpsec.hash.php
+share/tiki6/lib/phpsec/phpsec/phpsec.otp.php
+share/tiki6/lib/phpsec/phpsec/phpsec.otpcard.php
+share/tiki6/lib/phpsec/phpsec/phpsec.pw.php
+share/tiki6/lib/phpsec/phpsec/phpsec.rand.php
+share/tiki6/lib/phpsec/phpsec/phpsec.session.php
+share/tiki6/lib/phpsec/phpsec/phpsec.store.filesystem.php
+share/tiki6/lib/phpsec/phpsec/phpsec.store.pdo.php
+share/tiki6/lib/phpsec/phpsec/phpsec.store.php
+share/tiki6/lib/phpsec/phpsec/phpsec.token.php
+share/tiki6/lib/phpsec/phpsec/phpsec.yubikey.php
 share/tiki6/lib/polls/index.php
 share/tiki6/lib/polls/polllib.php
 share/tiki6/lib/polls/polllib_shared.php
diff --git a/www/php-tiki6/distinfo b/www/php-tiki6/distinfo
index 817ec552993..f124158763d 100644
--- a/www/php-tiki6/distinfo
+++ b/www/php-tiki6/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2012/06/07 21:46:55 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2012/12/24 01:59:45 ryoon Exp $
 
-SHA1 (tiki-6.7.tar.bz2) = be464dda11e934cd8701fb949f9e15ba5a96d1bb
-RMD160 (tiki-6.7.tar.bz2) = e7889de5930a7431bcfbdbf211c3e8220dae9787
-Size (tiki-6.7.tar.bz2) = 19038029 bytes
+SHA1 (tiki-6.8.tar.bz2) = 7a4680cabb1bc116a762127e5f6d993e58ffa456
+RMD160 (tiki-6.8.tar.bz2) = fa2955163fcf15c60a37f49f872bf4bb88d2c1b8
+Size (tiki-6.8.tar.bz2) = 19042439 bytes
 SHA1 (patch-setup.sh) = b0e7c905700b97bdcb8b040679d477b4865fefc7