Date: Mon, 17 Jan 2005 13:41:05 +0300 (MSK) From: Sergey Akifyev <asa@agava.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/76337: [maintainer] cups 1.1.22 -> 1.1.23 Message-ID: <20050117104105.64BF6FDEC@plunderer.agava.net> Resent-Message-ID: <200501171050.j0HAoP1T060934@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 76337 >Category: ports >Synopsis: [maintainer] cups 1.1.22 -> 1.1.23 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Jan 17 10:50:25 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Sergey Akifyev >Release: FreeBSD 5.3-RELEASE i386 >Organization: AGAVA Software Company >Environment: System: FreeBSD asa.domain 5.3-RELEASE FreeBSD 5.3-RELEASE #3: Tue Dec 21 15:29:00 MSK 2004 root@asa.domain:/usr/src/sys/i386/compile/KERNEL i386 >Description: * Update 1.1.22 -> 1.1.23 Fixes: http://vuxml.FreeBSD.org/7850a238-680a-11d9-a9e7-0001020eed82.html http://vuxml.FreeBSD.org/40a3bca2-6809-11d9-a9e7-0001020eed82.html * Build with GNUTLS isntead of OpenSSL by default to fix FireFox issues * Fixed man languages >How-To-Repeat: >Fix: --- cups.diff begins here --- diff -ruN orig/cups/Makefile cups/Makefile --- orig/cups/Makefile Fri Nov 14 20:28:15 2003 +++ cups/Makefile Mon Jan 17 13:34:23 2005 @@ -16,7 +16,7 @@ DISTFILES= # empty EXTRACT_ONLY= # empty -MAINTAINER= ports@FreeBSD.org +MAINTAINER= asa@agava.com COMMENT= The Common UNIX Printing System: Metaport to install complete system LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base diff -ruN orig/cups/Makefile.common cups/Makefile.common --- orig/cups/Makefile.common Mon Nov 15 07:24:31 2004 +++ cups/Makefile.common Mon Jan 17 12:47:45 2005 @@ -9,7 +9,7 @@ ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \ ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/ -CUPS_VERSION= 1.1.22 +CUPS_VERSION= 1.1.23 CUPS_REVISION= 0 CUPS_PORTVER= ${CUPS_VERSION}.${CUPS_REVISION} CUPS_PORTREV= 0 @@ -71,6 +71,11 @@ --with-cups-group=${CUPSGRP} \ --with-docdir=${CUPS_DOCSDIR} \ --with-rcdir=${CUPS_RCDIR} + +.if !defined(WITHOUT_GNUTLS) +CONFIGURE_ARGS+= --enable-gnutls +LIB_DEPENDS+= gnutls-openssl.12:${PORTSDIR}/security/gnutls +.endif CONFIGURE_ARGS+= CPPFLAGS="-I.. -I${LOCALBASE}/include" CONFIGURE_ARGS+= DSOFLAGS="-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib" diff -ruN orig/cups/distinfo cups/distinfo --- orig/cups/distinfo Mon Nov 15 07:24:31 2004 +++ cups/distinfo Mon Jan 17 13:14:53 2005 @@ -1,2 +1,2 @@ -MD5 (cups-1.1.22-source.tar.bz2) = fe0a1b0fedccfe8b2e35e0cea1e5f0a9 -SIZE (cups-1.1.22-source.tar.bz2) = 8527045 +MD5 (cups-1.1.23-source.tar.bz2) = 4ce09b1dce09b6b9398af0daae9adf63 +SIZE (cups-1.1.23-source.tar.bz2) = 8705521 --- cups.diff ends here --- --- cups-base.diff begins here --- diff -ruN orig/cups-base/Makefile cups-base/Makefile --- orig/cups-base/Makefile Mon Dec 27 13:11:18 2004 +++ cups-base/Makefile Mon Jan 17 13:34:35 2005 @@ -14,13 +14,13 @@ CATEGORIES= print MASTER_SITES= ${CUPS_MASTER_SITES} -MAINTAINER= asa@gascom.ru +MAINTAINER= asa@agava.com COMMENT= The Common UNIX Printing System: headers, libs, & daemons USE_REINPLACE= yes INSTALLS_SHLIB= yes -MANLANG= "" +MANLANG= "" es fr post-patch: @${REINPLACE_CMD} -e '/SILENT/d' \ diff -ruN orig/cups-base/files/patch-pdftops-Gfx.cc cups-base/files/patch-pdftops-Gfx.cc --- orig/cups-base/files/patch-pdftops-Gfx.cc Sat Dec 25 02:17:44 2004 +++ cups-base/files/patch-pdftops-Gfx.cc Thu Jan 1 03:00:00 1970 @@ -1,29 +0,0 @@ -diff -ruN pdftops/Gfx.cxx /home/josef//temp/pdftops/Gfx.cxx ---- pdftops/Gfx.cxx Fri Apr 9 22:18:31 2004 -+++ /home/josef//temp/pdftops/Gfx.cxx Fri Dec 24 20:21:32 2004 -@@ -2655,7 +2655,9 @@ - haveMask = gFalse; - dict->lookup("Mask", &maskObj); - if (maskObj.isArray()) { -- for (i = 0; i < maskObj.arrayGetLength(); ++i) { -+ for (i = 0; -+ i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps; -+ ++i) { - maskObj.arrayGet(i, &obj1); - maskColors[i] = obj1.getInt(); - obj1.free(); -diff -ruN pdftops/GfxState.cxx /home/josef//temp/pdftops/GfxState.cxx ---- pdftops/GfxState.cxx Mon Feb 2 23:41:09 2004 -+++ /home/josef//temp/pdftops/GfxState.cxx Fri Dec 24 20:21:32 2004 -@@ -708,6 +708,11 @@ - } - nCompsA = obj2.getInt(); - obj2.free(); -+ if (nCompsA > gfxColorMaxComps) { -+ error(-1, "ICCBased color space with too many (%d > %d) components", -+ nCompsA, gfxColorMaxComps); -+ nCompsA = gfxColorMaxComps; -+ } - if (dict->lookup("Alternate", &obj2)->isNull() || - !(altA = GfxColorSpace::parse(&obj2))) { - switch (nCompsA) { --- cups-base.diff ends here --- --- cups-lpr.diff begins here --- diff -ruN orig/cups-lpr/Makefile cups-lpr/Makefile --- orig/cups-lpr/Makefile Mon Nov 15 07:24:32 2004 +++ cups-lpr/Makefile Mon Jan 17 13:34:46 2005 @@ -14,12 +14,12 @@ CATEGORIES= print MASTER_SITES= ${CUPS_MASTER_SITES} -MAINTAINER= asa@gascom.ru +MAINTAINER= asa@agava.com COMMENT= The CUPS BSD and system V compatibility binaries (lp* commands) USE_REINPLACE= yes -MANLANG= "" +MANLANG= "" es fr .ifndef CUPS_OVERWRITE_BASE PKGINSTALL= nonexistent --- cups-lpr.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050117104105.64BF6FDEC>