Attachment #244011 for bug #273052

View | Details | Raw Unified | Return to bug 273052
Collapse All | Expand All




PORTNAME=	openssh
DISTVERSION=	9.3p2
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	security
MASTER_SITES=	OPENBSD/OpenSSH/portable


# Must add this patch before HPN due to conflicts
.if ${PORT_OPTIONS:MKERB_GSSAPI} || ${FLAVOR:U} == gssapi
#BROKEN=	KERB_GSSAPI No patch for ${DISTVERSION} yet.
.  if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER}
# Needed glue for applying HPN patch without conflict
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-hpn-gss-glue
.  endif
# - See https://sources.debian.org/data/main/o/openssh/ for which subdir to
# pull from.
GSSAPI_DEBIAN_VERSION=	9.3p2
GSSAPI_DEBIAN_SUBDIR=	${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-1
# - Debian does not use a versioned filename so we trick fetch to make one for
# us with the ?<anything>=/ trick.
PATCH_SITES+=	https://sources.debian.org/data/main/o/openssh/1:${GSSAPI_DEBIAN_SUBDIR}/debian/patches/gssapi.patch?dummy=/:gsskex
# Bump this when updating the patch location
#GSSAPI_UPDATE_DATE=	20220203
GSSAPI_DISTVERSION=	9.3p2
PATCHFILES+=	openssh-${GSSAPI_DISTVERSION:U${DISTVERSION}}-gsskex-all-debian-rh-${GSSAPI_DISTVERSION}.patch:-p1:gsskex
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gssapi-auth2-gss.c
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gssapi-kexgssc.c
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gssapi-kexgsss.c

Lines 1-3 Link Here

(-)b/security/openssh-portable/distinfo (-1 / +3 lines)
1	TIMESTAMP = 1689788774	1	TIMESTAMP = 1690578195
2	SHA256 (openssh-9.3p2.tar.gz) = 200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8	2	SHA256 (openssh-9.3p2.tar.gz) = 200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8
3	SIZE (openssh-9.3p2.tar.gz) = 1835850	3	SIZE (openssh-9.3p2.tar.gz) = 1835850
		4	SHA256 (openssh-9.3p2-gsskex-all-debian-rh-9.3p2.patch) = 3232a8aa5ed128d429d97065338a57998fd9e244dfaab24aa1b2461a291f1d77
		5	SIZE (openssh-9.3p2-gsskex-all-debian-rh-9.3p2.patch) = 131674

Return to bug 273052

Lines 1-6 Link Here

(-)b/security/openssh-portable/Makefile (-7 / +7 lines)
1	PORTNAME= openssh	1	PORTNAME= openssh
2	DISTVERSION= 9.3p2	2	DISTVERSION= 9.3p2
3	PORTREVISION= 0	3	PORTREVISION= 1
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= security	5	CATEGORIES= security
6	MASTER_SITES= OPENBSD/OpenSSH/portable	6	MASTER_SITES= OPENBSD/OpenSSH/portable
Lines 101-122 PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,hpn,gsskex Link Here
101		101
102	# Must add this patch before HPN due to conflicts	102	# Must add this patch before HPN due to conflicts
103	.if ${PORT_OPTIONS:MKERB_GSSAPI} \|\| ${FLAVOR:U} == gssapi	103	.if ${PORT_OPTIONS:MKERB_GSSAPI} \|\| ${FLAVOR:U} == gssapi
104	BROKEN= KERB_GSSAPI No patch for ${DISTVERSION} yet.	104	#BROKEN= KERB_GSSAPI No patch for ${DISTVERSION} yet.
105	. if ${PORT_OPTIONS:MHPN} \|\| ${PORT_OPTIONS:MNONECIPHER}	105	. if ${PORT_OPTIONS:MHPN} \|\| ${PORT_OPTIONS:MNONECIPHER}
106	# Needed glue for applying HPN patch without conflict	106	# Needed glue for applying HPN patch without conflict
107	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-gss-glue	107	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-gss-glue
108	. endif	108	. endif
109	# - See https://sources.debian.org/data/main/o/openssh/ for which subdir to	109	# - See https://sources.debian.org/data/main/o/openssh/ for which subdir to
110	# pull from.	110	# pull from.
111	GSSAPI_DEBIAN_VERSION= 9.2p1	111	GSSAPI_DEBIAN_VERSION= 9.3p2
112	GSSAPI_DEBIAN_SUBDIR= ${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-2	112	GSSAPI_DEBIAN_SUBDIR= ${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-1
113	# - Debian does not use a versioned filename so we trick fetch to make one for	113	# - Debian does not use a versioned filename so we trick fetch to make one for
114	# us with the ?<anything>=/ trick.	114	# us with the ?<anything>=/ trick.
115	PATCH_SITES+= https://sources.debian.org/data/main/o/openssh/1:${GSSAPI_DEBIAN_SUBDIR}/debian/patches/gssapi.patch?dummy=/:gsskex	115	PATCH_SITES+= https://sources.debian.org/data/main/o/openssh/1:${GSSAPI_DEBIAN_SUBDIR}/debian/patches/gssapi.patch?dummy=/:gsskex
116	# Bump this when updating the patch location	116	# Bump this when updating the patch location
117	GSSAPI_UPDATE_DATE= 20220203	117	#GSSAPI_UPDATE_DATE= 20220203
118	#GSSAPI_DISTVERSION= 9.0p1	118	GSSAPI_DISTVERSION= 9.3p2
119	PATCHFILES+= openssh-${GSSAPI_DISTVERSION:U${DISTVERSION}}-gsskex-all-20141021-debian-rh-${GSSAPI_UPDATE_DATE}.patch:-p1:gsskex	119	PATCHFILES+= openssh-${GSSAPI_DISTVERSION:U${DISTVERSION}}-gsskex-all-debian-rh-${GSSAPI_DISTVERSION}.patch:-p1:gsskex
120	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-auth2-gss.c	120	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-auth2-gss.c
121	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgssc.c	121	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgssc.c
122	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgsss.c	122	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgsss.c