[debian-edu-commits] debian-edu/slbackup-php.git (#16) - edu-wheezy (branch) updated: debian/0.3-2.2-15-g7f6a8ca

[Mike Gabriel]

The branch, edu-wheezy has been updated
       via  7f6a8ca36f0894578856a6f0233a257bfbdbdb04 (commit)
      from  e3e0bd07629fe65ee67a56badba34b15ad925a12 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                     |    2 ++
 .../001_slbackup-php_cookie+request-merge.patch      |   18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a0c38eb..ff981ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ slbackup-php (0.3-2.3) UNRELEASED; urgency=low
     as $_COOKIE key.
   * Add patch: 100_slbackup-php_fix-language-detection.patch. Automatically
     detect locales like de_DE.UTF-8 from a .mo files named de.po.
+  * Update patch: 001_slbackup-php_cookie+request-merge.patch. Use base64
+    encoding to store $xorstring in _COOKIE.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 15 Jan 2012 13:40:20 +0100
 
diff --git a/debian/patches/001_slbackup-php_cookie+request-merge.patch b/debian/patches/001_slbackup-php_cookie+request-merge.patch
index 5408d99..4ad804d 100644
--- a/debian/patches/001_slbackup-php_cookie+request-merge.patch
+++ b/debian/patches/001_slbackup-php_cookie+request-merge.patch
@@ -46,6 +46,15 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
      switch ($key) {
          case "smarty_templ": 
          case "smarty_compile": 
+@@ -597,7 +609,7 @@
+             break ; 
+         case "xorstring": 
+             if (empty($passwd))
+-		$xorstring = $value ; 
++		$xorstring = base64_decode($value) ; 
+             else break ; 
+             if (empty ($value))
+                 break ; 
 @@ -640,6 +652,8 @@
      }
  }
@@ -55,3 +64,12 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  if ($submit == "logout") {
      unset ($passwd) ; 
      unset ($xorstring) ; 
+@@ -666,7 +680,7 @@
+     $xorstring = xorstring ($encrypt, $passwd) ; 
+ }
+ 
+-setcookie ('xorstring', $xorstring) ; 
++setcookie ('xorstring', base64_encode($xorstring)) ; 
+ 
+ $scheduler = readcron ($passwd) ; 
+ 


hooks/post-receive
-- 
slbackup-php.git (Debian package slbackup-php)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).