From 58ef1825d5714688728331fbd7fe10ae7308a6a134639da08ae9dccb5234240c Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Fri, 25 Oct 2013 08:31:37 +0000 Subject: [PATCH] - really apply CVE-2012-5783 patch - build with java 6 and higher OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-httpclient?expand=0&rev=9 --- apache-commons-httpclient.changes | 6 ++++++ apache-commons-httpclient.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apache-commons-httpclient.changes b/apache-commons-httpclient.changes index 978dcd9..2dc9a8b 100644 --- a/apache-commons-httpclient.changes +++ b/apache-commons-httpclient.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 25 08:30:33 UTC 2013 - mvyskocil@suse.com + +- really apply CVE-2012-5783 patch +- build with java 6 and higher + ------------------------------------------------------------------- Thu Mar 28 10:54:13 UTC 2013 - mvyskocil@suse.com diff --git a/apache-commons-httpclient.spec b/apache-commons-httpclient.spec index 1749d2b..5d9eef8 100644 --- a/apache-commons-httpclient.spec +++ b/apache-commons-httpclient.spec @@ -38,11 +38,10 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ant +BuildRequires: ant-junit BuildRequires: commons-codec BuildRequires: commons-logging >= 1.0.3 -#BuildRequires: java-javadoc -#BuildRequires: apache-commons-logging-javadoc -BuildRequires: java-devel +BuildRequires: java-devel >= 1.6.0 BuildRequires: junit Requires: commons-codec @@ -51,9 +50,9 @@ Requires: commons-logging >= 1.0.3 Provides: %{short_name} = %{version} Provides: jakarta-%{short_name} = %{version} -Obsoletes: jakarta-%{short_name} <= %{version} +Obsoletes: jakarta-%{short_name} <= 3.1 Provides: jakarta-%{short_name}3 = %{version} -Obsoletes: jakarta-%{short_name}3 <= %{version} +Obsoletes: jakarta-%{short_name}3 <= 3.1 %description Although the java.net package provides basic functionality for @@ -115,6 +114,7 @@ pushd src/conf popd %patch2 +%patch3 -p1 # Use javax classes, not com.sun ones # assume no filename contains spaces