From owner-cvs-all@FreeBSD.ORG Sun Oct 25 01:28:30 2009 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2EF7106568D; Sun, 25 Oct 2009 01:28:30 +0000 (UTC) (envelope-from miwi@bsdcrew.de) Received: from bsdcrew.de (duro.unixfreunde.de [85.214.90.4]) by mx1.freebsd.org (Postfix) with ESMTP id 58D938FC16; Sun, 25 Oct 2009 01:28:30 +0000 (UTC) Received: by bsdcrew.de (Postfix, from userid 1001) id 7A6B24AF56; Sun, 25 Oct 2009 02:28:28 +0100 (CET) Date: Sun, 25 Oct 2009 02:28:28 +0100 From: Martin Wilke To: "Lev A. Serebryakov" Message-ID: <20091025012828.GB48099@bsdcrew.de> References: <200910241257.n9OCv69v096394@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; x-action=pgp-signed Content-Disposition: inline In-Reply-To: <200910241257.n9OCv69v096394@repoman.freebsd.org> User-Agent: Mutt/1.5.19 (2009-01-05) Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/www/neon26 Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Oct 2009 01:28:30 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 we need here a vuxml entry. like to make the one? On Sat, Oct 24, 2009 at 12:57:06PM +0000, Lev A. Serebryakov wrote: > lev 2009-10-24 12:57:06 UTC > > FreeBSD ports repository > > Modified files: > www/neon26 Makefile > Log: > Apply patch to notify users about CVE-2009-2474 and CVE-2009-2474 > > Revision Changes Path > 1.44 +32 -18 ports/www/neon26/Makefile > http://cvsweb.FreeBSD.org/ports/www/neon26/Makefile.diff?r1=1.43&r2=1.44 > | --- ports/www/neon26/Makefile 2009/08/02 19:36:02 1.43 > | +++ ports/www/neon26/Makefile 2009/10/24 12:57:06 1.44 > | @@ -2,27 +2,47 @@ > | # Date created: 13 October 2000 > | # Whom: Mikhail Teterin > | # > | -# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/neon26/Makefile,v 1.43 2009/08/02 19:36:02 mezz Exp $ > | +# $FreeBSD: /usr/local/www/cvsroot/FreeBSD/ports/www/neon26/Makefile,v 1.44 2009/10/24 12:57:06 lev Exp $ > | # > | > | PORTNAME= neon26 > | PORTVERSION= 0.26.4 > | -PORTREVISION= 1 > | +PORTREVISION= 2 > | CATEGORIES= www > | -MASTER_SITES= http://www.webdav.org/neon/ \ > | - http://keyserver.kjsl.com/~jharris/distfiles/ > | +MASTER_SITES= http://www.webdav.org/neon/ > | DISTNAME= neon-${PORTVERSION} > | > | MAINTAINER= lev@FreeBSD.org > | COMMENT= An HTTP and WebDAV client library for Unix systems > | > | -LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 > | - > | -CONFLICTS= neon28-[0-9]* > | +CONFLICTS= neon2[8|9]-[0-9]* > | > | USE_AUTOTOOLS= libtool:22 > | USE_LDCONFIG= yes > | > | +USE_GNOME= gnomehack gnometarget > | +GNU_CONFIGURE= yes > | +CONFIGURE_ARGS= --enable-shared \ > | + --with-libs=${LOCALBASE}:${PREFIX} > | + > | +# expat is default unless WITH_XML is choosen > | +.if !defined(WITHOUT_EXPAT) && !defined(WITH_XML) > | +FORBIDDEN= see CVE-2009-2473 and CVE-2009-2474 please use neon28 or neon29 instead > | +CONFIGURE_ARGS+= --with-expat > | +LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 > | +.endif > | + > | +.if defined(WITH_XML) > | +CONFIGURE_ARGS+=--with-libxml2 > | +LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 > | +.endif > | + > | +.ifndef WITHOUT_OPENSSL > | +FORBIDDEN= see CVE-2009-2474 please use neon28 or neon29 instead > | +USE_OPENSSL= yes > | +CONFIGURE_ARGS+=--with-ssl > | +.endif > | + > | .if defined(WITHOUT_NLS) > | CONFIGURE_ARGS+=--disable-nls > | PLIST_SUB+= NLS="@comment " > | @@ -31,18 +51,6 @@ USE_GETTEXT= yes > | PLIST_SUB+= NLS="" > | .endif > | > | -.ifndef WITHOUT_OPENSSL > | -USE_OPENSSL= yes > | -.endif > | - > | -USE_GNOME= gnomehack gnometarget > | -GNU_CONFIGURE= yes > | -CONFIGURE_ARGS= --with-ssl \ > | - --enable-xml \ > | - --enable-shared \ > | - --with-expat \ > | - --with-libs=${PREFIX} > | - > | MAN1= neon-config.1 > | MAN3= ne_add_request_header.3 ne_addr_resolve.3 ne_buffer.3 \ > | ne_buffer_append.3 ne_buffer_clear.3 ne_buffer_create.3 \ > | @@ -116,6 +124,12 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} > | > | DOCSDIR:= ${DOCSDIR:S/26//} > | > | +pre-everything:: > | +.if defined(WITH_EXPAT) && defined(WITH_XML) > | + @${ECHO_CMD} "please choose between expat and libxml2 not both" > | + @${FALSE} > | +.endif > | + > | post-install: > | ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1 > | ${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${MANPREFIX}/man/man3 > - -- +-----------------------+-------------------------------+ | PGP : 0xB1E6FCE9 | Jabber : miwi(at)BSDCrew.de | | Skype : splash_111 | Mail : miwi(at)FreeBSD.org | +-----------------------+-------------------------------+ | Mess with the Best, Die like the Rest! | +-----------------------+-------------------------------+ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (FreeBSD) iEYEARECAAYFAkrjqbsACgkQdLJIhLHm/OkIbQCeL6nS1/H4ydeIbPlZs5q5nqB2 gTsAn2CepYROKWS0nl3+8bk4ZfEliJRU =SWWw -----END PGP SIGNATURE-----