uncommitted - profile-sync-daemon
Ready changes
Summary
Import uploads missing from VCS:Diff
diff --git a/INSTALL b/INSTALL
index 0404d59..1d79fe4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,8 @@
DEPENDENCIES
bash >=4.0
- find
+ coreutils
+ findutils
+ kmod
rsync
systemd
diff --git a/MIT b/MIT
index a75fd96..a186608 100644
--- a/MIT
+++ b/MIT
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 graysky
+Copyright (c) 2013-2019 graysky
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
diff --git a/Makefile b/Makefile
index 367c857..4296abe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 6.31
+VERSION = 6.34
PN = profile-sync-daemon
PREFIX ?= /usr
diff --git a/README.md b/README.md
index b3632be..99177f0 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-#Profile-sync-daemon
+# Profile-sync-daemon
Profile-sync-daemon (psd) is a tiny pseudo-daemon designed to manage your browser's profile in tmpfs and to periodically sync it back to your physical disc (HDD/SSD). This is accomplished via a symlinking step and an innovative use of rsync to maintain back-up and synchronization between the two. One of the major design goals of psd is a completely transparent user experience.
-##Good Advice
+## Good Advice
Always backup your browser profile(s) before using psd for the first time.
-##Users of eCryptFS
+## Users of eCryptFS
User of eCryptFS are encouraged not to use psd unless willing to help troubleshoot suspected browser corruption. See [#158](https://github.com/graysky2/profile-sync-daemon/issues/158).
-##Supported Browsers
+## Supported Browsers
* Chromium
* Conkeror
* Epiphany
@@ -30,13 +30,13 @@ User of eCryptFS are encouraged not to use psd unless willing to help troublesho
* Surf (http://surf.suckless.org/)
* Vivaldi-browser and Vivaldi-browser-snapshot
-##Documentation
+## Documentation
Consult the man page or the wiki page: https://wiki.archlinux.org/index.php/Profile-sync-daemon
-##Installation from Source
+## Installation from Source
To build from source, see the included INSTALL text document.
-##Installation from Distro Packages
+## Installation from Distro Packages
### Officially Packaged
* Antergos: in the official [repos](http://build.antergos.com/package/profile-sync-daemon).
* Debian jesse+: in the official [repos](https://packages.debian.org/unstable/profile-sync-daemon).
@@ -53,17 +53,17 @@ To build from source, see the included INSTALL text document.
* Slackware: on [slackbuilds](http://slackbuilds.org/apps/profile-sync-daemon/).
* Ubuntu: in [graysky's PPA](https://github.com/graysky2/profile-sync-daemon#ubuntu-users).
-###Debian Users
+### Debian Users
Since June of 2016, Profile-sync-daemon is in the official repos for Users of jesse+! [Reference](https://tracker.debian.org/pkg/profile-sync-daemon).
sudo apt-get install profile-sync-daemon
-###Fedora Users
+### Fedora Users
Since June of 2013, Profile-sync-daemon is in the official repos! [Reference](https://bugzilla.redhat.com/show_bug.cgi?id=968253).
sudo yum install profile-sync-daemon
-###Ubuntu Users
+### Ubuntu Users
Since June of 2016, Profile-sync-daemon is in the official repos for users of Yakkety+ (16.10+)! [Reference](https://launchpad.net/ubuntu/+source/profile-sync-daemon).
Others must be using AT LEAST Ubuntu 15.04 (Vivid) or have systemd as your init system to use these packages!
@@ -73,10 +73,10 @@ To add the PPA (personal package archive) to your Ubuntu system (packages availa
sudo apt-get update
sudo apt-get install profile-sync-daemon
-###Other Distros
+### Other Distros
If you are interested in packaging psd for your favorite distro, please contact me.
-##NOTE FOR VERSION 6
+## NOTE FOR VERSION 6
My desktop distro (Arch) switched to systemd a while ago and other big ones (Fedora, Debian, Ubuntu) have followed suite. With the release of psd version 6.x I will no longer be supporting alternative init systems such as upstart and openrc. It is too complex for me to maintain and test multiple configurations on non-native init systems for me.
Also of note for version 6.x is that no longer does psd run in as a system service. It now runs as a user service.
diff --git a/common/browsers/falkon b/common/browsers/falkon
new file mode 100644
index 0000000..cbcae9a
--- /dev/null
+++ b/common/browsers/falkon
@@ -0,0 +1,3 @@
+[[ -d $XDG_CONFIG_HOME/$browser ]] &&
+ DIRArr[0]="$XDG_CONFIG_HOME/$browser"
+PSNAME="$browser"
diff --git a/common/profile-sync-daemon.in b/common/profile-sync-daemon.in
index 4e83af6..5810f90 100644
--- a/common/profile-sync-daemon.in
+++ b/common/profile-sync-daemon.in
@@ -102,7 +102,7 @@ if [[ -z "$BACKUP_LIMIT" ]]; then
else
if [[ "$BACKUP_LIMIT" =~ ^[0-9]+$ ]]; then
# correctly setup
- /bin/true
+ true
else
echo -e " ${RED}ERROR:${NRM}${BLD} Bad value for BACKUP_LIMIT detected!${NRM}"
exit 1
@@ -351,7 +351,7 @@ running_check() {
for browser in "${BROWSERS[@]}"; do
load_env_for "$browser"
[[ -z "$PSNAME" ]] && continue
- if pgrep -u "$user" "$PSNAME" &>/dev/null; then
+ if pgrep -u "$user" "\<$PSNAME\>" &>/dev/null; then
echo "Refusing to start; $browser is running by $user!"
exit 1
fi
@@ -404,12 +404,12 @@ kill_browsers() {
local x=1
while [[ $x -le 60 ]]; do
[[ -n "$PSNAME" ]] || break
- pgrep -u "$user" "$PSNAME" &>/dev/null || break
+ pgrep -u "$user" "\<$PSNAME\>" &>/dev/null || break
if [[ $x -le 5 ]]; then
- pkill -SIGTERM -u "$user" "$PSNAME"
+ pkill -SIGTERM -u "$user" "\<$PSNAME\>"
else
- pkill -SIGKILL -u "$user" "$PSNAME"
+ pkill -SIGKILL -u "$user" "\<$PSNAME\>"
fi
x=$(( x + 1 ))
diff --git a/common/psd.conf b/common/psd.conf
index 35a0c01..f725128 100644
--- a/common/psd.conf
+++ b/common/psd.conf
@@ -23,6 +23,7 @@
# chromium-dev
# conkeror.mozdev.org
# epiphany
+# falkon
# firefox
# firefox-trunk
# google-chrome
diff --git a/debian/changelog b/debian/changelog
index 4640c6c..021f9f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+profile-sync-daemon (6.34-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add /sbin to PATH. (Closes: #932345)
+
+ -- Shengjing Zhu <zhsj@debian.org> Tue, 29 Nov 2022 23:45:53 +0800
+
+profile-sync-daemon (6.34-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * No source change upload to rebuild with debhelper 13.10.
+
+ -- Michael Biebl <biebl@debian.org> Sat, 15 Oct 2022 11:05:13 +0200
+
+profile-sync-daemon (6.34-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/compat: Update to version 12.
+ * debian/control:
+ - Update to Debian policy 4.3.0, no changes needed.
+
+ -- Jan Luca Naumann <j.naumann@fu-berlin.de> Sat, 02 Mar 2019 14:48:44 +0100
+
profile-sync-daemon (6.31-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/compat b/debian/compat
index ec63514..48082f7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+12
diff --git a/debian/control b/debian/control
index 31569fe..16d22d2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: profile-sync-daemon
Section: utils
Priority: optional
Maintainer: Jan Luca Naumann <j.naumann@fu-berlin.de>
-Build-Depends: debhelper (>=9)
-Standards-Version: 3.9.8
+Build-Depends: debhelper (>=12)
+Standards-Version: 4.3.0
Homepage: https://github.com/graysky2/profile-sync-daemon
Vcs-Git: https://github.com/JanLuca/profile-sync-daemon-debian.git
Vcs-Browser: https://github.com/JanLuca/profile-sync-daemon-debian
diff --git a/debian/patches/sbin-path.patch b/debian/patches/sbin-path.patch
new file mode 100644
index 0000000..64bba12
--- /dev/null
+++ b/debian/patches/sbin-path.patch
@@ -0,0 +1,17 @@
+Description: Add /sbin to PATH
+Origin: backport, https://github.com/graysky2/profile-sync-daemon/commit/25d6e40c
+Bug: https://github.com/graysky2/profile-sync-daemon/issues/258
+Bug-Debian: https://bugs.debian.org/932345
+Last-Update: 2022-11-29
+---
+--- a/common/profile-sync-daemon.in
++++ b/common/profile-sync-daemon.in
+@@ -6,7 +6,7 @@
+ #
+
+ # needed for debian 8.x
+-[[ -h /sbin ]] || PATH=$PATH:/sbin
++PATH=$PATH:/sbin
+
+ BLD="\e[01m"
+ RED="\e[01;31m"
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..057cf52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+sbin-path.patch
diff --git a/doc/psd.1 b/doc/psd.1
index 5e43790..470f843 100644
--- a/doc/psd.1
+++ b/doc/psd.1
@@ -1,5 +1,5 @@
.\" Text automatically generated by txt2man
-.TH profile-sync-daemon 1 "26 November 2016" "" ""
+.TH profile-sync-daemon 1 "28 February 2018" "" ""
.SH NAME
\fBprofile-sync-daemon \fP- Symlinks and syncs browser profiles to RAM (tmpfs) thus reducing HDD/SSD calls and speeding-up browsers.
\fB
@@ -116,6 +116,8 @@ Conkeror
.IP \(bu 3
Epiphany
.IP \(bu 3
+Falkon
+.IP \(bu 3
Firefox (stable, beta, and aurora)
.IP \(bu 3
Firefox-trunk (this is an Ubuntu-only browser: http://www.webupd8.org/2011/05/install-firefox-nightly-from-ubuntu-ppa.html)
@@ -253,8 +255,6 @@ Users wishing to contribute to this code, should fork and send a pull request. S
Discover a bug? Please open an issue on the project page linked below.
.RS
.IP \(bu 3
-Currently, psd checks for running browsers before it starts/stops by their name. If a running process that happens to contain that name, it will falsely refuse to start until that process is not running. For an example, see: https://github.com/graysky2/profile-sync-daemon/issues/85
-.IP \(bu 3
Several cases of data loss have been reported when using eCryptFS and psd, therefore until this issue is flushed out, users of eCryptFS are encouraged not to use psd unless willing to help troubleshoot suspected browser corruption. See: https://github.com/graysky2/profile-sync-daemon/issues/158
.SH ONLINE
.IP \(bu 3
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/psd/browsers/falkon -rwxr-xr-x root/root DEBIAN/postinst -rwxr-xr-x root/root DEBIAN/postrm
Control files: lines which differ (wdiff format)
Depends: rsync rsync, init-system-helpers (>= 1.52)