From 5095929737860f61fb84fb88ee7fbf3324cb6a8b Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Wed, 7 Sep 2016 00:08:48 +0100
Subject: flx/init-openssh: Refresh patch

Package-Manager: portage-2.2.28
---
 flx/init-openssh/Manifest                          |  4 +--
 .../files/4.5-Support-ECSDA-host-key.patch         | 36 ++++++++++++++++++++++
 flx/init-openssh/files/init-openssh-BJA-ecdsa.diff | 27 ----------------
 flx/init-openssh/init-openssh-4.5.ebuild           |  2 +-
 4 files changed, 39 insertions(+), 30 deletions(-)
 create mode 100644 flx/init-openssh/files/4.5-Support-ECSDA-host-key.patch
 delete mode 100644 flx/init-openssh/files/init-openssh-BJA-ecdsa.diff

(limited to 'flx')

diff --git a/flx/init-openssh/Manifest b/flx/init-openssh/Manifest
index 224f3ee1..358be100 100644
--- a/flx/init-openssh/Manifest
+++ b/flx/init-openssh/Manifest
@@ -1,3 +1,3 @@
-AUX init-openssh-BJA-ecdsa.diff 1147 SHA256 9c15bf627ee4e5c2eb117f5cd0e27ea5346514b31b58d16693e998acf6fa022d WHIRLPOOL bb7d42f58c8a6968317012a6e15cb4d56098936a0ca15f846ce9db80c4bb8845afb4446243d10eb886a2ab0d1157cb3a219c7feed5d63dfc50fd2b3615ab8c4b
-EBUILD init-openssh-4.5.ebuild 345 SHA256 06b3721fe225eceb86c429c0ed131bfeb5b9cab26ce736f28dbcd17eda9eb50c WHIRLPOOL 6418f93012380cae78cbc14a35632562bd64cbe2c2febcb18e9a991fce2caff0dc61785fe9b51f3c1e8514d1762d3eb4e90442e3930cfe2746f42a468895d394
+AUX 4.5-Support-ECSDA-host-key.patch 1427 SHA256 79bd5ff1005c698681b5be9a55946967a31531773c89729935fe0c838cf17e02 WHIRLPOOL 93e06aa3e281101492b078f3a6cb3a80b03640671d2a1550c36290d411b1532b181a275feea4c8e93e8cde7cbe4f3005250c4fceff16507a16886a76c5f38f58
+EBUILD init-openssh-4.5.ebuild 359 SHA256 d5a2a8a8533bd6095788cd711f2b87ffbd8aa65cd7495eec8c5f62dfbad3de85 WHIRLPOOL aca8abf38ba59a212751d0c39ad3125466d26ddec4f7cc89a36e50db0e6278f4f53b4292d2eb9395107a05a5ac1b542963b2044dd400477de0603fcd480c6b63
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-openssh/files/4.5-Support-ECSDA-host-key.patch b/flx/init-openssh/files/4.5-Support-ECSDA-host-key.patch
new file mode 100644
index 00000000..f212dda8
--- /dev/null
+++ b/flx/init-openssh/files/4.5-Support-ECSDA-host-key.patch
@@ -0,0 +1,36 @@
+From b4e11916d69aa91020b4ee5c91f7f0133ea4f82d Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Thu, 6 Oct 2011 22:06:16 +0200
+Subject: [PATCH] Support ECSDA host key
+
+---
+ add-ons/sshd | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/add-ons/sshd b/add-ons/sshd
+index deb5e86..79bf3e6 100644
+--- a/add-ons/sshd
++++ b/add-ons/sshd
+@@ -35,6 +35,8 @@ function sshd_find_keys {
+ 	    hostkey_list="$hostkey_list /etc/ssh/ssh_host_rsa_key"
+ 	    echo "  Assuming /etc/ssh/ssh_host_dsa_key for Protocol v2."
+ 	    hostkey_list="$hostkey_list /etc/ssh/ssh_host_dsa_key"
++	    echo "  Assuming /etc/ssh/ssh_host_ecdsa_key for Protocol v2."
++	    hostkey_list="$hostkey_list /etc/ssh/ssh_host_ecdsa_key"
+ 	fi
+     else
+ 	echo "  File $sshd_cfgfile references these keys : $hostkey_list"
+@@ -81,11 +83,12 @@ function do_install {
+ 		*/ssh_host_key*) type=rsa1 ;;
+ 		*/ssh_host_rsa_key*) type=rsa ;;
+ 		*/ssh_host_dsa_key*) type=dsa ;;
++		*/ssh_host_ecdsa_key*) type=ecdsa ;;
+ 		*) type=""
+ 		   echo "  Warning! host key $key does not exist and cannot"
+ 		   echo "  be auto-generated since it does not have a standard name."
+ 		   echo "  If SSHD doesn't start, you'll have to generate it manually this way :"
+-		   echo "    # ssh-keygen -t { rsa1 | rsa | dsa } -N '' -f $key"
++		   echo "    # ssh-keygen -t { rsa1 | rsa | dsa | ecdsa } -N '' -f $key"
+ 		   echo
+ 		   ;;
+ 	    esac
diff --git a/flx/init-openssh/files/init-openssh-BJA-ecdsa.diff b/flx/init-openssh/files/init-openssh-BJA-ecdsa.diff
deleted file mode 100644
index 98f1f979..00000000
--- a/flx/init-openssh/files/init-openssh-BJA-ecdsa.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git add-ons/sshd add-ons/sshd
-index deb5e86..79bf3e6 100644
---- add-ons/sshd
-+++ add-ons/sshd
-@@ -35,6 +35,8 @@ function sshd_find_keys {
- 	    hostkey_list="$hostkey_list /etc/ssh/ssh_host_rsa_key"
- 	    echo "  Assuming /etc/ssh/ssh_host_dsa_key for Protocol v2."
- 	    hostkey_list="$hostkey_list /etc/ssh/ssh_host_dsa_key"
-+	    echo "  Assuming /etc/ssh/ssh_host_ecdsa_key for Protocol v2."
-+	    hostkey_list="$hostkey_list /etc/ssh/ssh_host_ecdsa_key"
- 	fi
-     else
- 	echo "  File $sshd_cfgfile references these keys : $hostkey_list"
-@@ -81,11 +83,12 @@ function do_install {
- 		*/ssh_host_key*) type=rsa1 ;;
- 		*/ssh_host_rsa_key*) type=rsa ;;
- 		*/ssh_host_dsa_key*) type=dsa ;;
-+		*/ssh_host_ecdsa_key*) type=ecdsa ;;
- 		*) type=""
- 		   echo "  Warning! host key $key does not exist and cannot"
- 		   echo "  be auto-generated since it does not have a standard name."
- 		   echo "  If SSHD doesn't start, you'll have to generate it manually this way :"
--		   echo "    # ssh-keygen -t { rsa1 | rsa | dsa } -N '' -f $key"
-+		   echo "    # ssh-keygen -t { rsa1 | rsa | dsa | ecdsa } -N '' -f $key"
- 		   echo
- 		   ;;
- 	    esac
diff --git a/flx/init-openssh/init-openssh-4.5.ebuild b/flx/init-openssh/init-openssh-4.5.ebuild
index 293b66c4..ca9c292d 100644
--- a/flx/init-openssh/init-openssh-4.5.ebuild
+++ b/flx/init-openssh/init-openssh-4.5.ebuild
@@ -16,5 +16,5 @@ SVCNAME="sshd"
 src_prepare () {
 	default
 
-	epatch "${FILESDIR}/${PN}-BJA-ecdsa.diff"
+	epatch "${FILESDIR}/${PV}-Support-ECSDA-host-key.patch"
 }
-- 
cgit v1.2.3