MFH: r525282

qemu-user-static: revert SSP_CFLAGS workaround (ports r501032)

This was later diagnosed to be a bug in libc, which has since been addressed
in all supported releases and branches. PORTREVISION is bumped as SSP_CFLAGS
will change the output, and for consumers of these two ports it is
imperative that it be rebuilt against the updated libc to avoid high failure
rates. In testing qemu-user-static-devel failed roughly 60% of the time,
rendering it unusable as each fork/exec was yet one more chance to fail.

The bug was fixed in the following patch levels (FreeBSD-EN-20:01.ssp):
- 12.1-p2
- 12.0-p13
- 11.3-p6

PR:		243735
Approved by:	koobs (ports)

Approved by:	ports-secteam (implicit, runtime fix)

emulators/qemu-sbruno/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.11.50.g20191211
+PORTREVISION=	1
 CATEGORIES=	emulators
 PKGNAMESUFFIX?=	-sbruno
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -130,7 +131,6 @@ PLIST_SUB+=	SOFTMMU=""
 PLIST_SUB+=	STATIC=""
 .endif
 
-SSP_CFLAGS?=	-fstack-protector # XXX -strong crashes qemu-user-static
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CFLAGS+=	-Wno-address-of-packed-member

emulators/qemu-user-static-devel/Makefile

@@ -2,7 +2,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	3.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 PKGNAMESUFFIX=	-user-static-devel
 DIST_SUBDIR=	qemu/${PORTVERSION}
@@ -47,7 +47,6 @@ PLIST_SUB+=	64BIT="@comment "
 .endif
 CONFIGURE_ARGS+=	--target-list=${QEMU_TARGETS:ts,}
 
-SSP_CFLAGS?=	-fstack-protector # XXX -strong crashes qemu-user-static
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CFLAGS+=	-Wno-address-of-packed-member