security/openssh: Fixes

mail/opensmtpd/Makefile

@@ -48,6 +48,11 @@ SUBST_MESSAGE.exampledir=	Fixing exampledir path
 SUBST_FILES.exampledir=		smtpd/Makefile.am
 SUBST_SED.exampledir+=		-e 's,@EXAMPLE_DIR@,${EXAMPLEDIR},'
 
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+CPPFLAGS+= -D_OPENBSD_SOURCE
+.endif # ${OPSYS} == "NetBSD" && ${OS_VARIANT} == "Minix"
+
 post-extract:
 	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
 

mail/opensmtpd/PLIST

@@ -4,13 +4,13 @@ bin/newaliases
 bin/smtpscript
 libexec/mail.local
 libexec/opensmtpd/makemap
-man/man5/aliases.5
-man/man5/forward.5
-man/man5/smtpd.conf.5
-man/man8/makemap.8
-man/man8/newaliases.8
-man/man8/smtpctl.8
-man/man8/smtpd.8
+man/cat5/aliases.5
+man/cat5/forward.5
+man/cat5/smtpd.conf.5
+man/cat8/makemap.8
+man/cat8/newaliases.8
+man/cat8/smtpctl.8
+man/cat8/smtpd.8
 sbin/makemap
 sbin/smtpctl
 sbin/smtpd

mail/opensmtpd/distinfo

@@ -6,3 +6,6 @@ Size (opensmtpd-5.3.3p1.tar.gz) = 343733 bytes
 SHA1 (patch-configure.ac) = ed819952951700c057c11200095a72972aafc1f9
 SHA1 (patch-smtpd_Makefile.am) = 4267002ecadceaf68868b9d782d5e6f8571ebc36
 SHA1 (patch-smtpd_queue_fsqueue.c) = 80dae37705378c022c1a76d31ea54a3f907b6c1a
+SHA1 (patch-zz-minix-a) = 3c402b4c78c9d44728cabf2ce9193276b56f2989
+SHA1 (patch-zz-minix-b) = d77fa1c90d95e105a4b5e0d6dba2c387deae2c39
+SHA1 (patch-zz-minix-c) = a5d12cacd94ae8e3a7d62fd843c7884859ebe8b8

mail/opensmtpd/patches/patch-zz-minix-a

@@ -0,0 +1,11 @@
+--- configure.ac.orig	Sun Mar 13 17:02:45 2016
++++ configure.ac	Sun Mar 13 17:08:12 2016
+@@ -411,7 +411,7 @@
+ 		;;
+ 	esac
+ 	;;
+-*-*-netbsd*)
++	*-*-netbsd*|*-*-minix*)
+ 	check_for_libcrypt_before=1
+ 	if test "x$withval" != "xno" ; then
+ 		need_dash_r=1

mail/opensmtpd/patches/patch-zz-minix-b

@@ -0,0 +1,11 @@
+--- smtpd/queue_fsqueue.c.orig	Sun Mar 13 17:55:33 2016
++++ smtpd/queue_fsqueue.c	Sun Mar 13 17:51:46 2016
+@@ -28,7 +28,7 @@
+ #endif
+ #ifdef HAVE_SYS_STATVFS_H
+ #include <sys/statvfs.h>
+-#ifdef __NetBSD__
++#if defined(__NetBSD__) || defined(__minix)
+ #define statfs statvfs
+ #endif
+ #endif

mail/opensmtpd/patches/patch-zz-minix-c

@@ -0,0 +1,11 @@
+--- smtpd/Makefile.am.orig	Sun Mar 13 18:26:08 2016
++++ smtpd/Makefile.am	Sun Mar 13 18:33:22 2016
+@@ -139,7 +139,7 @@
+ 
+ $(MANPAGES): $(MANPAGES_IN)
+ 	if test "$(MANTYPE)" = "cat"; then \
+-		manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]\.out$$/\.0/'`; \
++		manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
+ 	else \
+ 		manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
+ 	fi; \

security/openssh/Makefile

@@ -110,6 +110,10 @@ CONFIGURE_ARGS+=	--disable-libutil
 # prior version don't have it.  So, disable use of strnvis(3) now.
 #
 CONFIGURE_ENV+=		ac_cv_func_strnvis=no
+. if ${OS_VARIANT} == "Minix"
+CPPFLAGS+= -D_OPENBSD_SOURCE
+CONFIGURE_ARGS+= ac_cv_have_decl_O_NONBLOCK=no
+. endif # ${OS_VARIANT} == "Minix"
 .endif
 
 .if (${OPSYS} == "SunOS") && (${OS_VERSION} == "5.8" || ${OS_VERSION} == "5.9")

security/openssh/distinfo

@@ -29,4 +29,4 @@ SHA1 (patch-sshd.8) = 50154729a94aeaef17213d92979967b12d9c4e15
 SHA1 (patch-sshd.c) = d381db6d05067d0f28be8268847df97a0c8e9ba4
 SHA1 (patch-sshpty.c) = f87451e49e39fe137c8876fae52110dc2569958a
 SHA1 (patch-uidswap.c) = 875be63bb6d1a7dd8c3d1c008c85aa4bf37dfdc2
-SHA1 (patch-zz-minix) = 1098c7642641e49952c358a4a9ca6f7e66a54c63
+SHA1 (patch-zz-minix) = fb0b798db80ae4c652f0b56ac8ea4920388df48d

security/openssh/files/sshd.sh

@@ -22,12 +22,13 @@ sshd_keygen()
 {
 	(
 	umask 022
-	if [ -f @PKG_SYSCONFDIR@/ssh_host_key ]; then
-		@ECHO@ "You already have an RSA host key in @PKG_SYSCONFDIR@/ssh_host_key"
-		@ECHO@ "Skipping protocol version 1 RSA Key Generation"
-	else
-		${keygen_command} -t rsa1 -b 1024 -f @PKG_SYSCONFDIR@/ssh_host_key -N ''
-	fi
+# LSC: For Minix: rsa1 is not supported anymore
+#	if [ -f @PKG_SYSCONFDIR@/ssh_host_key ]; then
+#		@ECHO@ "You already have an RSA host key in @PKG_SYSCONFDIR@/ssh_host_key"
+#		@ECHO@ "Skipping protocol version 1 RSA Key Generation"
+#	else
+#		${keygen_command} -t rsa1 -b 1024 -f @PKG_SYSCONFDIR@/ssh_host_key -N ''
+#	fi
 
 	if [ -f @PKG_SYSCONFDIR@/ssh_host_dsa_key ]; then
 		@ECHO@ "You already have a DSA host key in @PKG_SYSCONFDIR@/ssh_host_dsa_key"
@@ -63,7 +64,9 @@ sshd_keygen()
 
 sshd_precmd()
 {
-	if [ ! -f @PKG_SYSCONFDIR@/ssh_host_key -o \
+# LSC: For Minix: rsa1 is now unsupported
+#	if [ ! -f @PKG_SYSCONFDIR@/ssh_host_key -o \
+	if [ \
 	     ! -f @PKG_SYSCONFDIR@/ssh_host_dsa_key -o \
 	     ! -f @PKG_SYSCONFDIR@/ssh_host_rsa_key -o \
 	     ! -f @PKG_SYSCONFDIR@/ssh_host_ecdsa_key -o \

security/openssh/patches/patch-zz-minix

@@ -1,15 +1,23 @@
 --- sshd_config.orig	Sun Jan 12 08:20:47 2014
-+++ sshd_config	Sat Apr 25 09:28:41 2015
-@@ -99,6 +99,12 @@
- #AllowAgentForwarding yes
- #AllowTcpForwarding yes
- #GatewayPorts no
++++ sshd_config	Thu Apr 17 23:51:34 2014
+@@ -102,12 +102,19 @@ AuthorizedKeysFile	.ssh/authorized_keys
+ #X11Forwarding no
+ #X11DisplayOffset 10
+ #X11UseLocalhost yes
 +
 +# LSC: Uncomment if you wish to use X11 forwarding. To actually
 +#      activate X11 forwarding, you also need to set X11Forwarding yes.
 +#XAuthLocation /usr/X11R7/bin/xauth # LSC: Use Native xauth
 +#X11UseLocalhost no # LSC: Workaround SSHD bug
 +
- #X11Forwarding no
- #X11DisplayOffset 10
- #X11UseLocalhost yes
+ #PermitTTY yes
+ #PrintMotd yes
+ #PrintLastLog yes
+ #TCPKeepAlive yes
+ #UseLogin no
+-UsePrivilegeSeparation sandbox		# Default for new installations.
++#UsePrivilegeSeparation sandbox		# Default for new installations.
++UsePrivilegeSeparation no # LSC: for Minix, this is not supported ATM.
+ #PermitUserEnvironment no
+ #Compression delayed
+ #ClientAliveInterval 0

x11/gtk2/distinfo

@@ -8,5 +8,3 @@ SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
 SHA1 (patch-gdk_x11_gdkwindow-x11.c) = 08c05b31da38e16727a2941cdec4c855f2fc7d77
 SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780
-SHA1 (patch-zz-minix-a) = f5ff6d1aeb6f4e9edefc66986ed4bb3e2f6048a1
-SHA1 (patch-zz-minix-b) = ede94a1bde08e1e7bd4572b3452f7d40a6ce01f9

x11/gtk2/patches/patch-zz-minix-a

@@ -1,11 +0,0 @@
---- ltmain.sh.orig	Sun Oct 25 21:56:04 2015
-+++ ltmain.sh	Sun Oct 25 21:56:37 2015
-@@ -7627,7 +7627,7 @@
- 	    # Rhapsody C library is in the System framework
- 	    func_append deplibs " System.ltframework"
- 	    ;;
--	  *-*-netbsd*)
-+	  *-*-minix*|*-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
- 	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)

x11/gtk2/patches/patch-zz-minix-b

@@ -1,106 +0,0 @@
---- configure.orig	Sun Oct 25 21:57:33 2015
-+++ configure	Sun Oct 25 22:00:36 2015
-@@ -6303,7 +6303,7 @@
-     lt_cv_sys_max_cmd_len=8192;
-     ;;
- 
--  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+  minix* | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-     # This has been around since 386BSD, at least.  Likely further.
-     if test -x /sbin/sysctl; then
-       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-@@ -6797,6 +6797,10 @@
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-+minix*)
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-+  ;;
-+
- netbsd*)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-@@ -10396,6 +10400,11 @@
-       fi
-       ;;
- 
-+    minix*)
-+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      ;;
-+
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-@@ -11026,6 +11035,13 @@
-       link_all_deplibs=yes
-       ;;
- 
-+    minix*)
-+      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-     netbsd*)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-@@ -12058,6 +12074,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+minix*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Minix ld.elf_so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -14134,6 +14162,10 @@
- 	esac
- 	;;
- 
-+      minix*)
-+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+	;;
-+
-       netbsd*)
-         if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-@@ -14893,6 +14925,8 @@
- 	    ;;
- 	esac
- 	;;
-+      minix*)
-+	;;
-       netbsd*)
- 	;;
-       *qnx* | *nto*)
-@@ -15893,6 +15927,18 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+minix*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Minix ld.elf_so'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no