diff options
| author | Ruben Rodriguez <ruben@activitycentral.com> | 2012-09-04 14:02:10 (GMT) |
|---|---|---|
| committer | Ruben Rodriguez <ruben@activitycentral.com> | 2012-09-04 14:02:10 (GMT) |
| commit | fee82014d68343e32b570baa6af14d1604b720ca (patch) | |
| tree | a9463700fd795661c1ec9cab313ba24445f82a48 | |
| parent | 4ad54c41c8ae8b91d2750d607c4d0d473dba64a3 (diff) | |
Added 0137-sugar-gnomekeyring.patch from fedora
| -rw-r--r-- | rpms/sugar/0137-sugar-gnomekeyring.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/rpms/sugar/0137-sugar-gnomekeyring.patch b/rpms/sugar/0137-sugar-gnomekeyring.patch new file mode 100644 index 0000000..590a39c --- /dev/null +++ b/rpms/sugar/0137-sugar-gnomekeyring.patch @@ -0,0 +1,33 @@ +Taken from http://pkgs.fedoraproject.org/cgit/sugar.git/tree/sugar-gnomekeyring.patch + +diff --git a/bin/sugar.in b/bin/sugar.in +index 12098db..df27143 100644 +--- a/bin/sugar.in ++++ b/bin/sugar.in +@@ -62,6 +62,26 @@ export LANGUAGE="${LANGUAGE:-${LANG}}" + # Set Sugar's telepathy accounts directory + export MC_ACCOUNT_DIR=$HOME/.sugar/$SUGAR_PROFILE/accounts + ++# Check if the keyring exists and create a default ++# unencrypted keyring (OLPC #10290) ++keyring_path=$HOME/.gnome2/keyrings ++if [ ! -e $keyring_path/login.keyring ] && ++ [ ! -e $keyring_path/default.keyring ]; then ++ mkdir -p $keyring_path ++ echo 'default' > $keyring_path/default ++ TIME=$(/bin/date +%s) ++ cat >> $keyring_path/default.keyring.tmp <<EOF ++[keyring] ++display-name=default ++ctime=$TIME ++mtime=$TIME ++lock-on-idle=false ++lock-timeout=0 ++EOF ++ ++mv $keyring_path/default.keyring{.tmp,} ++fi ++ + # Workaround until gnome-keyring-daemon lets dbus activate it + # https://bugzilla.gnome.org/show_bug.cgi?id=628302 + if test "$SUGAR_EMULATOR" = "yes" -a "$(type gnome-keyring-daemon)"; then |