|
|
@@ -1,6 +1,6 @@
|
|
|
Name: kdenetwork
|
|
|
Version: 4.4.3
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Release: 2%{?_dist_release}
|
|
|
Summary: K Desktop Environment - Network Applications
|
|
|
Summary(ja): K デスクトップ環境 - ネットワークアプリケーション集
|
|
|
Group: Applications/Internet
|
|
|
@@ -11,10 +11,18 @@ Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.b
|
|
|
Source1: krdc-icons.tar.bz2
|
|
|
Source2: kppp.pamd
|
|
|
|
|
|
+## upstream me! -- Rex :)
|
|
|
Patch1: kdenetwork-4.2.98-kdrc-icon.patch
|
|
|
+# rhbz#540433 - KPPP is unable to add DNS entries to /etc/resolv.conf
|
|
|
+Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
|
|
|
+
|
|
|
+## security patches
|
|
|
+# rhbz#591966 - CVE-2010-1000 CVE-2010-1511 kdenetwork: improper sanitization
|
|
|
+# of metalink attribute for downloading files
|
|
|
+Patch100: kdenetwork-4.4.3-cve-2010-1000_1511.patch
|
|
|
|
|
|
# Vine patches
|
|
|
-Patch100: kdenetwork-3.5.8-kopete-fs.patch
|
|
|
+Patch1000: kdenetwork-3.5.8-kopete-fs.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: libboost-devel
|
|
|
@@ -85,13 +93,11 @@ PPP networking.
|
|
|
%prep
|
|
|
%setup -q -a 1
|
|
|
%patch1 -p1 -b .icon
|
|
|
-
|
|
|
-# 4.3 upstream patches
|
|
|
+%patch2 -p1 -b .resolv-conf-path
|
|
|
+%patch100 -p0 -b .cve-2010-1000_1511
|
|
|
|
|
|
# Vine patches
|
|
|
-%patch100 -p1 -b .kopete
|
|
|
-
|
|
|
-chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
|
|
|
+%patch1000 -p1 -b .kopete
|
|
|
|
|
|
%build
|
|
|
mkdir -p %{_target_platform}
|
|
|
@@ -209,6 +215,9 @@ fi
|
|
|
%{_datadir}/kde4/apps/kppp
|
|
|
|
|
|
%changelog
|
|
|
+* Mon May 17 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-2
|
|
|
+- security fixes: CVE-2010-1000, CVE-2010-1511 (#591966)
|
|
|
+
|
|
|
* Fri May 7 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.4.3-1
|
|
|
- new upstream release
|
|
|
|
inagaki