From 615b18379a6cba8d57e21bab64054dea91f8e814 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 17 Mar 2014 13:58:46 -0500 Subject: [PATCH 01/17] 4.12.90 --- .gitignore | 1 + kdelibs-4.12.90-dot.patch | 12 ++++++++++++ kdelibs-4.9.3-dot.patch | 12 ------------ kdelibs.spec | 7 +++++-- sources | 2 +- 5 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 kdelibs-4.12.90-dot.patch delete mode 100644 kdelibs-4.9.3-dot.patch diff --git a/.gitignore b/.gitignore index 5a5ab78..cd0e8d4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /kdelibs-4.12.1.tar.xz /kdelibs-4.12.2.tar.xz /kdelibs-4.12.3.tar.xz +/kdelibs-4.12.90.tar.xz diff --git a/kdelibs-4.12.90-dot.patch b/kdelibs-4.12.90-dot.patch new file mode 100644 index 0000000..fed6713 --- /dev/null +++ b/kdelibs-4.12.90-dot.patch @@ -0,0 +1,12 @@ +diff -up kdelibs-4.12.90/doc/common/Doxyfile.global.dot kdelibs-4.12.90/doc/common/Doxyfile.global +--- kdelibs-4.12.90/doc/common/Doxyfile.global.dot 2014-03-17 13:15:23.252517997 -0500 ++++ kdelibs-4.12.90/doc/common/Doxyfile.global 2014-03-17 13:16:02.472100942 -0500 +@@ -1360,7 +1360,7 @@ HIDE_UNDOC_RELATIONS = NO + # toolkit from AT&T and Lucent Bell Labs. The other options in this section + # have no effect if this option is set to NO (the default) + +-HAVE_DOT = YES ++HAVE_DOT = NO + + # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. + # The default size is 10pt. diff --git a/kdelibs-4.9.3-dot.patch b/kdelibs-4.9.3-dot.patch deleted file mode 100644 index 2bca78d..0000000 --- a/kdelibs-4.9.3-dot.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdelibs-4.9.3/doc/common/Doxyfile.global.me kdelibs-4.9.3/doc/common/Doxyfile.global ---- kdelibs-4.9.3/doc/common/Doxyfile.global.me 2012-12-04 16:57:09.239184154 +0100 -+++ kdelibs-4.9.3/doc/common/Doxyfile.global 2012-12-04 16:57:13.157191451 +0100 -@@ -1392,7 +1392,7 @@ HIDE_UNDOC_RELATIONS = NO - # toolkit from AT&T and Lucent Bell Labs. The other options in this section - # have no effect if this option is set to NO (the default) - --HAVE_DOT = YES -+HAVE_DOT = NO - - # By default doxygen will write a font called FreeSans.ttf to the output - # directory and reference it in all dot files that doxygen generates. This diff --git a/kdelibs.spec b/kdelibs.spec index 1db7a69..580fe80 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -38,7 +38,7 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Summary: KDE Libraries -Version: 4.12.3 +Version: 4.12.90 Release: 1%{?dist} Name: kdelibs @@ -148,7 +148,7 @@ Patch54: kdelibs-4.8.4-kjs-locale.patch Patch59: kdelibs-4.9.3-kcm_ssl.patch # disable dot to reduce apidoc size -Patch61: kdelibs-4.9.3-dot.patch +Patch61: kdelibs-4.12.90-dot.patch # workaround for bz#969524 on arm Patch62: kdelibs-4.11.3-arm.patch @@ -624,6 +624,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Mon Mar 17 2014 Rex Dieter 6:4.12.90-1 +- 4.12.90 + * Sat Mar 01 2014 Rex Dieter - 6:4.12.3-1 - 4.12.3 diff --git a/sources b/sources index 14d724c..b8b18c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b85c9ece434b6cbff364197827b649f kdelibs-4.12.3.tar.xz +ec4a561511c385c3b9fad3639836b025 kdelibs-4.12.90.tar.xz From ea8e8c340975ceda14cbe068ede156b9706fda23 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 22 Mar 2014 07:56:31 -0500 Subject: [PATCH 02/17] 4.12.95 --- .gitignore | 1 + kdelibs.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cd0e8d4..d638183 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /kdelibs-4.12.2.tar.xz /kdelibs-4.12.3.tar.xz /kdelibs-4.12.90.tar.xz +/kdelibs-4.12.95.tar.xz diff --git a/kdelibs.spec b/kdelibs.spec index 580fe80..e5589b8 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -38,7 +38,7 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Summary: KDE Libraries -Version: 4.12.90 +Version: 4.12.95 Release: 1%{?dist} Name: kdelibs @@ -624,6 +624,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Sat Mar 22 2014 Rex Dieter - 6:4.12.95-1 +- 4.12.95 + * Mon Mar 17 2014 Rex Dieter 6:4.12.90-1 - 4.12.90 diff --git a/sources b/sources index b8b18c2..927be16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec4a561511c385c3b9fad3639836b025 kdelibs-4.12.90.tar.xz +73520081f0482bc77dc4c0147c8a8b0d kdelibs-4.12.95.tar.xz From e437963ec907a70332be6f0d893246b5d13616be Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 3 Apr 2014 08:48:12 -0500 Subject: [PATCH 03/17] 4.12.97 --- .gitignore | 1 + kdelibs.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d638183..3f61fda 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /kdelibs-4.12.3.tar.xz /kdelibs-4.12.90.tar.xz /kdelibs-4.12.95.tar.xz +/kdelibs-4.12.97.tar.xz diff --git a/kdelibs.spec b/kdelibs.spec index e5589b8..dda3e09 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -38,7 +38,7 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Summary: KDE Libraries -Version: 4.12.95 +Version: 4.12.97 Release: 1%{?dist} Name: kdelibs @@ -624,6 +624,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Thu Apr 03 2014 Rex Dieter - 6:4.12.97-1 +- 4.12.97 + * Sat Mar 22 2014 Rex Dieter - 6:4.12.95-1 - 4.12.95 diff --git a/sources b/sources index 927be16..1add4c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73520081f0482bc77dc4c0147c8a8b0d kdelibs-4.12.95.tar.xz +d90ac8ec7186923d0056dc161eb63071 kdelibs-4.12.97.tar.xz From 69a04d95879beca5e3df9f9b5050c8578fef4437 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 11 Apr 2014 13:03:26 -0500 Subject: [PATCH 04/17] 4.13.0 --- .gitignore | 1 + kdelibs.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3f61fda..e95fd9a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /kdelibs-4.12.90.tar.xz /kdelibs-4.12.95.tar.xz /kdelibs-4.12.97.tar.xz +/kdelibs-4.13.0.tar.xz diff --git a/kdelibs.spec b/kdelibs.spec index dda3e09..398b282 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -38,7 +38,7 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Summary: KDE Libraries -Version: 4.12.97 +Version: 4.13.0 Release: 1%{?dist} Name: kdelibs @@ -624,6 +624,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Fri Apr 11 2014 Rex Dieter - 6:4.13.0-1 +- 4.13.0 + * Thu Apr 03 2014 Rex Dieter - 6:4.12.97-1 - 4.12.97 diff --git a/sources b/sources index 1add4c7..a872c87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d90ac8ec7186923d0056dc161eb63071 kdelibs-4.12.97.tar.xz +8e942f5ca010af69b078bfe549c2e947 kdelibs-4.13.0.tar.xz From 379a76777068b7ae2fcde14590f8d01b71cbe88b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 10 May 2014 08:50:44 -0500 Subject: [PATCH 05/17] 4.13.1 --- .gitignore | 11 +---------- kdelibs.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index e95fd9a..df0648a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -/kdelibs-4.11.3.tar.xz -/kdelibs-4.11.97.tar.xz -/kdelibs-4.12.0.tar.xz -/kdelibs-4.12.1.tar.xz -/kdelibs-4.12.2.tar.xz -/kdelibs-4.12.3.tar.xz -/kdelibs-4.12.90.tar.xz -/kdelibs-4.12.95.tar.xz -/kdelibs-4.12.97.tar.xz -/kdelibs-4.13.0.tar.xz +/kdelibs-4.13.1.tar.xz diff --git a/kdelibs.spec b/kdelibs.spec index 398b282..cd21f23 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -38,7 +38,7 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Summary: KDE Libraries -Version: 4.13.0 +Version: 4.13.1 Release: 1%{?dist} Name: kdelibs @@ -624,6 +624,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Sat May 10 2014 Rex Dieter - 6:4.13.1-1 +- 4.13.1 + * Fri Apr 11 2014 Rex Dieter - 6:4.13.0-1 - 4.13.0 diff --git a/sources b/sources index a872c87..f123f44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e942f5ca010af69b078bfe549c2e947 kdelibs-4.13.0.tar.xz +1d852f609bd1d5bc34da43cdb1c626b9 kdelibs-4.13.1.tar.xz From 2551653d7ca3604c6fea6d2e179669c0029c558b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 23 May 2014 13:00:54 -0500 Subject: [PATCH 06/17] meinproc4 doesn't substitute entity with libxml2 fixed for CVE-2014-0191 (kde#335001) --- kdelibs-r118270.patch | 46 +++++++++++++++++++++++++++++++++++++++++++ kdelibs.spec | 10 +++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 kdelibs-r118270.patch diff --git a/kdelibs-r118270.patch b/kdelibs-r118270.patch new file mode 100644 index 0000000..3b927ac --- /dev/null +++ b/kdelibs-r118270.patch @@ -0,0 +1,46 @@ +From d31488721660d7592e29f20dda747e1f129e0290 Mon Sep 17 00:00:00 2001 +From: Luigi Toscano +Date: Thu, 22 May 2014 23:29:09 +0200 +Subject: [PATCH] Explicitly load external entities (after CVE-2014-0191) + +Use the more modern API function for XML loading and enable the +flags which load the external entities, so that meinproc4 can work +again after the security changes implemented for CVE-2014-0191. + +BUG: 335001 +--- + kdoctools/meinproc.cpp | 4 ++-- + kdoctools/xslt.cpp | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp +index 0894d63..c4e963f 100644 +--- a/kdoctools/meinproc.cpp ++++ b/kdoctools/meinproc.cpp +@@ -197,8 +197,8 @@ int main(int argc, char **argv) { + + if (style_sheet != NULL) { + +- xmlDocPtr doc = xmlParseFile( QFile::encodeName( checkFilename ).constData() ); +- ++ xmlDocPtr doc = xmlReadFile( QFile::encodeName( checkFilename ).constData(), ++ NULL, XML_PARSE_NOENT|XML_PARSE_DTDLOAD ); + xmlDocPtr res = xsltApplyStylesheet(style_sheet, doc, ¶ms[0]); + + xmlFreeDoc(doc); +diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp +index a7265ca..0e7047d 100644 +--- a/kdoctools/xslt.cpp ++++ b/kdoctools/xslt.cpp +@@ -157,7 +157,7 @@ QString transform( const QString &pat, const QString& tss, + + INFO(i18n("Parsing document")); + +- xmlDocPtr doc = xmlParseFile(QFile::encodeName(pat)); ++ xmlDocPtr doc = xmlReadFile(QFile::encodeName(pat), NULL, XML_PARSE_NOENT|XML_PARSE_DTDLOAD); + xsltTransformContextPtr ctxt; + + ctxt = xsltNewTransformContext(style_sheet, doc); +-- +2.0.0.rc2 + diff --git a/kdelibs.spec b/kdelibs.spec index cd21f23..92d74f3 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -39,7 +39,7 @@ Summary: KDE Libraries Version: 4.13.1 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -144,6 +144,10 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch # return valid locale (RFC 1766) Patch54: kdelibs-4.8.4-kjs-locale.patch +# meinproc4 doesn't substitute entity with libxml2 fixed for CVE-2014-0191 +# http://bugs.kde.org/335001 , https://git.reviewboard.kde.org/r/118270 +Patch55: kdelibs-r118270.patch + # make filter working, TODO: upstream? -- rex Patch59: kdelibs-4.9.3-kcm_ssl.patch @@ -356,6 +360,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch52 -p1 -b .SOLID_UPNP %patch53 -p1 -b .kjs-s390 %patch54 -p1 -b .kjs-locale +%patch55 -p1 -b .r118270 %patch59 -p1 -b .filter %patch61 -p1 -b .dot %patch62 -p1 -b .arm-plasma @@ -624,6 +629,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Fri May 23 2014 Rex Dieter - 6:4.13.1-2 +- meinproc4 doesn't substitute entity with libxml2 fixed for CVE-2014-0191 (kde#335001) + * Sat May 10 2014 Rex Dieter - 6:4.13.1-1 - 4.13.1 From c1a484f8b736f7bccaf28f5fa302ab3b34f92a3a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 7 Jun 2014 16:07:46 -0500 Subject: [PATCH 07/17] 4.13.1 --- .gitignore | 2 +- kdelibs-r118270.patch | 46 ------------------------------------------- kdelibs.spec | 12 +++++------ sources | 2 +- 4 files changed, 7 insertions(+), 55 deletions(-) delete mode 100644 kdelibs-r118270.patch diff --git a/.gitignore b/.gitignore index df0648a..2aa9963 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kdelibs-4.13.1.tar.xz +/kdelibs-4.13.2.tar.xz diff --git a/kdelibs-r118270.patch b/kdelibs-r118270.patch deleted file mode 100644 index 3b927ac..0000000 --- a/kdelibs-r118270.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d31488721660d7592e29f20dda747e1f129e0290 Mon Sep 17 00:00:00 2001 -From: Luigi Toscano -Date: Thu, 22 May 2014 23:29:09 +0200 -Subject: [PATCH] Explicitly load external entities (after CVE-2014-0191) - -Use the more modern API function for XML loading and enable the -flags which load the external entities, so that meinproc4 can work -again after the security changes implemented for CVE-2014-0191. - -BUG: 335001 ---- - kdoctools/meinproc.cpp | 4 ++-- - kdoctools/xslt.cpp | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp -index 0894d63..c4e963f 100644 ---- a/kdoctools/meinproc.cpp -+++ b/kdoctools/meinproc.cpp -@@ -197,8 +197,8 @@ int main(int argc, char **argv) { - - if (style_sheet != NULL) { - -- xmlDocPtr doc = xmlParseFile( QFile::encodeName( checkFilename ).constData() ); -- -+ xmlDocPtr doc = xmlReadFile( QFile::encodeName( checkFilename ).constData(), -+ NULL, XML_PARSE_NOENT|XML_PARSE_DTDLOAD ); - xmlDocPtr res = xsltApplyStylesheet(style_sheet, doc, ¶ms[0]); - - xmlFreeDoc(doc); -diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp -index a7265ca..0e7047d 100644 ---- a/kdoctools/xslt.cpp -+++ b/kdoctools/xslt.cpp -@@ -157,7 +157,7 @@ QString transform( const QString &pat, const QString& tss, - - INFO(i18n("Parsing document")); - -- xmlDocPtr doc = xmlParseFile(QFile::encodeName(pat)); -+ xmlDocPtr doc = xmlReadFile(QFile::encodeName(pat), NULL, XML_PARSE_NOENT|XML_PARSE_DTDLOAD); - xsltTransformContextPtr ctxt; - - ctxt = xsltNewTransformContext(style_sheet, doc); --- -2.0.0.rc2 - diff --git a/kdelibs.spec b/kdelibs.spec index 92d74f3..176d4b6 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -38,8 +38,8 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Summary: KDE Libraries -Version: 4.13.1 -Release: 2%{?dist} +Version: 4.13.2 +Release: 1%{?dist} Name: kdelibs Epoch: 6 @@ -144,10 +144,6 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch # return valid locale (RFC 1766) Patch54: kdelibs-4.8.4-kjs-locale.patch -# meinproc4 doesn't substitute entity with libxml2 fixed for CVE-2014-0191 -# http://bugs.kde.org/335001 , https://git.reviewboard.kde.org/r/118270 -Patch55: kdelibs-r118270.patch - # make filter working, TODO: upstream? -- rex Patch59: kdelibs-4.9.3-kcm_ssl.patch @@ -360,7 +356,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch52 -p1 -b .SOLID_UPNP %patch53 -p1 -b .kjs-s390 %patch54 -p1 -b .kjs-locale -%patch55 -p1 -b .r118270 %patch59 -p1 -b .filter %patch61 -p1 -b .dot %patch62 -p1 -b .arm-plasma @@ -629,6 +624,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Sat Jun 07 2014 Rex Dieter - 6:4.13.2-1 +- 4.13.1 + * Fri May 23 2014 Rex Dieter - 6:4.13.1-2 - meinproc4 doesn't substitute entity with libxml2 fixed for CVE-2014-0191 (kde#335001) diff --git a/sources b/sources index f123f44..539663a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1d852f609bd1d5bc34da43cdb1c626b9 kdelibs-4.13.1.tar.xz +d06acae6071ae1679d8e3016da9d4dab kdelibs-4.13.2.tar.xz From 469049fb66a9a98f161c529cdf3fa064ef3ce1e5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 7 Jun 2014 17:31:13 -0500 Subject: [PATCH 08/17] fix changelog --- kdelibs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdelibs.spec b/kdelibs.spec index 176d4b6..e979502 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -625,7 +625,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog * Sat Jun 07 2014 Rex Dieter - 6:4.13.2-1 -- 4.13.1 +- 4.13.2 * Fri May 23 2014 Rex Dieter - 6:4.13.1-2 - meinproc4 doesn't substitute entity with libxml2 fixed for CVE-2014-0191 (kde#335001) From e9b64d15fcdf58edae8daf4d1de51a1fa552b0d2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 7 Jun 2014 23:02:34 -0500 Subject: [PATCH 09/17] fix build on arm see https://bugs.kde.org/show_bug.cgi?id=335346#c3 --- kdelibs-4.13.2-qreal.patch | 12 ++++++++++++ kdelibs.spec | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 kdelibs-4.13.2-qreal.patch diff --git a/kdelibs-4.13.2-qreal.patch b/kdelibs-4.13.2-qreal.patch new file mode 100644 index 0000000..5139e89 --- /dev/null +++ b/kdelibs-4.13.2-qreal.patch @@ -0,0 +1,12 @@ +diff -up kdelibs-4.13.2/khtml/css/cssparser.cpp.qreal kdelibs-4.13.2/khtml/css/cssparser.cpp +--- kdelibs-4.13.2/khtml/css/cssparser.cpp.qreal 2014-06-07 17:33:11.047973300 -0500 ++++ kdelibs-4.13.2/khtml/css/cssparser.cpp 2014-06-07 23:01:04.275165034 -0500 +@@ -2709,7 +2709,7 @@ static inline int yyerror( const char *s + return 1; + } + +-static const qreal dIntMax = INT_MAX; ++static const double dIntMax = INT_MAX; + #define END 0 + + #include "parser.h" diff --git a/kdelibs.spec b/kdelibs.spec index e979502..b714f52 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -157,6 +157,8 @@ Patch62: kdelibs-4.11.3-arm.patch Patch63: kdelibs-4.11.3-klauncher-no-glib.patch ## upstream +# https://bugs.kde.org/show_bug.cgi?id=335346#c3 +Patch100: kdelibs-4.13.2-qreal.patch # revert these commits for #https://bugs.kde.org/315578 @@ -366,6 +368,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch091 -p1 -R -b .coding-style-fixes.patch %patch092 -p1 -R -b .return-application-icons-properly %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default +%patch100 -p1 -b .qreal # security fixes From 12672cccc076e7f0a6ddadb6b11b61e06f131d84 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 Jun 2014 17:16:48 -0500 Subject: [PATCH 10/17] respin --- kdelibs-4.13.2-qreal.patch | 12 ------------ kdelibs.spec | 8 ++++---- sources | 2 +- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 kdelibs-4.13.2-qreal.patch diff --git a/kdelibs-4.13.2-qreal.patch b/kdelibs-4.13.2-qreal.patch deleted file mode 100644 index 5139e89..0000000 --- a/kdelibs-4.13.2-qreal.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdelibs-4.13.2/khtml/css/cssparser.cpp.qreal kdelibs-4.13.2/khtml/css/cssparser.cpp ---- kdelibs-4.13.2/khtml/css/cssparser.cpp.qreal 2014-06-07 17:33:11.047973300 -0500 -+++ kdelibs-4.13.2/khtml/css/cssparser.cpp 2014-06-07 23:01:04.275165034 -0500 -@@ -2709,7 +2709,7 @@ static inline int yyerror( const char *s - return 1; - } - --static const qreal dIntMax = INT_MAX; -+static const double dIntMax = INT_MAX; - #define END 0 - - #include "parser.h" diff --git a/kdelibs.spec b/kdelibs.spec index b714f52..3cfa638 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -39,7 +39,7 @@ Summary: KDE Libraries Version: 4.13.2 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -157,8 +157,6 @@ Patch62: kdelibs-4.11.3-arm.patch Patch63: kdelibs-4.11.3-klauncher-no-glib.patch ## upstream -# https://bugs.kde.org/show_bug.cgi?id=335346#c3 -Patch100: kdelibs-4.13.2-qreal.patch # revert these commits for #https://bugs.kde.org/315578 @@ -368,7 +366,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch091 -p1 -R -b .coding-style-fixes.patch %patch092 -p1 -R -b .return-application-icons-properly %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default -%patch100 -p1 -b .qreal # security fixes @@ -627,6 +624,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Sun Jun 08 2014 Rex Dieter - 6:4.13.2-2 +- respin + * Sat Jun 07 2014 Rex Dieter - 6:4.13.2-1 - 4.13.2 diff --git a/sources b/sources index 539663a..e10d43b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d06acae6071ae1679d8e3016da9d4dab kdelibs-4.13.2.tar.xz +51fa096f017e9c3c9480bcfad654ad86 kdelibs-4.13.2.tar.xz From 3e43f489c03d5502cf261da649779b93b86b1782 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 9 Jun 2014 08:04:41 -0500 Subject: [PATCH 11/17] FindKDE4Internal.cmake: define _DEFAULT_SOURCE too (to avoid _BSD_SOURCE deprecation warnings) --- kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch | 30 +++++++++++++++++++++++ kdelibs.spec | 10 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch diff --git a/kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch b/kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch new file mode 100644 index 0000000..666fa1e --- /dev/null +++ b/kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch @@ -0,0 +1,30 @@ +diff -up kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake._DEFAULT_SOURCE kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake +--- kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake._DEFAULT_SOURCE 2014-06-08 17:15:31.037189262 -0500 ++++ kdelibs-4.13.2/cmake/modules/FindKDE4Internal.cmake 2014-06-09 08:00:43.074844711 -0500 +@@ -1097,7 +1097,7 @@ endif (APPLE) + + if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) + if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") +- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) ++ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE) + set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") + set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") + +@@ -1112,7 +1112,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux OR C + endif(CMAKE_BUILD_TYPE_TOLOWER MATCHES profile) + endif (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + if (CMAKE_C_COMPILER MATCHES "icc") +- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE) ++ set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE) + set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}") + set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}") + endif (CMAKE_C_COMPILER MATCHES "icc") +@@ -1216,7 +1216,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) + # It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS}) + # and also because it is/was needed by glibc for snprintf to be available when building C files. + # See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c. +- add_definitions (-D_BSD_SOURCE) ++ add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE) + endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) + + if (CMAKE_SYSTEM_NAME STREQUAL GNU) diff --git a/kdelibs.spec b/kdelibs.spec index 3cfa638..e9caa2d 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -39,7 +39,7 @@ Summary: KDE Libraries Version: 4.13.2 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdelibs Epoch: 6 @@ -135,6 +135,10 @@ Patch49: kdelibs-solid_qt_no_debug_output.patch # https://git.reviewboard.kde.org/r/102439/ Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch +# glibc-2.20 has deprecated _BSD_SOURCE in favor of _DEFAULT_SOURCE +# http://sourceware.org/glibc/wiki/Release/2.20#Packaging_Changes +Patch51: kdelibs-4.13.2-glibc_DEFAULT_SOURCE.patch + # Toggle solid upnp support at runtime via env var SOLID_UPNP=1 (disabled by default) Patch52: kdelibs-4.10.0-SOLID_UPNP.patch @@ -353,6 +357,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # upstreamable patches %patch50 -p1 -b .knewstuff2_gpg2 +%patch51 -p1 -b .glibc_DEFAULT_SOURCE %patch52 -p1 -b .SOLID_UPNP %patch53 -p1 -b .kjs-s390 %patch54 -p1 -b .kjs-locale @@ -624,6 +629,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Mon Jun 09 2014 Rex Dieter - 6:4.13.2-3 +- FindKDE4Internal.cmake: define _DEFAULT_SOURCE too (to avoid _BSD_SOURCE deprecation warnings) + * Sun Jun 08 2014 Rex Dieter - 6:4.13.2-2 - respin From f9853a30da4724c3b6a8e1d847f8c2edc2e49255 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Jun 2014 08:41:02 -0500 Subject: [PATCH 12/17] POP3 kiosloave silently accepted invalid SSL certificates (#1111022, #1111023, CVE-2014-3494) --- ...require-a-job-to-handle-messageboxes.patch | 58 +++++++++++++++++++ kdelibs.spec | 7 ++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 0008-Don-t-require-a-job-to-handle-messageboxes.patch diff --git a/0008-Don-t-require-a-job-to-handle-messageboxes.patch b/0008-Don-t-require-a-job-to-handle-messageboxes.patch new file mode 100644 index 0000000..7cad922 --- /dev/null +++ b/0008-Don-t-require-a-job-to-handle-messageboxes.patch @@ -0,0 +1,58 @@ +From bbae87dc1be3ae063796a582774bd5642cacdd5d Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Wed, 18 Jun 2014 20:29:04 +0200 +Subject: [PATCH 08/12] Don't require a job to handle messageboxes. + +The POP3 ioslave doesn't have a job when it gets here. +--- + kio/kio/usernotificationhandler.cpp | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +diff --git a/kio/kio/usernotificationhandler.cpp b/kio/kio/usernotificationhandler.cpp +index 10043cf..2b2e091 100644 +--- a/kio/kio/usernotificationhandler.cpp ++++ b/kio/kio/usernotificationhandler.cpp +@@ -19,7 +19,7 @@ + #include "usernotificationhandler_p.h" + + #include "slave.h" +-#include "job_p.h" ++#include "jobuidelegate.h" + + #include + +@@ -76,19 +76,18 @@ void UserNotificationHandler::processRequest() + + if (m_cachedResults.contains(key)) { + result = *(m_cachedResults[key]); +- } else if (r->slave->job()) { +- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job()); +- if (jobPrivate) { +- result = jobPrivate->requestMessageBox(r->type, +- r->data.value(MSG_TEXT).toString(), +- r->data.value(MSG_CAPTION).toString(), +- r->data.value(MSG_YES_BUTTON_TEXT).toString(), +- r->data.value(MSG_NO_BUTTON_TEXT).toString(), +- r->data.value(MSG_YES_BUTTON_ICON).toString(), +- r->data.value(MSG_NO_BUTTON_ICON).toString(), +- r->data.value(MSG_DONT_ASK_AGAIN).toString(), +- r->data.value(MSG_META_DATA).toMap()); +- } ++ } else { ++ JobUiDelegate ui; ++ const JobUiDelegate::MessageBoxType type = static_cast(r->type); ++ result = ui.requestMessageBox(type, ++ r->data.value(MSG_TEXT).toString(), ++ r->data.value(MSG_CAPTION).toString(), ++ r->data.value(MSG_YES_BUTTON_TEXT).toString(), ++ r->data.value(MSG_NO_BUTTON_TEXT).toString(), ++ r->data.value(MSG_YES_BUTTON_ICON).toString(), ++ r->data.value(MSG_NO_BUTTON_ICON).toString(), ++ r->data.value(MSG_DONT_ASK_AGAIN).toString(), ++ r->data.value(MSG_META_DATA).toMap()); + m_cachedResults.insert(key, new int(result)); + } + } else { +-- +1.8.3.1 + diff --git a/kdelibs.spec b/kdelibs.spec index e9caa2d..83afdce 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -39,7 +39,7 @@ Summary: KDE Libraries Version: 4.13.2 -Release: 3%{?dist} +Release: 4%{?dist} Name: kdelibs Epoch: 6 @@ -174,6 +174,7 @@ Patch092: return-application-icons-properly.patch Patch093: turn-the-packagekit-support-feature-off-by-default.patch ## security fix +Patch158: 0008-Don-t-require-a-job-to-handle-messageboxes.patch # rhel patches @@ -373,6 +374,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default # security fixes +%patch158 -p1 -b .0008 # rhel patches %if ! 0%{?webkit} @@ -629,6 +631,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Thu Jun 19 2014 Rex Dieter 6:4.13.2-4 +- POP3 kiosloave silently accepted invalid SSL certificates (#1111022, #1111023, CVE-2014-3494) + * Mon Jun 09 2014 Rex Dieter - 6:4.13.2-3 - FindKDE4Internal.cmake: define _DEFAULT_SOURCE too (to avoid _BSD_SOURCE deprecation warnings) From 865d28c0b7adc3b4071c2dcbe6d466e873e075b0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Jun 2014 08:49:53 -0500 Subject: [PATCH 13/17] backport another meinproc/libxml2 fix (kde#335001) --- ...l-loading-of-DTD-and-entities-no-mor.patch | 36 +++++++++++++++++++ kdelibs.spec | 9 ++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch diff --git a/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch b/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch new file mode 100644 index 0000000..974eab1 --- /dev/null +++ b/0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch @@ -0,0 +1,36 @@ +From 684bb98b31d338d85e1e6089cac381a507a5b4d8 Mon Sep 17 00:00:00 2001 +From: Luigi Toscano +Date: Fri, 13 Jun 2014 02:41:50 +0200 +Subject: [PATCH 06/12] Do not set global loading of DTD and entities, no more + needed + +The global settings have been replaced by the fine-grained +parameters passed to xmlReadFile. +Moreover a libxml2 regression prevents those parameters from +being used when the patch for CVE-2014-0191 is applied, see +https://bugzilla.gnome.org/show_bug.cgi?id=730290 +A new libxml2 patch is going to be deployed soon, but anyway +this code works even without setting those parameters. + +CCBUG: 335001 +--- + kdoctools/meinproc.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp +index 0467f22..de4fbc8 100644 +--- a/kdoctools/meinproc.cpp ++++ b/kdoctools/meinproc.cpp +@@ -157,9 +157,6 @@ int main(int argc, char **argv) { + } + } + +- xmlSubstituteEntitiesDefault(1); +- xmlLoadExtDtdDefaultValue = 1; +- + QVector params; + #ifndef Q_WS_WIN + // libxslt parses the path given to outputFile as XPath expression which fails +-- +1.8.3.1 + diff --git a/kdelibs.spec b/kdelibs.spec index 83afdce..1d85b17 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -39,7 +39,7 @@ Summary: KDE Libraries Version: 4.13.2 -Release: 4%{?dist} +Release: 5%{?dist} Name: kdelibs Epoch: 6 @@ -173,6 +173,8 @@ Patch092: return-application-icons-properly.patch # revert disabling of packagekit Patch093: turn-the-packagekit-support-feature-off-by-default.patch +Patch106: 0006-Do-not-set-global-loading-of-DTD-and-entities-no-mor.patch + ## security fix Patch158: 0008-Don-t-require-a-job-to-handle-messageboxes.patch @@ -373,6 +375,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch092 -p1 -R -b .return-application-icons-properly %patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default +%patch106 -p1 -b .0006 + # security fixes %patch158 -p1 -b .0008 @@ -631,6 +635,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Thu Jun 19 2014 Rex Dieter 6:4.13.2-5 +- backport another meinproc/libxml2 fix (kde#335001) + * Thu Jun 19 2014 Rex Dieter 6:4.13.2-4 - POP3 kiosloave silently accepted invalid SSL certificates (#1111022, #1111023, CVE-2014-3494) From ffce806c954da7cc33170b40966f00d224332a2b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Jun 2014 09:51:20 -0500 Subject: [PATCH 14/17] webkit subpkg --- kdelibs.spec | 52 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index 1d85b17..f8f6afe 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -39,7 +39,7 @@ Summary: KDE Libraries Version: 4.13.2 -Release: 5%{?dist} +Release: 6%{?dist} Name: kdelibs Epoch: 6 @@ -287,7 +287,7 @@ This package includes the common files for the KDE 3 and KDE 4 libraries. Summary: Header files for compiling KDE 4 applications Provides: plasma-devel = %{version}-%{release} Provides: nepomuk-devel = %{version}-%{release} -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: kdelibs4-devel < %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release} Provides: kdelibs4-devel%{?_isa} = %{version}-%{release} @@ -304,15 +304,26 @@ Requires: pkgconfig(phonon) # considered part of nepomuk-devel Requires: pkgconfig(shared-desktop-ontologies) pkgconfig(soprano) Requires: qt4-devel -%if 0%{?webkit} -Requires: pkgconfig(QtWebKit) -%endif %{?x_deps:Requires: %{x_deps}} %description devel This package includes the header files you will need to compile applications for KDE 4. +%package webkit +Summary: KDE WebKit support library +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +%description webkit +%{summary}. + +%package webkit-devel +Summary: Development files for KDE WebKit support library +Requires: %{name}-webkit%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: pkgconfig(QtWebKit) +%description webkit-devel +%{summary}. + %package apidocs Summary: KDE 4 API documentation Requires: kde-filesystem @@ -596,6 +607,15 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_mandir}/man8/kded4.8* %{_mandir}/man8/kdeinit4.8* %{_mandir}/man8/meinproc4.8* +%if 0%{?webkit} +%exclude %{_kde4_libdir}/libkdewebkit.so.* + +%post webkit -p /sbin/ldconfig +%postun webkit -p /sbin/ldconfig + +%files webkit +%{_kde4_libdir}/libkdewebkit.so.* +%endif %files common %{_kde4_bindir}/preparetips @@ -623,6 +643,25 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_kde4_libdir}/cmake/KDeclarative/ %{_kde4_libdir}/kde4/devel/ +%if 0%{?webkit} +%exclude %{_kde4_includedir}/kdewebkit_export.h +%exclude %{_kde4_includedir}/kgraphicswebview.h +%exclude %{_kde4_includedir}/kwebpage.h +%exclude %{_kde4_includedir}/kwebpluginfactory.h +%exclude %{_kde4_includedir}/kwebview.h +%exclude %{_kde4_includedir}/kwebwallet.h +%exclude %{_kde4_libdir}/kde4/devel/libkdewebkit.so + +%files webkit-devel +%{_kde4_includedir}/kdewebkit_export.h +%{_kde4_includedir}/kgraphicswebview.h +%{_kde4_includedir}/kwebpage.h +%{_kde4_includedir}/kwebpluginfactory.h +%{_kde4_includedir}/kwebview.h +%{_kde4_includedir}/kwebwallet.h +%{_kde4_libdir}/kde4/devel/libkdewebkit.so +%endif + %if 0%{?apidocs} %files apidocs %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ @@ -635,6 +674,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Thu Jun 19 2014 Rex Dieter 6:4.13.2-6 +- -webkit subpkg + * Thu Jun 19 2014 Rex Dieter 6:4.13.2-5 - backport another meinproc/libxml2 fix (kde#335001) From d38cc88e564bcdd238db756004d308e035bef42a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Jun 2014 09:54:46 -0500 Subject: [PATCH 15/17] add kdelibs4-webkit Provides --- kdelibs.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kdelibs.spec b/kdelibs.spec index f8f6afe..cbc122a 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -312,12 +312,16 @@ applications for KDE 4. %package webkit Summary: KDE WebKit support library +Provides: kdelibs4-webkit = %{version}-%{release} +%{?_isa:Provides: kdelibs4-webkit%{?_isa} = %{version}-%{release}} Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description webkit %{summary}. %package webkit-devel Summary: Development files for KDE WebKit support library +Provides: kdelibs4-webkit-devel = %{version}-%{release} +%{?_isa:Provides: kdelibs4-webkit-devel%{?_isa} = %{version}-%{release}} Requires: %{name}-webkit%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pkgconfig(QtWebKit) From b0c6bf362c5398df1e19167fcd1c9ad216095292 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Jun 2014 12:55:26 -0500 Subject: [PATCH 16/17] add Obsoletes for -webkit upgrade path --- kdelibs.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/kdelibs.spec b/kdelibs.spec index cbc122a..b8e94b9 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -39,7 +39,7 @@ Summary: KDE Libraries Version: 4.13.2 -Release: 6%{?dist} +Release: 7%{?dist} Name: kdelibs Epoch: 6 @@ -312,6 +312,8 @@ applications for KDE 4. %package webkit Summary: KDE WebKit support library +# upgrade path, when -webkit subpkg landed +Obsoletes: kdelibs < 6:4.13.2-6 Provides: kdelibs4-webkit = %{version}-%{release} %{?_isa:Provides: kdelibs4-webkit%{?_isa} = %{version}-%{release}} Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -320,6 +322,8 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %package webkit-devel Summary: Development files for KDE WebKit support library +# upgrade path, when -webkit subpkg landed +Obsoletes: kdelibs-devel < 6:4.13.2-6 Provides: kdelibs4-webkit-devel = %{version}-%{release} %{?_isa:Provides: kdelibs4-webkit-devel%{?_isa} = %{version}-%{release}} Requires: %{name}-webkit%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -678,6 +682,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Thu Jun 19 2014 Rex Dieter 6:4.13.2-7 +- add Obsoletes for -webkit upgrade path + * Thu Jun 19 2014 Rex Dieter 6:4.13.2-6 - -webkit subpkg From ec69e7724ca9301da93f50f4c630aa6e02d1ee73 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 20 Jun 2014 11:53:52 -0500 Subject: [PATCH 17/17] 6:4.13.2-8 - %files enumerate libs - move kdewebkitwidgets.so to -webkit too --- kdelibs.spec | 59 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index b8e94b9..225ac66 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -39,7 +39,7 @@ Summary: KDE Libraries Version: 4.13.2 -Release: 7%{?dist} +Release: 8%{?dist} Name: kdelibs Epoch: 6 @@ -582,7 +582,43 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_docdir}/HTML/en/kioslave/ -%{_kde4_libdir}/lib*.so.* +%{_kde4_libdir}/libkcmutils.so.4* +%{_kde4_libdir}/libkde3support.so.4* +%{_kde4_libdir}/libkdeclarative.so.5* +%{_kde4_libdir}/libkdecore.so.5* +%{_kde4_libdir}/libkdefakes.so.5* +%{_kde4_libdir}/libkdesu.so.5* +%{_kde4_libdir}/libkdeui.so.5* +%{_kde4_libdir}/libkdnssd.so.4* +%{_kde4_libdir}/libkemoticons.so.4* +%{_kde4_libdir}/libkfile.so.4* +%{_kde4_libdir}/libkhtml.so.5* +%{_kde4_libdir}/libkidletime.so.4* +%{_kde4_libdir}/libkimproxy.so.4* +%{_kde4_libdir}/libkio.so.5* +%{_kde4_libdir}/libkjsapi.so.4* +%{_kde4_libdir}/libkjsembed.so.4* +%{_kde4_libdir}/libkjs.so.4* +%{_kde4_libdir}/libkmediaplayer.so.4* +%{_kde4_libdir}/libknewstuff2.so.4* +%{_kde4_libdir}/libknewstuff3.so.4* +%{_kde4_libdir}/libknotifyconfig.so.4* +%{_kde4_libdir}/libkntlm.so.4* +%{_kde4_libdir}/libkparts.so.4* +%{_kde4_libdir}/libkprintutils.so.4* +%{_kde4_libdir}/libkpty.so.4* +%{_kde4_libdir}/libkrosscore.so.4* +%{_kde4_libdir}/libkrossui.so.4* +%{_kde4_libdir}/libktexteditor.so.4* +%{_kde4_libdir}/libkunitconversion.so.4* +%{_kde4_libdir}/libkunittest.so.4* +%{_kde4_libdir}/libkutils.so.4* +%{_kde4_libdir}/libnepomukquery.so.4* +%{_kde4_libdir}/libnepomuk.so.4* +%{_kde4_libdir}/libnepomukutils.so.4* +%{_kde4_libdir}/libplasma.so.3* +%{_kde4_libdir}/libsolid.so.4* +%{_kde4_libdir}/libthreadweaver.so.4* %{_kde4_libdir}/libkdeinit4_*.so %{_kde4_libdir}/kconf_update_bin/ %dir %{_kde4_libdir}/kde4/ @@ -601,7 +637,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_kde4_libexecdir}/lnusertemp %{_kde4_libexecdir}/start_kdeinit %{_kde4_libexecdir}/start_kdeinit_wrapper -%{_kde4_libdir}/kde4/plugins/ +%dir %{_kde4_libdir}/kde4/plugins/ +%dir %{_kde4_libdir}/kde4/plugins/designer/ +%{_kde4_libdir}/kde4/plugins/designer/kde3supportwidgets.so +%{_kde4_libdir}/kde4/plugins/designer/kdedeprecated.so +%{_kde4_libdir}/kde4/plugins/designer/kdewidgets.so +%{_kde4_libdir}/kde4/plugins/imageformats/ +%{_kde4_libdir}/kde4/plugins/kauth/ +%{_kde4_libdir}/kde4/plugins/script/ %{_kde4_sysconfdir}/xdg/menus/*.menu %{_mandir}/man1/checkXML.1* %{_mandir}/man1/kde4-config.1* @@ -615,14 +658,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %{_mandir}/man8/kded4.8* %{_mandir}/man8/kdeinit4.8* %{_mandir}/man8/meinproc4.8* -%if 0%{?webkit} -%exclude %{_kde4_libdir}/libkdewebkit.so.* +%if 0%{?webkit} %post webkit -p /sbin/ldconfig %postun webkit -p /sbin/ldconfig %files webkit -%{_kde4_libdir}/libkdewebkit.so.* +%{_kde4_libdir}/libkdewebkit.so.5* +%{_kde4_libdir}/kde4/plugins/designer/kdewebkitwidgets.so %endif %files common @@ -682,6 +725,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : %changelog +* Fri Jun 20 2014 Rex Dieter - 6:4.13.2-8 +- %%files enumerate libs +- move kdewebkitwidgets.so to -webkit too + * Thu Jun 19 2014 Rex Dieter 6:4.13.2-7 - add Obsoletes for -webkit upgrade path