up to 2015.67

diff --git a/dropbear.spec b/dropbear.spec
index cdc3c9ff2fd502fb3e8196ab3d3ad081eb5d92e9..693786c07baf40365445113551f99e8fd3c88625 100644 (file)
--- a/dropbear.spec
+++ b/dropbear.spec
@@ -8,13 +8,12 @@
 Summary:       Dropbear - a smallish ssh2 server
 Summary(pl.UTF-8):     Dropbear - mały serwer ssh2
 Name:          dropbear
-Version:       2014.66
+Version:       2015.67
 Release:       1
 License:       MIT
 Group:         Applications/Networking
 Source0:       https://matt.ucc.asn.au/dropbear/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: c21a01111aa5015db038c6efdb85717d
-Patch0:                system-libtom.patch
+# Source0-md5: e967e320344cd4bfebe321e3ab8514d6
 URL:           https://matt.ucc.asn.au/dropbear/dropbear.html
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -43,7 +42,6 @@ trzeba go porządnie przetestować :)
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{?with_system_libtom:rm -r libtomcrypt libtommath}
 

diff --git a/system-libtom.patch b/system-libtom.patch
deleted file mode 100644 (file)
index c8789cd..0000000
--- a/system-libtom.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-PR: https://github.com/mkj/dropbear/pull/10
-
---- dropbear-2014.66/configure.ac~     2014-10-23 16:43:38.000000000 +0300
-+++ dropbear-2014.66/configure.ac      2015-01-25 19:00:39.840166231 +0200
-@@ -660,6 +660,7 @@
- AC_EXEEXT
- 
- # XXX there must be a nicer way to do this
-+if test $BUNDLED_LIBTOM = 1 ; then
- AS_MKDIR_P(libtomcrypt/src/ciphers/aes)
- AS_MKDIR_P(libtomcrypt/src/ciphers/safer)
- AS_MKDIR_P(libtomcrypt/src/ciphers/twofish)
-@@ -710,8 +711,10 @@
- AS_MKDIR_P(libtomcrypt/src/pk/pkcs1)
- AS_MKDIR_P(libtomcrypt/src/pk/rsa)
- AS_MKDIR_P(libtomcrypt/src/prngs)
-+LIBTOM_FILES="libtomcrypt/Makefile libtommath/Makefile"
-+fi
- AC_CONFIG_HEADER(config.h)
--AC_CONFIG_FILES(Makefile libtomcrypt/Makefile libtommath/Makefile)
-+AC_CONFIG_FILES(Makefile $LIBTOM_FILES)
- AC_OUTPUT
- 
- AC_MSG_NOTICE()