This is an automated email from the ASF dual-hosted git repository.
twolf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
The following commit(s) were added to refs/heads/master by this push:
new 5a6cf2f47 Fix source assembly
5a6cf2f47 is described below
commit 5a6cf2f47df5ac63dc8f88df662a33b662623e4e
Author: Thomas Wolf <[email protected]>
AuthorDate: Sun Jul 28 10:55:40 2024 +0200
Fix source assembly
Linux shell scripts must be treated as binary. If treated as text, they
get packaged in the ZIP with Windows line endings (CR-LF). Linux shells
fail in the most unpredictable and crazy ways if shell scripts contain
CR-LFs.
A similar problem exists for any private keys that get copied into
containers. OpenSSH may bail on them with "Load key ...: invalid format"
if they use CR-LF as line endings.
Also include the .mvn directory.
---
assembly/src/main/descriptors/unix-src.xml | 1 +
assembly/src/main/descriptors/windows-src.xml | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/assembly/src/main/descriptors/unix-src.xml
b/assembly/src/main/descriptors/unix-src.xml
index e26d22326..ea1aacd90 100644
--- a/assembly/src/main/descriptors/unix-src.xml
+++ b/assembly/src/main/descriptors/unix-src.xml
@@ -40,6 +40,7 @@
<include>**/*.bin</include>
<include>**/*.jnilib</include>
<include>**/*.cert</include>
+ <include>**/.mvn/*</include>
<include>sshd-openpgp/src/test/resources/**/*</include>
</includes>
diff --git a/assembly/src/main/descriptors/windows-src.xml
b/assembly/src/main/descriptors/windows-src.xml
index e260da95a..56be220be 100644
--- a/assembly/src/main/descriptors/windows-src.xml
+++ b/assembly/src/main/descriptors/windows-src.xml
@@ -40,8 +40,11 @@
<include>**/*.bin</include>
<include>**/*.jnilib</include>
<include>**/*.cert</include>
+ <include>**/*.sh</include>
+ <include>**/.mvn/*</include>
<include>sshd-openpgp/src/test/resources/**/*</include>
+
<include>sshd-core/src/test/resources/org/apache/sshd/client/opensshcerts/**/*</include>
</includes>
<excludes>
<exclude>**/eclipse-classes/**</exclude>
@@ -72,6 +75,7 @@
<exclude>**/*.bin</exclude>
<exclude>**/*.jnilib</exclude>
<exclude>**/*.cert</exclude>
+ <exclude>**/*.sh</exclude>
<exclude>**/target/**</exclude>
<exclude>**/build/**</exclude>
<exclude>**/eclipse-classes/**</exclude>
@@ -90,6 +94,7 @@
<exclude>**/key.pem</exclude>
<exclude>sshd-core/src/docs/*.txt</exclude>
+
<exclude>sshd-core/src/test/resources/org/apache/sshd/client/opensshcerts/**/*</exclude>
<exclude>sshd-openpgp/src/test/resources/**/*</exclude>
</excludes>
<lineEnding>dos</lineEnding>
