rpms/moodle/devel moodle.spec,1.34,1.35

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/moodle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21004

Modified Files:
	moodle.spec 
Log Message:
Security fix, initial font work.



Index: moodle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- moodle.spec	18 Dec 2008 13:03:50 -0000	1.34
+++ moodle.spec	21 Jan 2009 13:06:52 -0000	1.35
@@ -7,7 +7,7 @@
 
 Name:           moodle
 Version:        1.9.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -91,8 +91,10 @@
 Source73:       http://download.moodle.org/lang16/gu_utf8.zip
 Source74:       http://download.moodle.org/lang16/lo_utf8.zip
 Source75:       http://download.moodle.org/lang16/to_utf8.zip
+# Font removed, license violation.
 Source76:       http://download.moodle.org/lang16/mi_wwow_utf8.zip
 Source77:       http://download.moodle.org/lang16/sm_utf8.zip
+# Font removed, license violation.
 Source78:       http://download.moodle.org/lang16/ta_utf8.zip
 Source79:       http://download.moodle.org/lang16/hy_utf8.zip
 Source80:       http://download.moodle.org/lang16/mk_utf8.zip
@@ -110,6 +112,7 @@
 Requires:	php-Smarty
 Requires:	php-adodb
 Requires:	php-magpierss
+Requires:	freefont 
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -1095,6 +1098,7 @@
 Summary:        Moodle language pack for Samoan
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
+Requires:	dejavu-sans-fonts
 
 %description    sm
 This package contains the files needed to display Moodle in Samoan.
@@ -1253,6 +1257,7 @@
 Summary:        Moodle language pack for Tonga
 Group:          Applications/Publishing
 Requires:       moodle = %{version}-%{release}
+Requires:	dejavu-sans-fonts
 
 %description    to
 This package contains the files needed to display Moodle in Tonga.
@@ -1473,6 +1478,9 @@
 rm lib/editor/tinymce/jscripts/tiny_mce/themes/advanced/langs/tw.js
 rm lib/phpmailer/language/phpmailer.lang-fo.php
 
+#Drop spell-check-logic.cgi, CVE-2008-5153, per upstream.
+rm lib/editor/htmlarea/plugins/SpellChecker/spell-check-logic.cgi
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{moodlewebdir}
@@ -1498,6 +1506,14 @@
 rm -rf $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
 ln -s /usr/share/php/magpierss/ $RPM_BUILD_ROOT/var/www/moodle/web/lib/magpie
 
+#symlinks for illegal fonts
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/sm_utf8/fonts/default.ttf
+ln -s /usr/share/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lang/to_utf8/fonts/default.ttf
+
+#Symlink to FreeSans, to save space.
+rm -f $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+ln -s /usr/share/fonts/freefont/FreeSans.ttf $RPM_BUILD_ROOT%{moodlewebdir}/lib/default.ttf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1650,6 +1666,11 @@
 %{_sbindir}/%{name}-cron
 
 %changelog
+* Thu Jan 20 2009 Jon Ciesla <limb at jcomserv.net> - 1.9.3-5
+- Dropped and symlinked illegal sm and to fonts.
+- Symlinking to FreeSans.
+- Drop spell-check-logic.cgi, CVE-2008-5153, per upstream, BZ 472117, 472119, 472120.
+
 * Wed Dec 17 2008 Jon Ciesla <limb at jcomserv.net> - 1.9.3-4
 - Texed fix, BZ 476709.