[dropbear] Add pam, fix units.
Jon Ciesla
limb at fedoraproject.org
Mon Apr 23 15:50:34 UTC 2012
commit f555b2950af3a43d562c7278b556668f54b290f1
Author: Jon Ciesla <limburgher at gmail.com>
Date: Mon Apr 23 10:50:11 2012 -0500
Add pam, fix units.
dropbear-keygen.service | 2 --
dropbear.service | 3 ++-
dropbear.spec | 9 ++++++---
3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/dropbear-keygen.service b/dropbear-keygen.service
index 56e4f94..74f5d63 100644
--- a/dropbear-keygen.service
+++ b/dropbear-keygen.service
@@ -10,5 +10,3 @@ ExecStart=/usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
ExecStart=/usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key
RemainAfterExit=yes
-[Install]
-WantedBy=multi-user.target
diff --git a/dropbear.service b/dropbear.service
index 086c4ed..9c83532 100644
--- a/dropbear.service
+++ b/dropbear.service
@@ -6,7 +6,8 @@ After=network.target
[Service]
Type=forking
PIDFile=/run/dropbear.pid
-ExecStart=/usr/sbin/dropbear
+EnvironmentFile=-/etc/sysconfig/dropbear
+ExecStart=/usr/sbin/dropbear $OPTIONS
[Install]
WantedBy=multi-user.target
diff --git a/dropbear.spec b/dropbear.spec
index d2cbb38..826cf67 100644
--- a/dropbear.spec
+++ b/dropbear.spec
@@ -1,6 +1,6 @@
Name: dropbear
Version: 0.55
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: SSH2 server and client
Group: Applications/Internet
@@ -11,7 +11,7 @@ Source1: dropbear.service
Source2: dropbear-keygen.service
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: zlib-devel
+BuildRequires: zlib-devel pam-devel
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
@@ -31,7 +31,7 @@ iconv -f iso-8859-1 -t utf-8 -o CHANGES{.utf8,}
mv CHANGES{.utf8,}
%build
-%configure
+%configure --enable-pam
make %{?_smp_mflags}
%install
@@ -95,6 +95,9 @@ fi
%attr(0644,root,root) %{_mandir}/man8/dropbearkey.8*
%changelog
+* Mon Apr 22 2012 Jon Ciesla <limburgher at gmail.com> - 0.55-3
+- Enable pam support, fix unit file.
+
* Fri Apr 20 2012 Jon Ciesla <limburgher at gmail.com> - 0.55-2
- Migrate to systemd, BZ 770251.
More information about the scm-commits
mailing list