On 2008-11-04 at 13:27:24, Francois Marier wrote: > The fixes are quite small (as shown in the attached debdiff) Here's the missing file. Francois
diff -u mahara-1.0.4/debian/rules mahara-1.0.4/debian/rules
--- mahara-1.0.4/debian/rules
+++ mahara-1.0.4/debian/rules
@@ -36,15 +36,7 @@
rm -rf $(CURDIR)/debian/mahara/usr/share/mahara/lib/adodb/docs/
rm -rf $(CURDIR)/debian/mahara/usr/share/mahara/lib/adodb/tests/
rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/adodb/pear/readme.Auth.txt
- rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/configure.in
- rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/INSTALL
- rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/ChangeLog
- rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/FAQ
- rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/AUTHORS
- rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/Makefile.am
- rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/autogen.sh
- rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/TODO
- rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/NEWS
+ rm -rf $(CURDIR)/debian/mahara/usr/share/mahara/lib/snoopy/
rm -rf $(CURDIR)/debian/mahara/usr/share/mahara/lib/pear/File
rm -f $(CURDIR)/debian/mahara/usr/share/mahara/lib/pear/File.php
rm -rf $(CURDIR)/debian/mahara/usr/share/mahara/lib/pear/PEAR
diff -u mahara-1.0.4/debian/mahara.postinst mahara-1.0.4/debian/mahara.postinst
--- mahara-1.0.4/debian/mahara.postinst
+++ mahara-1.0.4/debian/mahara.postinst
@@ -70,6 +70,9 @@
# Link to captcha font
[ ! -h /usr/share/mahara/theme/default/static/captcha.ttf ] && ln -s /usr/share/fonts/truetype/freefont/FreeMono.ttf /usr/share/mahara/theme/default/static/captcha.ttf
+
+ # Link to libphp-snoopy
+ [ ! -h /usr/share/mahara/lib/snoopy ] && ln -s /usr/share/php/libphp-snoopy/ /usr/share/mahara/lib/snoopy
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -u mahara-1.0.4/debian/changelog mahara-1.0.4/debian/changelog
--- mahara-1.0.4/debian/changelog
+++ mahara-1.0.4/debian/changelog
@@ -1,3 +1,12 @@
+mahara (1.0.4-3) testing-proposed-updates; urgency=high
+
+ * Depend on libphp-snoopy instead of using the embedded copy shipped
+ with Mahara (CVE-2008-4796, closes: #504170)
+ * Backport upstream's patch (41189c30d198153dc66dc867e160dab948929458)
+ to phpmailer (CVE-2007-3125, closes: #504253)
+
+ -- Francois Marier <francois@debian.org> Tue, 04 Nov 2008 12:46:14 +1300
+
mahara (1.0.4-2) unstable; urgency=low
* Compress the package using bzip2
diff -u mahara-1.0.4/debian/control mahara-1.0.4/debian/control
--- mahara-1.0.4/debian/control
+++ mahara-1.0.4/debian/control
@@ -11,7 +11,7 @@
Package: mahara
Architecture: all
-Depends: ${misc:Depends}, php5-pgsql | php5-mysql, php5-cli, php5-gd, file, cron, perl, ttf-freefont, php-file, php-pear, smarty
+Depends: ${misc:Depends}, php5-pgsql | php5-mysql, php5-cli, php5-gd, file, cron, perl, ttf-freefont, php-file, php-pear, smarty, libphp-snoopy
Recommends: mahara-apache2, postgresql | postgresql-8.3 | mysql-server | mysql-server-5.0, clamav, clamav-daemon, php5-curl, php5-xmlrpc, php5-imagick, libfile-slurp-perl, libtext-diff-perl
Description: Electronic portfolio, weblog, and resume builder
Mahara is a fully featured electronic portfolio, weblog, resume builder and
only in patch2:
unchanged:
--- mahara-1.0.4.orig/htdocs/lib/phpmailer/class.phpmailer.php
+++ mahara-1.0.4/htdocs/lib/phpmailer/class.phpmailer.php
@@ -390,9 +390,9 @@
*/
function SendmailSend($header, $body) {
if ($this->Sender != "")
- $sendmail = sprintf("%s -oi -f %s -t", $this->Sendmail, $this->Sender);
+ $sendmail = sprintf("%s -oi -f %s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
else
- $sendmail = sprintf("%s -oi -t", $this->Sendmail);
+ $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
if(!@$mail = popen($sendmail, "w"))
{
Attachment:
signature.asc
Description: Digital signature