[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#711717: pu: package slbackup-php/0.4.3-3

Package: release.debian.org
Severity: normal
User: debian-edu@lists.debian.org
Usertags: debian-edu

Dear release team,

The package slbackup-php in Debian stable (0.4.3-2) requires three minor
patches from the new upstream version (0.4.4) to make the package work
on a plain Debian system. One of the patches also fixes the package's
functionality on a Debian Edu main server.

Thanks!
Mike

-- System Information:
Debian Release: 7.0
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'stable-updates'), (500, 'proposed-updates')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -u slbackup-php-0.4.3/debian/changelog slbackup-php-0.4.3/debian/changelog
--- slbackup-php-0.4.3/debian/changelog
+++ slbackup-php-0.4.3/debian/changelog
@@ -1,3 +1,18 @@
+slbackup-php (0.4.3-3) stable-proposed-updates; urgency=low
+
+  * /debian/control:
+    + Use my DD mail address in Uploaders: field.
+  * /debian/patches: (Closes: #700257).
+    + Add patch 001_fix-nonhttps-logins.patch. Store nonhttps param
+      in client-side cookie and update it if changed via query string.
+    + Add patch 002_default-backuphost-to-localhost.patch. Stop relying
+      on a »backup« host in /etc/hosts or DNS. Makes slbackup-php work
+      out-of-the-box on vanilla Debian (opposed to Debian Edu) systems.
+    + Add patch 003_fix-dir-for-config-file.patch. Search for config file
+      in our own /etc/ folder namespace.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sun, 09 Jun 2013 00:14:29 +0200
+
 slbackup-php (0.4.3-2) unstable; urgency=low
 
   * Rebuild package based on Debian version 0.3-3, only cherry-picking
diff -u slbackup-php-0.4.3/debian/control slbackup-php-0.4.3/debian/control
--- slbackup-php-0.4.3/debian/control
+++ slbackup-php-0.4.3/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Edu Packaging Team <debian-edu-pkg-team@lists.alioth.debian.org>
 Uploaders:
- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>,
+ Mike Gabriel <sunweaver@debian.org>,
  Patrick Winnertz <winnie@debian.org>,
  Morten Werner Olsen <werner@debian.org>,
  Finn-Arne Johansen <faj@bzz.no>
only in patch2:
unchanged:
--- slbackup-php-0.4.3.orig/debian/patches/002_default-backuphost-to-localhost.patch
+++ slbackup-php-0.4.3/debian/patches/002_default-backuphost-to-localhost.patch
@@ -0,0 +1,18 @@
+Description: Let $backuphost default to localhost
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Origin:
+ http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=commitdiff;h=8cb2b287befe83144d7751899805c90ffa44d814
+Abstract:
+ Stop relying on a »backup« host in /etc/hosts or DNS. Makes slbackup-php
+ work out-of-the-box on vanilla Debian (opposed to Debian Edu) systems. 
+--- a/src/functions.php
++++ b/src/functions.php
+@@ -28,7 +28,7 @@
+     if (empty ($smarty_templ))   $smarty_templ   = $_COOKIE ['smarty_templ'] ;
+     if (empty ($smarty_compile)) $smarty_compile = $_COOKIE ['smarty_compile'] ;
+ 
+-    if (empty ($backuphost)) $backuphost="backup" ; 
++    if (empty ($backuphost)) $backuphost="localhost" ; 
+     if (empty ($backupuser)) $backupuser="root" ; 
+     if (empty ($backupconf)) $backupconf="/etc/slbackup/slbackup.conf" ; 
+     if (empty ($backupcron)) $backupcron="/etc/cron.d/slbackup" ; 
only in patch2:
unchanged:
--- slbackup-php-0.4.3.orig/debian/patches/series
+++ slbackup-php-0.4.3/debian/patches/series
@@ -0,0 +1,3 @@
+001_fix-nonhttps-logins.patch
+002_default-backuphost-to-localhost.patch
+003_fix-dir-for-config-file.patch
only in patch2:
unchanged:
--- slbackup-php-0.4.3.orig/debian/patches/001_fix-nonhttps-logins.patch
+++ slbackup-php-0.4.3/debian/patches/001_fix-nonhttps-logins.patch
@@ -0,0 +1,35 @@
+Description: Fix nonhttps query string parameter
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Origin:
+ http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=commitdiff;h=8ca937578aeb706ffb531fb451734ade66fef3d4
+ http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=commitdiff;h=02c3107f08033b46da5ffd4f1a3423f7347415a0
+ http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=commitdiff;h=b9c77a887446fa5470a799bdb2d90e46833e51f0
+Abstract:
+ Store nonhttps param in client-side cookie and update it if changed via query
+ string. Make sure all session parameters are processed correctly.
+--- a/src/index.php
++++ b/src/index.php
+@@ -620,6 +620,7 @@
+             break ;
+         case "nonhttps":
+             $nonhttps = $value ;
++            break ;
+         case "Passwd": 
+             $passwd = $value ; 
+             $submit = "status" ; 
+@@ -654,6 +655,7 @@
+             break ;
+         case "selected":
+             $selected=$value ; 
++            break ;
+         case "snapshot":
+             $snapshot=$value ; 
+             break ;
+@@ -684,6 +686,7 @@
+ if (empty ($config)) {
+     if (empty ($_SERVER["HTTPS"])) {
+ 	$smarty->assign ('nonhttps', $nonhttps) ; 
++	if ($nonhttps != $_COOKIE['nonhttps']) setcookie ('nonhttps', $nonhttps);
+     }
+     $smarty->assign ('backupuser', $backupuser) ; 
+     $smarty->assign ('backuphost', $backuphost) ; 
only in patch2:
unchanged:
--- slbackup-php-0.4.3.orig/debian/patches/003_fix-dir-for-config-file.patch
+++ slbackup-php-0.4.3/debian/patches/003_fix-dir-for-config-file.patch
@@ -0,0 +1,20 @@
+Description: Search for config file in our own /etc/ folder namespace.
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Origin:
+ http://anonscm.debian.org/gitweb/?p=debian-edu/upstream/slbackup-php.git;a=commitdiff;h=8cb2b287befe83144d7751899805c90ffa44d814
+Abstract:
+ Store config file in our own /etc/ folder namespace. As the file
+ at the old location has not been shipped in previous versions of
+ this package, there is no need to remove the conffile at the old
+ location.
+--- a/src/functions.php
++++ b/src/functions.php
+@@ -22,7 +22,7 @@
+     global $backuphost, $backupuser, $backupconf, $backupcron,
+            $ssh_options, $logfile, $nonhttps, $smarty_templ, $smarty_compile ; 
+ 
+-    @include_once ("/etc/slbackup/config.php") ; 
++    @include_once ("/etc/slbackup-php/config.php") ; 
+ 
+     if (empty ($nonhttps))       $nonhttps       = $_COOKIE ['nonhttps'] ;
+     if (empty ($smarty_templ))   $smarty_templ   = $_COOKIE ['smarty_templ'] ;
Reply to: