Merge branch 'master' of github.com:termux/termux-packages

packages/openssh/build.sh

@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_VERSION=7.8p1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca
 TERMUX_PKG_SRCURL=https://fastly.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libedit, libutil"
@@ -39,6 +39,7 @@ ac_cv_func_bzero=yes
 "
 TERMUX_PKG_MAKE_INSTALL_TARGET="install-nokeys"
 TERMUX_PKG_RM_AFTER_INSTALL="bin/slogin share/man/man1/slogin.1"
+TERMUX_PKG_CONFFILES="etc/ssh/ssh_config etc/ssh/sshd_config"
 
 termux_step_pre_configure() {
 	autoreconf

packages/openssl/apps-openssl.cnf.patch

@@ -0,0 +1,21 @@
+See https://github.com/openssl/openssl/pull/7217
+
+diff -u -r ../openssl-1.1.1/apps/openssl.cnf ./apps/openssl.cnf
+--- ../openssl-1.1.1/apps/openssl.cnf	2018-09-11 12:48:20.000000000 +0000
++++ ./apps/openssl.cnf	2018-09-20 21:25:38.970930892 +0000
+@@ -10,7 +10,6 @@
+ # This definition stops the following lines choking if HOME isn't
+ # defined.
+ HOME			= .
+-RANDFILE		= $ENV::HOME/.rnd
+ 
+ # Extra OBJECT IDENTIFIER info:
+ #oid_file		= $ENV::HOME/.oid
+@@ -57,7 +56,6 @@
+ 					# must be commented out to leave a V1 CRL
+ crl		= $dir/crl.pem 		# The current CRL
+ private_key	= $dir/private/cakey.pem# The private key
+-RANDFILE	= $dir/private/.rand	# private random number file
+ 
+ x509_extensions	= usr_cert		# The extensions to add to the cert
+ 

packages/openssl/build.sh

@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://www.openssl.org/
 TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well as general purpose cryptography functions"
 TERMUX_PKG_DEPENDS="ca-certificates"
 TERMUX_PKG_VERSION=1.1.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a3d
 TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION/\~/-}.tar.gz
 TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc"
@@ -43,4 +43,6 @@ termux_step_make () {
 termux_step_make_install () {
 	# "install_sw" instead of "install" to not install man pages:
 	make -j 1 install_sw MANDIR=$TERMUX_PREFIX/share/man MANSUFFIX=.ssl
+
+	cp apps/openssl.cnf $TERMUX_PREFIX/etc/tls/openssl.cnf
 }

packages/openssl/openssl-tool.subpackage.sh

@@ -1,3 +1,4 @@
-TERMUX_SUBPKG_INCLUDE="bin"
+TERMUX_SUBPKG_INCLUDE="bin etc/tls/openssl.cnf"
 TERMUX_SUBPKG_DESCRIPTION="The openssl command line cryptographic tool"
 TERMUX_SUBPKG_DEPENDS="openssl"
+TERMUX_SUBPKG_CONFFILES="etc/tls/openssl.cnf"

packages/picolisp/build.sh

@@ -1,9 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://picolisp.com
 TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
-TERMUX_PKG_VERSION=18.7.18
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=b88ab3c65d014b653be2aac90b36bb303b6f888954f994cb98eb2a44852f19df
+TERMUX_PKG_VERSION=18.9.18
+TERMUX_PKG_SHA256=aa14a35b7d071c068545d835db74c77538b115b37316dd1b331bd0dee2af0f24
 # We use our bintray mirror since old version snapshots are not kept on main site.
 TERMUX_PKG_SRCURL=https://dl.bintray.com/termux/upstream/picolisp_${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=true