2 files changed, 129 insertions, 121 deletions
diff --git a/pkg/openssh/gen.lua b/pkg/openssh/gen.lua
new file mode 100644
index 00000000..9aa550d7
--- /dev/null
+++ b/pkg/openssh/gen.lua
@@ -0,0 +1,129 @@
+cflags{
+	'-D _XOPEN_SOURCE=600',
+	'-D _DEFAULT_SOURCE',
+	'-I include',
+	'-I $dir',
+	'-I $srcdir',
+	'-I $srcdir/openbsd-compat',
+	'-I pkg/openbsd/include',
+	'-I $builddir/pkg/libressl/include',
+	'-I $builddir/pkg/zlib/include',
+}
+
+pkg.deps = {
+	'pkg/libressl/headers',
+	'pkg/zlib/headers',
+}
+
+build('cc', '$outdir/umac128.c.o', {'$srcdir/umac.c', '||', '$dir/deps'}, {
+	cflags={
+		'$cflags',
+		'-D UMAC_OUTPUT_LEN=16',
+		'-D umac_new=umac128_new',
+		'-D umac_update=umac128_update',
+		'-D umac_final=umac128_final',
+		'-D umac_delete=umac128_delete',
+		'-D umac_ctx=umac128_ctx',
+	},
+})
+
+lib('libopenbsd-compat.a', [[openbsd-compat/(
+	base64.c basename.c bcrypt_pbkdf.c bindresvport.c blowfish.c daemon.c
+	dirname.c fmt_scaled.c getcwd.c getgrouplist.c getopt_long.c
+	getrrsetbyname.c glob.c inet_aton.c inet_ntoa.c inet_ntop.c mktemp.c
+	pwcache.c readpassphrase.c reallocarray.c realpath.c rresvport.c
+	setenv.c setproctitle.c sha1.c sha2.c rmd160.c md5.c sigact.c
+	strcasestr.c strlcat.c strlcpy.c strmode.c strnlen.c strptime.c
+	strsep.c strtonum.c strtoll.c strtoul.c strtoull.c timingsafe_bcmp.c
+	vis.c explicit_bzero.c
+
+	arc4random.c bsd-asprintf.c bsd-closefrom.c bsd-cray.c
+	bsd-cygwin_util.c bsd-getpeereid.c getrrsetbyname-ldns.c bsd-misc.c
+	bsd-nextstep.c bsd-openpty.c bsd-poll.c bsd-setres_id.c bsd-snprintf.c
+	bsd-statvfs.c bsd-waitpid.c fake-rfc2553.c openssl-compat.c xcrypt.c
+	kludge-fd_set.c
+
+	port-aix.c port-irix.c port-linux.c port-solaris.c port-uw.c
+)]])
+
+-- port-tun.c from openbsd-compat depends on sshbuf-getput-basic.c and ssherr.c
+-- from libssh.a, so just include it in libssh.a.
+lib('libssh.a', [[
+	ssh_api.c
+	ssherr.c
+	sshbuf.c
+	sshkey.c
+	sshbuf-getput-basic.c
+	sshbuf-misc.c
+	sshbuf-getput-crypto.c
+	krl.c
+	bitmap.c
+
+	authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c
+	canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c
+	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c
+	compat.c crc32.c deattack.c fatal.c hostfile.c
+	log.c match.c md-sha256.c moduli.c nchan.c packet.c opacket.c
+	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c
+	atomicio.c key.c dispatch.c mac.c uidswap.c uuencode.c misc.c utf8.c
+	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c
+	msg.c progressmeter.c dns.c entropy.c gss-genr.c umac.c umac128.c.o
+	ssh-pkcs11.c smult_curve25519_ref.c
+	poly1305.c chacha.c cipher-chachapoly.c
+	ssh-ed25519.c digest-openssl.c digest-libc.c hmac.c
+	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c
+	kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c
+	kexdhc.c kexgexc.c kexecdhc.c kexc25519c.c
+	kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c
+	platform-pledge.c platform-tracing.c
+	openbsd-compat/port-tun.c libopenbsd-compat.a
+	$builddir/pkg/(libressl/libcrypto.a.d zlib/libz.a)
+]])
+
+exe('ssh', [[
+	ssh.c readconf.c clientloop.c sshtty.c
+	sshconnect.c sshconnect1.c sshconnect2.c mux.c
+	libssh.a.d
+]])
+file('bin/ssh', '755', '$outdir/ssh')
+
+cc('sftp-server.c')
+cc('sftp-common.c')
+
+exe('sshd', [[
+	sshd.c auth-rhosts.c auth-passwd.c
+	audit.c audit-bsm.c audit-linux.c platform.c
+	sshpty.c sshlogin.c servconf.c serverloop.c
+	auth.c auth2.c auth-options.c session.c
+	auth2-chall.c groupaccess.c
+	auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c
+	auth2-none.c auth2-passwd.c auth2-pubkey.c
+	monitor.c monitor_wrap.c auth-krb5.c
+	auth2-gss.c gss-serv.c gss-serv-krb5.c
+	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c
+	sftp-server.c.o sftp-common.c.o
+	sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c
+	sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c
+	sandbox-solaris.c
+	libssh.a.d
+]])
+file('bin/sshd', '755', '$outdir/sshd')
+
+exe('scp', {'scp.c', 'libssh.a.d'})
+file('bin/scp', '755', '$outdir/scp')
+
+exe('ssh-add', {'ssh-add.c', 'libssh.a.d'})
+file('bin/ssh-add', '755', '$outdir/ssh-add')
+
+exe('ssh-agent', {'ssh-agent.c', 'ssh-pkcs11-client.c', 'libssh.a.d'})
+file('bin/ssh-agent', '755', '$outdir/ssh-agent')
+
+exe('ssh-keygen', {'ssh-keygen.c', 'libssh.a.d'})
+file('bin/ssh-keygen', '755', '$outdir/ssh-keygen')
+
+exe('sftp-server', {'sftp-common.c.o', 'sftp-server.c.o', 'sftp-server-main.c', 'libssh.a.d'})
+file('libexec/sftp-server', '755', '$outdir/sftp-server')
+
+man{'ssh.1', 'scp.1', 'ssh-add.1', 'ssh-agent.1', 'ssh-keygen.1', 'sshd.8', 'sftp-server.8'}
+
+fetch 'git'
diff --git a/pkg/openssh/gen.rc b/pkg/openssh/gen.rc
deleted file mode 100644
index d5a229c1..00000000
--- a/pkg/openssh/gen.rc
+++ /dev/null
@@ -1,121 +0,0 @@
-cflags\
-	-D '_XOPEN_SOURCE=600' \
-	-D _DEFAULT_SOURCE\
-	-I include\
-	-I '$dir' \
-	-I '$srcdir' \
-	-I '$srcdir'/openbsd-compat\
-	-I pkg/openbsd/include\
-	-I '$builddir'/pkg/libressl/include\
-	-I '$builddir'/pkg/zlib/include
-
-phony deps pkg/^(libressl zlib)^/headers
-
-build '$outdir'/umac128.c.o cc '$srcdir'/umac.c '||' '$dir'/deps ; defs=(\
-	'-DUMAC_OUTPUT_LEN=16' \
-	'-Dumac_new=umac128_new' \
-	'-Dumac_update=umac128_update' \
-	'-Dumac_final=umac128_final' \
-	'-Dumac_delete=umac128_delete' \
-	'-Dumac_ctx=umac128_ctx' \
-) with cflags '$cflags '$"defs
-
-lib libopenbsd-compat.a -d '$dir'/deps openbsd-compat/^(\
-	base64.c basename.c bcrypt_pbkdf.c bindresvport.c blowfish.c daemon.c\
-	dirname.c fmt_scaled.c getcwd.c getgrouplist.c getopt_long.c\
-	getrrsetbyname.c glob.c inet_aton.c inet_ntoa.c inet_ntop.c mktemp.c\
-	pwcache.c readpassphrase.c reallocarray.c realpath.c rresvport.c\
-	setenv.c setproctitle.c sha1.c sha2.c rmd160.c md5.c sigact.c\
-	strcasestr.c strlcat.c strlcpy.c strmode.c strnlen.c strptime.c\
-	strsep.c strtonum.c strtoll.c strtoul.c strtoull.c timingsafe_bcmp.c\
-	vis.c explicit_bzero.c\
-	\
-	arc4random.c bsd-asprintf.c bsd-closefrom.c bsd-cray.c\
-	bsd-cygwin_util.c bsd-getpeereid.c getrrsetbyname-ldns.c bsd-misc.c\
-	bsd-nextstep.c bsd-openpty.c bsd-poll.c bsd-setres_id.c bsd-snprintf.c\
-	bsd-statvfs.c bsd-waitpid.c fake-rfc2553.c openssl-compat.c xcrypt.c\
-	kludge-fd_set.c\
-	\
-	port-aix.c port-irix.c port-linux.c port-solaris.c port-uw.c\
-)
-
-# port-tun.c from openbsd-compat depends on sshbuf-getput-basic.c and ssherr.c
-# from libssh.a, so just include it in libssh.a.
-lib libssh.a -d '$dir'/deps\
-	ssh_api.c\
-	ssherr.c\
-	sshbuf.c\
-	sshkey.c\
-	sshbuf-getput-basic.c\
-	sshbuf-misc.c\
-	sshbuf-getput-crypto.c\
-	krl.c\
-	bitmap.c\
-	\
-	authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c\
-	canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c\
-	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c\
-	compat.c crc32.c deattack.c fatal.c hostfile.c\
-	log.c match.c md-sha256.c moduli.c nchan.c packet.c opacket.c\
-	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c\
-	atomicio.c key.c dispatch.c mac.c uidswap.c uuencode.c misc.c utf8.c\
-	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c\
-	msg.c progressmeter.c dns.c entropy.c gss-genr.c umac.c umac128.c.o\
-	ssh-pkcs11.c smult_curve25519_ref.c\
-	poly1305.c chacha.c cipher-chachapoly.c\
-	ssh-ed25519.c digest-openssl.c digest-libc.c hmac.c\
-	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c\
-	kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c\
-	kexdhc.c kexgexc.c kexecdhc.c kexc25519c.c\
-	kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c\
-	platform-pledge.c platform-tracing.c\
-	openbsd-compat/port-tun.c libopenbsd-compat.a\
-	'$builddir'/pkg/^(libressl/libcrypto.a.d zlib/libz.a)\
-
-exe ssh -d '$dir'/deps\
-	ssh.c readconf.c clientloop.c sshtty.c\
-	sshconnect.c sshconnect1.c sshconnect2.c mux.c\
-	libssh.a.d
-file bin/ssh '$outdir'/ssh 755
-
-cc sftp-server.c '||' $dir/deps
-cc sftp-common.c '||' $dir/deps
-
-exe sshd -d '$dir'/deps\
-	sshd.c auth-rhosts.c auth-passwd.c\
-	audit.c audit-bsm.c audit-linux.c platform.c\
-	sshpty.c sshlogin.c servconf.c serverloop.c\
-	auth.c auth2.c auth-options.c session.c\
-	auth2-chall.c groupaccess.c\
-	auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c\
-	auth2-none.c auth2-passwd.c auth2-pubkey.c\
-	monitor.c monitor_wrap.c auth-krb5.c\
-	auth2-gss.c gss-serv.c gss-serv-krb5.c\
-	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c\
-	sftp-server.c.o sftp-common.c.o\
-	sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c\
-	sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c\
-	sandbox-solaris.c\
-	libssh.a.d
-file bin/sshd '$outdir'/sshd 755
-
-exe scp -d '$dir'/deps scp.c libssh.a.d
-file bin/scp '$outdir'/scp 755
-
-exe ssh-add -d '$dir'/deps ssh-add.c libssh.a.d
-file bin/ssh-add '$outdir'/ssh-add 755
-
-exe ssh-agent -d '$dir'/deps ssh-agent.c ssh-pkcs11-client.c libssh.a.d
-file bin/ssh-agent '$outdir'/ssh-agent 755
-
-exe ssh-keygen -d '$dir'/deps ssh-keygen.c libssh.a.d
-file bin/ssh-keygen '$outdir'/ssh-keygen 755
-
-exe sftp-server -d '$dir'/deps sftp-common.c.o sftp-server.c.o sftp-server-main.c libssh.a.d
-file libexec/sftp-server '$outdir'/sftp-server 755
-
-man\
-	1 ssh.1 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1\
-	8 sshd.8 sftp-server.8
-
-fetch git