snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

kdepimlibs: remove

Browse source
This commit is contained in:
Michael Gehring 2018-04-01 20:01:20 +00:00
parent 3ccd8dd2fc
commit ea215b54c2
6 changed files with 0 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
common/shlibs
View file

@ -1281,36 +1281,6 @@ libkutils.so.4 kdelibs-4.13.3_2
libkdeinit4_klauncher.so kdelibs-4.13.3_2 libkdeinit4_klauncher.so kdelibs-4.13.3_2
libkimproxy.so.4 kdelibs-4.13.3_2 libkimproxy.so.4 kdelibs-4.13.3_2
libkrossui.so.4 kdelibs-4.13.3_2 libkrossui.so.4 kdelibs-4.13.3_2
libkholidays.so.4 kdepimlibs-4.10.4_1
libkcalcore.so.4 kdepimlibs-4.10.4_1
libkcalutils.so.4 kdepimlibs-4.10.4_1
libakonadi-kde.so.4 kdepimlibs-4.10.4_1
libkmime.so.4 kdepimlibs-4.10.4_1
libakonadi-kmime.so.4 kdepimlibs-4.10.4_1
libkabc.so.4 kdepimlibs-4.10.4_1
libmicroblog.so.4 kdepimlibs-4.10.4_1
libsyndication.so.4 kdepimlibs-4.10.4_1
libkldap.so.4 kdepimlibs-4.10.4_1
libkpimutils.so.4 kdepimlibs-4.10.4_1
libakonadi-kcal.so.4 kdepimlibs-4.10.4_1
libkcal.so.4 kdepimlibs-4.10.4_1
libkresources.so.4 kdepimlibs-4.10.4_1
libmailtransport.so.4 kdepimlibs-4.10.4_1
libkpimtextedit.so.4 kdepimlibs-4.10.4_1
libkmbox.so.4 kdepimlibs-4.10.4_1
libkpimidentities.so.4 kdepimlibs-4.10.4_1
libkimap.so.4 kdepimlibs-4.10.4_1
libakonadi-calendar.so.4 kdepimlibs-4.10.4_1
libakonadi-contact.so.4 kdepimlibs-4.10.4_1
libkalarmcal.so.2 kdepimlibs-4.10.4_1
libakonadi-notes.so.4 kdepimlibs-4.10.4_1
libakonadi-kabc.so.4 kdepimlibs-4.10.4_1
libkontactinterface.so.4 kdepimlibs-4.10.4_1
libktnef.so.4 kdepimlibs-4.10.4_1
libgpgme++-pthread.so.2 kdepimlibs-4.10.4_1
libkblog.so.4 kdepimlibs-4.10.4_1
libqgpgme.so.1 kdepimlibs-4.10.4_1
libgpgme++.so.2 kdepimlibs-4.10.4_1
libssh.so.4 libssh-0.5.4_1 libssh.so.4 libssh-0.5.4_1
libssh_threads.so.4 libssh-0.5.4_1 libssh_threads.so.4 libssh-0.5.4_1
libqjson.so.0 qjson-0.8.1_1 libqjson.so.0 qjson-0.8.1_1

1
srcpkgs/kdepimlibs-devel
View file

@ -1 +0,0 @@
kdepimlibs

79
srcpkgs/kdepimlibs/patches/CVE-2016-7966.patch
View file

@ -1,79 +0,0 @@
--- kpimutils/linklocator.cpp
+++ kpimutils/linklocator.cpp
@@ -94,6 +94,12 @@
}
QString LinkLocator::getUrl()
+{
+ return getUrlAndCheckValidHref();
+}
+
+
+QString LinkLocator::getUrlAndCheckValidHref(bool *badurl)
{
QString url;
if ( atUrl() ) {
@@ -129,13 +135,26 @@
url.reserve( maxUrlLen() ); // avoid allocs
int start = mPos;
+ bool previousCharIsADoubleQuote = false;
while ( ( mPos < (int)mText.length() ) &&
( mText[mPos].isPrint() || mText[mPos].isSpace() ) &&
( ( afterUrl.isNull() && !mText[mPos].isSpace() ) ||
( !afterUrl.isNull() && mText[mPos] != afterUrl ) ) ) {
if ( !mText[mPos].isSpace() ) { // skip whitespace
- url.append( mText[mPos] );
- if ( url.length() > maxUrlLen() ) {
+ if (mText[mPos] == QLatin1Char('>') && previousCharIsADoubleQuote) {
+ //it's an invalid url
+ if (badurl) {
+ *badurl = true;
+ }
+ return QString();
+ }
+ if (mText[mPos] == QLatin1Char('"')) {
+ previousCharIsADoubleQuote = true;
+ } else {
+ previousCharIsADoubleQuote = false;
+ }
+ url.append( mText[mPos] );
+ if ( url.length() > maxUrlLen() ) {
break;
}
}
@@ -367,7 +386,12 @@
} else {
const int start = locator.mPos;
if ( !( flags & IgnoreUrls ) ) {
- str = locator.getUrl();
+ bool badUrl = false;
+ str = locator.getUrlAndCheckValidHref(&badUrl);
+ if (badUrl) {
+ return locator.mText;
+ }
+
if ( !str.isEmpty() ) {
QString hyperlink;
if ( str.left( 4 ) == QLatin1String("www.") ) {
--- kpimutils/linklocator.h
+++ kpimutils/linklocator.h
@@ -107,6 +107,7 @@
@return The URL at the current scan position, or an empty string.
*/
QString getUrl();
+ QString getUrlAndCheckValidHref(bool *badurl = 0);
/**
Attempts to grab an email address. If there is an @ symbol at the
@@ -155,7 +156,7 @@
*/
static QString pngToDataUrl( const QString & iconPath );
- protected:
+protected:
/**
The plaintext string being scanned for URLs and email addresses.
*/

29
srcpkgs/kdepimlibs/patches/CVE-2016-7966_part2.patch
View file

@ -1,29 +0,0 @@
--- kpimutils/linklocator.cpp
+++ kpimutils/linklocator.cpp
@@ -389,7 +389,23 @@
bool badUrl = false;
str = locator.getUrlAndCheckValidHref(&badUrl);
if (badUrl) {
- return locator.mText;
+ QString resultBadUrl;
+ const int helperTextSize(locator.mText.count());
+ for (int i = 0; i < helperTextSize; ++i) {
+ const QChar chBadUrl = locator.mText[i];
+ if (chBadUrl == QLatin1Char('&')) {
+ resultBadUrl += QLatin1String("&amp;");
+ } else if (chBadUrl == QLatin1Char('"')) {
+ resultBadUrl += QLatin1String("&quot;");
+ } else if (chBadUrl == QLatin1Char('<')) {
+ resultBadUrl += QLatin1String("&lt;");
+ } else if (chBadUrl == QLatin1Char('>')) {
+ resultBadUrl += QLatin1String("&gt;");
+ } else {
+ resultBadUrl += chBadUrl;
+ }
+ }
+ return resultBadUrl;
}
if ( !str.isEmpty() ) {

31
srcpkgs/kdepimlibs/patches/gpgme_largefile.patch
View file

@ -1,31 +0,0 @@
Newer versions of gpgme.h require _FILE_OFFSET_BITS defined
to the same value which gpgme-devel was compiled with.
I assume here we all use _FILE_OFFSET_BITS=64.
The gpgmefw.h patch is required because exception.cpp for some
reason does not include config-gpgme++.h, but <gpgme.h>
--- gpgme++/config-gpgme++.h.cmake 2014-11-04 22:19:27.000000000 +0100
+++ gpgme++/config-gpgme++.h.cmake 2015-07-28 15:34:47.449866029 +0200
@@ -134,4 +134,9 @@
#define GPG_ERR_SOURCE_DEFAULT ((gpg_err_source_t)22)
#endif
+#ifndef _FILE_OFFSET_BITS
+/* required to build against recent gpgme.h */
+#define _FILE_OFFSET_BITS 64
+#endif
+
#endif /* __GPGMEPP_CONFIG_GPGMEPP_H__ */
--- gpgme++/gpgmefw.h 2014-11-04 22:19:27.000000000 +0100
+++ gpgme++/gpgmefw.h 2015-07-28 15:39:40.636865160 +0200
@@ -23,6 +23,10 @@
#ifndef __GPGMEPP_GPGMEFW_H__
#define __GPGMEPP_GPGMEFW_H__
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
+
struct gpgme_context;
typedef gpgme_context * gpgme_ctx_t;

29
srcpkgs/kdepimlibs/template
View file

@ -1,29 +0,0 @@
# Template file for 'kdepimlibs'
pkgname=kdepimlibs
version=4.14.3
revision=6
short_desc="KDE PIM Libraries"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2, LGPL-2.1, FDL"
homepage="https://projects.kde.org/projects/kde/kdepimlibs"
distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz"
checksum=65edb1bec191be1b6f8450dc71eadae734f4ab0585aab0a885207390399868d7
build_style=cmake
configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF"
hostmakedepends="automoc4 pkg-config"
makedepends="boost-devel gpgme-devel qjson-devel libical-devel
kdelibs-devel phonon-devel libxslt-devel libldap-devel
akonadi-devel shared-mime-info"
depends="cyrus-sasl shared-mime-info"
kdepimlibs-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/gpgmepp
}
}