Apply slapos.recipe.cmmi in the component dropbear.

component/dropbear/buildout.cfg

@@ -11,36 +11,8 @@ extends =
 parts =
   dropbear
 
-[dropbear-userspace-patch]
-recipe = hexagonit.recipe.download
-md5sum = 3d934c2c90e8c57536a4fa2cf8ad216d
-url = ${:_profile_base_location_}/${:filename}
-filename = userspace.patch
-download-only = true
-
-[dropbear-ipv6-patch]
-recipe = hexagonit.recipe.download
-md5sum = b30dd58d68829a80eee69188134382ef
-url = ${:_profile_base_location_}/${:filename}
-filename = ipv6-support.patch
-download-only = true
-
-[dropbear-no-shell-check-patch]
-recipe = hexagonit.recipe.download
-md5sum = bb2ac410bd4cb2b07c23bfcc712e45f7
-url = ${:_profile_base_location_}/${:filename}
-filename = no-shell-checking.patch
-download-only = true
-
-[dropbear-static_build_fix.patch]
-recipe = hexagonit.recipe.download
-md5sum = 6e0ccc1949dfa31b4bc3951b9bb6472e
-url = ${:_profile_base_location_}/${:filename}
-filename = dropbear-0.53.1-static_build_fix.patch
-download-only = true
-
 [dropbear]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = 0284ea239083f04c8b874e08e1aca243
 # XXX: We still use an old version of dropbear instead of the last one
 #      in order have all patches working.
@@ -56,10 +28,15 @@ environment =
   LDFLAGS =-Wl,-rpath=${zlib:location}/lib -L${zlib:location}/lib
 
 patches=
-  ${dropbear-userspace-patch:location}/${dropbear-userspace-patch:filename}
-  ${dropbear-ipv6-patch:location}/${dropbear-ipv6-patch:filename}
-  ${dropbear-no-shell-check-patch:location}/${dropbear-no-shell-check-patch:filename}
-  ${dropbear-static_build_fix.patch:location}/${dropbear-static_build_fix.patch:filename}
+  ${:_profile_base_location_}/userspace.patch
+  ${:_profile_base_location_}/ipv6-support.patch
+  ${:_profile_base_location_}/no-shell-checking.patch
+  ${:_profile_base_location_}/dropbear-0.53.1-static_build_fix.patch
 
 patch-options=
   -p1
+
+[x86-cygwin-dropbear]
+patches = 
+  ${dropbear:patches}
+  ${:_profile_base_location_}/dropbear-0.53.1-cygwin.patch

component/dropbear/dropbear-0.53.1-cygwin.patch

+diff --git a/Makefile.in b/Makefile.in
+index 8d81647..d72828b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -28,10 +28,10 @@ COMMONOBJS=dbutil.o buffer.o \
+ 		queue.o \
+ 		atomicio.o compat.o  fake-rfc2553.o 
+ 
+-SVROBJS=@CRYPTLIB@ svr-kex.o svr-algo.o svr-auth.o sshpty.o \
++SVROBJS=svr-kex.o svr-algo.o svr-auth.o sshpty.o \
+ 		svr-authpasswd.o svr-authpubkey.o svr-authpubkeyoptions.o svr-session.o svr-service.o \
+ 		svr-chansession.o svr-runopts.o svr-agentfwd.o svr-main.o svr-x11fwd.o\
+-		svr-tcpfwd.o svr-authpam.o
++		svr-tcpfwd.o svr-authpam.o @CRYPTLIB@
+ 
+ CLIOBJS=cli-algo.o cli-main.o cli-auth.o cli-authpasswd.o cli-kex.o \
+ 		cli-session.o cli-service.o cli-runopts.o cli-chansession.o \