[dropbear/el6] Merge 2013.59 into EL6.

[Christopher Meng]

commit 7500d2b994ae95e23e41b59f646a0c7e8fbd7ccc
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Oct 8 17:42:24 2013 +0800

    Merge 2013.59 into EL6.

 dropbear.spec |   68 ++++++++++++++++++++++++++------------------------------
 sources       |    2 +-
 2 files changed, 33 insertions(+), 37 deletions(-)
---
diff --git a/dropbear.spec b/dropbear.spec
index 730ee56..0f50a59 100644
--- a/dropbear.spec
+++ b/dropbear.spec
@@ -1,26 +1,25 @@
-Name:		dropbear
-Version:	0.58
-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/dropbear/releases/dropbear-2013.58.tar.bz2
-Source1:	dropbear.init
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildRequires:	zlib-devel
-Requires:	initscripts
-Requires(post):	chkconfig >= 0.9, initscripts
+Name:            dropbear
+Version:         2013.59
+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:   zlib-devel
+Requires:        initscripts
+Requires(post):	 chkconfig >= 0.9, initscripts
 
 %description
-Dropbear is a relatively small SSH 2 server and client.  Dropbear
+Dropbear is a relatively small SSH server and client. Dropbear
 is particularly useful for "embedded"-type Linux (or other Unix)
 systems, such as wireless routers.
 
 %prep
-%setup -q -n dropbear-2013.58
+%setup -q
 
 # convert CHANGES to UTF-8
 iconv -f iso-8859-1 -t utf-8 -o CHANGES{.utf8,}
@@ -31,19 +30,10 @@ mv CHANGES{.utf8,}
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/dropbear
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/dropbear
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 0644 dbclient.1 $RPM_BUILD_ROOT%{_mandir}/man1/dbclient.1
-install -d $RPM_BUILD_ROOT%{_mandir}/man8
-install -m 0644 dropbear.8 $RPM_BUILD_ROOT%{_mandir}/man8/dropbear.8
-install -m 0644 dropbearkey.8 $RPM_BUILD_ROOT%{_mandir}/man8/dropbearkey.8
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
+install -d %{buildroot}%{_sysconfdir}/%{name}
+install -d %{buildroot}%{_initrddir}
+install -pm755 %{S:1} %{buildroot}%{_initrddir}/dropbear
 
 %post
 /sbin/chkconfig --add dropbear
@@ -59,19 +49,25 @@ then
 fi
 
 %files
-%defattr(-,root,root)
-%doc CHANGES INSTALL LICENSE MULTI README SMALL TODO
+%doc CHANGES LICENSE README TODO
 %attr(0755,root,root) %dir %{_sysconfdir}/dropbear
-%attr(0755,root,root) /etc/rc.d/init.d/dropbear
+%attr(0755,root,root) %{_initrddir}/dropbear
 %attr(0755,root,root) %{_bindir}/dropbearkey
 %attr(0755,root,root) %{_bindir}/dropbearconvert
 %attr(0755,root,root) %{_bindir}/dbclient
 %attr(0755,root,root) %{_sbindir}/dropbear
-%attr(0644,root,root) %{_mandir}/man1/dbclient.1*
-%attr(0644,root,root) %{_mandir}/man8/dropbear.8*
-%attr(0644,root,root) %{_mandir}/man8/dropbearkey.8*
+%{_mandir}/man1/*.1*
+%{_mandir}/man8/*.8*
 
 %changelog
+* Mon Oct 07 2013 Christopher Meng <rpm at cicku.me> - 2013.59-1
+- New version.
+- Adapt the version tag to match the actual one.
+- Add systemd BR(BZ#992141).
+- Unbundle libtom libraries(BZ#992141).
+- Add AArch64 support(BZ#925278).
+- SPEC cleanup.
+
 * Tue May 14 2013 Christopher Meng <rpm at cicku.me> - 0.58-1
 - New upstream release.
 
diff --git a/sources b/sources
index 378c81b..1465dfa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d3579bbbfcea48404a3219643076450  dropbear-2013.58.tar.bz2
+6c1e6c2c297f4034488ffc95e8b7e6e9  dropbear-2013.59.tar.bz2