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 =================================================================== --- security/openssh-portable/Makefile (revision 460698) +++ security/openssh-portable/Makefile (working copy) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= openssh -DISTVERSION= 7.6p1 -PORTREVISION= 3 +DISTVERSION= 7.7p1 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= OPENBSD/OpenSSH/portable @@ -89,7 +89,9 @@ .include <bsd.port.pre.mk> -PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex +#PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex \ +PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn \ + http://sources.debian.net/data/main/o/openssh/1:7.7p1-2/debian/patches/:gsskex # 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= No patch for 7.6 yet. # Patch from: # http://sources.debian.net/data/main/o/openssh/1:7.4p1-5/debian/patches/gssapi.patch # which was originally based on 5.7 patch from @@ -108,12 +109,13 @@ # Needed glue for applying HPN patch without conflict EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-gss-glue . endif -PATCHFILES+= openssh-7.4p1-gsskex-all-20141021-debian-rh-20161228.patch.gz:-p1:gsskex +#PATCHFILES+= openssh-7.4p1-gsskex-all-20141021-debian-rh-20161228.patch.gz:-p1:gsskex +PATCHFILES+= 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= Not yet updated for 7.6+ and disabled in base +#BROKEN= Not yet updated for 7.6+ and disabled in base PORTDOCS+= HPN-README HPN_VERSION= 14v5 HPN_DISTVERSION= 6.7p1 Index: security/openssh-portable/distinfo =================================================================== --- security/openssh-portable/distinfo (revision 460698) +++ security/openssh-portable/distinfo (working copy) @@ -1,7 +1,3 @@ -TIMESTAMP = 1507833573 -SHA256 (openssh-7.6p1.tar.gz) = a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723 -SIZE (openssh-7.6p1.tar.gz) = 1489788 -SHA256 (openssh-7.2_p1-sctp.patch.gz) = fb67e3e23f39fabf44ef198e3e19527417c75c9352747547448512032365dbfc -SIZE (openssh-7.2_p1-sctp.patch.gz) = 8501 -SHA256 (openssh-7.6p1+x509-11.0.diff.gz) = bc4175ed8efce14579f10e242b25a23c959b1ff0e63b7c15493503eb654a960e -SIZE (openssh-7.6p1+x509-11.0.diff.gz) = 440219 +TIMESTAMP = 1524506053 +SHA256 (openssh-7.7p1.tar.gz) = d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f +SIZE (openssh-7.7p1.tar.gz) = 1536900 Poudrière fails to build the port citing: =======================<phase: fetch >============================ => gssapi.patch is not in /usr/ports/security/openssh-portable/distinfo. => Either /usr/ports/security/openssh-portable/distinfo is out of date, or => gssapi.patch is spelled incorrectly. *** Error code 1 Stop. make: stopped in /usr/ports/security/openssh-portable Surely this is something I’m not doing right. Just need help understanding. Do you have feedback? -- Take care Rick Miller _______________________________________________ freebsd-ports@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"