From 897b1bc34d5d0900e9225ca7a780b783ad6bd69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
Date: Sun, 20 May 2018 13:35:41 +0900
Subject: [PATCH] component/openssh: version up 7.7p1
Also change download URL to use https:// (no reason to use http)
Also switch to git format patch
---
component/openssh/buildout.cfg | 8 ++---
.../openssh/no_create_privsep_path.patch | 31 ++++++++++++++-----
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/component/openssh/buildout.cfg b/component/openssh/buildout.cfg
index 0341fedcb..2a91983c8 100644
--- a/component/openssh/buildout.cfg
+++ b/component/openssh/buildout.cfg
@@ -15,12 +15,12 @@ parts =
[openssh]
recipe = slapos.recipe.cmmi
-md5sum = b2db2a83caf66a208bb78d6d287cdaa3
-url = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.4p1.tar.gz
+md5sum = 68ba883aff6958297432e5877e9a0fe2
+url = https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.7p1.tar.gz
patch-binary = ${patch:location}/bin/patch
-#patch-options = -p1
+patch-options = -p1
patches =
- ${:_profile_base_location_}/no_create_privsep_path.patch#d5b61a2442fffa457cebe4ad1dc68f4e
+ ${:_profile_base_location_}/no_create_privsep_path.patch#f341dc11d73df6f43c7ae1fa47b8c003
environment =
CPPFLAGS=-I${zlib:location}/include -I${openssl-1.0:location}/include
LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${openssl-1.0:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib
diff --git a/component/openssh/no_create_privsep_path.patch b/component/openssh/no_create_privsep_path.patch
index f5961e9d9..c9157e29c 100644
--- a/component/openssh/no_create_privsep_path.patch
+++ b/component/openssh/no_create_privsep_path.patch
@@ -1,10 +1,27 @@
---- Makefile.in 2016-07-28 00:54:27.000000000 +0200
-+++ Makefile.in 2016-08-19 13:02:30.227177750 +0200
-@@ -304,7 +304,6 @@
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
- $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
- $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
-- (umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
+From 46cf5eba19cf52ffae48ea95f07a36b4c107ebd8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com>
+Date: Sun, 20 May 2018 20:47:16 +0900
+Subject: [PATCH] Do not create PRIVSEP_PATH
+
+For SlapOS, this would need to be in instance, but instance paths are
+not known at software compilation time. Because we don't do privileges
+separation, just disable creation of this directory.
+---
+ Makefile.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 04e1c8e5..9bd5d01b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -329,7 +329,6 @@ install-files:
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+ $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+ $(MKDIR_P) $(DESTDIR)$(libexecdir)
+- $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
$(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
+--
+2.11.0
+
--
2.30.9