[WebCalendar/f17] * Wed Mar 28 2012 Patrick Monnerat <pm at datasphere.ch> 1.2.5-1 - New upstream release.
Patrick Monnerat
monnerat at fedoraproject.org
Wed Mar 28 14:43:50 UTC 2012
commit 9e76d06c0096a3a4c9bf3794be3be7b71b11f243
Author: Patrick Monnerat <pm at datasphere.ch>
Date: Wed Mar 28 16:43:24 2012 +0200
* Wed Mar 28 2012 Patrick Monnerat <pm at datasphere.ch> 1.2.5-1
- New upstream release.
.gitignore | 1 +
WebCalendar-1.2.4-cve2011_3814.patch | 133 --------------------
WebCalendar-1.2.4-cve2012_0846.patch | 70 ----------
...rcase.patch => WebCalendar-1.2.5-usercase.patch | 62 +++++-----
WebCalendar.spec | 18 ++--
sources | 2 +-
6 files changed, 41 insertions(+), 245 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b03f6f..9b89189 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ WebCalendarUserManual-0.9.43.tar.gz
/WebCalendar-http.conf
/WebCalendar-taglang.php
/WebCalendar-1.2.4-clean.tar.gz
+/WebCalendar-1.2.5-clean.tar.gz
diff --git a/WebCalendar-1.2.4-usercase.patch b/WebCalendar-1.2.5-usercase.patch
similarity index 67%
rename from WebCalendar-1.2.4-usercase.patch
rename to WebCalendar-1.2.5-usercase.patch
index ab694ab..45e2534 100644
--- a/WebCalendar-1.2.4-usercase.patch
+++ b/WebCalendar-1.2.5-usercase.patch
@@ -1,6 +1,6 @@
-diff -Naur WebCalendar-1.2.4.orig/includes/classes/WebCalendar.class WebCalendar-1.2.4.new/includes/classes/WebCalendar.class
---- WebCalendar-1.2.4.orig/includes/classes/WebCalendar.class 2011-09-30 17:09:31.835185072 +0200
-+++ WebCalendar-1.2.4.new/includes/classes/WebCalendar.class 2011-09-30 17:11:16.210456941 +0200
+diff -Naur WebCalendar-1.2.5.orig/includes/classes/WebCalendar.class WebCalendar-1.2.5.new/includes/classes/WebCalendar.class
+--- WebCalendar-1.2.5.orig/includes/classes/WebCalendar.class 2012-03-28 15:05:15.534347414 +0200
++++ WebCalendar-1.2.5.new/includes/classes/WebCalendar.class 2012-03-28 15:09:17.852660755 +0200
@@ -152,7 +152,7 @@
load_global_settings ();
@@ -20,9 +20,9 @@ diff -Naur WebCalendar-1.2.4.orig/includes/classes/WebCalendar.class WebCalendar
}
/* Initializations from includes/connect.php.
-diff -Naur WebCalendar-1.2.4.orig/includes/config.php WebCalendar-1.2.4.new/includes/config.php
---- WebCalendar-1.2.4.orig/includes/config.php 2011-08-09 05:27:56.000000000 +0200
-+++ WebCalendar-1.2.4.new/includes/config.php 2011-09-30 17:11:16.210456941 +0200
+diff -Naur WebCalendar-1.2.5.orig/includes/config.php WebCalendar-1.2.5.new/includes/config.php
+--- WebCalendar-1.2.5.orig/includes/config.php 2012-02-29 02:12:22.000000000 +0100
++++ WebCalendar-1.2.5.new/includes/config.php 2012-03-28 15:09:17.852660756 +0200
@@ -104,9 +104,10 @@
function do_config ( $fileLoc ) {
@@ -35,8 +35,8 @@ diff -Naur WebCalendar-1.2.4.orig/includes/config.php WebCalendar-1.2.4.new/incl
+ $settings, $single_user, $single_user_login, $TROUBLE_URL, $use_http_auth,
+ $user_inc;
- $PROGRAM_VERSION = 'v1.2.4';
- $PROGRAM_DATE = '08 Aug 2011';
+ $PROGRAM_VERSION = 'v1.2.5';
+ $PROGRAM_DATE = '29 Feb 2012';
@@ -232,6 +233,11 @@
$use_http_auth = ( preg_match ( '/(1|yes|true|on)/i',
$settings['use_http_auth'] ) ? true : false );
@@ -49,11 +49,11 @@ diff -Naur WebCalendar-1.2.4.orig/includes/config.php WebCalendar-1.2.4.new/incl
// Type of user authentication.
$user_inc = $settings['user_inc'];
-diff -Naur WebCalendar-1.2.4.orig/includes/functions.php WebCalendar-1.2.4.new/includes/functions.php
---- WebCalendar-1.2.4.orig/includes/functions.php 2011-09-30 17:09:31.836184998 +0200
-+++ WebCalendar-1.2.4.new/includes/functions.php 2011-09-30 17:11:16.212456828 +0200
-@@ -6136,4 +6136,19 @@
- return $ret;
+diff -Naur WebCalendar-1.2.5.orig/includes/functions.php WebCalendar-1.2.5.new/includes/functions.php
+--- WebCalendar-1.2.5.orig/includes/functions.php 2012-03-28 15:05:15.536347327 +0200
++++ WebCalendar-1.2.5.new/includes/functions.php 2012-03-28 15:09:17.854660665 +0200
+@@ -6162,4 +6162,19 @@
+ }
}
+/* Translate user name to lower case if required. */
@@ -72,9 +72,9 @@ diff -Naur WebCalendar-1.2.4.orig/includes/functions.php WebCalendar-1.2.4.new/i
+}
+
?>
-diff -Naur WebCalendar-1.2.4.orig/includes/settings.php.orig WebCalendar-1.2.4.new/includes/settings.php.orig
---- WebCalendar-1.2.4.orig/includes/settings.php.orig 2007-09-28 15:19:45.000000000 +0200
-+++ WebCalendar-1.2.4.new/includes/settings.php.orig 2011-09-30 17:11:16.212456828 +0200
+diff -Naur WebCalendar-1.2.5.orig/includes/settings.php.orig WebCalendar-1.2.5.new/includes/settings.php.orig
+--- WebCalendar-1.2.5.orig/includes/settings.php.orig 2007-09-28 15:19:45.000000000 +0200
++++ WebCalendar-1.2.5.new/includes/settings.php.orig 2012-03-28 15:09:17.854660665 +0200
@@ -71,5 +71,10 @@
# need to modify user-ldap.php to configure some settings.
user_inc: user.php
@@ -86,9 +86,9 @@ diff -Naur WebCalendar-1.2.4.orig/includes/settings.php.orig WebCalendar-1.2.4.n
+
# end */
?>
-diff -Naur WebCalendar-1.2.4.orig/install/index.php WebCalendar-1.2.4.new/install/index.php
---- WebCalendar-1.2.4.orig/install/index.php 2011-09-30 17:09:31.789188478 +0200
-+++ WebCalendar-1.2.4.new/install/index.php 2011-09-30 17:11:16.213456768 +0200
+diff -Naur WebCalendar-1.2.5.orig/install/index.php WebCalendar-1.2.5.new/install/index.php
+--- WebCalendar-1.2.5.orig/install/index.php 2012-03-28 15:05:15.525347812 +0200
++++ WebCalendar-1.2.5.new/install/index.php 2012-03-28 15:09:17.855660621 +0200
@@ -660,6 +660,7 @@
$settings['install_password'] = '';
$settings['single_user_login'] = '';
@@ -105,7 +105,7 @@ diff -Naur WebCalendar-1.2.4.orig/install/index.php WebCalendar-1.2.4.new/instal
$settings['readonly'] = getPostValue ( 'form_readonly' );
if ( getPostValue ( 'form_user_inc' ) == 'http' ) {
$settings['use_http_auth'] = 'true';
-@@ -838,8 +840,10 @@
+@@ -846,8 +848,10 @@
}
if ( form.form_user_inc.options[listid].selected ) {
makeVisible ( "singleuser" );
@@ -116,7 +116,7 @@ diff -Naur WebCalendar-1.2.4.orig/install/index.php WebCalendar-1.2.4.new/instal
}
}
-@@ -1498,6 +1502,16 @@
+@@ -1506,6 +1510,16 @@
<td>
<input name="form_single_user_login" size="20" value="<?php echo ( empty ( $settings['single_user_login'] ) ? '' : $settings['single_user_login'] );?>" /></td>
</tr>
@@ -133,9 +133,9 @@ diff -Naur WebCalendar-1.2.4.orig/install/index.php WebCalendar-1.2.4.new/instal
<tr>
<td class="prompt"><?php etranslate ( 'Read-Only' ) ?>:</td>
<td>
-diff -Naur WebCalendar-1.2.4.orig/tools/send_reminders.php WebCalendar-1.2.4.new/tools/send_reminders.php
---- WebCalendar-1.2.4.orig/tools/send_reminders.php 2011-08-07 19:56:16.000000000 +0200
-+++ WebCalendar-1.2.4.new/tools/send_reminders.php 2011-09-30 17:11:16.213456768 +0200
+diff -Naur WebCalendar-1.2.5.orig/tools/send_reminders.php WebCalendar-1.2.5.new/tools/send_reminders.php
+--- WebCalendar-1.2.5.orig/tools/send_reminders.php 2011-04-27 02:27:35.000000000 +0200
++++ WebCalendar-1.2.5.new/tools/send_reminders.php 2012-03-28 15:09:17.855660621 +0200
@@ -101,7 +101,7 @@
$allusers = user_get_users ();
$allusercnt = count ( $allusers );
@@ -154,10 +154,10 @@ diff -Naur WebCalendar-1.2.4.orig/tools/send_reminders.php WebCalendar-1.2.4.new
$percentage[$row[0]] = $row[1];
}
}
-diff -Naur WebCalendar-1.2.4.orig/translations/English-US.txt WebCalendar-1.2.4.new/translations/English-US.txt
---- WebCalendar-1.2.4.orig/translations/English-US.txt 2011-09-30 17:09:31.771189810 +0200
-+++ WebCalendar-1.2.4.new/translations/English-US.txt 2011-09-30 17:11:16.214456702 +0200
-@@ -1844,6 +1844,7 @@
+diff -Naur WebCalendar-1.2.5.orig/translations/English-US.txt WebCalendar-1.2.5.new/translations/English-US.txt
+--- WebCalendar-1.2.5.orig/translations/English-US.txt 2012-03-28 15:05:15.497349046 +0200
++++ WebCalendar-1.2.5.new/translations/English-US.txt 2012-03-28 15:09:17.856660577 +0200
+@@ -1843,6 +1843,7 @@
Web Server (detected): Web Server (detected)
Web Server (not detected): Web Server (not detected)
None (Single-User): None (Single-User)
@@ -165,9 +165,9 @@ diff -Naur WebCalendar-1.2.4.orig/translations/English-US.txt WebCalendar-1.2.4.
Read-Only: Read-Only
Environment: Environment
Production: Production
-diff -Naur WebCalendar-1.2.4.orig/translations/French.txt WebCalendar-1.2.4.new/translations/French.txt
---- WebCalendar-1.2.4.orig/translations/French.txt 2011-09-30 17:09:31.781189070 +0200
-+++ WebCalendar-1.2.4.new/translations/French.txt 2011-09-30 17:11:16.214456702 +0200
+diff -Naur WebCalendar-1.2.5.orig/translations/French.txt WebCalendar-1.2.5.new/translations/French.txt
+--- WebCalendar-1.2.5.orig/translations/French.txt 2012-03-28 15:05:15.507348605 +0200
++++ WebCalendar-1.2.5.new/translations/French.txt 2012-03-28 15:09:17.856660577 +0200
@@ -1794,6 +1794,7 @@
Web Server (detected): =
Web Server (not detected): =
diff --git a/WebCalendar.spec b/WebCalendar.spec
index f8d2a2a..34df84a 100644
--- a/WebCalendar.spec
+++ b/WebCalendar.spec
@@ -12,15 +12,15 @@
# tar czf WebCalendar-%{version}-clean.tar.gz WebCalendar-%{version}/
#
# Upstream tarball MD5 sum:
-# 337e784a932b8963911fffb83b9d28f7 WebCalendar-1.2.4.tar.gz
+# 965877c6344ef7dbc2e34ce80c24aee3 WebCalendar-1.2.5.tar.gz
#
# Source tarball WebCalendar-1.2.0-newmenuicons.tar.gz is Fedora-
# specific and thus, has no "upstream".
Name: WebCalendar
Summary: Single/multi-user web-based calendar application
-Version: 1.2.4
-Release: 3%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
Source0: WebCalendar-%{version}-clean.tar.gz
@@ -41,12 +41,10 @@ Patch10: WebCalendar-1.2.4-php53.patch
Patch11: WebCalendar-1.2.0-daylightbug.patch
Patch12: WebCalendar-1.2.0-viewothers.patch
Patch13: WebCalendar-1.2.3-nonuser.patch
-Patch14: WebCalendar-1.2.4-usercase.patch
+Patch14: WebCalendar-1.2.5-usercase.patch
Patch15: WebCalendar-1.2.3-authsettings.patch
Patch16: WebCalendar-1.2.3-etp.patch
Patch17: WebCalendar-1.2.3-canadd.patch
-Patch18: WebCalendar-1.2.4-cve2011_3814.patch
-Patch19: WebCalendar-1.2.4-cve2012_0846.patch
URL: http://www.k5n.us/webcalendar.php
Requires: webserver
Requires: php >= 4.1.0
@@ -117,8 +115,6 @@ rm -rf includes/classes/captcha
%patch15 -p 1
%patch16 -p 1
%patch17 -p 1
-%patch18 -p 1
-%patch19 -p 1
#-------------------------------------------------------------------------------
@@ -147,7 +143,7 @@ rm -rf "${RPM_BUILD_ROOT}"
install -d -m 755 "${RPM_BUILD_ROOT}/%{basepath}"
-for DIR in docs icons images includes install themes tools translations ws
+for DIR in docs icons images includes install themes tools translations
do cp -a "${DIR}" "${RPM_BUILD_ROOT}/%{basepath}/${DIR}"
done
@@ -189,7 +185,6 @@ find "${RPM_BUILD_ROOT}%{basepath}/tools" -type f -name '*.pl' -print0 |
# Java control panel is not (yet) operational.
rm -f "${RPM_BUILD_ROOT}%{basepath}/controlpanel.php"
-rm -f "${RPM_BUILD_ROOT}%{basepath}/ws/webcalendar.jar"
# Process the configuration files.
@@ -264,6 +259,9 @@ rm -rf "${RPM_BUILD_ROOT}"
%changelog
#-------------------------------------------------------------------------------
+* Wed Mar 28 2012 Patrick Monnerat <pm at datasphere.ch> 1.2.5-1
+- New upstream release.
+
* Fri Feb 17 2012 Patrick Monnerat <pm at datasphere.ch> 1.2.4-3
- Patch "cve2012_0846" fixes CVE-2012-0846 and some other XSS vulnerabilities.
http://sourceforge.net/tracker/?func=detail&aid=3472745&group_id=3870&atid=103870
diff --git a/sources b/sources
index 36d2875..cf6b59a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-3653f846dffaa4f61a3121a1e867b81b WebCalendar-1.2.4-clean.tar.gz
+eee0f65aaf13c3f1a208cbb4636bf5f9 WebCalendar-1.2.5-clean.tar.gz
c746b936b582c04f69b6052c8c4be2f8 WebCalendar-1.2.0-newmenuicons.tar.gz
ef48b67a09af50404167c66856cc724d WebCalendarUserManual-0.9.43.tar.gz
More information about the scm-commits
mailing list