pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
openssh: remove more interix support which has likely bitrotted
Module Name: pkgsrc-wip
Committed By: coypu <coypu%sdf.org@localhost>
Pushed By: coypu
Date: Wed May 1 20:47:10 2019 +0300
Changeset: 7e958fbd1a4f6aab2890d59fab83a7da93271cbd
Modified Files:
openssh/Makefile
openssh/distinfo
openssh/patches/patch-config.h.in
openssh/patches/patch-configure.ac
openssh/patches/patch-loginrec.c
Removed Files:
openssh/MESSAGE.Interix
openssh/patches/patch-includes.h
openssh/patches/patch-openbsd-compat_bsd-openpty.c
openssh/patches/patch-platform.c
openssh/patches/patch-scp.c
Log Message:
openssh: remove more interix support which has likely bitrotted
and is very taxing for anyone updating this package.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7e958fbd1a4f6aab2890d59fab83a7da93271cbd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
openssh/MESSAGE.Interix | 20 -----------
openssh/Makefile | 23 -------------
openssh/distinfo | 10 ++----
openssh/patches/patch-config.h.in | 12 +------
openssh/patches/patch-configure.ac | 16 ---------
openssh/patches/patch-includes.h | 17 ----------
openssh/patches/patch-loginrec.c | 5 ++-
openssh/patches/patch-openbsd-compat_bsd-openpty.c | 22 ------------
openssh/patches/patch-platform.c | 16 ---------
openssh/patches/patch-scp.c | 39 ----------------------
10 files changed, 8 insertions(+), 172 deletions(-)
diffs:
diff --git a/openssh/MESSAGE.Interix b/openssh/MESSAGE.Interix
deleted file mode 100644
index ee57d65d24..0000000000
--- a/openssh/MESSAGE.Interix
+++ /dev/null
@@ -1,20 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.Interix,v 1.1 2005/03/07 23:29:49 tv Exp $
-
-OpenSSH on Interix has some important caveats:
-
-* Hostname resolution uses the BIND resolver library rather than Windows
- native lookup services. This requires that /etc/resolv.conf be set up
- properly with a "nameserver" line; see resolv.conf(5). In most
- installations, this was generated automatically when Services for UNIX
- was installed (based on the name server in use at that time).
-
-* Currently, UsePrivilegeSeparation does not work properly, so it defaults
- to "no" on Interix.
-
-* Network drives and encrypted local files may not be accessible after
- logging in through sshd thanks to the way the Windows security API works.
- A workaround is to "exec su USERNAME" after logging in, which will use
- the password to create a proper Windows access credential key.
-
-===========================================================================
diff --git a/openssh/Makefile b/openssh/Makefile
index 0f497cfb75..c24fd657ca 100644
--- a/openssh/Makefile
+++ b/openssh/Makefile
@@ -36,33 +36,12 @@ INSTALL_TARGET= install-nokeys
# fixes: dyld: Symbol not found: _allow_severity
CONFIGURE_ARGS.Darwin+= --disable-strip
-# OpenSSH on Interix has some important caveats
-.if ${OPSYS} == "Interix"
-MESSAGE_SRC= ${.CURDIR}/MESSAGE.Interix
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib/bind
-CONFIGURE_ENV+= ac_cv_func_openpty=no
-CONFIGURE_ENV+= ac_cv_type_struct_timespec=yes
-CPPFLAGS+= -DIOV_MAX=16 # default is INT_MAX, way too large
-. if exists(/usr/local/include/bind/resolv.h)
-CPPFLAGS+= -I/usr/local/include/bind
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind
-. elif exists(/usr/local/bind/include/resolv.h)
-CPPFLAGS+= -I/usr/local/bind/include
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/bind/include
-. endif
-LDFLAGS+= -L/usr/local/lib/bind
-LIBS+= -lbind -ldb -lcrypt
-
-.else # not Interix
-
PKG_GROUPS= ${OPENSSH_GROUP}
PKG_USERS= ${OPENSSH_USER}:${OPENSSH_GROUP}
PKG_GECOS.${OPENSSH_USER}= sshd privsep pseudo-user
PKG_HOME.${OPENSSH_USER}= ${OPENSSH_CHROOT}
-.endif
-
SSH_PID_DIR= ${VARBASE}/run # default directory for PID files
PKG_SYSCONFSUBDIR= ssh
@@ -73,10 +52,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR}
CONFIGURE_ARGS+= --with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers}
-.if ${OPSYS} != "Interix"
CONFIGURE_ARGS+= --with-privsep-path=${OPENSSH_CHROOT:Q}
CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER}
-.endif
# pkgsrc already enforces a "secure" version of zlib via dependencies,
# so skip this bogus version check.
diff --git a/openssh/distinfo b/openssh/distinfo
index 56dfc67cae..4662b0524f 100644
--- a/openssh/distinfo
+++ b/openssh/distinfo
@@ -7,16 +7,12 @@ Size (openssh-8.0p1.tar.gz) = 1597697 bytes
SHA1 (patch-Makefile.in) = 13502b825c13c98b2ba3b84ff4bae9aa664b76b1
SHA1 (patch-auth.c) = 194e3293fdc18b93014041d379d57df172716e1c
SHA1 (patch-clientloop.c) = 4e88fbd14db33f003eb93c30c682a017e102196e
-SHA1 (patch-config.h.in) = 926507ea281568e06385e16cbd3c8b907f2baa3f
-SHA1 (patch-configure.ac) = 4500549c9b85eb5502101f1043ccb85154df04b7
+SHA1 (patch-config.h.in) = 7d1050743da7264763254b57938775c546c3baa5
+SHA1 (patch-configure.ac) = 321ef5ed83abe7e07d38026e096a10700b010ac8
SHA1 (patch-defines.h) = bd8687a9a2857f3b8d15ae94095f27f9344003c4
-SHA1 (patch-includes.h) = c4a7622af6fbcd098d18d257724dca6aaeea4fda
-SHA1 (patch-loginrec.c) = 77a925b43967c0e6f4a984faa98d2b635b64e0a8
-SHA1 (patch-openbsd-compat_bsd-openpty.c) = 80e076a18a0f9ba211ecd4bc5853ce01899568ae
+SHA1 (patch-loginrec.c) = 76f1e03182cbd18dd9ac0bdfcb6502eec7eb56a9
SHA1 (patch-openbsd-compat_openbsd-compat.h) = bedbede16ab2fe918419c994ba15a20167b411b4
SHA1 (patch-openbsd-compat_port-tun.c) = 4b1b55b7fdc319e011d249ee336301b17a589228
-SHA1 (patch-platform.c) = f8f211dbc5e596c0f82eb86324d18a84c6151ec5
SHA1 (patch-sandbox-darwin.c) = c9a1fe2e4dbf98e929d983b4206a244e0e354b75
-SHA1 (patch-scp.c) = 9c2317b0f796641903a826db355ba06595a26ea1
SHA1 (patch-sshd.8) = 5bf48cd27cef8e8810b9dc7115f5180102a345d1
SHA1 (patch-sshd.c) = 825eeec13608859852f4cfdeaceedce21bd2f164
diff --git a/openssh/patches/patch-config.h.in b/openssh/patches/patch-config.h.in
index c1bb668067..5bfcff67d7 100644
--- a/openssh/patches/patch-config.h.in
+++ b/openssh/patches/patch-config.h.in
@@ -1,20 +1,10 @@
$NetBSD: patch-config.h.in,v 1.6 2019/01/18 20:13:37 tnn Exp $
-* Added Interix and define new path to if_tun.h.
+* define new path to if_tun.h.
* Revive tcp_wrappers support.
--- config.h.in.orig 2018-10-19 01:06:33.000000000 +0000
+++ config.h.in
-@@ -741,6 +741,9 @@
- /* define if you have int64_t data type */
- #undef HAVE_INT64_T
-
-+/* Define if you are on Interix */
-+#undef HAVE_INTERIX
-+
- /* Define to 1 if the system has the type `intmax_t'. */
- #undef HAVE_INTMAX_T
-
@@ -910,6 +913,9 @@
/* Define to 1 if you have the <net/route.h> header file. */
#undef HAVE_NET_ROUTE_H
diff --git a/openssh/patches/patch-configure.ac b/openssh/patches/patch-configure.ac
index ec50365d8e..08c0ba4d6e 100644
--- a/openssh/patches/patch-configure.ac
+++ b/openssh/patches/patch-configure.ac
@@ -20,22 +20,6 @@ $NetBSD$
netdb.h \
netgroup.h \
pam/pam_appl.h \
-@@ -737,6 +741,15 @@ main() { if (NSVersionOfRunTimeLibrary("
- ;;
- esac
- ;;
-+*-*-interix*)
-+ AC_DEFINE(HAVE_INTERIX)
-+ AC_DEFINE(DISABLE_FD_PASSING)
-+ AC_DEFINE(DISABLE_SHADOW)
-+ AC_DEFINE(IP_TOS_IS_BROKEN)
-+ AC_DEFINE(MISSING_HOWMANY)
-+ AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT)
-+ AC_DEFINE(USE_PIPES)
-+ ;;
- *-*-irix5*)
- PATH="$PATH:/usr/etc"
- AC_DEFINE([BROKEN_INET_NTOA], [1],
@@ -1494,6 +1507,62 @@ else
AC_MSG_RESULT([no])
fi
diff --git a/openssh/patches/patch-includes.h b/openssh/patches/patch-includes.h
deleted file mode 100644
index 5e54a9dcd8..0000000000
--- a/openssh/patches/patch-includes.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-includes.h,v 1.4 2016/01/18 12:53:26 jperkin Exp $
-
-Interix support
-
---- includes.h.orig 2015-08-21 04:49:03.000000000 +0000
-+++ includes.h
-@@ -127,6 +127,10 @@
- #ifdef HAVE_READPASSPHRASE_H
- # include <readpassphrase.h>
- #endif
-+#ifdef HAVE_INTERIX
-+# include <interix/env.h>
-+# include <interix/security.h>
-+#endif
-
- #ifdef HAVE_IA_H
- # include <ia.h>
diff --git a/openssh/patches/patch-loginrec.c b/openssh/patches/patch-loginrec.c
index 834a763156..c12f9b0963 100644
--- a/openssh/patches/patch-loginrec.c
+++ b/openssh/patches/patch-loginrec.c
@@ -1,6 +1,9 @@
$NetBSD: patch-loginrec.c,v 1.5 2016/01/18 12:53:26 jperkin Exp $
-Interix support and related fixes. Fix build on FreeBSD.
+Interix support and related fixes.
+Fix build on FreeBSD.
+
+XXX remove interix once we figure out which one's which
--- loginrec.c.orig 2015-08-21 04:49:03.000000000 +0000
+++ loginrec.c
diff --git a/openssh/patches/patch-openbsd-compat_bsd-openpty.c b/openssh/patches/patch-openbsd-compat_bsd-openpty.c
deleted file mode 100644
index adbacbee3a..0000000000
--- a/openssh/patches/patch-openbsd-compat_bsd-openpty.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-openbsd-compat_bsd-openpty.c,v 1.4 2016/12/30 04:43:16 taca Exp $
-
-Interix support
-
---- openbsd-compat/bsd-openpty.c.orig 2016-12-19 04:59:41.000000000 +0000
-+++ openbsd-compat/bsd-openpty.c
-@@ -121,6 +121,7 @@ openpty(int *amaster, int *aslave, char
- return (-1);
- }
-
-+#if !defined(HAVE_INTERIX)
- /*
- * Try to push the appropriate streams modules, as described
- * in Solaris pts(7).
-@@ -130,6 +131,7 @@ openpty(int *amaster, int *aslave, char
- # ifndef __hpux
- ioctl(*aslave, I_PUSH, "ttcompat");
- # endif /* __hpux */
-+#endif /* !HAVE_INTERIX */
-
- return (0);
-
diff --git a/openssh/patches/patch-platform.c b/openssh/patches/patch-platform.c
deleted file mode 100644
index fe837c1b5a..0000000000
--- a/openssh/patches/patch-platform.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-platform.c,v 1.5 2016/01/18 12:53:26 jperkin Exp $
-
-Interix support
-
---- platform.c.orig 2015-08-21 04:49:03.000000000 +0000
-+++ platform.c
-@@ -90,7 +90,9 @@ platform_privileged_uidswap(void)
- /* uid 0 is not special on Cygwin so always try */
- return 1;
- #else
-+#if !defined(HAVE_INTERIX)
- return (getuid() == 0 || geteuid() == 0);
-+#endif /* !HAVE_INTERIX */
- #endif
- }
-
diff --git a/openssh/patches/patch-scp.c b/openssh/patches/patch-scp.c
deleted file mode 100644
index 415ddfbc2b..0000000000
--- a/openssh/patches/patch-scp.c
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-scp.c,v 1.4 2016/01/18 12:53:26 jperkin Exp $
-
-Interix support
-
---- scp.c.orig 2015-08-21 04:49:03.000000000 +0000
-+++ scp.c
-@@ -478,7 +478,11 @@ main(int argc, char **argv)
- argc -= optind;
- argv += optind;
-
-+#ifdef HAVE_INTERIX
-+ if ((pwd = getpwuid_ex(userid = getuid(), PW_FULLNAME)) == NULL)
-+#else
- if ((pwd = getpwuid(userid = getuid())) == NULL)
-+#endif
- fatal("unknown user %u", (u_int) userid);
-
- if (!isatty(STDOUT_FILENO))
-@@ -886,8 +890,10 @@ rsource(char *name, struct stat *statp)
- return;
- }
- while ((dp = readdir(dirp)) != NULL) {
-+#ifndef HAVE_INTERIX
- if (dp->d_ino == 0)
- continue;
-+#endif
- if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
- continue;
- if (strlen(name) + 1 + strlen(dp->d_name) >= sizeof(path) - 1) {
-@@ -1297,7 +1303,9 @@ okname(char *cp0)
- case '\'':
- case '"':
- case '`':
-+#ifndef HAVE_INTERIX
- case ' ':
-+#endif
- case '#':
- goto bad;
- default:
Home |
Main Index |
Thread Index |
Old Index