diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-29 04:17:53 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-03-29 04:17:53 +0000 |
| commit | 6014ebaef2fc946f5fc971cd4c6d882acca60098 (patch) | |
| tree | da5cba2f1e195608596bbbfd6dabc7643cad83ff /security | |
| parent | - Update to 2.4.0. (diff) | |
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
Notes
Notes:
svn path=/head/; revision=382566
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh-portable/Makefile | 13 | ||||
| -rw-r--r-- | security/openssh-portable/files/extra-patch-version-addendum | 5 |
2 files changed, 9 insertions, 9 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index a4c7cbb7f203..50211e39c826 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -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 --disable-wtmp --disable-wtmpx --without-lastlog 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='${CONFIGURE_LIBS}' 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 diff --git a/security/openssh-portable/files/extra-patch-version-addendum b/security/openssh-portable/files/extra-patch-version-addendum new file mode 100644 index 000000000000..b10e1c6f9156 --- /dev/null +++ b/security/openssh-portable/files/extra-patch-version-addendum @@ -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); |