From 69aecbc935d022d46574adeca984ee0bdc6cdcb1 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Sat, 26 Sep 2020 00:37:36 +0300 Subject: openssh and sftp: move to extra, remove sftp --- community/openssh/build | 39 --------------------------------------- community/openssh/checksums | 2 -- community/openssh/depends | 2 -- community/openssh/files/sshd.run | 3 --- community/openssh/message | 14 -------------- community/openssh/sources | 2 -- community/openssh/version | 1 - extra/openssh/build | 39 +++++++++++++++++++++++++++++++++++++++ extra/openssh/checksums | 2 ++ extra/openssh/depends | 2 ++ extra/openssh/files/sshd.run | 3 +++ extra/openssh/message | 14 ++++++++++++++ extra/openssh/sources | 2 ++ extra/openssh/version | 1 + extra/sftp/build | 29 ----------------------------- extra/sftp/checksums | 1 - extra/sftp/depends | 5 ----- extra/sftp/files | 1 - extra/sftp/sources | 1 - extra/sftp/version | 1 - 20 files changed, 63 insertions(+), 101 deletions(-) delete mode 100755 community/openssh/build delete mode 100644 community/openssh/checksums delete mode 100644 community/openssh/depends delete mode 100644 community/openssh/files/sshd.run delete mode 100644 community/openssh/message delete mode 100644 community/openssh/sources delete mode 100644 community/openssh/version create mode 100755 extra/openssh/build create mode 100644 extra/openssh/checksums create mode 100644 extra/openssh/depends create mode 100644 extra/openssh/files/sshd.run create mode 100644 extra/openssh/message create mode 100644 extra/openssh/sources create mode 100644 extra/openssh/version delete mode 100755 extra/sftp/build delete mode 120000 extra/sftp/checksums delete mode 100644 extra/sftp/depends delete mode 120000 extra/sftp/files delete mode 120000 extra/sftp/sources delete mode 120000 extra/sftp/version diff --git a/community/openssh/build b/community/openssh/build deleted file mode 100755 index a70f97a3..00000000 --- a/community/openssh/build +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -e - -# Adds optional libedit support -cpt-list libedit >/dev/null 2>&1 && - libedit="--with-libedit" && LIBS="$(pkgconf --static --libs libedit)" - -export LIBS - -export LDFLAGS="$LDFLAGS -static" - -autoreconf -fi - -./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --datadir=/usr/share/openssh \ - --sysconfdir=/etc/ssh \ - --without-selinux \ - --with-privsep-user=nobody \ - --with-mantype=doc \ - --without-rpath \ - --disable-strip \ - --with-pid-dir=/run \ - --disable-wtmp \ - --disable-utmp \ - "$libedit" - -make -make DESTDIR="$1" install - -install -m 755 contrib/ssh-copy-id "$1/usr/bin/ssh-copy-id" -install -m 644 contrib/ssh-copy-id.1 "$1/usr/share/man/man8/ssh-copy-id.1" - -# Install runit service. -install -Dm755 sshd.run "$1/etc/sv/sshd/run" -ln -s /run/runit/supervise.sshd "$1/etc/sv/sshd/supervise" - -# Install sysmgr service. -install -Dm755 sshd.run "$1/etc/sysmgr/sshd" diff --git a/community/openssh/checksums b/community/openssh/checksums deleted file mode 100644 index cae2d98b..00000000 --- a/community/openssh/checksums +++ /dev/null @@ -1,2 +0,0 @@ -27c2766cc5adcaf260ad8d3c4d0dc28c86568c5d3ae823999e76e4b8f7c31342 7e9f1c87501d3abf13893a346633e3208d0abcd0.tar.gz -5d32a817344ac444424063d75e49afd95d7eb76d972ef5c5cfad355c8e8b1ff1 sshd.run diff --git a/community/openssh/depends b/community/openssh/depends deleted file mode 100644 index bc8550fe..00000000 --- a/community/openssh/depends +++ /dev/null @@ -1,2 +0,0 @@ -bearssl make -zlib make diff --git a/community/openssh/files/sshd.run b/community/openssh/files/sshd.run deleted file mode 100644 index 04f7adbb..00000000 --- a/community/openssh/files/sshd.run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -ssh-keygen -A >/dev/null 2>&1 # Will generate host keys if they don't already exist. -exec /usr/bin/sshd -D diff --git a/community/openssh/message b/community/openssh/message deleted file mode 100644 index f7ad71e9..00000000 --- a/community/openssh/message +++ /dev/null @@ -1,14 +0,0 @@ -If you are updating openssh, and you are running -a daemon, do not forget to restart the daemon or -you will not be able to make any more connections. - -runit: - - sv restart sshd - - -sysmgr: - - svctl restart sshd - - diff --git a/community/openssh/sources b/community/openssh/sources deleted file mode 100644 index 78565afe..00000000 --- a/community/openssh/sources +++ /dev/null @@ -1,2 +0,0 @@ -https://github.com/oasislinux/openssh/archive/7e9f1c87501d3abf13893a346633e3208d0abcd0.tar.gz -files/sshd.run diff --git a/community/openssh/version b/community/openssh/version deleted file mode 100644 index e7af434a..00000000 --- a/community/openssh/version +++ /dev/null @@ -1 +0,0 @@ -8.3p1 1 diff --git a/extra/openssh/build b/extra/openssh/build new file mode 100755 index 00000000..a70f97a3 --- /dev/null +++ b/extra/openssh/build @@ -0,0 +1,39 @@ +#!/bin/sh -e + +# Adds optional libedit support +cpt-list libedit >/dev/null 2>&1 && + libedit="--with-libedit" && LIBS="$(pkgconf --static --libs libedit)" + +export LIBS + +export LDFLAGS="$LDFLAGS -static" + +autoreconf -fi + +./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --datadir=/usr/share/openssh \ + --sysconfdir=/etc/ssh \ + --without-selinux \ + --with-privsep-user=nobody \ + --with-mantype=doc \ + --without-rpath \ + --disable-strip \ + --with-pid-dir=/run \ + --disable-wtmp \ + --disable-utmp \ + "$libedit" + +make +make DESTDIR="$1" install + +install -m 755 contrib/ssh-copy-id "$1/usr/bin/ssh-copy-id" +install -m 644 contrib/ssh-copy-id.1 "$1/usr/share/man/man8/ssh-copy-id.1" + +# Install runit service. +install -Dm755 sshd.run "$1/etc/sv/sshd/run" +ln -s /run/runit/supervise.sshd "$1/etc/sv/sshd/supervise" + +# Install sysmgr service. +install -Dm755 sshd.run "$1/etc/sysmgr/sshd" diff --git a/extra/openssh/checksums b/extra/openssh/checksums new file mode 100644 index 00000000..cae2d98b --- /dev/null +++ b/extra/openssh/checksums @@ -0,0 +1,2 @@ +27c2766cc5adcaf260ad8d3c4d0dc28c86568c5d3ae823999e76e4b8f7c31342 7e9f1c87501d3abf13893a346633e3208d0abcd0.tar.gz +5d32a817344ac444424063d75e49afd95d7eb76d972ef5c5cfad355c8e8b1ff1 sshd.run diff --git a/extra/openssh/depends b/extra/openssh/depends new file mode 100644 index 00000000..bc8550fe --- /dev/null +++ b/extra/openssh/depends @@ -0,0 +1,2 @@ +bearssl make +zlib make diff --git a/extra/openssh/files/sshd.run b/extra/openssh/files/sshd.run new file mode 100644 index 00000000..04f7adbb --- /dev/null +++ b/extra/openssh/files/sshd.run @@ -0,0 +1,3 @@ +#!/bin/sh +ssh-keygen -A >/dev/null 2>&1 # Will generate host keys if they don't already exist. +exec /usr/bin/sshd -D diff --git a/extra/openssh/message b/extra/openssh/message new file mode 100644 index 00000000..f7ad71e9 --- /dev/null +++ b/extra/openssh/message @@ -0,0 +1,14 @@ +If you are updating openssh, and you are running +a daemon, do not forget to restart the daemon or +you will not be able to make any more connections. + +runit: + + sv restart sshd + + +sysmgr: + + svctl restart sshd + + diff --git a/extra/openssh/sources b/extra/openssh/sources new file mode 100644 index 00000000..78565afe --- /dev/null +++ b/extra/openssh/sources @@ -0,0 +1,2 @@ +https://github.com/oasislinux/openssh/archive/7e9f1c87501d3abf13893a346633e3208d0abcd0.tar.gz +files/sshd.run diff --git a/extra/openssh/version b/extra/openssh/version new file mode 100644 index 00000000..e7af434a --- /dev/null +++ b/extra/openssh/version @@ -0,0 +1 @@ +8.3p1 1 diff --git a/extra/sftp/build b/extra/sftp/build deleted file mode 100755 index d2a9aa39..00000000 --- a/extra/sftp/build +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -e - -# Standalone sftp client crashes without -# libedit, so it is mandatory. - -./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --datadir=/usr/share/openssh \ - --sysconfdir=/etc/ssh \ - --without-selinux \ - --with-privsep-user=nobody \ - --with-mantype=doc \ - --without-rpath \ - --disable-strip \ - --with-ssl-engine \ - --with-pid-dir=/run \ - --disable-wtmp \ - --disable-utmp \ - --with-libedit \ - -make sftp sftp-server - -mkdir -p "$1/usr/bin" "$1/usr/libexec" - -cp sftp "$1/usr/bin" -cp sftp-server "$1/usr/libexec" - -chmod 755 "$1/usr/bin/sftp" "$1/usr/libexec/sftp-server" diff --git a/extra/sftp/checksums b/extra/sftp/checksums deleted file mode 120000 index d249955b..00000000 --- a/extra/sftp/checksums +++ /dev/null @@ -1 +0,0 @@ -../../community/openssh/checksums \ No newline at end of file diff --git a/extra/sftp/depends b/extra/sftp/depends deleted file mode 100644 index d9675ded..00000000 --- a/extra/sftp/depends +++ /dev/null @@ -1,5 +0,0 @@ -dropbear -libedit -libressl -ncurses -zlib diff --git a/extra/sftp/files b/extra/sftp/files deleted file mode 120000 index 918a11a9..00000000 --- a/extra/sftp/files +++ /dev/null @@ -1 +0,0 @@ -../../community/openssh/files \ No newline at end of file diff --git a/extra/sftp/sources b/extra/sftp/sources deleted file mode 120000 index c18d53af..00000000 --- a/extra/sftp/sources +++ /dev/null @@ -1 +0,0 @@ -../../community/openssh/sources \ No newline at end of file diff --git a/extra/sftp/version b/extra/sftp/version deleted file mode 120000 index 646eeacb..00000000 --- a/extra/sftp/version +++ /dev/null @@ -1 +0,0 @@ -../../community/openssh/version \ No newline at end of file -- cgit v1.2.3