| 1 |
mrpouet 09/11/04 21:43:37 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: gconf-2.28.0-r1.ebuild |
| 5 |
Log: |
| 6 |
Do not crash in gconf_entry_set_value() when entry is NULL |
| 7 |
(Portage version: 2.2_rc48/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.216 gnome-base/gconf/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.216&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.216&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/ChangeLog?r1=1.215&r2=1.216 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v |
| 19 |
retrieving revision 1.215 |
| 20 |
retrieving revision 1.216 |
| 21 |
diff -u -r1.215 -r1.216 |
| 22 |
--- ChangeLog 29 Oct 2009 23:38:50 -0000 1.215 |
| 23 |
+++ ChangeLog 4 Nov 2009 21:43:37 -0000 1.216 |
| 24 |
@@ -1,6 +1,13 @@ |
| 25 |
# ChangeLog for gnome-base/gconf |
| 26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.215 2009/10/29 23:38:50 eva Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.216 2009/11/04 21:43:37 mrpouet Exp $ |
| 29 |
+ |
| 30 |
+*gconf-2.28.0-r1 (04 Nov 2009) |
| 31 |
+ |
| 32 |
+ 04 Nov 2009; Romain Perier <mrpouet@g.o> |
| 33 |
+ +gconf-2.28.0-r1.ebuild, |
| 34 |
+ +files/gconf-2.28.0-entry-set-value-sigsegv.patch: |
| 35 |
+ Do not crash in gconf_entry_set_value() when entry is NULL. |
| 36 |
|
| 37 |
*gconf-2.28.0 (29 Oct 2009) |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 gnome-base/gconf/gconf-2.28.0-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/gconf-2.28.0-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gconf/gconf-2.28.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: gconf-2.28.0-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2009 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.28.0-r1.ebuild,v 1.1 2009/11/04 21:43:37 mrpouet Exp $ |
| 52 |
|
| 53 |
EAPI="2" |
| 54 |
|
| 55 |
inherit eutils gnome2 |
| 56 |
|
| 57 |
MY_PN=GConf |
| 58 |
MY_P=${MY_PN}-${PV} |
| 59 |
PVP=(${PV//[-\._]/ }) |
| 60 |
|
| 61 |
DESCRIPTION="Gnome Configuration System and Daemon" |
| 62 |
HOMEPAGE="http://www.gnome.org/" |
| 63 |
SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2" |
| 64 |
|
| 65 |
LICENSE="LGPL-2" |
| 66 |
SLOT="2" |
| 67 |
KEYWORDS="~amd64 ~x86" |
| 68 |
IUSE="debug doc ldap policykit" |
| 69 |
|
| 70 |
RDEPEND=">=dev-libs/glib-2.14 |
| 71 |
>=x11-libs/gtk+-2.8.16 |
| 72 |
>=dev-libs/dbus-glib-0.74 |
| 73 |
>=sys-apps/dbus-1 |
| 74 |
>=gnome-base/orbit-2.4 |
| 75 |
>=dev-libs/libxml2-2 |
| 76 |
ldap? ( net-nds/openldap ) |
| 77 |
policykit? ( sys-auth/polkit )" |
| 78 |
DEPEND="${RDEPEND} |
| 79 |
>=dev-util/intltool-0.35 |
| 80 |
>=dev-util/pkgconfig-0.9 |
| 81 |
>=dev-util/gtk-doc-am-1.10 |
| 82 |
doc? ( >=dev-util/gtk-doc-1 )" |
| 83 |
|
| 84 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
| 85 |
|
| 86 |
S="${WORKDIR}/${MY_P}" |
| 87 |
|
| 88 |
pkg_setup() { |
| 89 |
G2CONF="${G2CONF} |
| 90 |
--enable-gtk |
| 91 |
--disable-static |
| 92 |
$(use_with ldap openldap) |
| 93 |
$(use_enable policykit defaults-service)" |
| 94 |
kill_gconf |
| 95 |
|
| 96 |
# Need host's IDL compiler for cross or native build, bug #262747 |
| 97 |
export EXTRA_EMAKE="${EXTRA_EMAKE} ORBIT_IDL=/usr/bin/orbit-idl-2" |
| 98 |
} |
| 99 |
|
| 100 |
src_prepare() { |
| 101 |
gnome2_src_prepare |
| 102 |
|
| 103 |
# Do not start gconfd when installing schemas, fix bug #238276, upstream ? |
| 104 |
epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" |
| 105 |
|
| 106 |
# Do not crash in gconf_entry_set_value() when entry pointer is NULL |
| 107 |
epatch "${FILESDIR}/${P}-entry-set-value-sigsegv.patch" |
| 108 |
|
| 109 |
# Fix intltoolize broken file, see upstream #577133 |
| 110 |
sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" |
| 111 |
} |
| 112 |
|
| 113 |
# Can't run tests, missing script. |
| 114 |
#src_test() { |
| 115 |
# emake -C tests || die "make tests failed" |
| 116 |
# sh "${S}"/tests/runtests.sh || die "running tests failed" |
| 117 |
#} |
| 118 |
|
| 119 |
src_install() { |
| 120 |
gnome2_src_install |
| 121 |
|
| 122 |
keepdir /etc/gconf/gconf.xml.mandatory |
| 123 |
keepdir /etc/gconf/gconf.xml.defaults |
| 124 |
# Make sure this directory exists, bug #268070, upstream #572027 |
| 125 |
keepdir /etc/gconf/gconf.xml.system |
| 126 |
|
| 127 |
echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf |
| 128 |
doenvd 50gconf || die "doenv failed" |
| 129 |
dodir /root/.gconfd |
| 130 |
} |
| 131 |
|
| 132 |
pkg_preinst() { |
| 133 |
kill_gconf |
| 134 |
} |
| 135 |
|
| 136 |
pkg_postinst() { |
| 137 |
kill_gconf |
| 138 |
|
| 139 |
# change the permissions to avoid some gconf bugs |
| 140 |
einfo "changing permissions for gconf dirs" |
| 141 |
find /etc/gconf/ -type d -exec chmod ugo+rx "{}" \; |
| 142 |
|
| 143 |
einfo "changing permissions for gconf files" |
| 144 |
find /etc/gconf/ -type f -exec chmod ugo+r "{}" \; |
| 145 |
} |
| 146 |
|
| 147 |
kill_gconf() { |
| 148 |
# This function will kill all running gconfd-2 that could be causing troubles |
| 149 |
if [ -x /usr/bin/gconftool-2 ] |
| 150 |
then |
| 151 |
/usr/bin/gconftool-2 --shutdown |
| 152 |
fi |
| 153 |
|
| 154 |
return 0 |
| 155 |
} |
Archives