Skip to content

Commit 3f990ce

Browse files
authored
Merge pull request #571 from dscho/dont-ship-sshd
installer/portable: exclude `sshd`
2 parents 077c846 + cf48e1a commit 3f990ce

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

make-file-list.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
194194
-e '^/usr/lib/python' -e '^/usr/lib/ruby' -e '^/\(mingw\|clang\)[^/]*/lib/python' \
195195
-e '^/usr/share/subversion' \
196196
-e '^/etc/skel/' -e '^/\(mingw\|clang\)[^/]*/etc/skel/' \
197+
-e '^/etc/sshd_config' \
197198
-e '^/usr/bin/svn' \
198199
-e '^/usr/bin/xml.*exe$' \
199200
-e '^/usr/bin/xslt.*$' \
@@ -239,13 +240,14 @@ grep -v -e '\.[acho]$' -e '\.l[ao]$' -e '/aclocal/' \
239240
echo 'uuid\|lzma\|'
240241
fi)'fdisk\|gettextpo\|gmpxx\|gnutlsxx\|gomp\|xml2\|xslt\|exslt\)-.*\.dll$' \
241242
-e '^/usr/bin/msys-\(hdb\|history8\|kadm5\|kdc\|otp\|sl\).*\.dll$' \
242-
-e '^/usr/bin/msys-\(atomic\|blkid\|charset\|gthread\|metalink\|nghttp2\|ssh2\)-.*\.dll$' \
243+
-e '^/usr/bin/msys-\(atomic\|blkid\|charset\|gthread\|metalink\|nghttp2\|ssh2\|kafs\)-.*\.dll$' \
243244
-e '^/usr/bin/msys-\(ncurses++w6\|asprintf-[0-9]*\|\)\.dll$' \
244245
-e '^/usr/bin/msys-\(formw6\|menuw6\|panelw6\)\.dll$' \
245246
-e '^/usr/bin/msys-svn_swig_\(py\|ruby\)-.*\.dll$' \
246-
-e '^/usr/bin/\(dumper\|sasl.*\)\.exe$' \
247+
-e '^/usr/bin/\(dumper\|sasl.*\|sshd\)\.exe$' \
247248
-e '^/usr/lib/gio/' -e '^/usr/lib/sasl2/msys-sasldb-.*\.dll$' \
248249
-e '^/usr/lib/\(itcl\|tdbc\|pkcs11/p11-kit-client\|thread\)' \
250+
-e '^/usr/lib/ssh/sshd\($\|-\)' \
249251
-e '^/usr/share.*/magic$' \
250252
-e '^/usr/share/perl5/core_perl/Unicode/' \
251253
-e '^/usr/share/perl5/core_perl/pods/' \
@@ -326,16 +328,16 @@ else
326328
-e '^/usr/bin/\(pr\|printenv\|ps\|ptx\|realpath\)\.exe$' \
327329
-e '^/usr/bin/\(regtool\|runcon\|scp\|seq\|setfacl\)\.exe$' \
328330
-e '^/usr/bin/\(setmetamode\|sftp\|sha.*sum\|shred\)\.exe$' \
329-
-e '^/usr/bin/\(shuf\|sleep\|slogin\|split\|sshd\)\.exe$' \
331+
-e '^/usr/bin/\(shuf\|sleep\|slogin\|split\)\.exe$' \
330332
-e '^/usr/bin/\(ssh-key.*\|ssp\|stat\|stdbuf\|strace\)\.exe$' \
331333
-e '^/usr/bin/\(stty\|sum\|sync\|tac\|tee\|timeout\)\.exe$' \
332334
-e '^/usr/bin/\(truncate\|tsort\|tty\|tzset\|umount\)\.exe$' \
333335
-e '^/usr/bin/\(unexpand\|unlink\|users\|vdir\|who.*\)\.exe$' \
334-
-e '^/usr/bin/msys-\(cilkrts\|kafs\|ssl\)-.*\.dll$' \
336+
-e '^/usr/bin/msys-\(cilkrts\|ssl\)-.*\.dll$' \
335337
-e '^/usr/bin/msys-sqlite3[a-z].*\.dll$' \
336338
-e '^/usr/bin/msys-\(gomp.*\|vtv.*\)-.*\.dll$' \
337339
-e '^/usr/lib/\(awk\|coreutils\|gawk\|openssl\|pkcs11\)/' \
338-
-e '^/usr/lib/ssh/\(sftp\|sshd\($\|-\)\)' \
340+
-e '^/usr/lib/ssh/sftp\)' \
339341
-e '^/usr/libexec/\(bigram\|code\|frcode\)\.exe$' \
340342
-e '^/usr/share/\(cygwin\|git\)/' \
341343
-e '^/usr/ssl/misc/' \

0 commit comments

Comments
 (0)