Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Apr 2018 11:46:03 +0000
From:      Rick Miller <vrwmiller@gmail.com>
To:        freebsd-ports <freebsd-ports@freebsd.org>
Subject:   security/openssh-portable and KERB_GSSAPI
Message-ID:  <CAHzLAVF-JVoToAdBpTbWfVg914zK8Yr8v3pbq=EoR1GM5QvsEw@mail.gmail.com>

next in thread | raw e-mail | index | archive | help
Hi,

Thanks in advance for taking a look at this.

 I need help understanding how to test a port patch and submit it to the
port maintainer. Port in question is security/openssh-portable, for which
KERB_GSSAPI is broken. Upstream has a patch, but Poudriere is failing in
the fetch phase after my updates.

security/openssh-portable/Makefile is updated according to the patch below
in order to test, but Poudriere fails citing the error below.

root@server # svn diff

Index: security/openssh-portable/Makefile

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

--- security/openssh-portable/Makefile  (revision 460698)

+++ security/openssh-portable/Makefile               (working copy)

@@ -2,8 +2,8 @@

# $FreeBSD$

 PORTNAME=3D    openssh

-DISTVERSION=3D 7.6p1

-PORTREVISION=3D             3

+DISTVERSION=3D 7.7p1

+PORTREVISION=3D            4

PORTEPOCH=3D   1

CATEGORIES=3D   security ipv6

MASTER_SITES=3D              OPENBSD/OpenSSH/portable

@@ -89,7 +89,9 @@

 .include <bsd.port.pre.mk>

-PATCH_SITES+=3D
http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex

+#PATCH_SITES+=3D
http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex \

+PATCH_SITES+=3D
http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn \

+
http://sources.debian.net/data/main/o/openssh/1:7.7p1-2/debian/patches/:gss=
kex

 # X509 patch includes TCP Wrapper support already

.if ${PORT_OPTIONS:MX509}

@@ -98,7 +100,6 @@

 # Must add this patch before HPN due to conflicts

.if ${PORT_OPTIONS:MKERB_GSSAPI}

-BROKEN=3D           No patch for 7.6 yet.

# Patch from:

#
http://sources.debian.net/data/main/o/openssh/1:7.4p1-5/debian/patches/gssa=
pi.patch

# which was originally based on 5.7 patch from

@@ -108,12 +109,13 @@

# Needed glue for applying HPN patch without conflict

EXTRA_PATCHES+=3D        ${FILESDIR}/extra-patch-hpn-gss-glue

.  endif

-PATCHFILES+=3D
openssh-7.4p1-gsskex-all-20141021-debian-rh-20161228.patch.gz:-p1:gsskex

+#PATCHFILES+=3D
openssh-7.4p1-gsskex-all-20141021-debian-rh-20161228.patch.gz:-p1:gsskex

+PATCHFILES+=3D gssapi.patch:-p1:gsskex

.endif

 # http://www.psc.edu/index.php/hpn-ssh https://github.com/rapier1/hpn-ssh
https://github.com/rapier1/openssh-portable

.if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER}

-BROKEN=3D                                           Not yet updated for 7.=
6+
and disabled in base

+#BROKEN=3D                                       Not yet updated for 7.6+
and disabled in base

PORTDOCS+=3D                   HPN-README

HPN_VERSION=3D                               14v5

HPN_DISTVERSION=3D      6.7p1

Index: security/openssh-portable/distinfo

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

--- security/openssh-portable/distinfo    (revision 460698)

+++ security/openssh-portable/distinfo (working copy)

@@ -1,7 +1,3 @@

-TIMESTAMP =3D 1507833573

-SHA256 (openssh-7.6p1.tar.gz) =3D
a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723

-SIZE (openssh-7.6p1.tar.gz) =3D 1489788

-SHA256 (openssh-7.2_p1-sctp.patch.gz) =3D
fb67e3e23f39fabf44ef198e3e19527417c75c9352747547448512032365dbfc

-SIZE (openssh-7.2_p1-sctp.patch.gz) =3D 8501

-SHA256 (openssh-7.6p1+x509-11.0.diff.gz) =3D
bc4175ed8efce14579f10e242b25a23c959b1ff0e63b7c15493503eb654a960e

-SIZE (openssh-7.6p1+x509-11.0.diff.gz) =3D 440219

+TIMESTAMP =3D 1524506053

+SHA256 (openssh-7.7p1.tar.gz) =3D
d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f

+SIZE (openssh-7.7p1.tar.gz) =3D 1536900



Poudri=C3=A8re fails to build the port citing:



=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D<phase=
: fetch          >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D

=3D> gssapi.patch is not in /usr/ports/security/openssh-portable/distinfo.

=3D> Either /usr/ports/security/openssh-portable/distinfo is out of date, o=
r

=3D> gssapi.patch is spelled incorrectly.

*** Error code 1



Stop.

make: stopped in /usr/ports/security/openssh-portable

Surely this is something I=E2=80=99m not doing right. Just need help unders=
tanding.
Do you have feedback?


--=20
Take care
Rick Miller



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHzLAVF-JVoToAdBpTbWfVg914zK8Yr8v3pbq=EoR1GM5QvsEw>