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