diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-04-09 20:57:23 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-04-09 20:57:23 +0000 |
| commit | 08dd690c4af612aaa6863b13b08b59edfb9c8e02 (patch) | |
| tree | 3a5b3b7aa974929d11d77a3012fa08833ac8beba | |
| parent | Unbreak by fixing the code to work newer PHP. I'm not sure, if this (diff) | |
Cleanup some unneeded patches.
1. There's no need to patch the xauth(1) location as the OpenSSH build already
does so based on the --with-xauth path provided. It also updates manpages.
2. Don't modify manpage for shosts location as it was wrong. The proper
LOCALBASE path is now used due to OpenSSH's build already handling it
properly.
3. Remove confusing UsePrivilegeSeparation change in sshd_config. The default
upstream is to have it disabled by default. The sshd_config line is in
upstream to enable it by default in new installations. We always enable
it though. So remove the sshd_config change which makes it look like
we don't use it; it was not a needed difference with upstream.
From discussion with: TJ <tj@mrsk.me>
| -rw-r--r-- | security/openssh-portable/Makefile | 7 | ||||
| -rw-r--r-- | security/openssh-portable/files/patch-sshd_config | 9 | ||||
| -rw-r--r-- | security/openssh-portable/files/patch-sshd_config.5 | 9 |
3 files changed, 3 insertions, 22 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 5fadb9581c30..11edc6f192b3 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.8p1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} @@ -187,6 +187,8 @@ CONFIGURE_ARGS+= --sysconfdir=${ETCDIR} --with-privsep-path=${EMPTYDIR} CONFIGURE_ARGS+= --with-libs='${CONFIGURE_LIBS}' .endif +CONFIGURE_ARGS+= --with-xauth=${LOCALBASE}/bin/xauth + RC_SCRIPT_NAME= openssh VERSION_ADDENDUM_DEFAULT?= ${OPSYS}-${PKGNAME} @@ -195,9 +197,6 @@ post-patch: @${REINPLACE_CMD} \ -e 's|install: \(.*\) host-key check-config|install: \1|g' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|' \ - ${WRKSRC}/pathnames.h ${WRKSRC}/sshd_config.5 \ - ${WRKSRC}/ssh_config.5 @${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|' \ -e 's|%%RC_SCRIPT_NAME%%|${RC_SCRIPT_NAME}|' ${WRKSRC}/sshd.8 @${REINPLACE_CMD} \ diff --git a/security/openssh-portable/files/patch-sshd_config b/security/openssh-portable/files/patch-sshd_config index 773f90d667f0..8e2ca0e2b48c 100644 --- a/security/openssh-portable/files/patch-sshd_config +++ b/security/openssh-portable/files/patch-sshd_config @@ -68,12 +68,3 @@ #X11DisplayOffset 10 #X11UseLocalhost yes #PermitTTY yes -@@ -107,7 +109,7 @@ - #PrintLastLog yes - #TCPKeepAlive yes - #UseLogin no --UsePrivilegeSeparation sandbox # Default for new installations. -+#UsePrivilegeSeparation sandbox - #PermitUserEnvironment no - #Compression delayed - #ClientAliveInterval 0 diff --git a/security/openssh-portable/files/patch-sshd_config.5 b/security/openssh-portable/files/patch-sshd_config.5 index e13d32dcfc67..85d213a8a791 100644 --- a/security/openssh-portable/files/patch-sshd_config.5 +++ b/security/openssh-portable/files/patch-sshd_config.5 @@ -11,15 +11,6 @@ The default is .Dq yes . .It Cm ChrootDirectory -@@ -615,7 +617,7 @@ or - .Pp - .Pa /etc/hosts.equiv - and --.Pa /etc/shosts.equiv -+.Pa /etc/ssh/shosts.equiv - are still used. - The default is - .Dq yes . @@ -977,7 +979,22 @@ are refused if the number of unauthentic .It Cm PasswordAuthentication Specifies whether password authentication is allowed. |