summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@gmail.com>2012-07-18 13:14:44 +0200
committerPatrick Uiterwijk <puiterwijk@gmail.com>2012-07-18 13:14:44 +0200
commit62d39c10d5815ddbf5c6b1a920c313de7cea7473 (patch)
treed82aa03fbda67564b202472e74b1e8a8d879bc30
parent55be11f50a6267dfc7b9bb8f5eb41431cbe6aa79 (diff)
- Set owner correctly for /var/lib/monkeysphere and /var/lib/monkeysphere/authorized_keys for sshd to read them (RHBZ #732203)
- Make monkeysphere use sudo instead of su to make it able to execute privileged operations with /sbin/nologin login shell (RHBZ #732191)
-rw-r--r--monkeysphere.spec13
-rw-r--r--monkeysphere.sutosudo.patch11
2 files changed, 20 insertions, 4 deletions
diff --git a/monkeysphere.spec b/monkeysphere.spec
index eaef453..d1cf821 100644
--- a/monkeysphere.spec
+++ b/monkeysphere.spec
@@ -3,12 +3,13 @@
Name: monkeysphere
Summary: Use the OpenPGP web of trust to verify SSH connections
Version: 0.35
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3+
Group: Applications/Internet
URL: http://web.monkeysphere.info/
Source: http://archive.monkeysphere.info/debian/pool/%{name}/m/%{name}/%{name}_%{version}.orig.tar.gz
+Patch0: %{name}.sutosudo.patch
BuildArch: noarch
@@ -28,7 +29,7 @@ users to get validated host keys, and for hosts to authenticate users.
%prep
%setup -q
-
+%patch0 -p0
%build
%{__make} %{?_smp_mflags}
@@ -87,11 +88,15 @@ exit 0
%{_mandir}/*/*
-%attr(-,%{name},%{name}) %dir %{_var}/lib/%{name}
-%attr(-,%{name},%{name}) %dir %{_var}/lib/%{name}/authorized_keys
+%attr(-,root,root) %dir %{_var}/lib/%{name}
+%attr(-,root,root) %dir %{_var}/lib/%{name}/authorized_keys
%changelog
+* Wed Jul 18 2012 Patrick Uiterwijk <puiterwijk@gmail.com> - 0.35-5
+- Set owner correctly for /var/lib/monkeysphere and /var/lib/monkeysphere/authorized_keys for sshd to read them (RHBZ #732203)
+- Make monkeysphere use sudo instead of su to make it able to execute privileged operations with /sbin/nologin login shell (RHBZ #732191)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.35-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/monkeysphere.sutosudo.patch b/monkeysphere.sutosudo.patch
new file mode 100644
index 0000000..b5c1b19
--- /dev/null
+++ b/monkeysphere.sutosudo.patch
@@ -0,0 +1,11 @@
+--- src/share/common 2010-11-14 00:34:09.000000000 +0100
++++ src/share/common 2012-07-18 13:11:35.614304738 +0200
+@@ -108,7 +108,7 @@ su_monkeysphere_user() {
+
+ # if root, su command as monkeysphere user
+ 'root')
+- su "$MONKEYSPHERE_USER" -c "$*"
++ sudo -u "$MONKEYSPHERE_USER" -E "$*"
+ ;;
+
+ # otherwise, fail