commit e12a3a2a72a2374fb6ed96a89b545b61d2138d73 Merge: 8ff6a4d 48915f0 Author: gil puntogil@libero.it Date: Thu Dec 4 01:59:20 2014 +0100
- fix for CVE-2014-0363 (rhbz#1093274) - remove jzlib systemPath in smackx pom
smack-3.2.2-CVE-2014-0363.patch | 505 +++++++++++++++++++++++++++++++++++++++ smack.spec | 71 ++---- smackx-3.2.2.pom | 2 - 3 files changed, 529 insertions(+), 49 deletions(-) --- diff --cc smack.spec index 10b4d13,4b4dba0..516e814 --- a/smack.spec +++ b/smack.spec @@@ -1,7 -1,7 +1,7 @@@ %global pkg_version %(echo %version | tr . _) Name: smack Version: 3.2.2 - Release: 5%{?dist} -Release: 8%{?dist} ++Release: 6%{?dist} Summary: Open Source XMPP (Jabber) client library License: ASL 2.0 URL: http://www.igniterealtime.org/projects/smack/index.jsp @@@ -11,36 -11,25 +11,24 @@@ Source0: http://download.ignitere # change version # add xpp3 Source1: %{name}-%{version}.pom --# add jzlib as system deps Source2: %{name}x-%{version}.pom Source3: %{name}x-debug-%{version}.pom # unavailable test resources # wget -O smack-3.2.2-test-config-test-case.xml http://svn.igniterealtime.org/svn/repos/smack/tags/smack_3_2_2/test/config/t... Source4: %{name}-%{version}-test-config-test-case.xml + # use system libraries # disable jzlib and xpp3 repackage - # disable smack jingle extension. cause: unavailable deps - - # jingle/extension/build/lib/Speex.jar mil.jfcom.cie.media ? - # jingle/extension/build/lib/jmf.jar replace with fmj - # jingle/extension/build/lib/commons-logging-1.1.jar - # jingle/extension/build/lib/commons-logging-adapters-1.1.jar - # jingle/extension/build/lib/commons-logging-api-1.1.jar - # jingle/extension/build/lib/jspeex-0.9.7-jfcom.jar org.xiph.speex - # jingle/extension/build/merge/jstun.jar - # jingle/extension/build/lib/junit.jar - # remove classpath from manifest files # fix javadoc link # fix build/javadoc/tests classpath Patch0: %{name}-%{version}-build.patch - Patch1: %{name}-3.2.2-CVE-2014-5075.patch + Patch2: %{name}-3.2.2-CVE-2014-0363.patch
- BuildRequires: java-devel BuildRequires: java-javadoc - BuildRequires: jpackage-utils + BuildRequires: javapackages-local
BuildRequires: ant BuildRequires: ant-contrib @@@ -82,7 -71,11 +70,8 @@@ find . -name "*.jar" -print -delet rm -rf javadoc/* documentation/*
%patch0 -p0 -%if %{?fedora} > 21 -sed -i.ant-contrib "s|%{_javadir}/ant/ant-contrib.jar|%{_javadir}/ant-contrib/ant-contrib.jar|" build/build.xml -%endif %patch1 -p1 + %patch2 -p1
mkdir -p test/config cp -p %{SOURCE4} test/config/test-case.xml @@@ -140,9 -117,19 +113,13 @@@ rm -r test/org/jivesoftware/smack/ChatT %doc README.html
%changelog -* Thu Dec 04 2014 gil cattaneo puntogil@libero.it 3.2.2-8 ++* Thu Dec 04 2014 gil cattaneo puntogil@libero.it 3.2.2-6 + - fix for CVE-2014-0363 (rhbz#1093274) + - remove jzlib systemPath in smackx pom + -* Thu Aug 21 2014 gil cattaneo puntogil@libero.it 3.2.2-7 +* Thu Aug 21 2014 gil cattaneo puntogil@libero.it 3.2.2-5 - fix for CVE-2014-5075 (rhbz#1127277)
-* Sun Jun 08 2014 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 3.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek msimacek@redhat.com - 3.2.2-5 -- Use Requires: java-headless rebuild (#1067528) - * Sun Aug 04 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 3.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
java-sig-commits@lists.fedoraproject.org