diff options
| -rw-r--r-- | kde-base/kopete/ChangeLog | 10 | ||||
| -rw-r--r-- | kde-base/kopete/Manifest | 11 | ||||
| -rw-r--r-- | kde-base/kopete/files/kopete-3.5.10-icq-protocol-change2.patch | 24 | ||||
| -rw-r--r-- | kde-base/kopete/files/kopete-3.5.10-libgadu-CVE-2008-4776.patch | 19 | ||||
| -rw-r--r-- | kde-base/kopete/kopete-3.5.10-r4.ebuild | 145 |
5 files changed, 204 insertions, 5 deletions
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog index 402395dec8ee..a486798e00f4 100644 --- a/kde-base/kopete/ChangeLog +++ b/kde-base/kopete/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/kopete # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.188 2009/05/26 17:34:34 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.189 2009/05/27 19:38:07 tampakrap Exp $ + +*kopete-3.5.10-r4 (27 May 2009) + + 27 May 2009; Theo Chatzimichos <tampakrap@gentoo.org> + +kopete-3.5.10-r4.ebuild, +files/kopete-3.5.10-icq-protocol-change2.patch, + +files/kopete-3.5.10-libgadu-CVE-2008-4776.patch: + Revision bump, add patch for gadu, security bug 264613, add v4l2 use flag, + bug 265248, add patch for icq, bug 257625 *kopete-3.5.10-r3 (26 May 2009) diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest index 6b79edb74b16..8f7d02b3cde6 100644 --- a/kde-base/kopete/Manifest +++ b/kde-base/kopete/Manifest @@ -6,6 +6,8 @@ AUX kdenetwork-3.5.5-linux-headers-2.6.18.patch 799 RMD160 1e12373bef6f0a69d9b5d AUX kopete-0.12_alpha1-xscreensaver.patch 778 RMD160 d188f074982191f6f961c7e32ec97a79746e73df SHA1 85dea3f727af4393740bacb237c80ee666f1bdae SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d AUX kopete-3.5-rolling_icon.patch 430 RMD160 1574dc336ea63febfb9505b46f89070aff0b7dd4 SHA1 b6ad2c16fa27c3cb987b339dfe9d0546df1e2948 SHA256 2b1c56526712db57a5fe5765ac8d6a404baf53f36bb7d36a457d51c58546a908 AUX kopete-3.5.10-gcc43.patch 5464 RMD160 d535c743e56e007883012cee6c2acc976e4be71a SHA1 f33768f7d434901c52ca8e3382422d4a2901641f SHA256 1987e03fc57ae56d70ca79efcebd23cf6b73da6a1b6548189315df580d9e6e76 +AUX kopete-3.5.10-icq-protocol-change2.patch 1193 RMD160 3b64b3e73e676ba470224ae8c8862fb02f2a9778 SHA1 0e850940c96d8a4f28032eeee56e7d1c56896b0d SHA256 6241bf75b41606c081da0ca116e6f1f6d004b3e4adee110da4cabb8bd15626b2 +AUX kopete-3.5.10-libgadu-CVE-2008-4776.patch 1122 RMD160 f0bee221b4e98731f6dfc2612fb636abb929854a SHA1 b8e3f021ddae685cafcca557ce1054f803e2a88a SHA256 58ce7f80403a6457e4803806b90be339820e4d654ba43a8323ea72b5ef0cd62a AUX kopete-3.5.5-icqfix.patch 749 RMD160 129efdaa2bf0dbf88fe4714b4daab5f3606cbc91 SHA1 f3ef29b821ba5f0b62438a7b78a982625e42bd94 SHA256 e165e409343918ac49da0df867f7df34fffa5adfd550ca3079016d0b576a1987 AUX kopete-3.5.9-icq-protocol-change.patch 1553 RMD160 b08150812b10e779c8399c856390f53f6e83d553 SHA1 dc29430a8c6be45ba7fea9c31de30124b9988d7d SHA256 30183b9a0a3646541e5b43029ba2f53be2b5606f9bbda6ccb93a8084a4221586 DIST kdenetwork-3.5-patchset-01.tar.bz2 2986 RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf SHA1 cacc9ad8137e5c9e44bda1faa05e26cf2450f4e6 SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b @@ -15,17 +17,18 @@ DIST kdenetwork-4.2.2.tar.bz2 7174894 RMD160 e9bcf31475785ed2ecc7148cba7e1650cdc DIST kdenetwork-4.2.3.tar.bz2 7038337 RMD160 428c5356e716d3d0f60b766f3ad362b0599d8b6f SHA1 633432d049794f50143ed60197f6f0b5ac9011a7 SHA256 b3d9b5d1107acc8c2875a3ff6f8c645b42673f6c3ad2c66043dfbb543f1e298f EBUILD kopete-3.5.10-r2.ebuild 4124 RMD160 1672e79d3fd7dd5fa6fa0f425f7cff4be84716a4 SHA1 3feac332b55beb3e0f21fd6a33272c40756c3df8 SHA256 60764ef0c1cfbca457d40aad5fdcc1d785e451a4cdaa8fcc32d47684c2429e53 EBUILD kopete-3.5.10-r3.ebuild 4124 RMD160 798886d67892e7f1e128b250ea7910dc454e9081 SHA1 c924985eb2314c213ef6d66a6376d0b9c2e671b9 SHA256 748dc08969de40e24ef0a418a2732a79402119d3b18dac671b72b8964b5b6cb2 +EBUILD kopete-3.5.10-r4.ebuild 4266 RMD160 32e4fc8411244ec7bb0234a90d7ce18c834f6bb8 SHA1 7b79abc7e19fb0629c70ba42f3761e5a47bdaca6 SHA256 4c313a367536e7b470394188f041218d7b23f9d38283fd7db34b23589524ad08 EBUILD kopete-3.5.10.ebuild 4059 RMD160 351d646a33eab02cd9b7d6b6a589f5da0e3c0766 SHA1 c8d11f59fce543b3f9e96fde40b908be5dd08f66 SHA256 2f41468272f57ecc391354dfbcb7f16a3308923a0e6e3615038f3246859c7071 EBUILD kopete-3.5.9-r2.ebuild 4209 RMD160 a0833a4579ebd3d7053018fcab6019ab8029de70 SHA1 a87e06d671a73b8be426cc095d58d9313045ab94 SHA256 3e5e102e57f5add8ad215192c40ae64b4bcda8b1dd2704fdf181286212283e36 EBUILD kopete-3.5.9.ebuild 4176 RMD160 cf1327ab6f51b56d533aa0807975477027c76aa2 SHA1 64cd84aceda4987fcbcc38c433e11329aaa4ff7e SHA256 7e95a6a931c2d80e0896e38ef1a40d498a7ffc54d6cb1624a1aeb9a7aeccebeb EBUILD kopete-4.2.2-r1.ebuild 3597 RMD160 d856b853cee36adeba65a99eae63529c1404db02 SHA1 3f4bdcedad862db10469a02c45148a69f2b3369f SHA256 975bc003e3b29b9a248f5f5a749f9e619d94cb7f93d456785a9088caabe51315 EBUILD kopete-4.2.3.ebuild 3597 RMD160 20be5f1971ae05da999c68a63115f839e53feba5 SHA1 6e57e3834b1a3f8eb1ba28dafdb9256f6a50274d SHA256 3de9470cd03ce7887757319db0105436b55454a0e176c837c1137141c9c0346f -MISC ChangeLog 27675 RMD160 b1c38c448cf81af647ca4ad3986a38e165aff6ba SHA1 389adde436f2d00398fdb244d0429e38375021d1 SHA256 079fa1614c76f59d7231fdfa9fe18ffd165fd9fd165ab7c59f3a90ded2a2346a +MISC ChangeLog 28015 RMD160 004af7f8cee90ef669f4ab37fd1a72b3a0acc96f SHA1 da7574eafe045c5d12209dfdc04a4dc9b6f96fb3 SHA256 1cc4393db042fde2535682d3e0782532713132ec98f3468a170b98b95a27a6f9 MISC metadata.xml 2634 RMD160 10b05cb985eeffdae72c7b18dfbc42fc8905c801 SHA1 4c17c656188e65a0cb00f0a3622f02fa7fb4af9a SHA256 c837ab1bcc7057217bedf5ff46fb22faca6f766aa09db915bb0da4738509b86d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkocKDEACgkQjDdoMVfcAHhsyACfVRlusik93GoNCR/7+pGNG8Li -d/0AoJ3hZohqh0qWMgJmkXfq8adh3gvS -=ykWI +iEYEARECAAYFAkodlqkACgkQjDdoMVfcAHjopACg3AJVg0vP3pbRNFd8QR0HznDL +6XoAoKZ1nwuy5m3TUVxQcZ2FoAUR1mRH +=WWRn -----END PGP SIGNATURE----- diff --git a/kde-base/kopete/files/kopete-3.5.10-icq-protocol-change2.patch b/kde-base/kopete/files/kopete-3.5.10-icq-protocol-change2.patch new file mode 100644 index 000000000000..37a4afd4bdbb --- /dev/null +++ b/kde-base/kopete/files/kopete-3.5.10-icq-protocol-change2.patch @@ -0,0 +1,24 @@ +diff -urNpa kopete-3.5.9.orig/kopete/protocols/oscar/liboscar/connection.cpp kopete-3.5.9/kopete/protocols/oscar/liboscar/connection.cpp +--- kopete-3.5.9.orig/kopete/protocols/oscar/liboscar/connection.cpp 2009-02-04 17:34:44.000000000 +0300 ++++ kopete-3.5.9/kopete/protocols/oscar/liboscar/connection.cpp 2009-02-04 17:40:47.000000000 +0300 +@@ -31,6 +31,10 @@ + + #include "oscartypeclasses.h" + ++const Oscar::WORD StarSequences[] = { ++5695, 23595, 23620, 23049, 0x2886, 0x2493, 23620, 23049, 2853, 17372, 1255, 1796, 1657, 13606, 1930, 23918, 31234, 30120, 0x1BEA, 0x5342, 0x30CC, 0x2294, 0x5697, 0x25FA, 0x3C26, 0x3303, 0x078A, 0x0FC5, 0x25D6, 0x26EE,0x7570, 0x7F33, 0x4E94, 0x07C9, 0x7339, 0x42A8 ++//0x39B1, 0x1F07 ++}; + + class ConnectionPrivate + { +@@ -208,7 +212,8 @@ void Connection::forcedSend( Transfer* r + void Connection::initSequence() + { + d->snacSequence = ( KApplication::random() & 0xFFFF ); +- d->flapSequence = ( KApplication::random() & 0xFFFF ); ++ int startSequencesIndex = KApplication::random() % ((sizeof StarSequences) / (sizeof StarSequences[0])); ++ d->flapSequence = StarSequences[startSequencesIndex] - 1; + } + + void Connection::distribute( Transfer * transfer ) const diff --git a/kde-base/kopete/files/kopete-3.5.10-libgadu-CVE-2008-4776.patch b/kde-base/kopete/files/kopete-3.5.10-libgadu-CVE-2008-4776.patch new file mode 100644 index 000000000000..84ef79bb71e9 --- /dev/null +++ b/kde-base/kopete/files/kopete-3.5.10-libgadu-CVE-2008-4776.patch @@ -0,0 +1,19 @@ +------------------------------------------------------------------------ +r638 | wojtekka | 2008-10-23 23:50:29 +0200 (Thu, 23 Oct 2008) | 2 lines + +Poprawka błędu analizowania pakietów GG_NOTIFY_REPLY* znalezionego przez Jakuba Zawadzkiego. Odpowiednio spreparowany pakiet wysłany przez serwer może spowodować naruszenie ochrony pamięci. + +------------------------------------------------------------------------ +Index: kopete-3.5.9/kopete/protocols/gadu/libgadu/events.c +=================================================================== +--- kopete-3.5.9.orig/kopete/protocols/gadu/libgadu/events.c ++++ kopete-3.5.9/kopete/protocols/gadu/libgadu/events.c +@@ -598,7 +598,7 @@ static int gg_watch_fd_connected(struct + if (GG_S_D(n->status)) { + unsigned char descr_len = *((char*) n + sizeof(struct gg_notify_reply60)); + +- if (descr_len < length) { ++ if (sizeof(struct gg_notify_reply60) + descr_len <= length) { + if (!(e->event.notify60[i].descr = malloc(descr_len + 1))) { + gg_debug(GG_DEBUG_MISC, "// gg_watch_fd_connected() not enough memory for notify data\n"); + goto fail; diff --git a/kde-base/kopete/kopete-3.5.10-r4.ebuild b/kde-base/kopete/kopete-3.5.10-r4.ebuild new file mode 100644 index 000000000000..87191b869a11 --- /dev/null +++ b/kde-base/kopete/kopete-3.5.10-r4.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.10-r4.ebuild,v 1.1 2009/05/27 19:38:07 tampakrap Exp $ + +KMNAME=kdenetwork +EAPI="1" +inherit kde-meta eutils + +DESCRIPTION="KDE multi-protocol IM client" +HOMEPAGE="http://kopete.kde.org/" + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +IUSE="jingle ssl xscreensaver slp kernel_linux kdehiddenvisibility" +PLUGINS="addbookmarks alias autoreplace connectionstatus contactnotes crypt highlight history latex netmeeting nowlistening + statistics texteffect translator webpresence" +PROTOCOLS="gadu groupwise irc jabber oscar msn sametime sms v4l2 winpopup yahoo" +IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}" + +# Even more broken tests... +RESTRICT="test" + +# The kernel_linux? ( ) conditional dependencies are for webcams, not supported +# on other kernels AFAIK +BOTH_DEPEND=" + =app-crypt/qca-1.0* + >=dev-libs/glib-2 + dev-libs/libxml2 + dev-libs/libxslt + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + jabber? ( + net-dns/libidn + ) + jingle? ( + dev-libs/expat + >=media-libs/speex-1.1.6 + ~net-libs/ortp-0.7.1 + ) + kernel_linux? ( virtual/opengl ) + sametime? ( =net-libs/meanwhile-1.0* ) + sms? ( app-mobilephone/gsmlib ) + xscreensaver? ( x11-libs/libXScrnSaver ) +" +RDEPEND=" + ${BOTH_DEPEND} + crypt? ( app-crypt/gnupg ) + latex? ( + media-gfx/imagemagick + virtual/latex-base + ) + ssl? ( =app-crypt/qca-tls-1.0* ) +" +# !kde-base/kdenetwork is handled by the eclass. +# gnomemeeting is deprecated and ekiga is not yet ~ppc64 +# only needed for calling +# netmeeting? ( net-im/gnomemeeting )" + +DEPEND=" + ${BOTH_DEPEND} + x11-proto/videoproto + kernel_linux? ( + virtual/os-headers + x11-libs/libXv + ) + xscreensaver? ( x11-proto/scrnsaverproto ) +" + +pkg_setup() { + if use v4l2 && use kernel_linux && ! built_with_use x11-libs/qt:3 opengl; then + eerror "To support Video4Linux webcams in this package is required to have" + eerror "x11-libs/qt:3 compiled with OpenGL support." + eerror "Please reemerge x11-libs/qt:3 with USE=\"opengl\"." + die "Please reemerge x11-libs/qt:3 with USE=\"opengl\"." + fi +} + +kopete_disable() { + einfo "Disabling $2 $1" + sed -i -e "s/$2//" "${S}/kopete/$1s/Makefile.am" +} + +src_unpack() { + kde-meta_src_unpack + + epatch "${FILESDIR}/${PN}-0.12_alpha1-xscreensaver.patch" + epatch "${FILESDIR}/${PN}-3.5.5-icqfix.patch" + epatch "${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch" + epatch "${FILESDIR}/${P}-gcc43.patch" + epatch "${FILESDIR}/${PN}-3.5-rolling_icon.patch" + epatch "${FILESDIR}/${P}-libgadu-CVE-2008-4776.patch" + epatch "${FILESDIR}/${P}-icq-protocol-change2.patch" + + use addbookmarks || kopete_disable plugin addbookmarks + use alias || kopete_disable plugin alias + use autoreplace || kopete_disable plugin autoreplace + use connectionstatus || kopete_disable plugin connectionstatus + use contactnotes || kopete_disable plugin contactnotes + use crypt || kopete_disable plugin cryptography + use highlight || kopete_disable plugin highlight + use history || kopete_disable plugin history + use latex || kopete_disable plugin latex + use netmeeting || kopete_disable plugin netmeeting + use nowlistening || kopete_disable plugin nowlistening + use statistics || kopete_disable plugin statistics + use texteffect || kopete_disable plugin texteffect + use translator || kopete_disable plugin translator + use webpresence || kopete_disable plugin webpresence + use gadu || kopete_disable protocol '\$(GADU)' + use groupwise || kopete_disable protocol groupwise + use irc || kopete_disable protocol irc + use jabber || kopete_disable protocol '\$(JABBER)' + use oscar || kopete_disable protocol oscar + use msn || kopete_disable protocol msn + use winpopup || kopete_disable protocol winpopup + use yahoo || kopete_disable protocol yahoo + + rm -f "${S}/configure" +} + +src_compile() { + local myconf=" + --without-xmms + $(use_enable debug testbed) + $(use_enable jingle) + $(use_enable sametime meanwhile) + $(use_enable sms smsgsm) + $(use_with xscreensaver) + " + + kde_src_compile +} + +src_install() { + kde_src_install + + rm -f "${D}${KDEDIR}"/bin/{stun,relay}server +} + +pkg_postinst() { + kde_pkg_postinst + + elog "If you would like to use Off-The-Record encryption, emerge net-im/kopete-otr." +} |