1 |
pva 08/04/01 19:34:37 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cups-1.3.6-r3.ebuild |
5 |
Log: |
6 |
Fixing overflow in gif image filter, security bug #214068, thank Robert Buchholz for report. |
7 |
(Portage version: 2.1.4.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.296 net-print/cups/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.296&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.296&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?r1=1.295&r2=1.296 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v |
19 |
retrieving revision 1.295 |
20 |
retrieving revision 1.296 |
21 |
diff -u -r1.295 -r1.296 |
22 |
--- ChangeLog 1 Apr 2008 19:11:07 -0000 1.295 |
23 |
+++ ChangeLog 1 Apr 2008 19:34:36 -0000 1.296 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for net-print/cups |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.295 2008/04/01 19:11:07 rbu Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.296 2008/04/01 19:34:36 pva Exp $ |
29 |
+ |
30 |
+*cups-1.3.6-r3 (01 Apr 2008) |
31 |
+ |
32 |
+ 01 Apr 2008; Peter Volkov <pva@g.o> |
33 |
+ +files/cups-1.3.6-CVE-2008-1373.patch, +cups-1.3.6-r3.ebuild: |
34 |
+ Fixing overflow in gif image filter, security bug #214068, thank Robert |
35 |
+ Buchholz for report. |
36 |
|
37 |
01 Apr 2008; Robert Buchholz <rbu@g.o> cups-1.2.12-r7.ebuild: |
38 |
amd64 stable, bug #214068 |
39 |
|
40 |
|
41 |
|
42 |
1.1 net-print/cups/cups-1.3.6-r3.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.6-r3.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.6-r3.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: cups-1.3.6-r3.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2008 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.6-r3.ebuild,v 1.1 2008/04/01 19:34:36 pva Exp $ |
52 |
|
53 |
inherit autotools eutils flag-o-matic multilib pam |
54 |
|
55 |
MY_P=${P/_} |
56 |
|
57 |
DESCRIPTION="The Common Unix Printing System" |
58 |
HOMEPAGE="http://www.cups.org/" |
59 |
SRC_URI="mirror://sourceforge/cups/${MY_P}-source.tar.bz2" |
60 |
|
61 |
LICENSE="GPL-2" |
62 |
SLOT="0" |
63 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
64 |
IUSE="acl avahi dbus java jpeg kerberos ldap nls pam perl php png ppds python samba slp ssl static tiff X zeroconf" |
65 |
|
66 |
COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) |
67 |
avahi? ( net-dns/avahi ) |
68 |
dbus? ( sys-apps/dbus ) |
69 |
java? ( >=virtual/jre-1.4 ) |
70 |
jpeg? ( >=media-libs/jpeg-6b ) |
71 |
kerberos? ( virtual/krb5 ) |
72 |
ldap? ( net-nds/openldap ) |
73 |
pam? ( virtual/pam ) |
74 |
perl? ( dev-lang/perl ) |
75 |
php? ( dev-lang/php ) |
76 |
png? ( >=media-libs/libpng-1.2.1 ) |
77 |
python? ( dev-lang/python ) |
78 |
slp? ( >=net-libs/openslp-1.0.4 ) |
79 |
ssl? ( net-libs/gnutls ) |
80 |
tiff? ( >=media-libs/tiff-3.5.5 ) |
81 |
zeroconf? ( !avahi? ( net-misc/mDNSResponder ) ) |
82 |
app-text/libpaper |
83 |
dev-libs/libgcrypt" |
84 |
|
85 |
DEPEND="${COMMON_DEPEND} |
86 |
!<net-print/foomatic-filters-ppds-20070501 |
87 |
!<net-print/hplip-1.7.4a-r1 |
88 |
nls? ( sys-devel/gettext )" |
89 |
|
90 |
RDEPEND="${COMMON_DEPEND} |
91 |
!virtual/lpr |
92 |
nls? ( virtual/libintl ) |
93 |
X? ( x11-misc/xdg-utils ) |
94 |
>=app-text/poppler-0.4.3-r1" |
95 |
|
96 |
PDEPEND=" |
97 |
ppds? ( || ( |
98 |
( |
99 |
net-print/foomatic-filters-ppds |
100 |
net-print/foomatic-db-ppds |
101 |
) |
102 |
net-print/foomatic-filters-ppds |
103 |
net-print/foomatic-db-ppds |
104 |
net-print/hplip |
105 |
media-gfx/gimp-print |
106 |
net-print/foo2zjs |
107 |
net-print/cups-pdf |
108 |
) ) |
109 |
samba? ( >=net-fs/samba-3.0.8 ) |
110 |
virtual/ghostscript" |
111 |
|
112 |
PROVIDE="virtual/lpr" |
113 |
|
114 |
# upstream includes an interactive test which is a nono for gentoo. |
115 |
# therefore, since the printing herd has bigger fish to fry, for now, |
116 |
# we just leave it out, even if FEATURES=test |
117 |
RESTRICT="test" |
118 |
|
119 |
S="${WORKDIR}/${MY_P}" |
120 |
|
121 |
LANGS="de en es et fr he it ja pl sv zh_TW" |
122 |
for X in ${LANGS} ; do |
123 |
IUSE="${IUSE} linguas_${X}" |
124 |
done |
125 |
|
126 |
pkg_setup() { |
127 |
if use avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then |
128 |
echo |
129 |
eerror "In order to have cups working with avahi zeroconf support, you need" |
130 |
eerror "to have net-dns/avahi emerged with 'mdnsresponder-compat' in your USE" |
131 |
eerror "flag. Please add that flag, re-emerge avahi, and then emerge cups again." |
132 |
die "net-dns/avahi is missing the mdnsresponder-compat feature." |
133 |
fi |
134 |
|
135 |
enewgroup lp |
136 |
enewuser lp -1 -1 -1 lp |
137 |
|
138 |
enewgroup lpadmin 106 |
139 |
} |
140 |
|
141 |
src_unpack() { |
142 |
unpack ${A} |
143 |
cd "${S}" |
144 |
|
145 |
# disable configure automagic for acl/attr, upstream bug STR #2723. |
146 |
epatch "${FILESDIR}/${PN}-1.3.0-configure.patch" |
147 |
|
148 |
# CVE-2008-0047 security patch, bug #212364 |
149 |
epatch "${FILESDIR}/${PN}-1.2.12-CVE-2008-0047.patch" |
150 |
# CVE-2008-1373 security patch, bug #214068 |
151 |
epatch "${FILESDIR}/${P}-CVE-2008-1373.patch" |
152 |
|
153 |
# cups does not use autotools "the usual way" and ship a static config.h.in |
154 |
eaclocal |
155 |
eautoconf |
156 |
} |
157 |
|
158 |
src_compile() { |
159 |
|
160 |
# locale support |
161 |
strip-linguas ${LANGS} |
162 |
|
163 |
if [ -z "${LINGUAS}" ] ; then |
164 |
export LINGUAS=all |
165 |
fi |
166 |
|
167 |
export DSOFLAGS="${LDFLAGS}" |
168 |
|
169 |
if use ldap ; then |
170 |
append-flags -DLDAP_DEPRECATED |
171 |
fi |
172 |
|
173 |
local myconf |
174 |
|
175 |
if use avahi || use zeroconf ; then |
176 |
myconf="${myconf} --enable-dnssd" |
177 |
else |
178 |
myconf="${myconf} --disable-dnssd" |
179 |
fi |
180 |
|
181 |
econf \ |
182 |
--libdir=/usr/$(get_libdir) \ |
183 |
--localstatedir=/var \ |
184 |
--with-cups-user=lp \ |
185 |
--with-cups-group=lp \ |
186 |
--with-docdir=/usr/share/cups/html \ |
187 |
--with-languages=${LINGUAS} \ |
188 |
--with-system-groups=lpadmin \ |
189 |
$(use_enable acl) \ |
190 |
$(use_enable dbus) \ |
191 |
$(use_enable jpeg) \ |
192 |
$(use_enable kerberos gssapi) \ |
193 |
$(use_enable ldap) \ |
194 |
$(use_enable nls) \ |
195 |
$(use_enable pam) \ |
196 |
$(use_enable png) \ |
197 |
$(use_enable slp) \ |
198 |
$(use_enable ssl) \ |
199 |
$(use_enable static) \ |
200 |
$(use_enable tiff) \ |
201 |
$(use_with java) \ |
202 |
$(use_with perl) \ |
203 |
$(use_with php) \ |
204 |
$(use_with python) \ |
205 |
--enable-gnutls \ |
206 |
--enable-libpaper \ |
207 |
--enable-threads \ |
208 |
--disable-pdftops \ |
209 |
${myconf} \ |
210 |
|| die "econf failed" |
211 |
|
212 |
# install in /usr/libexec always, instead of using /usr/lib/cups, as that |
213 |
# makes more sense when facing multilib support. |
214 |
sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs |
215 |
sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h |
216 |
sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config |
217 |
|
218 |
emake || die "emake failed" |
219 |
} |
220 |
|
221 |
src_install() { |
222 |
emake BUILDROOT="${D}" install || die "emake install failed" |
223 |
dodoc {CHANGES{,-1.{0,1}},CREDITS,README}.txt || die "dodoc install failed" |
224 |
|
225 |
# clean out cups init scripts |
226 |
rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} |
227 |
|
228 |
# install our init script |
229 |
local neededservices |
230 |
use avahi && neededservices="$neededservices avahi-daemon" |
231 |
use dbus && neededservices="$neededservices dbus" |
232 |
use zeroconf && ! use avahi && neededservices="$neededservices mDNSResponderPosix" |
233 |
[[ -n ${neededservices} ]] && neededservices="need${neededservices}" |
234 |
sed -e "s/@neededservices@/$neededservices/" "${FILESDIR}"/cupsd.init.d > "${T}"/cupsd |
235 |
doinitd "${T}"/cupsd |
236 |
|
237 |
# install our pam script |
238 |
pamd_mimic_system cups auth account |
239 |
|
240 |
# correct path |
241 |
sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd |
242 |
# it is safer to disable this by default, bug 137130 |
243 |
grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \ |
244 |
sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd |
245 |
|
246 |
# install pdftops filter |
247 |
exeinto /usr/libexec/cups/filter/ |
248 |
newexe "${FILESDIR}"/pdftops-1.20.gentoo pdftops |
249 |
|
250 |
# only for gs-esp this is correct, see bug 163897 |
251 |
if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu ; then |
252 |
sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs |
253 |
fi |
254 |
|
255 |
keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ |
256 |
/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl |
257 |
|
258 |
# .desktop handling. X useflag. xdg-open from freedesktop is preferred, upstream bug STR #2724. |
259 |
if use X ; then |
260 |
sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop |
261 |
else |
262 |
rm -r "${D}"/usr/share/applications |
263 |
fi |
264 |
|
265 |
# fix a symlink collision, see bug #172341 |
266 |
dodir /usr/share/ppd |
267 |
dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds |
268 |
|
269 |
# create RSS feed directory |
270 |
diropts -m 0740 -o lp -g lp |
271 |
dodir /var/cache/cups/rss |
272 |
|
273 |
# create /etc/cups/client.conf, bug #196967 |
274 |
echo "ServerName localhost" >> "${D}"/etc/cups/client.conf |
275 |
} |
276 |
|
277 |
pkg_preinst() { |
278 |
# cleanups |
279 |
[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-* |
280 |
} |
281 |
|
282 |
pkg_postinst() { |
283 |
echo |
284 |
elog "For information about installing a printer and general cups setup" |
285 |
elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" |
286 |
echo |
287 |
|
288 |
local good_gs=false |
289 |
for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp ; do |
290 |
if has_version ${x} && built_with_use ${x} cups ; then |
291 |
good_gs=true |
292 |
break |
293 |
fi |
294 |
done; |
295 |
if ! ${good_gs}; then |
296 |
echo |
297 |
ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on" |
298 |
echo |
299 |
fi |
300 |
|
301 |
if has_version =net-print/cups-1.1* ; then |
302 |
echo |
303 |
ewarn "The configuration changed with cups-1.3, you may want to save the old" |
304 |
ewarn "one and start from scratch:" |
305 |
ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups" |
306 |
echo |
307 |
ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.3" |
308 |
echo |
309 |
fi |
310 |
|
311 |
if [ -e "${ROOT}"/usr/lib/cups ] ; then |
312 |
echo |
313 |
ewarn "/usr/lib/cups exists - You need to remerge every ebuild that" |
314 |
ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:" |
315 |
ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")" |
316 |
echo |
317 |
ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility" |
318 |
ewarn "symlinks installed by this package, it won't be needed on later merges." |
319 |
ewarn "You should also run revdep-rebuild" |
320 |
echo |
321 |
|
322 |
# place symlinks to make the update smoothless |
323 |
for i in "${ROOT}"/usr/lib/cups/{backend,filter}/* ; do |
324 |
if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ] ; then |
325 |
ln -s ${i} ${i/lib/libexec} |
326 |
fi |
327 |
done |
328 |
fi |
329 |
} |
330 |
|
331 |
|
332 |
|
333 |
-- |
334 |
gentoo-commits@l.g.o mailing list |