Merge pull request #272 from gosella/openssh-privsep

openssh: Wrong _PATH_PRIVSEP_CHROOT_DIR: "/var/empty"

diff --git a/ndk_patches/stdio.h.patch b/ndk_patches/stdio.h.patch
index 325fcf3cd097ac30657c3bd999f2e4c7f53e0c3e..d8f662678bb55544c49ba4637e200a90c0721b76 100644 (file)
--- a/ndk_patches/stdio.h.patch
+++ b/ndk_patches/stdio.h.patch
@@ -62,7 +62,7 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
 +      for (i = 0; i < 100; i++) {
 +              unsigned int r = arc4random();
 +              if (asprintf(&path, "@TERMUX_PREFIX@/tmp/tmpfile.%d-%u", p, r) == -1) return NULL;
-+              int fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE);
++              int fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE, 0600);
 +              free(path);
 +              if (fd >= 0) {
 +                      FILE* result = fdopen(fd, "w+");

diff --git a/packages/glib/build.sh b/packages/glib/build.sh
index af5fa53750d72940637794b5fe40656d89aa7d40..940255278363de3ab049f6c296454ac73e6dce65 100755 (executable)
--- a/packages/glib/build.sh
+++ b/packages/glib/build.sh
@@ -1,8 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/
 TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C"
 _TERMUX_GLIB_MAJOR_VERSION=2.48
-TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.0
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.1
 TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="libffi, pcre"