svn commit: r305438 - in head/security: libotr pidgin-otr

[Doug Barton]

Author: dougb
Date: Sun Oct  7 07:54:18 2012
New Revision: 305438
URL: http://svn.freebsd.org/changeset/ports/305438

Log:
  Work around a problem on stable/[89] with libotr generating an
  "undefined reference to `__stack_chk_fail_local'" error. None
  of the usual remedies work (such as making sure that gcc is used
  instead of ld for the linker) so on those releases we simply
  disable that option.
  
  pointyhat logs confirm that pidgin-otr (the only consumer of libotr
  atm) is failing on 8 and 9 with the same configure error that I am
  seeing on 8, so this patch should at least allow it to build on those
  releases.
  
  Bump PORTREVISION for libotr to err on the side of caution.
  
  While I'm here, remove a now-spurious mod to the pidgin-otr configure.

Modified:
  head/security/libotr/Makefile
  head/security/pidgin-otr/Makefile

Modified: head/security/libotr/Makefile
==============================================================================
--- head/security/libotr/Makefile	Sun Oct  7 07:46:04 2012	(r305437)
+++ head/security/libotr/Makefile	Sun Oct  7 07:54:18 2012	(r305438)
@@ -4,6 +4,7 @@ PORTNAME=	libotr
 PORTVERSION=	4.0.0
 # Please do not bump PORTREVISION for this port unless you have
 # confirmed via testing that it is necessary
+PORTREVISION=	1
 CATEGORIES=	security net-im net
 MASTER_SITES=	http://www.cypherpunks.ca/otr/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
@@ -34,8 +35,15 @@ MLINKS=		otr_toolkit.1 otr_parse.1 \
 verify: checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#^pkgconfigdir .*#pkgconfigdir = ${PREFIX}/libdata/pkgconfig#' \
 	    ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am
 
-.include <bsd.port.mk>
+.if ${OSVERSION} >= 800000 && ${OSVERSION} < 1000000
+	${REINPLACE_CMD} -e 's#OTR_CHECK_CFLAGS(.*stack-protector.*#dnl &#' \
+	    ${WRKSRC}/configure.ac
+.endif
+
+.include <bsd.port.post.mk>

Modified: head/security/pidgin-otr/Makefile
==============================================================================
--- head/security/pidgin-otr/Makefile	Sun Oct  7 07:46:04 2012	(r305437)
+++ head/security/pidgin-otr/Makefile	Sun Oct  7 07:54:18 2012	(r305438)
@@ -35,7 +35,4 @@ CONFIGURE_ARGS=	--with-libotr-prefix=${L
 verify: checksum
 	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
-
 .include <bsd.port.mk>