Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-extra/gnome-screensaver: ChangeLog gnome-screensaver-2.20.0-r3.ebuild gnome-screensaver-2.22.0-r1.ebuild gnome-screensaver-2.22.0.ebuild
Date: Wed, 02 Apr 2008 14:03:36
Message-Id: E1Jh3Yq-0007Ly-0a@stork.gentoo.org
1 eva 08/04/02 14:03:32
2
3 Modified: ChangeLog
4 Added: gnome-screensaver-2.20.0-r3.ebuild
5 gnome-screensaver-2.22.0-r1.ebuild
6 Removed: gnome-screensaver-2.22.0.ebuild
7 Log:
8 fix security bug #213940
9 (Portage version: 2.1.4.4, RepoMan options: --force)
10
11 Revision Changes Path
12 1.73 gnome-extra/gnome-screensaver/ChangeLog
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog?rev=1.73&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog?rev=1.73&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog?r1=1.72&r2=1.73
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v
21 retrieving revision 1.72
22 retrieving revision 1.73
23 diff -u -r1.72 -r1.73
24 --- ChangeLog 26 Mar 2008 21:03:07 -0000 1.72
25 +++ ChangeLog 2 Apr 2008 14:03:31 -0000 1.73
26 @@ -1,6 +1,15 @@
27 # ChangeLog for gnome-extra/gnome-screensaver
28 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.72 2008/03/26 21:03:07 cardoe Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.73 2008/04/02 14:03:31 eva Exp $
31 +
32 +*gnome-screensaver-2.22.0-r1 (02 Apr 2008)
33 +*gnome-screensaver-2.20.0-r3 (02 Apr 2008)
34 +
35 + 02 Apr 2008; Gilles Dartiguelongue <eva@g.o>
36 + +files/gnome-screensaver-CVE-2008-0887.patch,
37 + +gnome-screensaver-2.20.0-r3.ebuild, -gnome-screensaver-2.22.0.ebuild,
38 + +gnome-screensaver-2.22.0-r1.ebuild:
39 + fix security bug #213940
40
41 26 Mar 2008; Doug Goldstein <cardoe@g.o>
42 gnome-screensaver-2.22.0.ebuild:
43
44
45
46 1.1 gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r3.ebuild
47
48 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r3.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r3.ebuild?rev=1.1&content-type=text/plain
50
51 Index: gnome-screensaver-2.20.0-r3.ebuild
52 ===================================================================
53 # Copyright 1999-2008 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.20.0-r3.ebuild,v 1.1 2008/04/02 14:03:31 eva Exp $
56
57 inherit gnome2 eutils
58
59 DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
60 HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
61
62 LICENSE="GPL-2"
63 SLOT="0"
64 KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
65 KERNEL_IUSE="kernel_linux"
66 IUSE="debug doc libnotify opengl pam xinerama $KERNEL_IUSE"
67
68 RDEPEND=">=gnome-base/gconf-2.6.1
69 >=x11-libs/gtk+-2.11.5
70 >=gnome-base/gnome-vfs-2.12
71 >=gnome-base/libglade-2.5.0
72 >=gnome-base/gnome-menus-2.12
73 >=dev-libs/glib-2.8
74 >=gnome-base/libgnomekbd-0.1
75 >=dev-libs/dbus-glib-0.71
76 libnotify? ( x11-libs/libnotify )
77 opengl? ( virtual/opengl )
78 xinerama? (
79 x11-libs/libXinerama
80 x11-proto/xineramaproto
81 )
82 pam? ( virtual/pam )
83 !pam? ( kernel_linux? ( sys-apps/shadow ) )
84 x11-libs/libX11
85 x11-libs/libXext
86 x11-libs/libXrandr
87 x11-libs/libXScrnSaver"
88 DEPEND="${RDEPEND}
89 sys-devel/gettext
90 >=dev-util/pkgconfig-0.9
91 >=dev-util/intltool-0.35
92 doc? (
93 app-text/xmlto
94 ~app-text/docbook-xml-dtd-4.1.2
95 ~app-text/docbook-xml-dtd-4.4
96 )
97 x11-proto/xextproto
98 x11-proto/randrproto
99 x11-proto/scrnsaverproto
100 x11-proto/xf86miscproto"
101
102 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
103
104 pkg_setup() {
105 G2CONF="${G2CONF} \
106 $(use_enable doc docbook-docs) \
107 $(use_enable debug) \
108 $(use_with libnotify) \
109 $(use_with opengl libgl) \
110 $(use_enable pam) \
111 $(use_enable xinerama) \
112 --enable-locking \
113 --with-kbd-layout-indicator \
114 --with-gdm-config=/usr/share/gdm/defaults.conf \
115 --with-xscreensaverdir=/usr/share/xscreensaver/config \
116 --with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
117 }
118
119 src_unpack() {
120 gnome2_src_unpack
121 epatch "${FILESDIR}/${P}-fix-gamma.patch"
122
123 # Fix CVE-2008-0887, bug #213940
124 epatch "${FILESDIR}/${PN}-CVE-2008-0887.patch"
125 }
126
127 src_install() {
128 gnome2_src_install
129
130 # Install the conversion script in the documentation
131 dodoc "${S}"/data/migrate-xscreensaver-config.sh
132 dodoc "${S}"/data/xscreensaver-config.xsl
133
134 # Conversion information
135 sed -e "s:\${PF}:${PF}:" \
136 < "${FILESDIR}"/xss-conversion-2.txt > "${S}"/xss-conversion.txt
137
138 dodoc "${S}"/xss-conversion.txt
139
140 # Non PAM users will need this suid to read the password hashes.
141 # OpenPAM users will probably need this too when
142 # http://bugzilla.gnome.org/show_bug.cgi?id=370847
143 # is fixed.
144 if ! use pam ; then
145 fperms u+s /usr/libexec/gnome-screensaver-dialog
146 fi
147 }
148
149 pkg_postinst() {
150 gnome2_pkg_postinst
151
152 ewarn "If you have xscreensaver installed, you probably want to disable it."
153 ewarn "To prevent a duplicate Screensaver entry in the menu, you need to"
154 ewarn "build xscreensaver with -gnome in the USE flags."
155 ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
156 echo
157 elog "Information for converting screensavers is located in "
158 elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
159 }
160
161
162
163 1.1 gnome-extra/gnome-screensaver/gnome-screensaver-2.22.0-r1.ebuild
164
165 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.0-r1.ebuild?rev=1.1&view=markup
166 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.0-r1.ebuild?rev=1.1&content-type=text/plain
167
168 Index: gnome-screensaver-2.22.0-r1.ebuild
169 ===================================================================
170 # Copyright 1999-2008 Gentoo Foundation
171 # Distributed under the terms of the GNU General Public License v2
172 # $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.22.0-r1.ebuild,v 1.1 2008/04/02 14:03:31 eva Exp $
173
174 inherit eutils gnome2
175
176 DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
177 HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
178
179 LICENSE="GPL-2"
180 SLOT="0"
181 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
182 KERNEL_IUSE="kernel_linux"
183 IUSE="debug doc libnotify opengl pam xinerama $KERNEL_IUSE"
184
185 RDEPEND=">=gnome-base/gconf-2.6.1
186 >=x11-libs/gtk+-2.11.5
187 >=gnome-base/libglade-2.5.0
188 >=gnome-base/gnome-menus-2.12
189 >=dev-libs/glib-2.15
190 >=gnome-base/libgnomekbd-0.1
191 >=dev-libs/dbus-glib-0.71
192 libnotify? ( x11-libs/libnotify )
193 opengl? ( virtual/opengl )
194 xinerama? ( x11-libs/libXinerama )
195 pam? ( virtual/pam )
196 !pam? ( kernel_linux? ( sys-apps/shadow ) )
197 x11-libs/libX11
198 x11-libs/libXext
199 x11-libs/libXrandr
200 x11-libs/libXScrnSaver
201 x11-libs/libXxf86misc
202 x11-libs/libXxf86vm"
203 DEPEND="${RDEPEND}
204 sys-devel/gettext
205 >=dev-util/pkgconfig-0.9
206 >=dev-util/intltool-0.35
207 doc? (
208 app-text/xmlto
209 ~app-text/docbook-xml-dtd-4.1.2
210 ~app-text/docbook-xml-dtd-4.4
211 )
212 x11-proto/xextproto
213 x11-proto/randrproto
214 x11-proto/scrnsaverproto
215 x11-proto/xf86miscproto
216 xinerama? ( x11-proto/xineramaproto )"
217
218 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
219
220 pkg_setup() {
221 G2CONF="${G2CONF}
222 $(use_enable doc docbook-docs)
223 $(use_enable debug)
224 $(use_with libnotify)
225 $(use_with opengl libgl)
226 $(use_enable pam)
227 $(use_enable xinerama)
228 --enable-locking
229 --with-xf86gamma-ext
230 --with-kbd-layout-indicator
231 --with-gdm-config=/usr/share/gdm/defaults.conf
232 --with-xscreensaverdir=/usr/share/xscreensaver/config
233 --with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
234 }
235
236 src_unpack() {
237 gnome2_src_unpack
238
239 # Fix CVE-2008-0887, bug #213940
240 epatch "${FILESDIR}/${PN}-CVE-2008-0887.patch"
241 }
242
243 src_install() {
244 gnome2_src_install
245
246 # Install the conversion script in the documentation
247 dodoc "${S}/data/migrate-xscreensaver-config.sh"
248 dodoc "${S}/data/xscreensaver-config.xsl"
249
250 # Conversion information
251 sed -e "s:\${PF}:${PF}:" \
252 < "${FILESDIR}/xss-conversion-2.txt" > "${S}/xss-conversion.txt"
253
254 dodoc "${S}"/xss-conversion.txt
255
256 # Non PAM users will need this suid to read the password hashes.
257 # OpenPAM users will probably need this too when
258 # http://bugzilla.gnome.org/show_bug.cgi?id=370847
259 # is fixed.
260 if ! use pam ; then
261 fperms u+s /usr/libexec/gnome-screensaver-dialog
262 fi
263 }
264
265 pkg_postinst() {
266 gnome2_pkg_postinst
267
268 if has_version x11-misc/xscreensaver ; then
269 ewarn "You have xscreensaver installed, you probably want to disable it."
270 ewarn "To prevent a duplicate Screensaver entry in the menu, you need to"
271 ewarn "build xscreensaver with -gnome in the USE flags."
272 ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
273 fi
274 echo
275 elog "Information for converting screensavers is located in "
276 elog "/usr/share/doc/${PF}/xss-conversion.txt.${PORTAGE_COMPRESS}"
277 }
278
279
280
281 --
282 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups