From owner-svn-ports-all@FreeBSD.ORG Sun Oct 7 07:54:19 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 627E8106566B; Sun, 7 Oct 2012 07:54:19 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 32D338FC08; Sun, 7 Oct 2012 07:54:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q977sJr1052851; Sun, 7 Oct 2012 07:54:19 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q977sIFv052847; Sun, 7 Oct 2012 07:54:18 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201210070754.q977sIFv052847@svn.freebsd.org> From: Doug Barton Date: Sun, 7 Oct 2012 07:54:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r305438 - in head/security: libotr pidgin-otr X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2012 07:54:19 -0000 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 + post-patch: @${REINPLACE_CMD} -e 's#^pkgconfigdir .*#pkgconfigdir = ${PREFIX}/libdata/pkgconfig#' \ ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am -.include +.if ${OSVERSION} >= 800000 && ${OSVERSION} < 1000000 + ${REINPLACE_CMD} -e 's#OTR_CHECK_CFLAGS(.*stack-protector.*#dnl &#' \ + ${WRKSRC}/configure.ac +.endif + +.include 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