[debian-edu-commits] debian-edu/slbackup-php.git (#61) - wheezy-updates (branch) updated: debian/0.3-3-36-g7c5432a
Mike Gabriel
sunweaver at alioth.debian.org
Mon Jun 10 05:48:10 UTC 2013
The branch, wheezy-updates has been updated
via 7c5432a4f247c5940d937c456a3f4d5362359317 (commit)
from 7e167c6a9e594c4be39c6b6bef5116db587b69f9 (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 -----------------------------------------------------------------
commit 7c5432a4f247c5940d937c456a3f4d5362359317
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Jun 8 23:58:18 2013 +0200
/debian/patches: (Closes: #700257).
* /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.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++
debian/patches/001_fix-nonhttps-logins.patch | 35 ++++++++++++++++++++
.../002_default-backuphost-to-localhost.patch | 18 ++++++++++
debian/patches/003_fix-dir-for-config-file.patch | 20 +++++++++++
debian/patches/series | 3 ++
5 files changed, 84 insertions(+), 0 deletions(-)
create mode 100644 debian/patches/001_fix-nonhttps-logins.patch
create mode 100644 debian/patches/002_default-backuphost-to-localhost.patch
create mode 100644 debian/patches/003_fix-dir-for-config-file.patch
create mode 100644 debian/patches/series
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2217b9e..e87cf48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,14 @@ slbackup-php (0.4.3-3) UNRELEASED; 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 at debian.org> Fri, 22 Mar 2013 22:46:06 +0100
diff --git a/debian/patches/001_fix-nonhttps-logins.patch b/debian/patches/001_fix-nonhttps-logins.patch
new file mode 100644
index 0000000..f8ece79
--- /dev/null
+++ b/debian/patches/001_fix-nonhttps-logins.patch
@@ -0,0 +1,35 @@
+Description: Fix nonhttps query string parameter
+Author: Mike Gabriel <mike.gabriel at 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) ;
diff --git a/debian/patches/002_default-backuphost-to-localhost.patch b/debian/patches/002_default-backuphost-to-localhost.patch
new file mode 100644
index 0000000..238633f
--- /dev/null
+++ b/debian/patches/002_default-backuphost-to-localhost.patch
@@ -0,0 +1,18 @@
+Description: Let $backuphost default to localhost
+Author: Mike Gabriel <mike.gabriel at 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" ;
diff --git a/debian/patches/003_fix-dir-for-config-file.patch b/debian/patches/003_fix-dir-for-config-file.patch
new file mode 100644
index 0000000..495971c
--- /dev/null
+++ b/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 at 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'] ;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b6d0095
--- /dev/null
+++ b/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
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).
More information about the debian-edu-commits
mailing list