From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RqrcJ-0002HQ-ID for garchives@archives.gentoo.org; Fri, 27 Jan 2012 19:37:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F095E078D; Fri, 27 Jan 2012 19:37:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1C525E078D for ; Fri, 27 Jan 2012 19:37:40 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 233811B4009 for ; Fri, 27 Jan 2012 19:37:39 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2276) id E90012004B; Fri, 27 Jan 2012 19:37:37 +0000 (UTC) From: "Andreas HAttel (dilfridge)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dilfridge@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.5.0-r3.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog cups-1.5.0-r3.ebuild X-VCS-Directories: net-print/cups X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas HAttel Content-Type: text/plain; charset=utf8 Message-Id: <20120127193737.E90012004B@flycatcher.gentoo.org> Date: Fri, 27 Jan 2012 19:37:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 5994f479-0187-4855-91f7-637b1d2cd422 X-Archives-Hash: 73e60ba49e3c89b8d17afa5fcfa57d08 dilfridge 12/01/27 19:37:37 Modified: ChangeLog cups-1.5.0-r3.ebuild Log: Some cleanups in the ebuild =20 (Portage version: 2.1.10.44/cvs/Linux x86_64) Revision Changes Path 1.443 net-print/cups/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/Cha= ngeLog?rev=3D1.443&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/Cha= ngeLog?rev=3D1.443&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/Cha= ngeLog?r1=3D1.442&r2=3D1.443 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v retrieving revision 1.442 retrieving revision 1.443 diff -u -r1.442 -r1.443 --- ChangeLog 22 Jan 2012 17:14:51 -0000 1.442 +++ ChangeLog 27 Jan 2012 19:37:37 -0000 1.443 @@ -1,6 +1,9 @@ # ChangeLog for net-print/cups # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.442 2012= /01/22 17:14:51 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.443 2012= /01/27 19:37:37 dilfridge Exp $ + + 27 Jan 2012; Andreas K. Huettel cups-1.5.0-r3.e= build: + Some cleanups in the ebuild =20 22 Jan 2012; Andreas K. Huettel cups-1.4.8-r1.e= build, cups-1.4.8-r23.ebuild, cups-1.5.0-r3.ebuild: 1.5 net-print/cups/cups-1.5.0-r3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cup= s-1.5.0-r3.ebuild?rev=3D1.5&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cup= s-1.5.0-r3.ebuild?rev=3D1.5&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cup= s-1.5.0-r3.ebuild?r1=3D1.4&r2=3D1.5 Index: cups-1.5.0-r3.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cups-1.5.0-r3.ebuild 22 Jan 2012 17:14:51 -0000 1.4 +++ cups-1.5.0-r3.ebuild 27 Jan 2012 19:37:37 -0000 1.5 @@ -1,13 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v= 1.4 2012/01/22 17:14:51 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v= 1.5 2012/01/27 19:37:37 dilfridge Exp $ =20 -# -# See http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;a=3Db= lob;f=3Dnet-print/cups/notes.txt;hb=3DHEAD -# for some notes about the ongoing work here -# - -EAPI=3D3 +EAPI=3D4 =20 PYTHON_DEPEND=3D"python? 2:2.5" =20 @@ -72,7 +67,7 @@ filters? ( net-print/foomatic-filters ) " =20 -# upstream includes an interactive test which is a nono for gentoo. +# upstream includes an interactive test which is a nono for gentoo RESTRICT=3D"test" =20 S=3D"${WORKDIR}/${MY_P}" @@ -97,6 +92,7 @@ epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch" epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch" epatch "${FILESDIR}/${PN}-1.4.8-largeimage.patch" + # security fixes epatch "${FILESDIR}/${PN}-1.4.8-CVE-2011-3170.patch" =20 @@ -126,16 +122,6 @@ " fi =20 - # bug 352252, recheck for later versions if still necessary.... - if use gnutls && ! use threads ; then - ewarn "The useflag gnutls requires also threads enabled. Switching on = threads." - fi - if use gnutls || use threads ; then - myconf+=3D" --enable-threads " - else - myconf+=3D" --disable-threads " - fi - econf \ --libdir=3D/usr/$(get_libdir) \ --localstatedir=3D/var \ @@ -156,6 +142,7 @@ $(use_enable png) \ $(use_enable slp) \ $(use_enable static-libs static) \ + $(use_enable threads) \ $(use_enable tiff) \ $(use_enable usb libusb) \ $(use_with java) \ @@ -175,7 +162,7 @@ } =20 src_compile() { - emake || die "emake failed" + emake =20 if use perl ; then cd "${S}"/scripting/perl @@ -185,13 +172,13 @@ =20 if use php ; then cd "${S}"/scripting/php - emake || die "emake php failed" + emake fi } =20 src_install() { - emake BUILDROOT=3D"${D}" install || die "emake install failed" - dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed" + emake BUILDROOT=3D"${D}" install + dodoc {CHANGES,CREDITS,README}.txt =20 if use perl ; then cd "${S}"/scripting/perl @@ -215,7 +202,7 @@ sed -i \ -e "s/@neededservices@/$neededservices/" \ "${T}"/cupsd || die - doinitd "${T}"/cupsd || die "doinitd failed" + doinitd "${T}"/cupsd =20 # install our pam script pamd_mimic_system cups auth account