From ad8b8f145b439b9119dbbbaca3b551d8a8b90d9e Mon Sep 17 00:00:00 2001 From: Paul de Vrieze Date: Thu, 5 Feb 2004 10:48:09 +0000 Subject: Critical fix for kdepim, remove the old versions as they are unsafe --- kde-base/kdepim/ChangeLog | Bin 9100 -> 9268 bytes kde-base/kdepim/Manifest | 9 +++-- kde-base/kdepim/files/digest-kdepim-3.2.0 | 1 - kde-base/kdepim/files/digest-kdepim-3.2.0-r1 | 1 - kde-base/kdepim/files/digest-kdepim-3.2.0-r2 | 1 + kde-base/kdepim/files/kmfilter.cpp.patch | 49 +++++++++++++++++++++++++++ kde-base/kdepim/kdepim-3.2.0-r1.ebuild | 23 ------------- kde-base/kdepim/kdepim-3.2.0-r2.ebuild | 23 +++++++++++++ kde-base/kdepim/kdepim-3.2.0.ebuild | 22 ------------ 9 files changed, 77 insertions(+), 52 deletions(-) delete mode 100644 kde-base/kdepim/files/digest-kdepim-3.2.0 delete mode 100644 kde-base/kdepim/files/digest-kdepim-3.2.0-r1 create mode 100644 kde-base/kdepim/files/digest-kdepim-3.2.0-r2 create mode 100644 kde-base/kdepim/files/kmfilter.cpp.patch delete mode 100644 kde-base/kdepim/kdepim-3.2.0-r1.ebuild create mode 100644 kde-base/kdepim/kdepim-3.2.0-r2.ebuild delete mode 100644 kde-base/kdepim/kdepim-3.2.0.ebuild (limited to 'kde-base') diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog index adcc1fc4be1d..3c419ba55b2d 100644 Binary files a/kde-base/kdepim/ChangeLog and b/kde-base/kdepim/ChangeLog differ diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest index 54d38dd113b6..0876cbc04f0c 100644 --- a/kde-base/kdepim/Manifest +++ b/kde-base/kdepim/Manifest @@ -1,13 +1,12 @@ +MD5 e9a277028f88ae7a5131204037e05686 kdepim-3.2.0-r2.ebuild 785 MD5 87f99e9059e596436116e772edba31b1 kdepim-3.1.5.ebuild 800 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 MD5 bb8e62370b86408792fbf3fdde2df702 kdepim-3.1.4.ebuild 852 -MD5 d38cf87ce9d5dc4ef744f97d4d5c061a ChangeLog 9101 -MD5 035228000eb155ccb24f0cf148086487 kdepim-3.2.0.ebuild 699 +MD5 2e185474de8910aa72953c243e08b95e ChangeLog 9212 MD5 917d71da75c5eac3a6ef30c8551fc347 kdepim-3.0.5b.ebuild 575 -MD5 d67315c897f7ca27e88ccb091edf9975 kdepim-3.2.0-r1.ebuild 754 MD5 d833726815dce86df6d79630ceeecfdc files/digest-kdepim-3.0.5b 67 -MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0 66 -MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0-r1 66 +MD5 bafdafa3d2488fa1168ccbb4a981dd87 files/digest-kdepim-3.2.0-r2 66 MD5 0658e29c8e0fa024884f165bf129e8e9 files/digest-kdepim-3.1.5 66 MD5 bf481282b9583a3e4095dcdef1aee22c files/KMail-inboxEater-BRANCH.diff 1619 +MD5 ee45bc53826f95bcf3a3367db4d3845e files/kmfilter.cpp.patch 1528 MD5 10f1253acc1418066ffea529e8818b43 files/digest-kdepim-3.1.4 66 diff --git a/kde-base/kdepim/files/digest-kdepim-3.2.0 b/kde-base/kdepim/files/digest-kdepim-3.2.0 deleted file mode 100644 index 7f0b3ccf1635..000000000000 --- a/kde-base/kdepim/files/digest-kdepim-3.2.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 657a61e0f3d90d2afec3820e77f81306 kdepim-3.2.0.tar.bz2 7707960 diff --git a/kde-base/kdepim/files/digest-kdepim-3.2.0-r1 b/kde-base/kdepim/files/digest-kdepim-3.2.0-r1 deleted file mode 100644 index 7f0b3ccf1635..000000000000 --- a/kde-base/kdepim/files/digest-kdepim-3.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 657a61e0f3d90d2afec3820e77f81306 kdepim-3.2.0.tar.bz2 7707960 diff --git a/kde-base/kdepim/files/digest-kdepim-3.2.0-r2 b/kde-base/kdepim/files/digest-kdepim-3.2.0-r2 new file mode 100644 index 000000000000..7f0b3ccf1635 --- /dev/null +++ b/kde-base/kdepim/files/digest-kdepim-3.2.0-r2 @@ -0,0 +1 @@ +MD5 657a61e0f3d90d2afec3820e77f81306 kdepim-3.2.0.tar.bz2 7707960 diff --git a/kde-base/kdepim/files/kmfilter.cpp.patch b/kde-base/kdepim/files/kmfilter.cpp.patch new file mode 100644 index 000000000000..8206264ecd2a --- /dev/null +++ b/kde-base/kdepim/files/kmfilter.cpp.patch @@ -0,0 +1,49 @@ +Index: kmfilter.cpp +=================================================================== +RCS file: /home/kde/kdepim/kmail/kmfilter.cpp,v +retrieving revision 1.58 +diff -u -3 -p -r1.58 kmfilter.cpp +--- kmail/kmfilter.cpp 29 Nov 2003 15:46:43 -0000 1.58 ++++ kmail/kmfilter.cpp 4 Feb 2004 16:16:01 -0000 +@@ -147,9 +147,18 @@ void KMFilter::readConfig(KConfig* confi + // that the pattern is purified. + mPattern.readConfig(config); + +- if (bPopFilter) ++ if (bPopFilter) { + // get the action description... +- mAction = (KMPopFilterAction) config->readNumEntry( "action" ); ++ QString action = config->readEntry( "action" ); ++ if ( action == "down" ) ++ mAction = Down; ++ else if ( action == "later" ) ++ mAction = Later; ++ else if ( action == "delete" ) ++ mAction = Delete; ++ else ++ mAction = NoAction; ++ } + else { + QStringList sets = config->readListEntry("apply-on"); + if ( sets.isEmpty() && !config->hasKey("apply-on") ) { +@@ -210,7 +219,19 @@ void KMFilter::writeConfig(KConfig* conf + mPattern.writeConfig(config); + + if (bPopFilter) { +- config->writeEntry( "action", mAction ); ++ switch ( mAction ) { ++ case Down: ++ config->writeEntry( "action", "down" ); ++ break; ++ case Later: ++ config->writeEntry( "action", "later" ); ++ break; ++ case Delete: ++ config->writeEntry( "action", "delete" ); ++ break; ++ default: ++ config->writeEntry( "action", "" ); ++ } + } else { + QStringList sets; + if ( bApplyOnInbound ) diff --git a/kde-base/kdepim/kdepim-3.2.0-r1.ebuild b/kde-base/kdepim/kdepim-3.2.0-r1.ebuild deleted file mode 100644 index cb6807de87ef..000000000000 --- a/kde-base/kdepim/kdepim-3.2.0-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.0-r1.ebuild,v 1.1 2004/02/04 12:02:09 pauldv Exp $ -inherit kde-dist - -IUSE="pda crypt ldap" -DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..." -KEYWORDS="~x86 ~sparc ~amd64" - -DEPEND="~kde-base/kdenetwork-${PV} - pda? ( app-pda/pilot-link dev-libs/libmal ) - ldap? ( net-nds/openldap ) - crypt? ( app-crypt/cryptplug app-crypt/gnupg )" -RDEPEND="$DEPEND" -PATCHES="${FILESDIR}/KMail-inboxEater-BRANCH.diff" - -use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock" - -src_install() { - kde_src_install - docinto html - dodoc *.html -} diff --git a/kde-base/kdepim/kdepim-3.2.0-r2.ebuild b/kde-base/kdepim/kdepim-3.2.0-r2.ebuild new file mode 100644 index 000000000000..9618c23f2b78 --- /dev/null +++ b/kde-base/kdepim/kdepim-3.2.0-r2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.0-r2.ebuild,v 1.1 2004/02/05 10:48:09 pauldv Exp $ +inherit kde-dist + +IUSE="pda crypt ldap" +DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..." +KEYWORDS="~x86 ~sparc ~amd64" + +DEPEND="~kde-base/kdenetwork-${PV} + pda? ( app-pda/pilot-link dev-libs/libmal ) + ldap? ( net-nds/openldap ) + crypt? ( app-crypt/cryptplug app-crypt/gnupg )" +RDEPEND="$DEPEND" +PATCHES="${FILESDIR}/KMail-inboxEater-BRANCH.diff ${FILESDIR}/kmfilter.cpp.patch" + +use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock" + +src_install() { + kde_src_install + docinto html + dodoc *.html +} diff --git a/kde-base/kdepim/kdepim-3.2.0.ebuild b/kde-base/kdepim/kdepim-3.2.0.ebuild deleted file mode 100644 index 47696e29b12d..000000000000 --- a/kde-base/kdepim/kdepim-3.2.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.2.0.ebuild,v 1.1 2004/02/02 12:30:07 caleb Exp $ -inherit kde-dist - -IUSE="pda crypt ldap" -DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..." -KEYWORDS="~x86 ~sparc ~amd64" - -DEPEND="~kde-base/kdenetwork-${PV} - pda? ( app-pda/pilot-link dev-libs/libmal ) - ldap? ( net-nds/openldap ) - crypt? ( app-crypt/cryptplug app-crypt/gnupg )" -RDEPEND="$DEPEND" - -use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock" - -src_install() { - kde_src_install - docinto html - dodoc *.html -} -- cgit v1.2.3-65-gdbad