[dropbear/el6: 3/3] Merge branch 'master' into el6

[Christopher Meng]

commit a20ae7fa2805a27efe7b37d0629e5c91f90092ad
Merge: 11ddf88 bdf720a
Author: Christopher Meng <i at cicku.me>
Date:   Sat Aug 9 09:08:49 2014 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	dropbear.spec

 .gitignore    |    1 +
 dropbear.spec |   17 +++++++++++------
 sources       |    2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --cc dropbear.spec
index a403a9c,66df380..f2e05df
--- a/dropbear.spec
+++ b/dropbear.spec
@@@ -1,18 -1,24 +1,20 @@@
 -%global _hardened_build 1
 -
 -Name:              dropbear
 -Version:           2014.65
 -Release:           1%{?dist}
 -Summary:           A lightweight SSH server and client
 -License:           MIT
 -URL:               http://matt.ucc.asn.au/dropbear/dropbear.html
 -Source0:           http://matt.ucc.asn.au/%{name}/releases/%{name}-%{version}.tar.bz2
 -Source1:           dropbear.service
 -Source2:           dropbear-keygen.service
 -BuildRequires:     libtomcrypt-devel
 -BuildRequires:     libtommath-devel
 -BuildRequires:     pam-devel
 -BuildRequires:     systemd
 -BuildRequires:     zlib-devel
 -Requires(post):    systemd
 -Requires(preun):   systemd
 -Requires(postun):  systemd
 -# For triggerun
 -Requires(post):    systemd-sysv
 +Name:            dropbear
- Version:         2014.64
++Version:         2014.65
 +Release:         1%{?dist}
 +Summary:         SSH2 server and client
 +Group:           Applications/Internet
 +License:         MIT
 +URL:             http://matt.ucc.asn.au/dropbear/dropbear.html
 +Source0:         http://matt.ucc.asn.au/%{name}/releases/%{name}-%{version}.tar.bz2
 +Source1:         dropbear.init
 +BuildRequires:   libtomcrypt-devel
 +BuildRequires:   libtommath-devel
 +BuildRequires:   pam-devel
 +BuildRequires:   zlib-devel
- Requires:        initscripts
- Requires(post):	 chkconfig initscripts
++Requires(post):  chkconfig
++Requires(preun): chkconfig
++Requires(preun): initscripts
++Requires(postun):initscripts
  
  %description
  Dropbear is a relatively small SSH server and client. Dropbear
@@@ -27,27 -31,34 +29,27 @@@ iconv -f iso-8859-1 -t utf-8 -o CHANGES
  mv CHANGES{.utf8,}
  
  %build
- %configure --enable-pam
- make %{?_smp_mflags}
+ %configure --enable-pam --disable-bundled-libtom
+ %make_build
  
  %install
- make install DESTDIR=%{buildroot}
+ %make_install
  install -d %{buildroot}%{_sysconfdir}/%{name}
 -install -d %{buildroot}%{_unitdir}
 -install -pm644 %{S:1} %{buildroot}%{_unitdir}/%{name}.service
 -install -pm644 %{S:2} %{buildroot}%{_unitdir}/dropbear-keygen.service
 +install -d %{buildroot}%{_initrddir}
 +install -pm755 %{S:1} %{buildroot}%{_initrddir}/dropbear
  
  %post
 -%systemd_post %{name}.service
 +/sbin/chkconfig --add dropbear
  
  %postun
 -%systemd_postun_with_restart %{name}.service
 +/sbin/service dropbear condrestart > /dev/null 2>&1 || :
  
  %preun
 -%systemd_preun %{name}.service
 -
 -%triggerun -- dropbear < 0.55-2
 -# Save the current service runlevel info
 -# User must manually run systemd-sysv-convert --apply dropbear
 -# to migrate them to systemd targets
 -systemd-sysv-convert --save dropbear >/dev/null 2>&1 ||:
 -
 -# Run these because the SysV package being removed won't do them
 -chkconfig --del dropbear >/dev/null 2>&1 || :
 -systemctl try-restart dropbear.service >/dev/null 2>&1 || :
 +if [ "$1" = 0 ]
 +then
 +	sbin/service dropbear stop > /dev/null 2>&1 || :
 +	sbin/chkconfig --del dropbear
 +fi
  
  %files
  %doc CHANGES LICENSE README TODO