svn commit: r382566 - in head/security/openssh-portable: . files
Bryan Drewery
bdrewery at FreeBSD.org
Sun Mar 29 04:17:55 UTC 2015
Author: bdrewery
Date: Sun Mar 29 04:17:53 2015
New Revision: 382566
URL: https://svnweb.freebsd.org/changeset/ports/382566
QAT: https://qat.redports.org/buildarchive/r382566/
Log:
Make the VersionAddendum fix use the proper default.
Once I ran into the X509 issue previously I failed to retest that the patch
worked.
PR: 193127
Added:
head/security/openssh-portable/files/extra-patch-version-addendum (contents, props changed)
Modified:
head/security/openssh-portable/Makefile
Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile Sun Mar 29 02:28:48 2015 (r382565)
+++ head/security/openssh-portable/Makefile Sun Mar 29 04:17:53 2015 (r382566)
@@ -3,7 +3,7 @@
PORTNAME= openssh
DISTVERSION= 6.7p1
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= security ipv6
MASTER_SITES= ${MASTER_SITE_OPENBSD}
@@ -132,6 +132,9 @@ CONFIGURE_ARGS+= --disable-utmp --disabl
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sshd-utmp-size
.endif
+# Keep this last
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-version-addendum
+
.if ${PORT_OPTIONS:MX509}
. if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER}
BROKEN= X509 patch and HPN patch do not apply cleanly together
@@ -201,7 +204,6 @@ CONFIGURE_ARGS+= --with-libs='${CONFIGUR
RC_SCRIPT_NAME= openssh
VERSION_ADDENDUM_DEFAULT?= ${OPSYS}-${PKGNAME}
-VERSION_ADDENDUM_SERVCONF_GREP= " options->version_addendum = xstrdup"
post-patch:
@${REINPLACE_CMD} -e 's|-ldes|-lcrypto|g' ${WRKSRC}/configure
@@ -213,13 +215,6 @@ post-patch:
${WRKSRC}/ssh_config.5
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${LOCALBASE}|' \
-e 's|%%RC_SCRIPT_NAME%%|${RC_SCRIPT_NAME}|' ${WRKSRC}/sshd.8
-# Making this a patch conflicts with the X509 option. Use grep to force failure.
- @${ECHO_CMD} "===> Applying VersionAddendum patch to servconf.c" && \
- ${GREP} -q ${VERSION_ADDENDUM_SERVCONF_GREP} \
- ${WRKSRC}/servconf.c && \
- ${REINPLACE_CMD} \
- -e 's|\( ${VERSION_ADDENDUM_SERVCONF_GREP}\).*);|\1(SSH_VERSION_FREEBSD_PORT);|' \
- ${WRKSRC}/servconf.c
@${REINPLACE_CMD} \
-e 's|\(VersionAddendum\) none|\1 ${VERSION_ADDENDUM_DEFAULT}|' \
${WRKSRC}/sshd_config
Added: head/security/openssh-portable/files/extra-patch-version-addendum
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/openssh-portable/files/extra-patch-version-addendum Sun Mar 29 04:17:53 2015 (r382566)
@@ -0,0 +1,5 @@
+--- servconf.c.orig 2015-03-28 23:08:41.296700000 -0500
++++ servconf.c 2015-03-28 23:08:54.016291000 -0500
+@@ -318 +318 @@
+- options->version_addendum = xstrdup("");
++ options->version_addendum = xstrdup(SSH_VERSION_FREEBSD_PORT);
More information about the svn-ports-head
mailing list