devel/popt

devel/popt/distinfo

@@ -6,3 +6,6 @@ Size (popt-1.16.tar.gz) = 702769 bytes
 SHA1 (patch-aa) = 7edb4bbd7fe044da9f388159fdc22327377e267e
 SHA1 (patch-lookup3.c) = 7643b577c0913742fc4333c4469d606d81b6aa98
 SHA1 (patch-poptint.h) = c26b97bdeedf8a057009dfca985eb9287220f54b
+SHA1 (patch-zz-minix-a) = 2ab9d08e2fc8dc07202a33e21d5595d6479a2401
+SHA1 (patch-zz-minix-b) = 5321a1a4572555005e63e6a5af97892db7a38148
+SHA1 (patch-zz-minix-c) = 86137b8927325dc856ebc4e7e5a3a7a61f402690

devel/popt/patches/patch-zz-minix-a

@@ -0,0 +1,15 @@
+--- poptconfig.c.orig	Sun Oct  4 12:34:19 2015
++++ poptconfig.c	Sun Oct  4 12:35:21 2015
+@@ -42,10 +42,10 @@
+ /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
+ #endif	/* __LCLINT__ */
+ 
+-#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__minix)
+ #include <sys/param.h>
+ #endif
+-#if !defined(__GLIBC__) && (!defined(__NetBSD__) || __NetBSD_Version__ < 599001100)
++#if !defined(__GLIBC__) && !defined(__minix) && (!defined(__NetBSD__) || __NetBSD_Version__ < 599001100)
+ /* Return nonzero if PATTERN contains any metacharacters.
+    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
+ static int

devel/popt/patches/patch-zz-minix-b

@@ -0,0 +1,29 @@
+--- config.rpath.orig	Sun Oct  4 12:36:32 2015
++++ config.rpath	Sun Oct  4 12:37:46 2015
+@@ -203,7 +203,7 @@
+         ld_shlibs=no
+       fi
+       ;;
+-    netbsd*)
++    minix* | netbsd*)
+       ;;
+     solaris*)
+       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+@@ -405,7 +405,7 @@
+       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+       hardcode_libdir_separator=:
+       ;;
+-    netbsd*)
++    minix* | netbsd*)
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+       ;;
+@@ -582,7 +582,7 @@
+   knetbsd*-gnu)
+     library_names_spec='$libname$shrext'
+     ;;
+-  netbsd*)
++  minix* | netbsd*)
+     library_names_spec='$libname$shrext'
+     ;;
+   newsos6)

devel/popt/patches/patch-zz-minix-c

@@ -0,0 +1,57 @@
+--- configure.orig	Sun Oct  4 12:38:55 2015
++++ configure	Sun Oct  4 12:41:52 2015
+@@ -5826,7 +5826,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`
+@@ -6233,7 +6233,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++minix* | 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)$'
+   else
+@@ -9626,7 +9626,7 @@
+       fi
+       ;;
+ 
+-    netbsd*)
++    minix* | netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -10215,7 +10215,7 @@
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    minix* | netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -11193,6 +11193,18 @@
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   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*)

mail/opensmtpd/Makefile

@@ -48,11 +48,6 @@ 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/cat5/aliases.5
+man/man5/aliases.5
-man/cat5/forward.5
+man/man5/forward.5
-man/cat5/smtpd.conf.5
+man/man5/smtpd.conf.5
-man/cat8/makemap.8
+man/man8/makemap.8
-man/cat8/newaliases.8
+man/man8/newaliases.8
-man/cat8/smtpctl.8
+man/man8/smtpctl.8
-man/cat8/smtpd.8
+man/man8/smtpd.8
 sbin/makemap
 sbin/smtpctl
 sbin/smtpd

mail/opensmtpd/distinfo

@@ -6,6 +6,3 @@ 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

@@ -1,11 +0,0 @@
---- 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

@@ -1,11 +0,0 @@
---- 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

@@ -1,11 +0,0 @@
---- 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,10 +110,6 @@ 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) = fb0b798db80ae4c652f0b56ac8ea4920388df48d
+SHA1 (patch-zz-minix) = 1098c7642641e49952c358a4a9ca6f7e66a54c63

security/openssh/files/sshd.sh

@@ -22,13 +22,12 @@ sshd_keygen()
 {
 	(
 	umask 022
-# LSC: For Minix: rsa1 is not supported anymore
+	if [ -f @PKG_SYSCONFDIR@/ssh_host_key ]; then
-#	if [ -f @PKG_SYSCONFDIR@/ssh_host_key ]; then
+		@ECHO@ "You already have an RSA host key in @PKG_SYSCONFDIR@/ssh_host_key"
-#		@ECHO@ "You already have an RSA host key in @PKG_SYSCONFDIR@/ssh_host_key"
+		@ECHO@ "Skipping protocol version 1 RSA Key Generation"
-#		@ECHO@ "Skipping protocol version 1 RSA Key Generation"
+	else
-#	else
+		${keygen_command} -t rsa1 -b 1024 -f @PKG_SYSCONFDIR@/ssh_host_key -N ''
-#		${keygen_command} -t rsa1 -b 1024 -f @PKG_SYSCONFDIR@/ssh_host_key -N ''
+	fi
-#	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"
@@ -64,9 +63,7 @@ sshd_keygen()
 
 sshd_precmd()
 {
-# LSC: For Minix: rsa1 is now unsupported
+	if [ ! -f @PKG_SYSCONFDIR@/ssh_host_key -o \
-#	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,23 +1,15 @@
 --- sshd_config.orig	Sun Jan 12 08:20:47 2014
-+++ sshd_config	Thu Apr 17 23:51:34 2014
++++ sshd_config	Sat Apr 25 09:28:41 2015
-@@ -102,12 +102,19 @@ AuthorizedKeysFile	.ssh/authorized_keys
+@@ -99,6 +99,12 @@
- #X11Forwarding no
+ #AllowAgentForwarding yes
- #X11DisplayOffset 10
+ #AllowTcpForwarding yes
- #X11UseLocalhost yes
+ #GatewayPorts no
 +
 +# 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
 +
- #PermitTTY yes
+ #X11Forwarding no
- #PrintMotd yes
+ #X11DisplayOffset 10
- #PrintLastLog yes
+ #X11UseLocalhost 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