$ git show --format=fuller --patch-with-stat --summary 7b495574b63ccdc543d552770d49f7fa4c5ffd75
commit 7b495574b63ccdc543d552770d49f7fa4c5ffd75
Author: Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Mon Sep 14 16:53:56 2020 +0200
Commit: Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Mon Sep 14 16:53:56 2020 +0200
Add kwallet configs
---
MobileData.nmconnection | 2 +-
kdewallet.kwl | Bin 0 -> 192 bytes
kdewallet.salt | 1 +
pinephone-tools.spec | 14 ++++++++++++--
4 files changed, 14 insertions(+), 3 deletions(-)
create mode 100644 kdewallet.kwl
create mode 100644 kdewallet.salt
diff --git a/MobileData.nmconnection b/MobileData.nmconnection
index 360c7e7..fff8738 100644
--- a/MobileData.nmconnection
+++ b/MobileData.nmconnection
@@ -1,6 +1,6 @@
[connection]
id=MobileData
-uuid=66d9464c-c37e-4288-83e8-d3963f0be0ea
+uuid=23a343f6-ecfb-4f7a-8ec9-bb899c57fd36
type=gsm
interface-name=cdc-wdm0
permissions=
diff --git a/kdewallet.kwl b/kdewallet.kwl
new file mode 100644
index 0000000..1b9bccc
Binary files /dev/null and b/kdewallet.kwl differ
diff --git a/kdewallet.salt b/kdewallet.salt
new file mode 100644
index 0000000..c1cc014
--- /dev/null
+++ b/kdewallet.salt
@@ -0,0 +1 @@
+*z ͈N9°‘st°Xž0s´®Ãä™VLÚº‚ÙÎ@I¹`ŽD“&ÜûúÁ&ô™lM”10¿·™N÷
\ No newline at end of file
diff --git a/pinephone-tools.spec b/pinephone-tools.spec
index f6d356e..92627cd 100644
--- a/pinephone-tools.spec
+++ b/pinephone-tools.spec
@@ -1,7 +1,7 @@
Summary: Tools for working with the PinePhone hardware
Name: pinephone-tools
Version: 1.0
-Release: 0.20200905.4
+Release: 0.20200914.1
Url: https://xnux.eu/devices/feature/audio-pp.html
# Tools to drive PinePhone hardware...
# Audio routing
@@ -23,6 +23,11 @@ Source13: 99-dmix.conf
Source14: asound.state
# NetworkManager configuration
Source20: MobileData.nmconnection
+# TEMPORARY preloaded kwallet to make things easier. Should be replaced
+# by patching kwallet to create an empty wallet on first startup to make
+# sure we have random seeds
+Source30: kdewallet.kwl
+Source31: kdewallet.salt
ExclusiveArch: aarch64
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(libxcrypt)
@@ -54,6 +59,9 @@ cp %{S:3} %{S:4} %{buildroot}/lib/systemd/system/
mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/system-connections
cp %{S:20} %{buildroot}%{_sysconfdir}/NetworkManager/system-connections/
+mkdir -p %{buildroot}/home/omv/.local/share/kwalletd
+cp %{S:30} %{S:31} %{buildroot}/home/omv/.local/share/kwalletd/
+
chmod +x %{buildroot}%{_bindir}/*
%files
@@ -65,4 +73,6 @@ chmod +x %{buildroot}%{_bindir}/*
/lib/systemd/system/modem.service
/lib/systemd/system/modem-wait-powered.service
%config %{_sysconfdir}/alsa/conf.d/99-dmix.conf
-%config(noreplace) %{_sysconfdir}/NetworkManager/system-connections/MobileData.nmconnection
+%config(noreplace) %attr(0600,root,root) %{_sysconfdir}/NetworkManager/system-connections/MobileData.nmconnection
+# FIXME remove as soon as kwalletd is patched
+/home/omv/.local/share/kwalletd/*