1 |
coldwind 08/07/04 15:20:01 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: licq-1.3.5-r1.ebuild |
5 |
Log: |
6 |
Fix security bug #219708, gcc-4.3 and glibc-2.8 fixes (bugs #218814 and #228373) and ICQ protocol upgrade (bug #230387). |
7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.93 net-im/licq/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?rev=1.93&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?rev=1.93&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/ChangeLog?r1=1.92&r2=1.93 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v |
19 |
retrieving revision 1.92 |
20 |
retrieving revision 1.93 |
21 |
diff -u -r1.92 -r1.93 |
22 |
--- ChangeLog 27 Mar 2008 15:03:11 -0000 1.92 |
23 |
+++ ChangeLog 4 Jul 2008 15:20:01 -0000 1.93 |
24 |
@@ -1,6 +1,14 @@ |
25 |
# ChangeLog for net-im/licq |
26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.92 2008/03/27 15:03:11 coldwind Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.93 2008/07/04 15:20:01 coldwind Exp $ |
29 |
+ |
30 |
+*licq-1.3.5-r1 (04 Jul 2008) |
31 |
+ |
32 |
+ 04 Jul 2008; Santiago M. Mola <coldwind@g.o> |
33 |
+ +files/licq-1.3.5-gcc43.patch, +files/licq-1.3.5-logonfix.patch, |
34 |
+ +files/licq-1.3.5-prevent-dos.patch, +licq-1.3.5-r1.ebuild: |
35 |
+ Fix security bug #219708, gcc-4.3 and glibc-2.8 fixes (bugs #218814 and |
36 |
+ #228373) and ICQ protocol upgrade (bug #230387). |
37 |
|
38 |
27 Mar 2008; Santiago M. Mola <coldwind@g.o> -licq-1.2.7.ebuild, |
39 |
-licq-1.3.0.ebuild: |
40 |
|
41 |
|
42 |
|
43 |
1.1 net-im/licq/licq-1.3.5-r1.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: licq-1.3.5-r1.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2008 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.5-r1.ebuild,v 1.1 2008/07/04 15:20:01 coldwind Exp $ |
53 |
|
54 |
inherit autotools eutils kde-functions multilib |
55 |
|
56 |
DESCRIPTION="ICQ Client with v8 support" |
57 |
HOMEPAGE="http://www.licq.org/" |
58 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="2" |
62 |
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd" |
63 |
IUSE="ssl socks5 qt3 kde ncurses crypt msn debug" |
64 |
|
65 |
# we can't have conditional dependencies so "use kde && inherit kde" |
66 |
# won't work -- messes up dep caching. |
67 |
|
68 |
# need-kde and their eclass friends inject things into DEPEND. But we only |
69 |
# want them enabled if the kde USE flag is set. We get around this in the |
70 |
# following dep lines: |
71 |
RDEPEND="kde? ( >=kde-base/kdelibs-3.0 )" |
72 |
DEPEND="kde? ( >=kde-base/kdelibs-3.0 ) |
73 |
ssl? ( >=dev-libs/openssl-0.9.6 ) |
74 |
qt3? ( =x11-libs/qt-3* ) |
75 |
ncurses? ( sys-libs/ncurses >=dev-libs/cdk-4.9.11.20031210-r1 ) |
76 |
crypt? ( >=app-crypt/gpgme-1.0.0 )" |
77 |
|
78 |
src_unpack() { |
79 |
unpack ${A} |
80 |
cd "${S}" |
81 |
|
82 |
epatch "${FILESDIR}"/${P}-logonfix.patch |
83 |
epatch "${FILESDIR}"/${P}-prevent-dos.patch |
84 |
epatch "${FILESDIR}"/${P}-gcc43.patch |
85 |
|
86 |
use ncurses && epatch "${FILESDIR}"/1.3.0-suse_bool.patch |
87 |
|
88 |
if use kde |
89 |
then |
90 |
# fix for #12436 |
91 |
ebegin "Setting kde plugin as default" |
92 |
cp "${S}"/src/licq.conf.h "${T}" |
93 |
sed "s:Plugin1 = qt-gui:Plugin1 = kde-gui:" \ |
94 |
"${T}"/licq.conf.h > "${S}"/src/licq.conf.h |
95 |
eend $? |
96 |
else |
97 |
if ! use qt3 |
98 |
then |
99 |
ebegin "Setting console plugin as default..." |
100 |
cp "${S}"/src/licq.conf.h "${T}" |
101 |
sed "s:Plugin1 = qt-gui:Plugin1 = console:" \ |
102 |
"${T}"/licq.conf.h > "${S}"/src/licq.conf.h |
103 |
eend $? |
104 |
fi |
105 |
fi |
106 |
|
107 |
# Install plugins in the correct libdir |
108 |
sed -i -e "s:lib/licq/:$(get_libdir)/licq/:" \ |
109 |
"${S}"/include/licq_constants.h || die "sed failed" |
110 |
sed -i -e 's:$(prefix)/lib:@libdir@:' \ |
111 |
"${S}"/plugins/*/src/Makefile.{in,am} || die "sed failed" |
112 |
|
113 |
for plugin in msn auto-reply email ; do |
114 |
cd "${S}"/plugins/${plugin} |
115 |
eautoreconf |
116 |
done |
117 |
} |
118 |
|
119 |
src_compile() { |
120 |
local myconf |
121 |
use ssl || myconf="${myconf} --disable-openssl" |
122 |
use socks5 && myconf="${myconf} --enable-socks5" |
123 |
use debug && myconf="${myconf} --enable-debug" |
124 |
|
125 |
myconf="${myconf} $(use_enable crypt gpgme)" |
126 |
|
127 |
cd "${S}" |
128 |
|
129 |
# bug #21009 |
130 |
find . -name 'configure' -exec sed -e "s:sed 's/-g:sed 's/^-g:" -i {} \; |
131 |
|
132 |
econf ${myconf} || die "econf failed" |
133 |
|
134 |
use crypt && { |
135 |
# workaround for gpgme's headers inclusion path |
136 |
sed \ |
137 |
-e "s:FAULT_INCLUDES =:FAULT_INCLUDES = -I/usr/include/gpgme:" \ |
138 |
-i "${S}"/src/Makefile |
139 |
} |
140 |
|
141 |
emake || die "emake failed" |
142 |
|
143 |
# Create the various plug-ins |
144 |
|
145 |
# First, the Qt plug-in |
146 |
if use qt3 |
147 |
then |
148 |
set-qtdir 3 |
149 |
set-kdedir 3 |
150 |
|
151 |
use kde && myconf="${myconf} --with-kde" |
152 |
|
153 |
# Problems finding qt on multilib systems |
154 |
myconf="${myconf} --with-qt-libraries=${QTDIR}/$(get_libdir)" |
155 |
|
156 |
# note! watch the --prefix=/usr placement; |
157 |
# licq itself installs into /usr, but the |
158 |
# optional kde/qt interface (to which second_conf belogns) |
159 |
# installs its files in $KDE3DIR/{lib,share}/licq |
160 |
|
161 |
cd "${S}"/plugins/qt-gui |
162 |
einfo "Compiling Qt GUI plug-in" |
163 |
econf ${myconf} || die |
164 |
emake || die |
165 |
fi |
166 |
|
167 |
# Now the console plug-in |
168 |
if use ncurses |
169 |
then |
170 |
cd "${S}"/plugins/console |
171 |
einfo "Compiling the Console plug-in" |
172 |
econf || die |
173 |
emake || die |
174 |
fi |
175 |
|
176 |
for plugin in auto-reply rms msn email ; do |
177 |
cd "${S}"/plugins/${plugin} |
178 |
einfo "Compiling '${plugin}' plug-in" |
179 |
econf || die "econf failed for ${plugin} plugin" |
180 |
emake || die "emake failed for ${plugin} plugin" |
181 |
done |
182 |
} |
183 |
|
184 |
src_install() { |
185 |
emake DESTDIR="${D}" install || die "emake install failed" |
186 |
|
187 |
dodoc ChangeLog INSTALL README* doc/* |
188 |
|
189 |
# Install the plug-ins |
190 |
if use qt3 |
191 |
then |
192 |
cd "${S}"/plugins/qt-gui |
193 |
emake DESTDIR="${D}" install || die |
194 |
docinto plugins/qt-gui |
195 |
dodoc README* |
196 |
|
197 |
fi |
198 |
|
199 |
if use ncurses |
200 |
then |
201 |
cd "${S}"/plugins/console |
202 |
emake DESTDIR="${D}" install || die |
203 |
docinto plugins/console |
204 |
dodoc README |
205 |
fi |
206 |
|
207 |
if use msn |
208 |
then |
209 |
cd "${S}"/plugins/msn |
210 |
make DESTDIR="${D}" install || die |
211 |
docinto plugins/msn |
212 |
dodoc README |
213 |
fi |
214 |
|
215 |
cd "${S}"/plugins/auto-reply |
216 |
emake DESTDIR="${D}" install || die |
217 |
docinto plugins/auto-reply |
218 |
dodoc README licq_autoreply.conf |
219 |
|
220 |
cd "${S}"/plugins/rms |
221 |
make DESTDIR="${D}" install || die |
222 |
docinto plugins/rms |
223 |
dodoc README licq_rms.conf |
224 |
|
225 |
exeinto /usr/share/${PN}/upgrade |
226 |
doexe "${S}"/upgrade/* |
227 |
|
228 |
# fixes bug #22136 and #149464 |
229 |
rm -fR "${D}"/var |
230 |
} |
231 |
|
232 |
pkg_postinst() { |
233 |
echo |
234 |
ewarn |
235 |
ewarn "If you're upgrading from <=licq-1.3.0 - you have to manually " |
236 |
ewarn "upgrade your existing licq installation. Please backup your " |
237 |
ewarn "settings and look into: /usr/share/licq/upgrade for scripts." |
238 |
ewarn |
239 |
echo |
240 |
} |
241 |
|
242 |
|
243 |
|
244 |
-- |
245 |
gentoo-commits@l.g.o mailing list |