| 1 |
genstef 07/10/09 20:57:59 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: pwlib-1.10.10-r1.ebuild |
| 5 |
Log: |
| 6 |
Add security fix for rbu, bug 193095 |
| 7 |
(Portage version: 2.1.3.12) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.138 dev-libs/pwlib/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/pwlib/ChangeLog?rev=1.138&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/pwlib/ChangeLog?rev=1.138&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/pwlib/ChangeLog?r1=1.137&r2=1.138 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v |
| 19 |
retrieving revision 1.137 |
| 20 |
retrieving revision 1.138 |
| 21 |
diff -u -r1.137 -r1.138 |
| 22 |
--- ChangeLog 8 Oct 2007 14:39:07 -0000 1.137 |
| 23 |
+++ ChangeLog 9 Oct 2007 20:57:58 -0000 1.138 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for dev-libs/pwlib |
| 26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.137 2007/10/08 14:39:07 genstef Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.138 2007/10/09 20:57:58 genstef Exp $ |
| 29 |
+ |
| 30 |
+*pwlib-1.10.10-r1 (09 Oct 2007) |
| 31 |
+ |
| 32 |
+ 09 Oct 2007; Stefan Schweizer <genstef@g.o> |
| 33 |
+ +files/pwlib-1.10.1-vsprintf.patch, +pwlib-1.10.10-r1.ebuild: |
| 34 |
+ Add security fix for rbu, bug 193095 |
| 35 |
|
| 36 |
*pwlib-1.10.10 (08 Oct 2007) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 dev-libs/pwlib/pwlib-1.10.10-r1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r1.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r1.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: pwlib-1.10.10-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2007 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r1.ebuild,v 1.1 2007/10/09 20:57:58 genstef Exp $ |
| 51 |
|
| 52 |
inherit eutils flag-o-matic multilib autotools toolchain-funcs |
| 53 |
|
| 54 |
IUSE="alsa debug ieee1394 ipv6 ldap oss sasl sdl ssl v4l v4l2 xml" |
| 55 |
|
| 56 |
DESCRIPTION="Portable Multiplatform Class Libraries used by several VoIP applications" |
| 57 |
HOMEPAGE="http://www.ekiga.org" |
| 58 |
SRC_URI="http://www.ekiga.org/admin/downloads/latest/sources/sources/${P}.tar.gz" |
| 59 |
|
| 60 |
LICENSE="MPL-1.1" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 63 |
|
| 64 |
RDEPEND="alsa? ( media-libs/alsa-lib ) |
| 65 |
ieee1394? ( media-libs/libdv |
| 66 |
sys-libs/libavc1394 |
| 67 |
sys-libs/libraw1394 |
| 68 |
<media-libs/libdc1394-1.9.99 ) |
| 69 |
ldap? ( >=net-nds/openldap-2.3.35 ) |
| 70 |
sasl? ( dev-libs/cyrus-sasl ) |
| 71 |
sdl? ( media-libs/libsdl ) |
| 72 |
ssl? ( dev-libs/openssl ) |
| 73 |
xml? ( dev-libs/expat )" |
| 74 |
DEPEND="${RDEPEND} |
| 75 |
>=sys-devel/bison-1.28 |
| 76 |
>=sys-devel/flex-2.5.4a |
| 77 |
>=sys-apps/sed-4" |
| 78 |
|
| 79 |
src_unpack() { |
| 80 |
unpack ${A} |
| 81 |
cd "${S}" |
| 82 |
|
| 83 |
# filter out -O3, -Os and -mcpu embedded compiler flags |
| 84 |
sed -i \ |
| 85 |
-e "s:-mcpu=\$(CPUTYPE)::" \ |
| 86 |
-e "s:-O3 -DNDEBUG:-DNDEBUG:" \ |
| 87 |
-e "s:-Os::" \ |
| 88 |
make/unix.mak |
| 89 |
|
| 90 |
# don't break make install if there are no plugins to install |
| 91 |
epatch "${FILESDIR}"/pwlib-1.8.7-instplugins.diff |
| 92 |
|
| 93 |
# use sdl-config to query required libraries |
| 94 |
epatch "${FILESDIR}"/pwlib-1.9.3-sdl-configure.patch |
| 95 |
|
| 96 |
# this patch fixes bugs: #145424 and #140358 |
| 97 |
epatch "${FILESDIR}"/${PN}-1.10.2-asm.patch |
| 98 |
|
| 99 |
# security - we obviousl need to patch.. |
| 100 |
epatch "${FILESDIR}"/pwlib-1.10.1-vsprintf.patch |
| 101 |
|
| 102 |
eautoconf || die "autoconf failed" |
| 103 |
} |
| 104 |
|
| 105 |
src_compile() { |
| 106 |
tc-export CC CXX |
| 107 |
local myconf="" |
| 108 |
# may cause ICE (bug #70638) |
| 109 |
filter-flags -fstack-protector |
| 110 |
# disable-alsa breaks oss, see bug 127677 |
| 111 |
use alsa && myconf="--enable-alsa" |
| 112 |
|
| 113 |
econf \ |
| 114 |
--enable-plugins \ |
| 115 |
$(use_enable v4l2) \ |
| 116 |
$(use_enable v4l) \ |
| 117 |
$(use_enable ieee1394 dc) \ |
| 118 |
$(use_enable ieee1394 avc) \ |
| 119 |
$(use_enable oss) \ |
| 120 |
$(use_enable ipv6) \ |
| 121 |
$(use_enable sdl) \ |
| 122 |
$(use_enable ssl openssl) \ |
| 123 |
$(use_enable debug exceptions) \ |
| 124 |
$(use_enable debug memcheck) \ |
| 125 |
$(use_enable ldap openldap) \ |
| 126 |
$(use_enable sasl) \ |
| 127 |
$(use_enable xml expat) \ |
| 128 |
${myconf} \ |
| 129 |
|| die "configure failed" |
| 130 |
|
| 131 |
# Horrible hack to strip out -L/usr/lib to allow upgrades |
| 132 |
# problem is it adds -L/usr/lib before -L${S} when SSL is |
| 133 |
# enabled. Same thing for -I/usr/include. |
| 134 |
# sed -i -e "s:^\(LDFLAGS.*\)-L/usr/lib:\1:" \ |
| 135 |
# -e "s:^\(STDCCFLAGS.*\)-I/usr/include:\1:" \ |
| 136 |
# ${S}/make/ptbuildopts.mak |
| 137 |
|
| 138 |
# sed -i -e "s:^\(LDFLAGS[\s]*=.*\) -L/usr/lib:\1:" \ |
| 139 |
# -e "s:^\(LDFLAGS[\s]*=.*\) -I/usr/include:\1:" \ |
| 140 |
# -e "s:^\(CCFLAGS[\s]*=.*\) -I/usr/include:\1:" \ |
| 141 |
# ${S}/make/ptlib-config |
| 142 |
|
| 143 |
emake -j1 opt || die "make failed" |
| 144 |
} |
| 145 |
|
| 146 |
src_install() { |
| 147 |
local libdir libname |
| 148 |
|
| 149 |
libdir=$(get_libdir) |
| 150 |
|
| 151 |
# makefile doesn't create ${D}/usr/bin |
| 152 |
make PREFIX=/usr DESTDIR="${D}" install || die "install failed" |
| 153 |
|
| 154 |
## vv will try to fix the mess below, requires a lot of patching though... |
| 155 |
|
| 156 |
# update 2005/08/22: |
| 157 |
# |
| 158 |
# locations in *.mak files haven been fixed |
| 159 |
# directories have been replaced w/ symlinks |
| 160 |
# (left to not break things, doing some testing atm) |
| 161 |
|
| 162 |
# Note: reactivating this seems to be the only easy solution to slot pwlib ebuild |
| 163 |
# and keep applications happy (e.g. gnomemeeting / ekiga) |
| 164 |
|
| 165 |
# dosym /usr/include /usr/share/pwlib/include |
| 166 |
# dosym /usr/${libdir} /usr/share/pwlib/${libdir} |
| 167 |
# |
| 168 |
# # just in case... |
| 169 |
# if [[ "${libdir}" = "lib64" ]]; then |
| 170 |
# dosym /usr/share/pwlib/lib64 /usr/share/pwlib/lib |
| 171 |
# fi |
| 172 |
|
| 173 |
## ^^ bad stuff |
| 174 |
|
| 175 |
# fix symlink |
| 176 |
libname=$(basename "`ls "${D}"/usr/${libdir}/libpt_*_*_r.so.${PV}`") |
| 177 |
rm "${D}"/usr/${libdir}/libpt.so |
| 178 |
dosym ${libname} /usr/${libdir}/libpt.so |
| 179 |
|
| 180 |
# fix makefiles to use headers from /usr/include and libs from /usr/lib |
| 181 |
# instead of /usr/share/pwlib |
| 182 |
# Note: change to /usr/include/pwlib-${PV} (or whereever includes will be) |
| 183 |
# once pwlib ebuilds get slotted |
| 184 |
sed -i -e "s:-I\$(PWLIBDIR)\(/include[a-zA-Z0-9_/-]\+\):-I/usr/include\1:g" \ |
| 185 |
-e "s:-I\$(PWLIBDIR)/include::g" \ |
| 186 |
-e "s:^\(PW_LIBDIR[ \t]\+=\).*:\1 /usr/${libdir}:" \ |
| 187 |
"${D}"/usr/share/pwlib/make/*.mak |
| 188 |
|
| 189 |
# dodgy configure/makefiles forget to expand this |
| 190 |
# Note: change to /usr/share/pwlib/${PV} (or whatever PWLIBDIR should point to) |
| 191 |
# once pwlib ebuilds get slotted |
| 192 |
sed -i -e "s:\${exec_prefix}:/usr:" \ |
| 193 |
"${D}"/usr/bin/ptlib-config \ |
| 194 |
"${D}"/usr/share/pwlib/make/ptlib-config |
| 195 |
|
| 196 |
# copy version.h |
| 197 |
insinto /usr/share/pwlib |
| 198 |
doins version.h |
| 199 |
|
| 200 |
dodoc ReadMe.txt ReadMe_QOS.txt History.txt |
| 201 |
dohtml mpl-1.0.htm |
| 202 |
} |
| 203 |
|
| 204 |
|
| 205 |
|
| 206 |
-- |
| 207 |
gentoo-commits@g.o mailing list |
Archives