- Updated to 1.2.5

- Added option for new SQLite backend

Requested by:	eadler
Security:	18dffa02-946a-11e1-be9d-000c29cc39d3
Security:	CVE-2012-1495
Security:	CVE-2012-1496

3 files changed, 11 insertions, 17 deletions

diff --git a/www/webcalendar-devel/Makefile b/www/webcalendar-devel/Makefile
index a3b9f339ed9e..f5f7eee481e7 100644
--- a/www/webcalendar-devel/Makefile
+++ b/www/webcalendar-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	WebCalendar
-PORTVERSION=	1.2.3
+PORTVERSION=	1.2.5
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}%201.2/${PORTVERSION}
 PKGNAMESUFFIX=	-devel
@@ -35,6 +35,7 @@ PORTDOCS=	WebCalendar-SysAdmin.html \
 OPTIONS=	APACHE "Configure for Apache-2.x" off \
 		MYSQL "Use MySQL database backend (default)" On \
 		PGSQL "Use PostgreSQL database backend" Off \
+		SQLITE "Use SQLite database backend" Off \
 		MSSQL "Use MSSQL database backend" Off \
 		DBASE "Use DBase database backend" Off \
 		ODBC "Use ODBC database backend" Off \
@@ -81,6 +82,11 @@ USE_PHP+=	pgsql
 DB_DEFINED=	yes
 .endif
 
+.if defined(WITH_SQLITE)
+USE_PHP+=	sqlite3
+DB_DEFINED=	yes
+.endif
+
 .if defined(WITH_MSSQL)
 USE_PHP+=	mssql
 DB_DEFINED=	yes
diff --git a/www/webcalendar-devel/distinfo b/www/webcalendar-devel/distinfo
index eac049c9eda3..9170620d5a3d 100644
--- a/www/webcalendar-devel/distinfo
+++ b/www/webcalendar-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (WebCalendar-1.2.3.tar.gz) = 6823041da30158951bbc45ad932c6c60e5a6e4f161b8df10f4433a51c63beac6
-SIZE (WebCalendar-1.2.3.tar.gz) = 1479858
+SHA256 (WebCalendar-1.2.5.tar.gz) = d32eed9851ac9079e153a6952f3b4c717f22eba08d719c3498b65f9303441cbe
+SIZE (WebCalendar-1.2.5.tar.gz) = 1372021
diff --git a/www/webcalendar-devel/pkg-plist b/www/webcalendar-devel/pkg-plist
index 4eda143ad470..53dfa5294047 100644
--- a/www/webcalendar-devel/pkg-plist
+++ b/www/webcalendar-devel/pkg-plist
@@ -3,7 +3,6 @@
 %%WWWDIR%%/GPL.html
 %%WWWDIR%%/NEWS
 %%WWWDIR%%/README.html
-%%WWWDIR%%/TODO
 %%WWWDIR%%/UPGRADING.html
 %%WWWDIR%%/about.php
 %%WWWDIR%%/access.php
@@ -82,7 +81,7 @@
 %%WWWDIR%%/images/leftarrow.gif
 %%WWWDIR%%/images/leftarrowsmall.gif
 %%WWWDIR%%/images/login.gif
-%%WWWDIR%%/images/new.gif
+%%WWWDIR%%/images/new.png
 %%WWWDIR%%/images/newmoon.gif
 %%WWWDIR%%/images/ok.gif
 %%WWWDIR%%/images/pix.gif
@@ -364,8 +363,8 @@
 %%WWWDIR%%/translations/Korean.txt
 %%WWWDIR%%/translations/Lithuanian.txt
 %%WWWDIR%%/translations/Norwegian.txt
-%%WWWDIR%%/translations/Polish.txt
 %%WWWDIR%%/translations/Polish-utf8.txt
+%%WWWDIR%%/translations/Polish.txt
 %%WWWDIR%%/translations/Portuguese.txt
 %%WWWDIR%%/translations/Portuguese_BR.txt
 %%WWWDIR%%/translations/Portuguese_BR_utf8.txt
@@ -396,18 +395,7 @@
 %%WWWDIR%%/week.php
 %%WWWDIR%%/week_details.php
 %%WWWDIR%%/week_ssi.php
-%%WWWDIR%%/ws/activity_log.php
-%%WWWDIR%%/ws/event_mod.php
-%%WWWDIR%%/ws/get_events.php
-%%WWWDIR%%/ws/get_reminders.php
-%%WWWDIR%%/ws/get_unapproved.php
-%%WWWDIR%%/ws/get_users.php
-%%WWWDIR%%/ws/login.php
-%%WWWDIR%%/ws/user_mod.php
-%%WWWDIR%%/ws/webcalendar.jar
-%%WWWDIR%%/ws/ws.php
 %%WWWDIR%%/year.php
-@dirrm %%WWWDIR%%/ws
 @dirrm %%WWWDIR%%/translations
 @dirrm %%WWWDIR%%/tools
 @dirrm %%WWWDIR%%/themes