Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
c898fe6ade | ||
|
f552abd54a | ||
|
d30828cbc4 | ||
|
e003ff1f06 | ||
|
88356de30f | ||
|
ee3e63ccca |
3336
kdelibs-3.5.10-openssl-1.1.patch
Normal file
3336
kdelibs-3.5.10-openssl-1.1.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -18,12 +18,11 @@
|
||||
Summary: KDE 3 Libraries
|
||||
Name: kdelibs3
|
||||
Version: 3.5.10
|
||||
Release: 90%{?dist}
|
||||
Release: 94%{?dist}
|
||||
|
||||
License: LGPLv2
|
||||
Url: http://www.kde.org/
|
||||
Group: System Environment/Libraries
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
|
||||
Source1: kde.sh
|
||||
@ -97,6 +96,11 @@ Patch150: kdelibs-3.5.10-cups16.patch
|
||||
# build fix for CUPS 2.2 by Slávek Banko, backported by Kevin Kofler
|
||||
# http://git.trinitydesktop.org/cgit/tdelibs/commit/?id=52a1b55368ec53b14347996851aca7eb29374397
|
||||
Patch151: kdelibs-3.5.10-cups22.patch
|
||||
# OpenSSL 1.1 support by Slávek Banko (with prerequisite patch by Timothy
|
||||
# Pearson), backported by Kevin Kofler
|
||||
# http://git.trinitydesktop.org/cgit/tdelibs/commit/?id=e757d3d6ae93cf967d54c566e9c003b0f9cc3a9c
|
||||
# http://git.trinitydesktop.org/cgit/tdelibs/commit/?id=e1861cb6811f7bac405ece204407ca46c000a453
|
||||
Patch152: kdelibs-3.5.10-openssl-1.1.patch
|
||||
|
||||
## security fixes
|
||||
# fix CVE-2009-2537 - select length DoS
|
||||
@ -186,11 +190,7 @@ BuildRequires: libidn2-devel
|
||||
BuildRequires: libidn-devel
|
||||
%endif
|
||||
BuildRequires: audiofile-devel
|
||||
%if 0%{?fedora} > 25 || 0%{?rhel} > 7
|
||||
BuildRequires: compat-openssl10-devel
|
||||
%else
|
||||
BuildRequires: openssl-devel
|
||||
%endif
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: gawk
|
||||
BuildRequires: byacc
|
||||
@ -236,11 +236,7 @@ Group: Development/Libraries
|
||||
Summary: Header files and documentation for compiling KDE 3 applications.
|
||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: %{qt3}-devel
|
||||
%if 0%{?fedora} > 25 || 0%{?rhel} > 7
|
||||
Requires: compat-openssl10-devel
|
||||
%else
|
||||
Requires: openssl-devel
|
||||
%endif
|
||||
Requires: arts-devel
|
||||
%{?libkdnssd:Requires: libkdnssd-devel}
|
||||
%description devel
|
||||
@ -327,6 +323,9 @@ This package includes tools kgrantpty and kpac_dhcp_helper.
|
||||
%patch211 -p1 -b .CVE-2016-6232
|
||||
%patch212 -p1 -b .CVE-2017-6410
|
||||
|
||||
# must be applied after the ossl-1.x patch (105) and the CVE-2009-2702 fix (205)
|
||||
%patch152 -p1 -b .openssl-1.1
|
||||
|
||||
%patch300 -p1 -b .acinclude
|
||||
%patch301 -p1 -b .automake-version
|
||||
%patch302 -p1 -b .automake-add-missing
|
||||
@ -544,9 +543,6 @@ fi
|
||||
exit $ERROR
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
@ -661,6 +657,18 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
|
||||
|
||||
%changelog
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.5.10-94
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.10-93
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 3.5.10-92
|
||||
- Rebuilt for switch to libxcrypt
|
||||
|
||||
* Sat Jan 06 2018 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-91
|
||||
- Build against OpenSSL 1.1, patch from Trinity, backported by Kevin Kofler
|
||||
|
||||
* Thu Dec 28 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.5.10-90
|
||||
- Fix loading of latest compat-openssl10 (#1529417)
|
||||
- Use ca-certificates' ca-bundle.crt (#521902)
|
||||
@ -1293,7 +1301,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
- should have been 6:3.5.3-9 but accidentally built as 6:3.5.3-8.fc6
|
||||
- --disable-libfam and --enable-inotify to get inotify support
|
||||
and to disable gamin/fam usage
|
||||
- add %{?dist} to Release:
|
||||
- add %%{?dist} to Release:
|
||||
|
||||
* Tue Jul 11 2006 Than Ngo <than@redhat.com> 6:3.5.3-8
|
||||
- upstream patches,
|
||||
|
Loading…
Reference in New Issue
Block a user