dropbear: update to 2018.76

5 files changed, 5 insertions, 86 deletions

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 51b90d007..34210e585 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		dropbear
-PKG_VERSION:=		2017.75
-PKG_RELEASE:=		2
-PKG_HASH:=		6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c
+PKG_VERSION:=		2018.76
+PKG_RELEASE:=		1
+PKG_HASH:=		f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65
 PKG_DESCR:=		ssh server/client designed for embedded systems
 PKG_SECTION:=		net/security
 PKG_URL:=		http://matt.ucc.asn.au/dropbear/
@@ -25,6 +25,8 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DROPBEAR,dropbear,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION}))
 
+TARGET_CFLAGS+=		-fPIC
+
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 CONFIGURE_ARGS+=	--disable-pam \
diff --git a/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h
deleted file mode 100644
index ef0231e4c..000000000
--- a/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_cfg_h
+++ /dev/null
@@ -1,14 +0,0 @@
-fix from
-http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html
-
---- dropbear-2014.63.orig/libtomcrypt/src/headers/tomcrypt_cfg.h	2014-02-19 15:05:24.000000000 +0100
-+++ dropbear-2014.63/libtomcrypt/src/headers/tomcrypt_cfg.h	2014-03-01 12:35:01.000000000 +0100
-@@ -60,7 +60,7 @@ LTC_EXPORT int   LTC_CALL XSTRCMP(const
-    #define ENDIAN_LITTLE
-    #define ENDIAN_32BITWORD
-    #define LTC_FAST
--   #define LTC_FAST_TYPE    unsigned long
-+   #define LTC_FAST_TYPE    unsigned long long
- #endif
- 
- /* detects MIPS R5900 processors (PS2) */
diff --git a/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h b/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h
deleted file mode 100644
index b4db81a06..000000000
--- a/package/dropbear/patches/patch-libtomcrypt_src_headers_tomcrypt_macros_h
+++ /dev/null
@@ -1,41 +0,0 @@
-fix from:
-http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html
-
---- dropbear-2014.63.orig/libtomcrypt/src/headers/tomcrypt_macros.h	2014-02-19 15:05:24.000000000 +0100
-+++ dropbear-2014.63/libtomcrypt/src/headers/tomcrypt_macros.h	2014-03-01 12:36:23.000000000 +0100
-@@ -343,7 +343,7 @@ static inline unsigned RORc(unsigned wor
- /* 64-bit Rotates */
- #if !defined(__STRICT_ANSI__) && defined(__GNUC__) && defined(__x86_64__) && !defined(LTC_NO_ASM)
- 
--static inline unsigned long ROL64(unsigned long word, int i)
-+static inline unsigned long long ROL64(unsigned long long word, int i)
- {
-    asm("rolq %%cl,%0"
-       :"=r" (word)
-@@ -351,7 +351,7 @@ static inline unsigned long ROL64(unsign
-    return word;
- }
- 
--static inline unsigned long ROR64(unsigned long word, int i)
-+static inline unsigned long long ROR64(unsigned long long word, int i)
- {
-    asm("rorq %%cl,%0"
-       :"=r" (word)
-@@ -361,7 +361,7 @@ static inline unsigned long ROR64(unsign
- 
- #ifndef LTC_NO_ROLC
- 
--static inline unsigned long ROL64c(unsigned long word, const int i)
-+static inline unsigned long long ROL64c(unsigned long long word, const int i)
- {
-    asm("rolq %2,%0"
-       :"=r" (word)
-@@ -369,7 +369,7 @@ static inline unsigned long ROL64c(unsig
-    return word;
- }
- 
--static inline unsigned long ROR64c(unsigned long word, const int i)
-+static inline unsigned long long ROR64c(unsigned long long word, const int i)
- {
-    asm("rorq %2,%0"
-       :"=r" (word)
diff --git a/package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c b/package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c
deleted file mode 100644
index a821eb2f9..000000000
--- a/package/dropbear/patches/patch-libtommath_bn_mp_montgomery_setup_c
+++ /dev/null
@@ -1,14 +0,0 @@
-fix from
-http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html
-
---- dropbear-2014.63.orig/libtommath/bn_mp_montgomery_setup.c	2014-02-19 15:05:24.000000000 +0100
-+++ dropbear-2014.63/libtommath/bn_mp_montgomery_setup.c	2014-03-01 12:34:21.000000000 +0100
-@@ -48,7 +48,7 @@ mp_montgomery_setup (mp_int * n, mp_digi
- #endif
- 
-   /* rho = -1/m mod b */
--  *rho = (unsigned long)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK;
-+  *rho = (mp_digit)(((mp_word)1 << ((mp_word) DIGIT_BIT)) - x) & MP_MASK;
- 
-   return MP_OKAY;
- }
diff --git a/package/dropbear/patches/patch-libtommath_tommath_h b/package/dropbear/patches/patch-libtommath_tommath_h
deleted file mode 100644
index d4716f2dc..000000000
--- a/package/dropbear/patches/patch-libtommath_tommath_h
+++ /dev/null
@@ -1,14 +0,0 @@
-fix from
-http://lists.openembedded.org/pipermail/openembedded-core/2013-May/079000.html
-
---- dropbear-2014.63.orig/libtommath/tommath.h	2014-02-19 15:05:24.000000000 +0100
-+++ dropbear-2014.63/libtommath/tommath.h	2014-03-01 12:33:13.000000000 +0100
-@@ -73,7 +73,7 @@ extern "C" {
-    typedef signed long long   long64;
- #endif
- 
--   typedef unsigned long      mp_digit;
-+   typedef unsigned long long mp_digit;
-    typedef unsigned long      mp_word __attribute__ ((mode(TI)));
- 
-    #define DIGIT_BIT          60