[azureus] removed bundled apache-commons (Bz 820117)
David Juran
djuran at fedoraproject.org
Sat Feb 23 20:20:59 UTC 2013
commit a2b550683ba11c222df15851b1ec88581d9669bb
Author: David Juran <djuran at redhat.com>
Date: Sat Feb 23 21:19:35 2013 +0100
removed bundled apache-commons (Bz 820117)
azureus-4.8.1.2-no-bundled-apache-commons.patch | 114 +++++++++++++++++++++++
azureus.spec | 14 +++-
2 files changed, 126 insertions(+), 2 deletions(-)
---
diff --git a/azureus-4.8.1.2-no-bundled-apache-commons.patch b/azureus-4.8.1.2-no-bundled-apache-commons.patch
new file mode 100644
index 0000000..0d40303
--- /dev/null
+++ b/azureus-4.8.1.2-no-bundled-apache-commons.patch
@@ -0,0 +1,114 @@
+diff -up azureus-4.7.2.0/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java.no-bundled-libs azureus-4.7.2.0/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java
+--- azureus-4.7.2.0/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java.no-bundled-libs 2012-11-02 21:42:47.475976268 +0100
++++ azureus-4.7.2.0/com/aelitis/azureus/core/metasearch/impl/web/WebResult.java 2012-11-02 21:50:03.722661057 +0100
+@@ -88,14 +88,14 @@ public class WebResult extends Result {
+ public void setNameFromHTML(String name) {
+ if(name != null) {
+ name = removeHTMLTags(name);
+- this.name = Entities.HTML40.unescape(name);
++ this.name = StringEscapeUtils.unescapeHtml(name);
+ }
+ }
+
+ public void setCommentsFromHTML(String comments) {
+ if(comments != null) {
+ comments = removeHTMLTags(comments);
+- comments = Entities.HTML40.unescape(comments);
++ comments = StringEscapeUtils.unescapeHtml(comments);
+ comments = comments.replaceAll(",", "");
+ comments = comments.replaceAll(" ", "");
+ try{
+@@ -108,7 +108,7 @@ public class WebResult extends Result {
+ public void setCategoryFromHTML(String category) {
+ if(category != null) {
+ category = removeHTMLTags(category);
+- this.category = Entities.HTML40.unescape(category).trim();
++ this.category = StringEscapeUtils.unescapeHtml(category).trim();
+ /*int separator = this.category.indexOf(">");
+
+ if(separator != -1) {
+@@ -133,7 +133,7 @@ public class WebResult extends Result {
+ public void setNbPeersFromHTML(String nbPeers) {
+ if(nbPeers != null) {
+ nbPeers = removeHTMLTags(nbPeers);
+- String nbPeersS = Entities.HTML40.unescape(nbPeers);
++ String nbPeersS = StringEscapeUtils.unescapeHtml(nbPeers);
+ nbPeersS = nbPeersS.replaceAll(",", "");
+ nbPeersS = nbPeersS.replaceAll(" ", "");
+ try {
+@@ -148,7 +148,7 @@ public class WebResult extends Result {
+ public void setNbSeedsFromHTML(String nbSeeds) {
+ if(nbSeeds != null) {
+ nbSeeds = removeHTMLTags(nbSeeds);
+- String nbSeedsS = Entities.HTML40.unescape(nbSeeds);
++ String nbSeedsS = StringEscapeUtils.unescapeHtml(nbSeeds);
+ nbSeedsS = nbSeedsS.replaceAll(",", "");
+ nbSeedsS = nbSeedsS.replaceAll(" ", "");
+ try {
+@@ -163,7 +163,7 @@ public class WebResult extends Result {
+ public void setNbSuperSeedsFromHTML(String nbSuperSeeds) {
+ if(nbSuperSeeds != null) {
+ nbSuperSeeds = removeHTMLTags(nbSuperSeeds);
+- String nbSuperSeedsS = Entities.HTML40.unescape(nbSuperSeeds);
++ String nbSuperSeedsS = StringEscapeUtils.unescapeHtml(nbSuperSeeds);
+ nbSuperSeedsS = nbSuperSeedsS.replaceAll(",", "");
+ nbSuperSeedsS = nbSuperSeedsS.replaceAll(" ", "");
+ try {
+@@ -230,7 +230,7 @@ public class WebResult extends Result {
+ public void setPublishedDateFromHTML(String publishedDate) {
+ if(publishedDate != null) {
+ publishedDate = removeHTMLTags(publishedDate);
+- String publishedDateS = Entities.HTML40.unescape(publishedDate).replace((char)160,(char)32);
++ String publishedDateS = StringEscapeUtils.unescapeHtml(publishedDate).replace((char)160,(char)32);
+ this.publishedDate = dateParser.parseDate(publishedDateS);
+ }
+ }
+@@ -239,7 +239,7 @@ public class WebResult extends Result {
+ public void setSizeFromHTML(String size) {
+ if(size != null) {
+ size = removeHTMLTags(size);
+- String sizeS = Entities.HTML40.unescape(size).replace((char)160,(char)32);
++ String sizeS = StringEscapeUtils.unescapeHtml(size).replace((char)160,(char)32);
+ sizeS = sizeS.replaceAll("<[^>]+>", " ");
+ //Add a space between the digits and unit if there is none
+ sizeS = sizeS.replaceFirst("(\\d)([a-zA-Z])", "$1 $2");
+@@ -285,7 +285,7 @@ public class WebResult extends Result {
+ public void setVotesFromHTML(String votes_str) {
+ if(votes_str != null) {
+ votes_str = removeHTMLTags(votes_str);
+- votes_str = Entities.HTML40.unescape(votes_str);
++ votes_str = StringEscapeUtils.unescapeHtml(votes_str);
+ votes_str = votes_str.replaceAll(",", "");
+ votes_str = votes_str.replaceAll(" ", "");
+ try {
+@@ -299,7 +299,7 @@ public class WebResult extends Result {
+ public void setVotesDownFromHTML(String votes_str) {
+ if(votes_str != null) {
+ votes_str = removeHTMLTags(votes_str);
+- votes_str = Entities.HTML40.unescape(votes_str);
++ votes_str = StringEscapeUtils.unescapeHtml(votes_str);
+ votes_str = votes_str.replaceAll(",", "");
+ votes_str = votes_str.replaceAll(" ", "");
+ try {
+diff -up azureus-4.7.2.0/com/aelitis/azureus/core/metasearch/Result.java.no-bundled-libs azureus-4.7.2.0/com/aelitis/azureus/core/metasearch/Result.java
+--- azureus-4.7.2.0/com/aelitis/azureus/core/metasearch/Result.java.no-bundled-libs 2012-10-16 19:59:34.653928354 +0200
++++ azureus-4.7.2.0/com/aelitis/azureus/core/metasearch/Result.java 2012-10-16 21:16:05.455817520 +0200
+@@ -27,7 +27,7 @@ import java.util.Locale;
+ import java.util.Map;
+ import java.util.Random;
+
+-import org.apache.commons.lang.Entities;
++import org.apache.commons.lang.StringEscapeUtils;
+ import org.gudy.azureus2.core3.util.DisplayFormatters;
+ import org.json.simple.JSONObject;
+
+@@ -372,6 +372,6 @@ public abstract class Result {
+ if ( input == null ){
+ return( null );
+ }
+- return( Entities.HTML40.unescape( input ));
++ return( StringEscapeUtils.unescapeHtml( input ));
+ }
+ }
+diff -up azureus-4.7.2.0/com/aelitis/azureus/core/security/impl/CryptoSTSEngineImpl.java.no-bundled-libs azureus-4.7.2.0/com/aelitis/azureus/core/security/impl/CryptoSTSEngineImpl.java
+
diff --git a/azureus.spec b/azureus.spec
index de70a18..0182202 100644
--- a/azureus.spec
+++ b/azureus.spec
@@ -2,7 +2,7 @@
Name: azureus
Version: 4.8.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
License: GPLv2+
@@ -43,8 +43,11 @@ Patch58: azureus-4.2.0.4-java5.patch
Patch59: azureus-4.8.1.2-fix-compile.patch
+Patch60: azureus-4.8.1.2-no-bundled-apache-commons.patch
+
BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis
BuildRequires: apache-commons-cli, log4j
+BuildRequires: apache-commons-lang
BuildRequires: bouncycastle >= 1.33-3
BuildRequires: eclipse-swt >= 3.5
BuildRequires: junit
@@ -124,6 +127,8 @@ rm org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
%patch59 -p1 -b .fix-compile
+%patch60 -p1 -b .no-bundled-apache-commons
+
#hacks to org.eclipse.swt.widgets.Tree2 don't compile.
rm -fR org/eclipse
@@ -136,11 +141,13 @@ rm -fR org/eclipse
sed -i 's/\r//' ChangeLog.txt
chmod 644 *.txt
+#remove bundled libs
+rm -fR org/apache
%build
mkdir -p build/libs
build-jar-repository -p build/libs bcprov apache-commons-cli log4j \
- junit
+ junit apache-commons-lang
#ppc seems to have eclipse-swt.ppc64 installed so libdir can't be used
if [ -e /usr/lib/eclipse/swt.jar ];then
@@ -230,6 +237,9 @@ fi
%{_datadir}/azureus
%changelog
+* Sat Feb 23 2013 David Juran <djuran at redhat.com> - 4.8.1.2-3
+- removed bundeled apache-commons (BZ 820117)
+
* Sun Feb 10 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 4.8.1.2-2
- remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247
- clean up spec to follow current guidelines
More information about the scm-commits
mailing list