xmw 14/08/16 01:33:56
Added: backintime-1.0.36-wrapper.patch
backintime-1.0.24-wrapper.patch
Removed: backintime-1.0.6-wrapper.patch
backintime-1.0.4-dont-install-license.diff
Log:
Revbump to fix python2 invocation and hard depend on ssh-agent (bug 482106,
thanks Rob Tongue; bug 487764, thanks Jaime Martin). Depend on gksu iff
USE=gnome (bug 476774, thanks Christian Strahl). Drop old version.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
62EEF090)
Revision Changes Path
1.1 app-backup/backintime/files/backintime-1.0.36-wrapper.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backintime/files/backintime-1.0.36-wrapper.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backintime/files/backintime-1.0.36-wrapper.patch?rev=1.1&content-type=text/plain
Index: backintime-1.0.36-wrapper.patch
===================================================================
--- backintime-1.0.24-r2/common/backintime
+++ backintime-1.0.24-r2/common/backintime
@@ -17,15 +17,14 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-if [ -f backintime.py ]; then
- APP_PATH="."
-else
- APP_PATH="/usr/share/backintime/common"
-fi
+APP_PATH="/usr/share/backintime/common"
#starting a new ssh-agent all the time is just a workaround for
#https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
#normally this should only be necessary if run as cronjob
#and the user is not logged in
-ssh-agent python $APP_PATH/backintime.py "$@"
+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
+ eval "$(ssh-agent)"
+fi
+python2 $APP_PATH/backintime.py "$@"
--- backintime-1.0.24-r2/gnome/backintime-gnome
+++ backintime-1.0.24-r2/gnome/backintime-gnome
@@ -17,14 +17,13 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-if [ -f app.py ]; then
- APP_PATH="."
-else
- APP_PATH="/usr/share/backintime/gnome"
-fi
+APP_PATH="/usr/share/backintime/gnome"
#starting a new ssh-agent all the time is just a workaround for
#https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
#normally we don't need to start ssh-agent for backintime-gnome
-ssh-agent python ${APP_PATH}/app.py "$@"
+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
+ eval "$(ssh-agent)"
+fi
+python2 ${APP_PATH}/app.py "$@"
--- backintime-1.0.24-r2/kde4/backintime-kde4
+++ backintime-1.0.24-r2/kde4/backintime-kde4
@@ -17,15 +17,10 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-if [ -f app.py ]; then
- APP_PATH="."
-else
- APP_PATH="/usr/share/backintime/kde4"
-fi
+APP_PATH="/usr/share/backintime/kde4"
if [ "x$SSH_AUTH_SOCK" = "x" ]; then
eval "$(ssh-agent)"
fi
-python ${APP_PATH}/app.py "$@"
-
+python2 ${APP_PATH}/app.py "$@"
1.1 app-backup/backintime/files/backintime-1.0.24-wrapper.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backintime/files/backintime-1.0.24-wrapper.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/backintime/files/backintime-1.0.24-wrapper.patch?rev=1.1&content-type=text/plain
Index: backintime-1.0.24-wrapper.patch
===================================================================
--- backintime-1.0.24-r2/common/backintime
+++ backintime-1.0.24-r2/common/backintime
@@ -17,15 +17,14 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-if [ -f backintime.py ]; then
- APP_PATH="."
-else
- APP_PATH="/usr/share/backintime/common"
-fi
+APP_PATH="/usr/share/backintime/common"
#starting a new ssh-agent all the time is just a workaround for
#https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
#normally this should only be necessary if run as cronjob
#and the user is not logged in
-ssh-agent python $APP_PATH/backintime.py "$@"
+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
+ eval "$(ssh-agent)"
+fi
+python2 $APP_PATH/backintime.py "$@"
--- backintime-1.0.24-r2/gnome/backintime-gnome
+++ backintime-1.0.24-r2/gnome/backintime-gnome
@@ -17,14 +17,13 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-if [ -f app.py ]; then
- APP_PATH="."
-else
- APP_PATH="/usr/share/backintime/gnome"
-fi
+APP_PATH="/usr/share/backintime/gnome"
#starting a new ssh-agent all the time is just a workaround for
#https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
#normally we don't need to start ssh-agent for backintime-gnome
-ssh-agent python ${APP_PATH}/app.py "$@"
+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
+ eval "$(ssh-agent)"
+fi
+python2 ${APP_PATH}/app.py "$@"
--- backintime-1.0.24-r2/kde4/backintime-kde4
+++ backintime-1.0.24-r2/kde4/backintime-kde4
@@ -17,11 +17,10 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-if [ -f app.py ]; then
- APP_PATH="."
-else
- APP_PATH="/usr/share/backintime/kde4"
+APP_PATH="/usr/share/backintime/kde4"
+#https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/841672
+if [ "x$SSH_AUTH_SOCK" = "x" ]; then
+ eval "$(ssh-agent)"
fi
-python ${APP_PATH}/app.py "$@"
-
+python2 ${APP_PATH}/app.py "$@"
