openssh and sftp: move to extra, remove sftp

13 files changed, 63 insertions, 38 deletions

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