10:44 a.m.
The package rpms/xmlrpc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xmlrpc.git/commit/?id=cdbb3caaf48...
https://src.fedoraproject.org/cgit/rpms/xmlrpc.git/commit/?id=b891086adac...
https://src.fedoraproject.org/cgit/rpms/xmlrpc.git/commit/?id=012bef57047....
Change:
+ExcludeArch: s390x ppc64
-ExcludeArch: s390x ppc64 s390
+ExcludeArch: s390x ppc64 s390
Thanks.
Full change:
============
commit 57ad716a389babc878aa8fffd602ce774408926e
Merge: 5319ef0 86ddcbd
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Wed Apr 1 16:26:48 2020 +0100
Merge branch 'eclipse'
commit 86ddcbd5daffcd1a9b62a1c389b0188ac4b7c6e3
Author: Mat Booth <mat.booth(a)redhat.com>
Date: Wed Apr 1 16:26:30 2020 +0100
Add patch for CVE-2019-17570
diff --git a/0001-Javax-Servlet-API.patch b/0001-Javax-Servlet-API.patch
new file mode 100644
index 0000000..c6a4f93
--- /dev/null
+++ b/0001-Javax-Servlet-API.patch
@@ -0,0 +1,264 @@
+From a552fe2cd20c9804d9abcbf5f99533ed9c495fe7 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth(a)redhat.com>
+Date: Tue, 31 Mar 2020 16:58:31 +0100
+Subject: [PATCH 1/6] Javax Servlet API
+
+---
+ dist/pom.xml | 2 +-
+ pom.xml | 4 +-
+ server/pom.xml | 8 ++-
+ .../webserver/HttpServletRequestImpl.java | 54 +++++++++++++++++++
+ .../webserver/HttpServletResponseImpl.java | 26 ++++++++-
+ .../webserver/ServletOutputStreamImpl.java | 5 ++
+ 6 files changed, 94 insertions(+), 5 deletions(-)
+
+diff --git a/dist/pom.xml b/dist/pom.xml
+index 67aded6..590f750 100644
+--- a/dist/pom.xml
++++ b/dist/pom.xml
+@@ -59,7 +59,7 @@
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
++ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+diff --git a/pom.xml b/pom.xml
+index 3933da5..5e18625 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -344,8 +344,8 @@
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.4</version>
++ <artifactId>javax.servlet-api</artifactId>
++ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+diff --git a/server/pom.xml b/server/pom.xml
+index 0d09544..6cbc6e7 100644
+--- a/server/pom.xml
++++ b/server/pom.xml
+@@ -67,6 +67,12 @@
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
++ <exclusions>
++ <exclusion>
++ <groupId>javax.servlet</groupId>
++ <artifactId>servlet-api</artifactId>
++ </exclusion>
++ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+@@ -81,7 +87,7 @@
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
++ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+diff --git a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
+index 3dc7e43..19b14a2 100644
+--- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
++++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
+@@ -31,6 +31,7 @@ import java.net.URLDecoder;
+ import java.security.Principal;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.Collection;
+ import java.util.Enumeration;
+ import java.util.HashMap;
+ import java.util.Iterator;
+@@ -39,10 +40,20 @@ import java.util.Locale;
+ import java.util.Map;
+ import java.util.StringTokenizer;
+
++import javax.servlet.ReadListener;
+ import javax.servlet.RequestDispatcher;
++import javax.servlet.ServletException;
+ import javax.servlet.ServletInputStream;
++import javax.servlet.DispatcherType;
++import javax.servlet.AsyncContext;
++import javax.servlet.ServletContext;
++import javax.servlet.ServletRequest;
++import javax.servlet.ServletResponse;
+ import javax.servlet.http.Cookie;
++import javax.servlet.http.HttpUpgradeHandler;
++import javax.servlet.http.Part;
+ import javax.servlet.http.HttpServletRequest;
++import javax.servlet.http.HttpServletResponse;
+ import javax.servlet.http.HttpSession;
+
+ import org.apache.xmlrpc.common.XmlRpcStreamConfig;
+@@ -66,6 +77,7 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ private String queryString;
+ private String httpVersion;
+ private final Map headers = new HashMap();
++ private final Map parts = new HashMap();
+ private final Map attributes = new HashMap();
+ private Map parameters;
+ private String characterEncoding;
+@@ -97,6 +109,18 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ }
+ return c;
+ }
++
++ public boolean isFinished() {
++ return contentBytesRemaining == 0;
++ }
++
++ public boolean isReady() {
++ return true;
++ }
++
++ public void setReadListener(ReadListener arg0) {
++ throw new IllegalStateException("Not implemented.");
++ }
+ };
+ }
+
+@@ -227,6 +251,12 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ return Collections.enumeration(list);
+ }
+
++ public Part getPart(String name) { throw new IllegalStateException("Not
implemented"); }
++
++ public Collection getParts() { throw new IllegalStateException("Not
implemented"); }
++
++ public boolean authenticate (HttpServletResponse response) { throw new
IllegalStateException("Not implemented"); }
++
+ public int getIntHeader(String pHeader) {
+ String s = getHeader(pHeader);
+ return s == null ? -1 : Integer.parseInt(s);
+@@ -242,6 +272,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+
+ public String getRemoteUser() { throw new IllegalStateException("Not
implemented"); }
+
++ public void login(String username, String password) { throw new
IllegalStateException("Not implemented"); }
++
++ public void logout() { throw new IllegalStateException("Not implemented"); }
++
+ public String getRequestURI() { return uri; }
+
+ public StringBuffer getRequestURL() {
+@@ -280,6 +314,20 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ return sb;
+ }
+
++ public AsyncContext getAsyncContext() { throw new IllegalStateException("Not
implemented"); }
++
++ public boolean isAsyncSupported() { return false; }
++
++ public boolean isAsyncStarted() { return false; }
++
++ public ServletContext getServletContext() { throw new IllegalStateException("Not
implemented"); }
++
++ public AsyncContext startAsync(ServletRequest req, ServletResponse resp) { throw new
IllegalStateException("Not implemented"); }
++
++ public AsyncContext startAsync() { throw new IllegalStateException("Not
implemented"); }
++
++ public DispatcherType getDispatcherType() { throw new IllegalStateException("Not
implemented"); }
++
+ public String getRequestedSessionId() { throw new IllegalStateException("Not
implemented"); }
+
+ public String getServletPath() { return uri; }
+@@ -544,4 +592,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ }
+
+ protected String getHttpVersion() { return httpVersion; }
++
++ public long getContentLengthLong() { throw new IllegalStateException("Not
implemented."); }
++
++ public String changeSessionId() { throw new IllegalStateException("Not
implemented."); }
++
++ public HttpUpgradeHandler upgrade(Class arg0) { throw new
IllegalStateException("Not implemented."); }
+ }
+diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
+index 6ba7018..5319dcf 100644
+--- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
++++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
+@@ -29,6 +29,8 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Locale;
+ import java.util.Map;
++import java.util.Collection;
++import java.util.Collections;
+ import java.util.StringTokenizer;
+
+ import javax.servlet.ServletOutputStream;
+@@ -84,7 +86,7 @@ public class HttpServletResponseImpl implements HttpServletResponse {
+ }
+ }
+
+- private String getHeader(String pHeader) {
++ public String getHeader(String pHeader) {
+ String key = pHeader.toLowerCase();
+ Object o = headers.get(key);
+ if (o == null) {
+@@ -101,6 +103,26 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
+ }
+ }
+
++ public Collection getHeaderNames() {
++ return headers.keySet();
++ }
++
++ public Collection getHeaders(String pHeader) {
++ String key = pHeader.toLowerCase();
++ Object o = headers.get(key);
++ List list;
++ if (o instanceof List) {
++ list = (List) o;
++ } else {
++ list = Collections.singletonList(o);
++ }
++ return list;
++ }
++
++ public int getStatus() {
++ return status;
++ }
++
+ public void addIntHeader(String pHeader, int pValue) {
+ addHeader(pHeader, Integer.toString(pValue));
+ }
+@@ -465,4 +487,6 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
+ sb.append("\r\n");
+ return sb.toString();
+ }
++
++ public void setContentLengthLong(long arg0) { throw new IllegalStateException("Not
implemented."); }
+ }
+diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
+index c2a53b1..86dbbb4 100644
+--- a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
++++ b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
+@@ -22,6 +22,7 @@ import java.io.IOException;
+ import java.io.OutputStream;
+
+ import javax.servlet.ServletOutputStream;
++import javax.servlet.WriteListener;
+
+
+ /** Default implementation of a servlet output stream.
+@@ -99,4 +100,8 @@ class ServletOutputStreamImpl extends ServletOutputStream {
+ boolean isCommitted() {
+ return committed;
+ }
++
++ public boolean isReady() { return true; }
++
++ public void setWriteListener(WriteListener arg0) { throw new
IllegalStateException("Not implemented."); }
+ }
+--
+2.26.0.rc2
+
diff --git a/0002-Add-OSGi-metadata.patch b/0002-Add-OSGi-metadata.patch
new file mode 100644
index 0000000..b3e4c77
--- /dev/null
+++ b/0002-Add-OSGi-metadata.patch
@@ -0,0 +1,74 @@
+From 56ed627f9d69a9c065aab02e8f7d07524d4fa315 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth(a)redhat.com>
+Date: Tue, 31 Mar 2020 17:00:03 +0100
+Subject: [PATCH 2/6] Add OSGi metadata
+
+---
+ client/pom.xml | 11 +++++++++++
+ common/pom.xml | 10 ++++++++++
+ server/pom.xml | 6 ++++++
+ 3 files changed, 27 insertions(+)
+
+diff --git a/client/pom.xml b/client/pom.xml
+index e588657..f31b2d2 100644
+--- a/client/pom.xml
++++ b/client/pom.xml
+@@ -48,6 +48,17 @@
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${project.version}</Implementation-Version>
++ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
++ <Bundle-Name>%Bundle-Name</Bundle-Name>
++ <Bundle-Localization>plugin</Bundle-Localization>
++ <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
++ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.client,
org.apache.xmlrpc.client.util</Export-Package>
++ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
++ <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0,
J2SE-1.3</Bundle-RequiredExecutionEnvironment>
++ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
++ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
+diff --git a/common/pom.xml b/common/pom.xml
+index 5058d50..7a5bf49 100644
+--- a/common/pom.xml
++++ b/common/pom.xml
+@@ -48,6 +48,16 @@
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${project.version}</Implementation-Version>
++ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
++ <Bundle-Name>%Bundle-Name</Bundle-Name>
++ <Bundle-Localization>plugin</Bundle-Localization>
++
<Bundle-SymbolicName>org.apache.xmlrpc.common</Bundle-SymbolicName>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.common,
org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer,
org.apache.xmlrpc.util</Export-Package>
++ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
++ <Bundle-RequiredExecutionEnvironment>J2SE-1.4,
CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
++ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
++ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
+diff --git a/server/pom.xml b/server/pom.xml
+index 6cbc6e7..4c90e50 100644
+--- a/server/pom.xml
++++ b/server/pom.xml
+@@ -48,6 +48,12 @@
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${project.version}</Implementation-Version>
++ <Bundle-ManifestVersion>1</Bundle-ManifestVersion>
++ <Bundle-Name>%Bundle-Name</Bundle-Name>
++
<Bundle-SymbolicName>org.apache.xmlrpc.server</Bundle-SymbolicName>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
++
<Export-Package>org.apache.xmlrpc.server,org.apache.xmlrpc.webserver</Export-Package>
+ </manifestEntries>
+ </archive>
+ </configuration>
+--
+2.26.0.rc2
+
diff --git a/0003-disallow-deserialization-of-ex-serializable-tags.patch
b/0003-disallow-deserialization-of-ex-serializable-tags.patch
new file mode 100644
index 0000000..0b568c7
--- /dev/null
+++ b/0003-disallow-deserialization-of-ex-serializable-tags.patch
@@ -0,0 +1,71 @@
+From febe70f7ca78926660a7d11607a35f663165322a Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth(a)redhat.com>
+Date: Tue, 31 Mar 2020 17:01:29 +0100
+Subject: [PATCH 3/6] disallow deserialization of ex serializable tags
+
+---
+ .../xmlrpc/parser/SerializableParser.java | 8 ++++++
+ .../java/org/apache/xmlrpc/test/BaseTest.java | 28 -------------------
+ 2 files changed, 8 insertions(+), 28 deletions(-)
+
+diff --git a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
+index 18f25ac..c8bb7ed 100644
+--- a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
++++ b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
+@@ -29,6 +29,14 @@ import org.apache.xmlrpc.XmlRpcException;
+ */
+ public class SerializableParser extends ByteArrayParser {
+ public Object getResult() throws XmlRpcException {
++ if
(!"1".equals(System.getProperty("org.apache.xmlrpc.allowInsecureDeserialization")))
{
++ throw new UnsupportedOperationException(
++ "Deserialization of ex:serializable objects is
vulnerable to " +
++ "remote execution attacks and is disabled by default.
" +
++ "If you are sure the source data is trusted, you can
enable " +
++ "it by setting
org.apache.xmlrpc.allowInsecureDeserialization " +
++ "JVM property to 1");
++ }
+ try {
+ byte[] res = (byte[]) super.getResult();
+ ByteArrayInputStream bais = new ByteArrayInputStream(res);
+diff --git a/server/src/test/java/org/apache/xmlrpc/test/BaseTest.java
b/server/src/test/java/org/apache/xmlrpc/test/BaseTest.java
+index 16699a6..6ad4b5e 100644
+--- a/server/src/test/java/org/apache/xmlrpc/test/BaseTest.java
++++ b/server/src/test/java/org/apache/xmlrpc/test/BaseTest.java
+@@ -805,34 +805,6 @@ public class BaseTest extends XmlRpcTestCase {
+ assertTrue(ok);
+ }
+
+- /** Test, whether we can invoke a method, passing an instance of
+- * {@link java.io.Serializable} as a parameter.
+- * @throws Exception The test failed.
+- */
+- public void testSerializableParam() throws Exception {
+- for (int i = 0; i < providers.length; i++) {
+- testSerializableParam(providers[i]);
+- }
+- }
+-
+- private void testSerializableParam(ClientProvider pProvider) throws Exception {
+- final String methodName = "Remote.serializableParam";
+- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+- cal.set(2005, 5, 23, 8, 4, 0);
+- cal.set(Calendar.MILLISECOND, 5);
+- final Object[] params = new Object[]{new Remote.CalendarWrapper(cal)};
+- final XmlRpcClient client = pProvider.getClient();
+- Object result = client.execute(getExConfig(pProvider), methodName, params);
+- assertEquals(new Long(cal.getTime().getTime()), result);
+- boolean ok = false;
+- try {
+- client.execute(getConfig(pProvider), methodName, params);
+- } catch (XmlRpcExtensionException e) {
+- ok = true;
+- }
+- assertTrue(ok);
+- }
+-
+ /** Tests, whether we can invoke a method, passing an instance of
+ * {@link Calendar} as a parameter.
+ * @throws Exception The test failed.
+--
+2.26.0.rc2
+
diff --git a/0004-disallow-loading-external-dtd.patch
b/0004-disallow-loading-external-dtd.patch
new file mode 100644
index 0000000..f522b77
--- /dev/null
+++ b/0004-disallow-loading-external-dtd.patch
@@ -0,0 +1,30 @@
+From 2c16d38ab18039327b2575f61c3035683f16cd7d Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth(a)redhat.com>
+Date: Tue, 31 Mar 2020 17:02:12 +0100
+Subject: [PATCH 4/6] disallow loading external dtd
+
+---
+ .../src/main/java/org/apache/xmlrpc/util/SAXParsers.java | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
+index b1034e7..49ef5de 100644
+--- a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
++++ b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
+@@ -48,6 +48,13 @@ public class SAXParsers {
+ } catch (org.xml.sax.SAXException e) {
+ // Ignore it
+ }
++ try {
++
spf.setFeature("http://apache.org/xml/features/nonvalidating/load-ex...;,
false);
++ } catch (javax.xml.parsers.ParserConfigurationException e) {
++ // Ignore it
++ } catch (org.xml.sax.SAXException e) {
++ // Ignore it
++ }
+ }
+
+ /** Creates a new instance of {@link XMLReader}.
+--
+2.26.0.rc2
+
diff --git a/0005-Remove-dep-on-ancient-commons-httpclient.patch
b/0005-Remove-dep-on-ancient-commons-httpclient.patch
new file mode 100644
index 0000000..1629c5a
--- /dev/null
+++ b/0005-Remove-dep-on-ancient-commons-httpclient.patch
@@ -0,0 +1,466 @@
+From 77f696a95873c6bd8cac9254579838db556044a6 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth(a)redhat.com>
+Date: Tue, 31 Mar 2020 17:18:53 +0100
+Subject: [PATCH 5/6] Remove dep on ancient commons httpclient
+
+---
+ client/pom.xml | 4 -
+ .../xmlrpc/client/XmlRpcCommonsTransport.java | 262 ------------------
+ .../client/XmlRpcCommonsTransportFactory.java | 66 -----
+ pom.xml | 6 -
+ server/pom.xml | 5 -
+ .../apache/xmlrpc/test/CommonsProvider.java | 41 ---
+ .../apache/xmlrpc/test/XmlRpcTestCase.java | 1 -
+ 7 files changed, 385 deletions(-)
+ delete mode 100644
client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
+ delete mode 100644
client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.java
+ delete mode 100644 server/src/test/java/org/apache/xmlrpc/test/CommonsProvider.java
+
+diff --git a/client/pom.xml b/client/pom.xml
+index f31b2d2..b78ede0 100644
+--- a/client/pom.xml
++++ b/client/pom.xml
+@@ -72,9 +72,5 @@
+ <artifactId>xmlrpc-common</artifactId>
+ <version>3.1.3</version>
+ </dependency>
+- <dependency>
+- <groupId>commons-httpclient</groupId>
+- <artifactId>commons-httpclient</artifactId>
+- </dependency>
+ </dependencies>
+ </project>
+diff --git a/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
b/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
+deleted file mode 100644
+index 1e60ceb..0000000
+--- a/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransport.java
++++ /dev/null
+@@ -1,262 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- */
+-package org.apache.xmlrpc.client;
+-
+-import java.io.BufferedOutputStream;
+-import java.io.FilterOutputStream;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.OutputStream;
+-
+-import org.apache.commons.httpclient.Credentials;
+-import org.apache.commons.httpclient.Header;
+-import org.apache.commons.httpclient.HttpClient;
+-import org.apache.commons.httpclient.HttpException;
+-import org.apache.commons.httpclient.HttpMethod;
+-import org.apache.commons.httpclient.HttpStatus;
+-import org.apache.commons.httpclient.HttpVersion;
+-import org.apache.commons.httpclient.URI;
+-import org.apache.commons.httpclient.URIException;
+-import org.apache.commons.httpclient.UsernamePasswordCredentials;
+-import org.apache.commons.httpclient.auth.AuthScope;
+-import org.apache.commons.httpclient.methods.PostMethod;
+-import org.apache.commons.httpclient.methods.RequestEntity;
+-import org.apache.commons.httpclient.params.HttpMethodParams;
+-import org.apache.xmlrpc.XmlRpcException;
+-import org.apache.xmlrpc.XmlRpcRequest;
+-import org.apache.xmlrpc.common.XmlRpcStreamConfig;
+-import org.apache.xmlrpc.common.XmlRpcStreamRequestConfig;
+-import org.apache.xmlrpc.util.HttpUtil;
+-import org.apache.xmlrpc.util.XmlRpcIOException;
+-import org.xml.sax.SAXException;
+-
+-
+-/** An HTTP transport factory, which is based on the Jakarta Commons
+- * HTTP Client.
+- */
+-public class XmlRpcCommonsTransport extends XmlRpcHttpTransport {
+- /**
+- * Maximum number of allowed redirects.
+- */
+- private static final int MAX_REDIRECT_ATTEMPTS = 100;
+-
+- protected final HttpClient client;
+- private static final String userAgent = USER_AGENT + " (Jakarta Commons httpclient
Transport)";
+- protected PostMethod method;
+- private int contentLength = -1;
+- private XmlRpcHttpClientConfig config;
+-
+- /** Creates a new instance.
+- * @param pFactory The factory, which created this transport.
+- */
+- public XmlRpcCommonsTransport(XmlRpcCommonsTransportFactory pFactory) {
+- super(pFactory.getClient(), userAgent);
+- HttpClient httpClient = pFactory.getHttpClient();
+- if (httpClient == null) {
+- httpClient = newHttpClient();
+- }
+- client = httpClient;
+- }
+-
+- protected void setContentLength(int pLength) {
+- contentLength = pLength;
+- }
+-
+- protected HttpClient newHttpClient() {
+- return new HttpClient();
+- }
+-
+- protected void initHttpHeaders(XmlRpcRequest pRequest) throws XmlRpcClientException
{
+- config = (XmlRpcHttpClientConfig) pRequest.getConfig();
+- method = newPostMethod(config);
+- super.initHttpHeaders(pRequest);
+-
+- if (config.getConnectionTimeout() != 0)
+-
client.getHttpConnectionManager().getParams().setConnectionTimeout(config.getConnectionTimeout());
+-
+- if (config.getReplyTimeout() != 0)
+-
client.getHttpConnectionManager().getParams().setSoTimeout(config.getReplyTimeout());
+-
+- method.getParams().setVersion(HttpVersion.HTTP_1_1);
+- }
+-
+- protected PostMethod newPostMethod(XmlRpcHttpClientConfig pConfig) {
+- return new PostMethod(pConfig.getServerURL().toString());
+- }
+-
+- protected void setRequestHeader(String pHeader, String pValue) {
+- method.setRequestHeader(new Header(pHeader, pValue));
+- }
+-
+- protected boolean isResponseGzipCompressed() {
+- Header h = method.getResponseHeader( "Content-Encoding" );
+- if (h == null) {
+- return false;
+- } else {
+- return HttpUtil.isUsingGzipEncoding(h.getValue());
+- }
+- }
+-
+- protected InputStream getInputStream() throws XmlRpcException {
+- try {
+- checkStatus(method);
+- return method.getResponseBodyAsStream();
+- } catch (HttpException e) {
+- throw new XmlRpcClientException("Error in HTTP transport: " +
e.getMessage(), e);
+- } catch (IOException e) {
+- throw new XmlRpcClientException("I/O error in server communication: " +
e.getMessage(), e);
+- }
+- }
+-
+- protected void setCredentials(XmlRpcHttpClientConfig pConfig) throws
XmlRpcClientException {
+- String userName = pConfig.getBasicUserName();
+- if (userName != null) {
+- String enc = pConfig.getBasicEncoding();
+- if (enc == null) {
+- enc = XmlRpcStreamConfig.UTF8_ENCODING;
+- }
+- client.getParams().setParameter(HttpMethodParams.CREDENTIAL_CHARSET, enc);
+- Credentials creds = new UsernamePasswordCredentials(userName,
pConfig.getBasicPassword());
+- AuthScope scope = new AuthScope(null, AuthScope.ANY_PORT, null,
AuthScope.ANY_SCHEME);
+- client.getState().setCredentials(scope, creds);
+- client.getParams().setAuthenticationPreemptive(true);
+- }
+- }
+-
+- protected void close() throws XmlRpcClientException {
+- method.releaseConnection();
+- }
+-
+- protected boolean isResponseGzipCompressed(XmlRpcStreamRequestConfig pConfig) {
+- Header h = method.getResponseHeader( "Content-Encoding" );
+- if (h == null) {
+- return false;
+- } else {
+- return HttpUtil.isUsingGzipEncoding(h.getValue());
+- }
+- }
+-
+- protected boolean isRedirectRequired() {
+- switch (method.getStatusCode()) {
+- case HttpStatus.SC_MOVED_TEMPORARILY:
+- case HttpStatus.SC_MOVED_PERMANENTLY:
+- case HttpStatus.SC_SEE_OTHER:
+- case HttpStatus.SC_TEMPORARY_REDIRECT:
+- return true;
+- default:
+- return false;
+- }
+- }
+-
+- protected void resetClientForRedirect()
+- throws XmlRpcException {
+- //get the location header to find out where to redirect to
+- Header locationHeader = method.getResponseHeader("location");
+- if (locationHeader == null) {
+- throw new XmlRpcException("Invalid redirect: Missing location
header");
+- }
+- String location = locationHeader.getValue();
+-
+- URI redirectUri = null;
+- URI currentUri = null;
+- try {
+- currentUri = method.getURI();
+- String charset = currentUri.getProtocolCharset();
+- redirectUri = new URI(location, true, charset);
+- method.setURI(redirectUri);
+- } catch (URIException ex) {
+- throw new XmlRpcException(ex.getMessage(), ex);
+- }
+-
+- //And finally invalidate the actual authentication scheme
+- method.getHostAuthState().invalidate();
+- }
+-
+- protected void writeRequest(final ReqWriter pWriter) throws XmlRpcException {
+- method.setRequestEntity(new RequestEntity(){
+- public boolean isRepeatable() { return true; }
+- public void writeRequest(OutputStream pOut) throws IOException {
+- try {
+- /* Make sure, that the socket is not closed by replacing it with
our
+- * own BufferedOutputStream.
+- */
+- OutputStream ostream;
+- if (isUsingByteArrayOutput(config)) {
+- // No need to buffer the output.
+- ostream = new FilterOutputStream(pOut){
+- public void close() throws IOException {
+- flush();
+- }
+- };
+- } else {
+- ostream = new BufferedOutputStream(pOut){
+- public void close() throws IOException {
+- flush();
+- }
+- };
+- }
+- pWriter.write(ostream);
+- } catch (XmlRpcException e) {
+- throw new XmlRpcIOException(e);
+- } catch (SAXException e) {
+- throw new XmlRpcIOException(e);
+- }
+- }
+- public long getContentLength() { return contentLength; }
+- public String getContentType() { return "text/xml"; }
+- });
+- try {
+- int redirectAttempts = 0;
+- for (;;) {
+- client.executeMethod(method);
+- if (!isRedirectRequired()) {
+- break;
+- }
+- if (redirectAttempts++ > MAX_REDIRECT_ATTEMPTS) {
+- throw new XmlRpcException("Too many redirects.");
+- }
+- resetClientForRedirect();
+- }
+- } catch (XmlRpcIOException e) {
+- Throwable t = e.getLinkedException();
+- if (t instanceof XmlRpcException) {
+- throw (XmlRpcException) t;
+- } else {
+- throw new XmlRpcException("Unexpected exception: " + t.getMessage(), t);
+- }
+- } catch (IOException e) {
+- throw new XmlRpcException("I/O error while communicating with HTTP server:
" + e.getMessage(), e);
+- }
+- }
+-
+- /**
+- * Check the status of the HTTP request and throw an XmlRpcHttpTransportException if
it
+- * indicates that there is an error.
+- * @param pMethod the method that has been executed
+- * @throws XmlRpcHttpTransportException if the status of the method indicates that
there is an error.
+- */
+- private void checkStatus(HttpMethod pMethod) throws XmlRpcHttpTransportException {
+- final int status = pMethod.getStatusCode();
+-
+- // All status codes except SC_OK are handled as errors. Perhaps some should
require special handling (e.g., SC_UNAUTHORIZED)
+- if (status < 200 || status > 299) {
+- throw new XmlRpcHttpTransportException(status, pMethod.getStatusText());
+- }
+- }
+-}
+diff --git
a/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.java
b/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.java
+deleted file mode 100644
+index 630d5b4..0000000
+--- a/client/src/main/java/org/apache/xmlrpc/client/XmlRpcCommonsTransportFactory.java
++++ /dev/null
+@@ -1,66 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- */
+-package org.apache.xmlrpc.client;
+-
+-import org.apache.commons.httpclient.HttpClient;
+-
+-
+-/** An HTTP transport factory, which is based on the Jakarta Commons
+- * HTTP Client.
+- */
+-public class XmlRpcCommonsTransportFactory extends XmlRpcTransportFactoryImpl {
+- private HttpClient httpClient;
+-
+- /** Creates a new instance.
+- * @param pClient The client, which is controlling the factory.
+- */
+- public XmlRpcCommonsTransportFactory(XmlRpcClient pClient) {
+- super(pClient);
+- }
+-
+- public XmlRpcTransport getTransport() {
+- return new XmlRpcCommonsTransport(this);
+- }
+-
+- /**
+- * <p>Sets the factories {@link HttpClient}. By default, a new instance
+- * of {@link HttpClient} is created for any request.</p>
+- * <p>Reusing the {@link HttpClient} is required, if you want to preserve
+- * some state between requests. This applies, in particular, if you want
+- * to use cookies: In that case, create an instance of {@link HttpClient},
+- * give it to the factory, and use {@link HttpClient#getState()} to
+- * read or set cookies.
+- */
+- public void setHttpClient(HttpClient pHttpClient) {
+- httpClient = pHttpClient;
+- }
+-
+- /**
+- * <p>Returns the factories {@link HttpClient}. By default, a new instance
+- * of {@link HttpClient} is created for any request.</p>
+- * <p>Reusing the {@link HttpClient} is required, if you want to preserve
+- * some state between requests. This applies, in particular, if you want
+- * to use cookies: In that case, create an instance of {@link HttpClient},
+- * give it to the factory, and use {@link HttpClient#getState()} to
+- * read or set cookies.
+- */
+- public HttpClient getHttpClient() {
+- return httpClient;
+- }
+-}
+diff --git a/pom.xml b/pom.xml
+index 5e18625..55cc6a8 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -321,12 +321,6 @@
+
+ <dependencyManagement>
+ <dependencies>
+- <dependency>
+- <groupId>commons-httpclient</groupId>
+- <artifactId>commons-httpclient</artifactId>
+- <version>3.0.1</version>
+- <scope>provided</scope>
+- </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+diff --git a/server/pom.xml b/server/pom.xml
+index 4c90e50..84234ff 100644
+--- a/server/pom.xml
++++ b/server/pom.xml
+@@ -95,10 +95,5 @@
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+- <dependency>
+- <groupId>commons-httpclient</groupId>
+- <artifactId>commons-httpclient</artifactId>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+ </project>
+diff --git a/server/src/test/java/org/apache/xmlrpc/test/CommonsProvider.java
b/server/src/test/java/org/apache/xmlrpc/test/CommonsProvider.java
+deleted file mode 100644
+index 2551a59..0000000
+--- a/server/src/test/java/org/apache/xmlrpc/test/CommonsProvider.java
++++ /dev/null
+@@ -1,41 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one
+- * or more contributor license agreements. See the NOTICE file
+- * distributed with this work for additional information
+- * regarding copyright ownership. The ASF licenses this file
+- * to you under the Apache License, Version 2.0 (the
+- * "License"); you may not use this file except in compliance
+- * with the License. You may obtain a copy of the License at
+- *
+- * http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing,
+- * software distributed under the License is distributed on an
+- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+- * KIND, either express or implied. See the License for the
+- * specific language governing permissions and limitations
+- * under the License.
+- */
+-package org.apache.xmlrpc.test;
+-
+-import org.apache.xmlrpc.client.XmlRpcClient;
+-import org.apache.xmlrpc.client.XmlRpcCommonsTransportFactory;
+-import org.apache.xmlrpc.client.XmlRpcTransportFactory;
+-import org.apache.xmlrpc.server.XmlRpcHandlerMapping;
+-
+-
+-/** Provider for testing the
+- * {@link org.apache.xmlrpc.client.XmlRpcCommonsTransport}.
+- */
+-public class CommonsProvider extends WebServerProvider {
+- /** Creates a new instance.
+- * @param pMapping The test servers handler mapping.
+- */
+- public CommonsProvider(XmlRpcHandlerMapping pMapping) {
+- super(pMapping, true);
+- }
+-
+- protected XmlRpcTransportFactory getTransportFactory(XmlRpcClient pClient) {
+- return new XmlRpcCommonsTransportFactory(pClient);
+- }
+-}
+diff --git a/server/src/test/java/org/apache/xmlrpc/test/XmlRpcTestCase.java
b/server/src/test/java/org/apache/xmlrpc/test/XmlRpcTestCase.java
+index a9d1fbf..de06406 100644
+--- a/server/src/test/java/org/apache/xmlrpc/test/XmlRpcTestCase.java
++++ b/server/src/test/java/org/apache/xmlrpc/test/XmlRpcTestCase.java
+@@ -75,7 +75,6 @@ public abstract class XmlRpcTestCase extends TestCase {
+ // new LiteTransportProvider(mapping, false), Doesn't support
HTTP/1.1
+ new SunHttpTransportProvider(pMapping, true),
+ new SunHttpTransportProvider(pMapping, false),
+- new CommonsProvider(pMapping),
+ new ServletWebServerProvider(pMapping, true),
+ new ServletWebServerProvider(pMapping, false)
+ };
+--
+2.26.0.rc2
+
diff --git a/0006-Fix-for-CVE-2019-17570.patch b/0006-Fix-for-CVE-2019-17570.patch
new file mode 100644
index 0000000..8a93dc5
--- /dev/null
+++ b/0006-Fix-for-CVE-2019-17570.patch
@@ -0,0 +1,52 @@
+From 1594395df534d60133d98884c9d9f5eb92d0652e Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth(a)redhat.com>
+Date: Wed, 1 Apr 2020 10:21:03 +0100
+Subject: [PATCH 6/6] Fix for CVE-2019-17570
+
+Deserialization of server-side exception from faultCause in XMLRPC error response
+---
+ .../xmlrpc/parser/XmlRpcResponseParser.java | 28 ++++++++++---------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/common/src/main/java/org/apache/xmlrpc/parser/XmlRpcResponseParser.java
b/common/src/main/java/org/apache/xmlrpc/parser/XmlRpcResponseParser.java
+index 087572b..f1b2427 100644
+--- a/common/src/main/java/org/apache/xmlrpc/parser/XmlRpcResponseParser.java
++++ b/common/src/main/java/org/apache/xmlrpc/parser/XmlRpcResponseParser.java
+@@ -69,19 +69,21 @@ public class XmlRpcResponseParser extends RecursiveTypeParserImpl {
+ getDocumentLocator());
+ }
+ errorMessage = (String) map.get("faultString");
+- Object exception = map.get("faultCause");
+- if (exception != null) {
+- try {
+- byte[] bytes = (byte[]) exception;
+- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+- ObjectInputStream ois = new ObjectInputStream(bais);
+- errorCause = (Throwable) ois.readObject();
+- ois.close();
+- bais.close();
+- } catch (Throwable t) {
+- // Ignore me
+- }
+- }
++ if (((XmlRpcStreamRequestConfig)cfg).isEnabledForExceptions()) {
++ Object exception = map.get("faultCause");
++ if (exception != null) {
++ try {
++ byte[] bytes = (byte[]) exception;
++ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
++ ObjectInputStream ois = new ObjectInputStream(bais);
++ errorCause = (Throwable) ois.readObject();
++ ois.close();
++ bais.close();
++ } catch (Throwable t) {
++ // Ignore me
++ }
++ }
++ }
+ }
+ }
+
+--
+2.26.0.rc2
+
diff --git a/changelog-pre3.x.txt b/changelog-pre3.x.txt
deleted file mode 100644
index 9cef632..0000000
--- a/changelog-pre3.x.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-12
-- Migrate to new tomcat-servlet-api
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Dec 21 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-9
-- Require java >= 1:1.6.0
-- Fix classpaths to ensure building of all optional features
-- Remove stale patch
-
-* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-8
-- Migrate from old servlet api to new one
-
-* Thu Dec 9 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-7
-- Remove gcj support
-- Make jars/javadocs versionless
-- Add ws-commons-util Requires
-- Use apache-commons-codec
-- Drop unneeded patch for jsse
-
-* Thu Mar 11 2010 Peter Lemenkov <lemenkov(a)gmail.com> - 0:2.0.1-6.6
-- Added missing requires jpackage-utils
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-6.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-5.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4.5
-- drop repotag
-
-* Thu May 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4jpp.4
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> -
0:2.0.1-4jpp.3
-- Autorebuild for GCC 4.3
-
-* Tue Mar 27 2007 Matt Wringe <mwringe(a)redhat.com> 0:2.0.1-3jpp.3
-- Spec file clean up for Fedora Extras Review
-
-* Thu Mar 08 2007 Deepak Bhole <dbhole(a)redhat.com> 2.0.1-3jpp.2
-- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
-- Minor spec file cleanup
-
-* Fri Aug 04 2006 Vivek Lakshmanan <vivekl(a)redhat.com> - 0:2.0.1-3jpp.1
-- Merge with latest from JPP.
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub(a)redhat.com> - 0:2.0.1-1jpp_8.2fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_8.1fc
-- rebuild
-
-* Wed Mar 8 2006 Rafael Schloming <rafaels(a)redhat.com> - 0:2.0.1-1jpp_7fc
-- excluded s390 due to eclipse
-
-* Mon Mar 6 2006 Jeremy Katz <katzj(a)redhat.com> - 0:2.0.1-1jpp_6fc
-- stop scriptlet spew
-
-* Fri Feb 24 2006 Igor Foox <ifoox(a)redhat.com> - 0:2.0.1-1jpp_5fc
-- Added post/postun dependency on coreutils.
-
-* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_4fc
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_3fc
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Jan 25 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_2fc
-- ExcludeArch s390x and ppc64
-
-* Wed Jan 18 2006 Andrew Overholt <overholt(a)redhat.com> 0:2.0.1-1jpp_2fc
-- Comment out JPackage Distribution and Vendor tags
-
-* Wed Jan 18 2006 Jesse Keating <jkeating(a)redhat.com> 0:2.0.1-1jpp_2fc
-- bump for test
-
-* Wed Jan 18 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_1fc
-- Update to version 2.0.1
-- Natively compile
-
-* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2-0.b1.3jpp
-- Build with ant-1.6.2
-
-* Thu Apr 29 2004 David Walluck <david(a)jpackage.org> 0:1.2-0.b1.2jpp
-- add jar symlinks
-- remove %%buildroot in %%install
-
-* Tue May 06 2003 David Walluck <david(a)anti-microsoft.org> 0:1.2-0.b1.1jpp
-- 1.2-b1
-- update for JPackage 1.5
-
-* Mon Mar 18 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.1-1jpp
-- 1.1
-- generic servlet support
-- used source release
-- dropped patch
-- added applet jar
-
-* Mon Jan 21 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-3jpp
-- versioned dir for javadoc
-- no dependencies for javadoc package
-- dropped jsse package
-- adaptation to new servlet3 package
-- adaptation to new jsse package
-- section macro
-
-* Fri Dec 7 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-2jpp
-- javadoc into javadoc package
-
-* Sat Nov 3 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-1jpp
-- first JPackage release
diff --git a/xmlrpc-client-addosgimanifest.patch b/xmlrpc-client-addosgimanifest.patch
deleted file mode 100644
index 437d78f..0000000
--- a/xmlrpc-client-addosgimanifest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pom.xml.sav 2010-02-06 17:44:57.000000000 +0200
-+++ pom.xml 2010-09-29 09:27:06.194857352 +0300
-@@ -48,6 +48,17 @@
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Version>${project.version}</Implementation-Version>
-+ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-+ <Bundle-Name>%Bundle-Name</Bundle-Name>
-+ <Bundle-Localization>plugin</Bundle-Localization>
-+ <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
-+ <Bundle-Version>${project.version}</Bundle-Version>
-+ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
-+ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.client,
org.apache.xmlrpc.client.util</Export-Package>
-+ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
-+ <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0,
J2SE-1.3</Bundle-RequiredExecutionEnvironment>
-+ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
-+ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
diff --git a/xmlrpc-common-addosgimanifest.patch b/xmlrpc-common-addosgimanifest.patch
deleted file mode 100644
index 4d4aeca..0000000
--- a/xmlrpc-common-addosgimanifest.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- pom.xml.sav 2010-02-06 17:44:50.000000000 +0200
-+++ pom.xml 2010-09-29 09:30:38.857857644 +0300
-@@ -48,6 +48,16 @@
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Version>${project.version}</Implementation-Version>
-+ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-+ <Bundle-Name>%Bundle-Name</Bundle-Name>
-+ <Bundle-Localization>plugin</Bundle-Localization>
-+
<Bundle-SymbolicName>org.apache.xmlrpc.common</Bundle-SymbolicName>
-+ <Bundle-Version>${project.version}</Bundle-Version>
-+ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.common,
org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer,
org.apache.xmlrpc.util</Export-Package>
-+ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
-+ <Bundle-RequiredExecutionEnvironment>J2SE-1.4,
CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
-+ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
-+ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
diff --git a/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
b/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
deleted file mode 100644
index 53a0a98..0000000
--- a/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 495d6136d9de5c0bbddadffe11b0841c6aafcb34 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek(a)redhat.com>
-Date: Fri, 18 May 2018 15:22:49 +0200
-Subject: [PATCH 1/2] Disallow deserialization of <ex:serializable> tags
-
-Can be reenabled by setting JVM property
-org.apache.xmlrpc.allowInsecureDeserialization to 1.
-
-- Resolves CVE-2016-5003
----
- .../java/org/apache/xmlrpc/parser/SerializableParser.java | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
-index 18f25ac..c8bb7ed 100644
---- a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
-+++ b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
-@@ -29,6 +29,14 @@ import org.apache.xmlrpc.XmlRpcException;
- */
- public class SerializableParser extends ByteArrayParser {
- public Object getResult() throws XmlRpcException {
-+ if
(!"1".equals(System.getProperty("org.apache.xmlrpc.allowInsecureDeserialization")))
{
-+ throw new UnsupportedOperationException(
-+ "Deserialization of ex:serializable objects is
vulnerable to " +
-+ "remote execution attacks and is disabled by default.
" +
-+ "If you are sure the source data is trusted, you can
enable " +
-+ "it by setting
org.apache.xmlrpc.allowInsecureDeserialization " +
-+ "JVM property to 1");
-+ }
- try {
- byte[] res = (byte[]) super.getResult();
- ByteArrayInputStream bais = new ByteArrayInputStream(res);
---
-2.17.0
-
diff --git a/xmlrpc-disallow-loading-external-dtd.patch
b/xmlrpc-disallow-loading-external-dtd.patch
deleted file mode 100644
index f59b9c0..0000000
--- a/xmlrpc-disallow-loading-external-dtd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 338ab231b228bd36afda4ab31db724c6669579b2 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek(a)redhat.com>
-Date: Tue, 22 May 2018 10:53:28 +0200
-Subject: [PATCH 2/2] Disallow loading external DTD
-
----
- .../src/main/java/org/apache/xmlrpc/util/SAXParsers.java | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
-index b1034e7..49ef5de 100644
---- a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
-+++ b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
-@@ -48,6 +48,13 @@ public class SAXParsers {
- } catch (org.xml.sax.SAXException e) {
- // Ignore it
- }
-+ try {
-+
spf.setFeature("http://apache.org/xml/features/nonvalidating/load-ex...;,
false);
-+ } catch (javax.xml.parsers.ParserConfigurationException e) {
-+ // Ignore it
-+ } catch (org.xml.sax.SAXException e) {
-+ // Ignore it
-+ }
- }
-
- /** Creates a new instance of {@link XMLReader}.
---
-2.17.0
-
diff --git a/xmlrpc-javax-methods.patch b/xmlrpc-javax-methods.patch
deleted file mode 100644
index 0c66b6c..0000000
--- a/xmlrpc-javax-methods.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-From d6834da0b1556bb133a534d31bb94d08f38fa195 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
-Date: Mon, 16 Jun 2014 10:03:35 +0200
-Subject: [PATCH] Use servlet 3.1.0 API
-
----
- dist/pom.xml | 2 +-
- pom.xml | 4 +-
- server/pom.xml | 8 +++-
- .../xmlrpc/webserver/HttpServletRequestImpl.java | 54 ++++++++++++++++++++++
- .../xmlrpc/webserver/HttpServletResponseImpl.java | 26 ++++++++++-
- .../xmlrpc/webserver/ServletOutputStreamImpl.java | 5 ++
- 6 files changed, 94 insertions(+), 5 deletions(-)
-
-diff --git a/dist/pom.xml b/dist/pom.xml
-index 67aded6..c18c2eb 100644
---- a/dist/pom.xml
-+++ b/dist/pom.xml
-@@ -59,7 +59,7 @@
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
-- <artifactId>servlet-api</artifactId>
-+ <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
-diff --git a/pom.xml b/pom.xml
-index 3933da5..70c508e 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -344,8 +344,8 @@
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
-- <artifactId>servlet-api</artifactId>
-- <version>2.4</version>
-+ <artifactId>javax.servlet-api</artifactId>
-+ <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
-diff --git a/server/pom.xml b/server/pom.xml
-index 0d09544..01288c8 100644
---- a/server/pom.xml
-+++ b/server/pom.xml
-@@ -67,6 +67,12 @@
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>javax.servlet</groupId>
-+ <artifactId>servlet-api</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
-@@ -81,7 +87,7 @@
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
-- <artifactId>servlet-api</artifactId>
-+ <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
-diff --git a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
-index 3dc7e43..19b14a2 100644
---- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
-+++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
-@@ -31,6 +31,7 @@ import java.net.URLDecoder;
- import java.security.Principal;
- import java.util.ArrayList;
- import java.util.Collections;
-+import java.util.Collection;
- import java.util.Enumeration;
- import java.util.HashMap;
- import java.util.Iterator;
-@@ -39,10 +40,20 @@ import java.util.Locale;
- import java.util.Map;
- import java.util.StringTokenizer;
-
-+import javax.servlet.ReadListener;
- import javax.servlet.RequestDispatcher;
-+import javax.servlet.ServletException;
- import javax.servlet.ServletInputStream;
-+import javax.servlet.DispatcherType;
-+import javax.servlet.AsyncContext;
-+import javax.servlet.ServletContext;
-+import javax.servlet.ServletRequest;
-+import javax.servlet.ServletResponse;
- import javax.servlet.http.Cookie;
-+import javax.servlet.http.HttpUpgradeHandler;
-+import javax.servlet.http.Part;
- import javax.servlet.http.HttpServletRequest;
-+import javax.servlet.http.HttpServletResponse;
- import javax.servlet.http.HttpSession;
-
- import org.apache.xmlrpc.common.XmlRpcStreamConfig;
-@@ -66,6 +77,7 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- private String queryString;
- private String httpVersion;
- private final Map headers = new HashMap();
-+ private final Map parts = new HashMap();
- private final Map attributes = new HashMap();
- private Map parameters;
- private String characterEncoding;
-@@ -97,6 +109,18 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- }
- return c;
- }
-+
-+ public boolean isFinished() {
-+ return contentBytesRemaining == 0;
-+ }
-+
-+ public boolean isReady() {
-+ return true;
-+ }
-+
-+ public void setReadListener(ReadListener arg0) {
-+ throw new IllegalStateException("Not implemented.");
-+ }
- };
- }
-
-@@ -227,6 +251,12 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- return Collections.enumeration(list);
- }
-
-+ public Part getPart(String name) { throw new IllegalStateException("Not
implemented"); }
-+
-+ public Collection getParts() { throw new IllegalStateException("Not
implemented"); }
-+
-+ public boolean authenticate (HttpServletResponse response) { throw new
IllegalStateException("Not implemented"); }
-+
- public int getIntHeader(String pHeader) {
- String s = getHeader(pHeader);
- return s == null ? -1 : Integer.parseInt(s);
-@@ -242,6 +272,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
-
- public String getRemoteUser() { throw new IllegalStateException("Not
implemented"); }
-
-+ public void login(String username, String password) { throw new
IllegalStateException("Not implemented"); }
-+
-+ public void logout() { throw new IllegalStateException("Not implemented"); }
-+
- public String getRequestURI() { return uri; }
-
- public StringBuffer getRequestURL() {
-@@ -280,6 +314,20 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- return sb;
- }
-
-+ public AsyncContext getAsyncContext() { throw new IllegalStateException("Not
implemented"); }
-+
-+ public boolean isAsyncSupported() { return false; }
-+
-+ public boolean isAsyncStarted() { return false; }
-+
-+ public ServletContext getServletContext() { throw new IllegalStateException("Not
implemented"); }
-+
-+ public AsyncContext startAsync(ServletRequest req, ServletResponse resp) { throw new
IllegalStateException("Not implemented"); }
-+
-+ public AsyncContext startAsync() { throw new IllegalStateException("Not
implemented"); }
-+
-+ public DispatcherType getDispatcherType() { throw new IllegalStateException("Not
implemented"); }
-+
- public String getRequestedSessionId() { throw new IllegalStateException("Not
implemented"); }
-
- public String getServletPath() { return uri; }
-@@ -544,4 +592,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- }
-
- protected String getHttpVersion() { return httpVersion; }
-+
-+ public long getContentLengthLong() { throw new IllegalStateException("Not
implemented."); }
-+
-+ public String changeSessionId() { throw new IllegalStateException("Not
implemented."); }
-+
-+ public HttpUpgradeHandler upgrade(Class arg0) { throw new
IllegalStateException("Not implemented."); }
- }
-diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
-index 6ba7018..5319dcf 100644
---- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
-+++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
-@@ -29,6 +29,8 @@ import java.util.Iterator;
- import java.util.List;
- import java.util.Locale;
- import java.util.Map;
-+import java.util.Collection;
-+import java.util.Collections;
- import java.util.StringTokenizer;
-
- import javax.servlet.ServletOutputStream;
-@@ -84,7 +86,7 @@ public class HttpServletResponseImpl implements HttpServletResponse {
- }
- }
-
-- private String getHeader(String pHeader) {
-+ public String getHeader(String pHeader) {
- String key = pHeader.toLowerCase();
- Object o = headers.get(key);
- if (o == null) {
-@@ -101,6 +103,26 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
- }
- }
-
-+ public Collection getHeaderNames() {
-+ return headers.keySet();
-+ }
-+
-+ public Collection getHeaders(String pHeader) {
-+ String key = pHeader.toLowerCase();
-+ Object o = headers.get(key);
-+ List list;
-+ if (o instanceof List) {
-+ list = (List) o;
-+ } else {
-+ list = Collections.singletonList(o);
-+ }
-+ return list;
-+ }
-+
-+ public int getStatus() {
-+ return status;
-+ }
-+
- public void addIntHeader(String pHeader, int pValue) {
- addHeader(pHeader, Integer.toString(pValue));
- }
-@@ -465,4 +487,6 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
- sb.append("\r\n");
- return sb.toString();
- }
-+
-+ public void setContentLengthLong(long arg0) { throw new IllegalStateException("Not
implemented."); }
- }
-diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
-index c2a53b1..86dbbb4 100644
---- a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
-+++ b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
-@@ -22,6 +22,7 @@ import java.io.IOException;
- import java.io.OutputStream;
-
- import javax.servlet.ServletOutputStream;
-+import javax.servlet.WriteListener;
-
-
- /** Default implementation of a servlet output stream.
-@@ -99,4 +100,8 @@ class ServletOutputStreamImpl extends ServletOutputStream {
- boolean isCommitted() {
- return committed;
- }
-+
-+ public boolean isReady() { return true; }
-+
-+ public void setWriteListener(WriteListener arg0) { throw new
IllegalStateException("Not implemented."); }
- }
---
-1.9.3
-
diff --git a/xmlrpc-server-addosgimanifest.patch b/xmlrpc-server-addosgimanifest.patch
deleted file mode 100644
index af54e20..0000000
--- a/xmlrpc-server-addosgimanifest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- pom.xml 2014-07-07 11:24:52.668887604 -0400
-+++ pom.xml.sav 2014-07-07 11:25:06.174916380 -0400
-@@ -48,6 +48,12 @@
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Version>${project.version}</Implementation-Version>
-+ <Bundle-ManifestVersion>1</Bundle-ManifestVersion>
-+ <Bundle-Name>%Bundle-Name</Bundle-Name>
-+
<Bundle-SymbolicName>org.apache.xmlrpc.server</Bundle-SymbolicName>
-+ <Bundle-Version>${project.version}</Bundle-Version>
-+ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
-+
<Export-Package>org.apache.xmlrpc.server,org.apache.xmlrpc.webserver</Export-Package>
- </manifestEntries>
- </archive>
- </configuration>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index c430286..a2cb5e6 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,79 +1,71 @@
Name: xmlrpc
Version: 3.1.3
-Release: 22%{?dist}
+Release: 24%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
-URL: http://ws.apache.org/xmlrpc/
+URL: https://ws.apache.org/xmlrpc/
BuildArch: noarch
-Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version}-src...
-Patch0: %{name}-client-addosgimanifest.patch
-Patch1: %{name}-common-addosgimanifest.patch
-Patch2: %{name}-javax-methods.patch
-Patch3: %{name}-server-addosgimanifest.patch
-Patch4: %{name}-disallow-deserialization-of-ex-serializable-tags.patch
-Patch5: %{name}-disallow-loading-external-dtd.patch
+Source0:
https://archive.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version...
+
+# Fix build against modern servlet API by implementing missing interfaces
+Patch0: 0001-Javax-Servlet-API.patch
+# Add OSGi metadata so that xmlrpc can be used in OSGi runtimes
+Patch1: 0002-Add-OSGi-metadata.patch
+# CVE-2016-5003 - Disallow deserialization of <ex:serializable> tags by default
+Patch2: 0003-disallow-deserialization-of-ex-serializable-tags.patch
+# CVE-2016-5002 - isallow loading of external DTD
+Patch3: 0004-disallow-loading-external-dtd.patch
+# Jakarta Commons HttpClient is obsolete and should not be used, one of the other
+# provider implementations should by used instead by clients of xmlrpc
+Patch4: 0005-Remove-dep-on-ancient-commons-httpclient.patch
+# CVE-2019-17570 - Deserialization of server-side exception from faultCause in XMLRPC
error response
+Patch5: 0006-Fix-for-CVE-2019-17570.patch
BuildRequires: maven-local
-BuildRequires: mvn(org.apache:apache:pom:)
-BuildRequires: mvn(commons-httpclient:commons-httpclient)
BuildRequires: mvn(commons-logging:commons-logging)
-BuildRequires: mvn(javax.servlet:servlet-api)
+BuildRequires: mvn(javax.servlet:javax.servlet-api)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache:apache:pom:)
BuildRequires: mvn(org.apache.ws.commons.util:ws-commons-util)
%description
Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
that uses XML over HTTP to implement remote procedure calls.
-Apache XML-RPC was previously known as Helma XML-RPC. If you have code
-using the Helma library, all you should have to do is change the import
-statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
%package javadoc
-Summary: Javadoc for %{name}
+Summary: Javadoc for %{name}
%description javadoc
Javadoc for %{name}.
%package common
-Summary: Common classes for XML-RPC client and server implementations
-# Provide xmlrpc is not here because it would be useless due to different jar names
-Obsoletes: %{name} < 3.1.3
-Obsoletes: %{name}3-common < 3.1.3-13
-Provides: %{name}3-common = 3.1.3-13
+Summary: Common classes for XML-RPC client and server implementations
%description common
%{summary}.
%package client
-Summary: XML-RPC client implementation
-Obsoletes: %{name}3-client < 3.1.3-13
-Provides: %{name}3-client = 3.1.3-13
+Summary: XML-RPC client implementation
%description client
%{summary}.
%package server
-Summary: XML-RPC server implementation
-Obsoletes: %{name}3-server < 3.1.3-13
-Provides: %{name}3-server = 3.1.3-13
+Summary: XML-RPC server implementation
%description server
%{summary}.
%prep
%setup -q -n apache-%{name}-%{version}-src
+
+%patch0 -p1
+%patch1 -p1
%patch2 -p1
-pushd client
-%patch0 -b .sav
-popd
-pushd common
-%patch1 -b .sav
-popd
-pushd server
-%patch3 -b .sav
-popd
+%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -81,14 +73,13 @@ sed -i 's/\r//' LICENSE.txt
%pom_disable_module dist
%pom_remove_dep jaxme:jaxmeapi common
-# This dep is no longer supplied by ws-commons-util
%pom_add_dep junit:junit:3.8.1:test
%mvn_file :{*} @1
%mvn_package :*-common %{name}
%build
-# FIXME: ignore test failure because server part needs network
+# ignore test failure because server part needs network
%mvn_build -s -- -Dmaven.test.failure.ignore=true
%install
@@ -105,6 +96,12 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Wed Apr 01 2020 Mat Booth <mat.booth(a)redhat.com> - 1:3.1.3-24
+- Add patch for CVE-2019-17570
+
+* Tue Mar 31 2020 Mat Booth <mat.booth(a)redhat.com> - 1:3.1.3-23
+- Modernise spec file and remove dep on ancient Jakarta Commons httpclient
implementation
+
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 5319ef0e20975cafe228ae3a8abb4e02363baafc
Author: Tomas Hrcka <thrcka(a)redhat.com>
Date: Wed Apr 1 17:05:22 2020 +0200
Revert "Orphaned for 6+ weeks"
This reverts commit 0a09e0d088b4815e8190a0eec1a93324750807da.
Unretirement request: https://pagure.io/releng/issue/9370
Signed-off-by: Tomas Hrcka <thrcka(a)redhat.com>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6de88cd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+xmlrpc-2.0.1-src.tar.gz
+/apache-xmlrpc-3.1.3-src.tar.bz2
diff --git a/.project b/.project
new file mode 100644
index 0000000..d3cdf74
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>xmlrpc</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
+ </natures>
+</projectDescription>
diff --git a/changelog-pre3.x.txt b/changelog-pre3.x.txt
new file mode 100644
index 0000000..9cef632
--- /dev/null
+++ b/changelog-pre3.x.txt
@@ -0,0 +1,120 @@
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-12
+- Migrate to new tomcat-servlet-api
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Dec 21 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-9
+- Require java >= 1:1.6.0
+- Fix classpaths to ensure building of all optional features
+- Remove stale patch
+
+* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-8
+- Migrate from old servlet api to new one
+
+* Thu Dec 9 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-7
+- Remove gcj support
+- Make jars/javadocs versionless
+- Add ws-commons-util Requires
+- Use apache-commons-codec
+- Drop unneeded patch for jsse
+
+* Thu Mar 11 2010 Peter Lemenkov <lemenkov(a)gmail.com> - 0:2.0.1-6.6
+- Added missing requires jpackage-utils
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-6.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-5.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4.5
+- drop repotag
+
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4jpp.4
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> -
0:2.0.1-4jpp.3
+- Autorebuild for GCC 4.3
+
+* Tue Mar 27 2007 Matt Wringe <mwringe(a)redhat.com> 0:2.0.1-3jpp.3
+- Spec file clean up for Fedora Extras Review
+
+* Thu Mar 08 2007 Deepak Bhole <dbhole(a)redhat.com> 2.0.1-3jpp.2
+- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
+- Minor spec file cleanup
+
+* Fri Aug 04 2006 Vivek Lakshmanan <vivekl(a)redhat.com> - 0:2.0.1-3jpp.1
+- Merge with latest from JPP.
+
+* Sat Jul 22 2006 Jakub Jelinek <jakub(a)redhat.com> - 0:2.0.1-1jpp_8.2fc
+- Rebuilt
+
+* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_8.1fc
+- rebuild
+
+* Wed Mar 8 2006 Rafael Schloming <rafaels(a)redhat.com> - 0:2.0.1-1jpp_7fc
+- excluded s390 due to eclipse
+
+* Mon Mar 6 2006 Jeremy Katz <katzj(a)redhat.com> - 0:2.0.1-1jpp_6fc
+- stop scriptlet spew
+
+* Fri Feb 24 2006 Igor Foox <ifoox(a)redhat.com> - 0:2.0.1-1jpp_5fc
+- Added post/postun dependency on coreutils.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_4fc
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_3fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Wed Jan 25 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_2fc
+- ExcludeArch s390x and ppc64
+
+* Wed Jan 18 2006 Andrew Overholt <overholt(a)redhat.com> 0:2.0.1-1jpp_2fc
+- Comment out JPackage Distribution and Vendor tags
+
+* Wed Jan 18 2006 Jesse Keating <jkeating(a)redhat.com> 0:2.0.1-1jpp_2fc
+- bump for test
+
+* Wed Jan 18 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_1fc
+- Update to version 2.0.1
+- Natively compile
+
+* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2-0.b1.3jpp
+- Build with ant-1.6.2
+
+* Thu Apr 29 2004 David Walluck <david(a)jpackage.org> 0:1.2-0.b1.2jpp
+- add jar symlinks
+- remove %%buildroot in %%install
+
+* Tue May 06 2003 David Walluck <david(a)anti-microsoft.org> 0:1.2-0.b1.1jpp
+- 1.2-b1
+- update for JPackage 1.5
+
+* Mon Mar 18 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.1-1jpp
+- 1.1
+- generic servlet support
+- used source release
+- dropped patch
+- added applet jar
+
+* Mon Jan 21 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-3jpp
+- versioned dir for javadoc
+- no dependencies for javadoc package
+- dropped jsse package
+- adaptation to new servlet3 package
+- adaptation to new jsse package
+- section macro
+
+* Fri Dec 7 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-2jpp
+- javadoc into javadoc package
+
+* Sat Nov 3 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-1jpp
+- first JPackage release
diff --git a/dead.package b/dead.package
deleted file mode 100644
index 5204a84..0000000
--- a/dead.package
+++ /dev/null
@@ -1 +0,0 @@
-Orphaned for 6+ weeks
diff --git a/sources b/sources
new file mode 100644
index 0000000..f4bbd2c
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+f7817485fa6a6a500c49ec9515d1f3b9 apache-xmlrpc-3.1.3-src.tar.bz2
diff --git a/xmlrpc-client-addosgimanifest.patch b/xmlrpc-client-addosgimanifest.patch
new file mode 100644
index 0000000..437d78f
--- /dev/null
+++ b/xmlrpc-client-addosgimanifest.patch
@@ -0,0 +1,20 @@
+--- pom.xml.sav 2010-02-06 17:44:57.000000000 +0200
++++ pom.xml 2010-09-29 09:27:06.194857352 +0300
+@@ -48,6 +48,17 @@
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${project.version}</Implementation-Version>
++ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
++ <Bundle-Name>%Bundle-Name</Bundle-Name>
++ <Bundle-Localization>plugin</Bundle-Localization>
++ <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
++ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.client,
org.apache.xmlrpc.client.util</Export-Package>
++ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
++ <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0,
J2SE-1.3</Bundle-RequiredExecutionEnvironment>
++ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
++ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
diff --git a/xmlrpc-common-addosgimanifest.patch b/xmlrpc-common-addosgimanifest.patch
new file mode 100644
index 0000000..4d4aeca
--- /dev/null
+++ b/xmlrpc-common-addosgimanifest.patch
@@ -0,0 +1,19 @@
+--- pom.xml.sav 2010-02-06 17:44:50.000000000 +0200
++++ pom.xml 2010-09-29 09:30:38.857857644 +0300
+@@ -48,6 +48,16 @@
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${project.version}</Implementation-Version>
++ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
++ <Bundle-Name>%Bundle-Name</Bundle-Name>
++ <Bundle-Localization>plugin</Bundle-Localization>
++
<Bundle-SymbolicName>org.apache.xmlrpc.common</Bundle-SymbolicName>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.common,
org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer,
org.apache.xmlrpc.util</Export-Package>
++ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
++ <Bundle-RequiredExecutionEnvironment>J2SE-1.4,
CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
++ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
++ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
diff --git a/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
b/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
new file mode 100644
index 0000000..53a0a98
--- /dev/null
+++ b/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
@@ -0,0 +1,35 @@
+From 495d6136d9de5c0bbddadffe11b0841c6aafcb34 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek(a)redhat.com>
+Date: Fri, 18 May 2018 15:22:49 +0200
+Subject: [PATCH 1/2] Disallow deserialization of <ex:serializable> tags
+
+Can be reenabled by setting JVM property
+org.apache.xmlrpc.allowInsecureDeserialization to 1.
+
+- Resolves CVE-2016-5003
+---
+ .../java/org/apache/xmlrpc/parser/SerializableParser.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
+index 18f25ac..c8bb7ed 100644
+--- a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
++++ b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
+@@ -29,6 +29,14 @@ import org.apache.xmlrpc.XmlRpcException;
+ */
+ public class SerializableParser extends ByteArrayParser {
+ public Object getResult() throws XmlRpcException {
++ if
(!"1".equals(System.getProperty("org.apache.xmlrpc.allowInsecureDeserialization")))
{
++ throw new UnsupportedOperationException(
++ "Deserialization of ex:serializable objects is
vulnerable to " +
++ "remote execution attacks and is disabled by default.
" +
++ "If you are sure the source data is trusted, you can
enable " +
++ "it by setting
org.apache.xmlrpc.allowInsecureDeserialization " +
++ "JVM property to 1");
++ }
+ try {
+ byte[] res = (byte[]) super.getResult();
+ ByteArrayInputStream bais = new ByteArrayInputStream(res);
+--
+2.17.0
+
diff --git a/xmlrpc-disallow-loading-external-dtd.patch
b/xmlrpc-disallow-loading-external-dtd.patch
new file mode 100644
index 0000000..f59b9c0
--- /dev/null
+++ b/xmlrpc-disallow-loading-external-dtd.patch
@@ -0,0 +1,30 @@
+From 338ab231b228bd36afda4ab31db724c6669579b2 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek(a)redhat.com>
+Date: Tue, 22 May 2018 10:53:28 +0200
+Subject: [PATCH 2/2] Disallow loading external DTD
+
+---
+ .../src/main/java/org/apache/xmlrpc/util/SAXParsers.java | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
+index b1034e7..49ef5de 100644
+--- a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
++++ b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
+@@ -48,6 +48,13 @@ public class SAXParsers {
+ } catch (org.xml.sax.SAXException e) {
+ // Ignore it
+ }
++ try {
++
spf.setFeature("http://apache.org/xml/features/nonvalidating/load-ex...;,
false);
++ } catch (javax.xml.parsers.ParserConfigurationException e) {
++ // Ignore it
++ } catch (org.xml.sax.SAXException e) {
++ // Ignore it
++ }
+ }
+
+ /** Creates a new instance of {@link XMLReader}.
+--
+2.17.0
+
diff --git a/xmlrpc-javax-methods.patch b/xmlrpc-javax-methods.patch
new file mode 100644
index 0000000..0c66b6c
--- /dev/null
+++ b/xmlrpc-javax-methods.patch
@@ -0,0 +1,264 @@
+From d6834da0b1556bb133a534d31bb94d08f38fa195 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Mon, 16 Jun 2014 10:03:35 +0200
+Subject: [PATCH] Use servlet 3.1.0 API
+
+---
+ dist/pom.xml | 2 +-
+ pom.xml | 4 +-
+ server/pom.xml | 8 +++-
+ .../xmlrpc/webserver/HttpServletRequestImpl.java | 54 ++++++++++++++++++++++
+ .../xmlrpc/webserver/HttpServletResponseImpl.java | 26 ++++++++++-
+ .../xmlrpc/webserver/ServletOutputStreamImpl.java | 5 ++
+ 6 files changed, 94 insertions(+), 5 deletions(-)
+
+diff --git a/dist/pom.xml b/dist/pom.xml
+index 67aded6..c18c2eb 100644
+--- a/dist/pom.xml
++++ b/dist/pom.xml
+@@ -59,7 +59,7 @@
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
++ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+diff --git a/pom.xml b/pom.xml
+index 3933da5..70c508e 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -344,8 +344,8 @@
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.4</version>
++ <artifactId>javax.servlet-api</artifactId>
++ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+diff --git a/server/pom.xml b/server/pom.xml
+index 0d09544..01288c8 100644
+--- a/server/pom.xml
++++ b/server/pom.xml
+@@ -67,6 +67,12 @@
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
++ <exclusions>
++ <exclusion>
++ <groupId>javax.servlet</groupId>
++ <artifactId>servlet-api</artifactId>
++ </exclusion>
++ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+@@ -81,7 +87,7 @@
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
++ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+diff --git a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
+index 3dc7e43..19b14a2 100644
+--- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
++++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
+@@ -31,6 +31,7 @@ import java.net.URLDecoder;
+ import java.security.Principal;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.Collection;
+ import java.util.Enumeration;
+ import java.util.HashMap;
+ import java.util.Iterator;
+@@ -39,10 +40,20 @@ import java.util.Locale;
+ import java.util.Map;
+ import java.util.StringTokenizer;
+
++import javax.servlet.ReadListener;
+ import javax.servlet.RequestDispatcher;
++import javax.servlet.ServletException;
+ import javax.servlet.ServletInputStream;
++import javax.servlet.DispatcherType;
++import javax.servlet.AsyncContext;
++import javax.servlet.ServletContext;
++import javax.servlet.ServletRequest;
++import javax.servlet.ServletResponse;
+ import javax.servlet.http.Cookie;
++import javax.servlet.http.HttpUpgradeHandler;
++import javax.servlet.http.Part;
+ import javax.servlet.http.HttpServletRequest;
++import javax.servlet.http.HttpServletResponse;
+ import javax.servlet.http.HttpSession;
+
+ import org.apache.xmlrpc.common.XmlRpcStreamConfig;
+@@ -66,6 +77,7 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ private String queryString;
+ private String httpVersion;
+ private final Map headers = new HashMap();
++ private final Map parts = new HashMap();
+ private final Map attributes = new HashMap();
+ private Map parameters;
+ private String characterEncoding;
+@@ -97,6 +109,18 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ }
+ return c;
+ }
++
++ public boolean isFinished() {
++ return contentBytesRemaining == 0;
++ }
++
++ public boolean isReady() {
++ return true;
++ }
++
++ public void setReadListener(ReadListener arg0) {
++ throw new IllegalStateException("Not implemented.");
++ }
+ };
+ }
+
+@@ -227,6 +251,12 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ return Collections.enumeration(list);
+ }
+
++ public Part getPart(String name) { throw new IllegalStateException("Not
implemented"); }
++
++ public Collection getParts() { throw new IllegalStateException("Not
implemented"); }
++
++ public boolean authenticate (HttpServletResponse response) { throw new
IllegalStateException("Not implemented"); }
++
+ public int getIntHeader(String pHeader) {
+ String s = getHeader(pHeader);
+ return s == null ? -1 : Integer.parseInt(s);
+@@ -242,6 +272,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+
+ public String getRemoteUser() { throw new IllegalStateException("Not
implemented"); }
+
++ public void login(String username, String password) { throw new
IllegalStateException("Not implemented"); }
++
++ public void logout() { throw new IllegalStateException("Not implemented"); }
++
+ public String getRequestURI() { return uri; }
+
+ public StringBuffer getRequestURL() {
+@@ -280,6 +314,20 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ return sb;
+ }
+
++ public AsyncContext getAsyncContext() { throw new IllegalStateException("Not
implemented"); }
++
++ public boolean isAsyncSupported() { return false; }
++
++ public boolean isAsyncStarted() { return false; }
++
++ public ServletContext getServletContext() { throw new IllegalStateException("Not
implemented"); }
++
++ public AsyncContext startAsync(ServletRequest req, ServletResponse resp) { throw new
IllegalStateException("Not implemented"); }
++
++ public AsyncContext startAsync() { throw new IllegalStateException("Not
implemented"); }
++
++ public DispatcherType getDispatcherType() { throw new IllegalStateException("Not
implemented"); }
++
+ public String getRequestedSessionId() { throw new IllegalStateException("Not
implemented"); }
+
+ public String getServletPath() { return uri; }
+@@ -544,4 +592,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ }
+
+ protected String getHttpVersion() { return httpVersion; }
++
++ public long getContentLengthLong() { throw new IllegalStateException("Not
implemented."); }
++
++ public String changeSessionId() { throw new IllegalStateException("Not
implemented."); }
++
++ public HttpUpgradeHandler upgrade(Class arg0) { throw new
IllegalStateException("Not implemented."); }
+ }
+diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
+index 6ba7018..5319dcf 100644
+--- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
++++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
+@@ -29,6 +29,8 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Locale;
+ import java.util.Map;
++import java.util.Collection;
++import java.util.Collections;
+ import java.util.StringTokenizer;
+
+ import javax.servlet.ServletOutputStream;
+@@ -84,7 +86,7 @@ public class HttpServletResponseImpl implements HttpServletResponse {
+ }
+ }
+
+- private String getHeader(String pHeader) {
++ public String getHeader(String pHeader) {
+ String key = pHeader.toLowerCase();
+ Object o = headers.get(key);
+ if (o == null) {
+@@ -101,6 +103,26 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
+ }
+ }
+
++ public Collection getHeaderNames() {
++ return headers.keySet();
++ }
++
++ public Collection getHeaders(String pHeader) {
++ String key = pHeader.toLowerCase();
++ Object o = headers.get(key);
++ List list;
++ if (o instanceof List) {
++ list = (List) o;
++ } else {
++ list = Collections.singletonList(o);
++ }
++ return list;
++ }
++
++ public int getStatus() {
++ return status;
++ }
++
+ public void addIntHeader(String pHeader, int pValue) {
+ addHeader(pHeader, Integer.toString(pValue));
+ }
+@@ -465,4 +487,6 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
+ sb.append("\r\n");
+ return sb.toString();
+ }
++
++ public void setContentLengthLong(long arg0) { throw new IllegalStateException("Not
implemented."); }
+ }
+diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
+index c2a53b1..86dbbb4 100644
+--- a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
++++ b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
+@@ -22,6 +22,7 @@ import java.io.IOException;
+ import java.io.OutputStream;
+
+ import javax.servlet.ServletOutputStream;
++import javax.servlet.WriteListener;
+
+
+ /** Default implementation of a servlet output stream.
+@@ -99,4 +100,8 @@ class ServletOutputStreamImpl extends ServletOutputStream {
+ boolean isCommitted() {
+ return committed;
+ }
++
++ public boolean isReady() { return true; }
++
++ public void setWriteListener(WriteListener arg0) { throw new
IllegalStateException("Not implemented."); }
+ }
+--
+1.9.3
+
diff --git a/xmlrpc-server-addosgimanifest.patch b/xmlrpc-server-addosgimanifest.patch
new file mode 100644
index 0000000..af54e20
--- /dev/null
+++ b/xmlrpc-server-addosgimanifest.patch
@@ -0,0 +1,15 @@
+--- pom.xml 2014-07-07 11:24:52.668887604 -0400
++++ pom.xml.sav 2014-07-07 11:25:06.174916380 -0400
+@@ -48,6 +48,12 @@
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${project.version}</Implementation-Version>
++ <Bundle-ManifestVersion>1</Bundle-ManifestVersion>
++ <Bundle-Name>%Bundle-Name</Bundle-Name>
++
<Bundle-SymbolicName>org.apache.xmlrpc.server</Bundle-SymbolicName>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
++
<Export-Package>org.apache.xmlrpc.server,org.apache.xmlrpc.webserver</Export-Package>
+ </manifestEntries>
+ </archive>
+ </configuration>
diff --git a/xmlrpc.spec b/xmlrpc.spec
new file mode 100644
index 0000000..2979844
--- /dev/null
+++ b/xmlrpc.spec
@@ -0,0 +1,181 @@
+Name: xmlrpc
+Version: 3.1.3
+Release: 23%{?dist}
+Epoch: 1
+Summary: Java XML-RPC implementation
+License: ASL 2.0
+URL: http://ws.apache.org/xmlrpc/
+BuildArch: noarch
+
+Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version}-src...
+Patch0: %{name}-client-addosgimanifest.patch
+Patch1: %{name}-common-addosgimanifest.patch
+Patch2: %{name}-javax-methods.patch
+Patch3: %{name}-server-addosgimanifest.patch
+Patch4: %{name}-disallow-deserialization-of-ex-serializable-tags.patch
+Patch5: %{name}-disallow-loading-external-dtd.patch
+
+BuildRequires: maven-local
+BuildRequires: mvn(org.apache:apache:pom:)
+BuildRequires: mvn(commons-httpclient:commons-httpclient)
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(javax.servlet:servlet-api)
+BuildRequires: mvn(org.apache.ws.commons.util:ws-commons-util)
+
+
+%description
+Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
+that uses XML over HTTP to implement remote procedure calls.
+Apache XML-RPC was previously known as Helma XML-RPC. If you have code
+using the Helma library, all you should have to do is change the import
+statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+Javadoc for %{name}.
+
+%package common
+Summary: Common classes for XML-RPC client and server implementations
+# Provide xmlrpc is not here because it would be useless due to different jar names
+Obsoletes: %{name} < 3.1.3
+Obsoletes: %{name}3-common < 3.1.3-13
+Provides: %{name}3-common = 3.1.3-13
+
+%description common
+%{summary}.
+
+%package client
+Summary: XML-RPC client implementation
+Obsoletes: %{name}3-client < 3.1.3-13
+Provides: %{name}3-client = 3.1.3-13
+
+%description client
+%{summary}.
+
+%package server
+Summary: XML-RPC server implementation
+Obsoletes: %{name}3-server < 3.1.3-13
+Provides: %{name}3-server = 3.1.3-13
+
+%description server
+%{summary}.
+
+%prep
+%setup -q -n apache-%{name}-%{version}-src
+%patch2 -p1
+pushd client
+%patch0 -b .sav
+popd
+pushd common
+%patch1 -b .sav
+popd
+pushd server
+%patch3 -b .sav
+popd
+%patch4 -p1
+%patch5 -p1
+
+sed -i 's/\r//' LICENSE.txt
+
+%pom_disable_module dist
+%pom_remove_dep jaxme:jaxmeapi common
+# This dep is no longer supplied by ws-commons-util
+%pom_add_dep junit:junit:3.8.1:test
+
+%mvn_file :{*} @1
+%mvn_package :*-common %{name}
+
+%build
+# FIXME: ignore test failure because server part needs network
+%mvn_build -s -- -Dmaven.test.failure.ignore=true
+
+%install
+%mvn_install
+
+%files common -f .mfiles-%{name}
+%license LICENSE.txt NOTICE.txt
+
+%files client -f .mfiles-%{name}-client
+
+%files server -f .mfiles-%{name}-server
+
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt NOTICE.txt
+
+%changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri May 18 2018 Michael Simacek <msimacek(a)redhat.com> - 1:3.1.3-20
+- Disallow deserialization of <ex:serializable> tags by default
+- Resolves CVE-2016-5003
+- Disallow loading of external DTD
+- Resolves CVE-2016-5002
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jun 12 2017 Troy Dawson <tdawson(a)redhat.com> - 1:3.1.3-17
+- Add junit to pom deps. Was originally supplied by ws-commons-util (#1460767)
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 1:3.1.3-15
+- Rebuild for readline 7.x
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Fri Feb 13 2015 gil cattaneo <puntogil(a)libero.it> 1:3.1.3-12
+- introduce license macro
+
+* Thu Jul 10 2014 Sami Wagiaalla <swagiaal(a)redhat.com> - 1:3.1.3-11
+- Add OSGi info for xmlrpc-server jar.
+- export o.a.xmlrpc from xmlrpc-client jar.
+
+* Mon Jun 16 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:3.1.3-10
+- Use servlet 3.1.0 API
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1:3.1.3-8
+- Use Requires: java-headless rebuild (#1067528)
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:3.1.3-6
+- Update to current packaging guidelines
+
+* Fri May 17 2013 Alexander Kurtakov <akurtako(a)redhat.com> 1:3.1.3-5
+- Remove javax.xml.bind from osgi imports - it's part of the JVM now.
+- Drop the ws-jaxme dependency for the same reason.
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1:3.1.3-3
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Sat Oct 20 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.1.3-2
+- xmlrpc v2 had an Epoch so we need one here. Add it back
+
+* Fri Sep 14 2012 Alexander Kurtakov <akurtako(a)redhat.com> 3.1.3-1
+- First release of version 3.x package
commit 0a09e0d088b4815e8190a0eec1a93324750807da
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Sun Oct 13 21:58:47 2019 +0200
Orphaned for 6+ weeks
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 6de88cd..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-xmlrpc-2.0.1-src.tar.gz
-/apache-xmlrpc-3.1.3-src.tar.bz2
diff --git a/.project b/.project
deleted file mode 100644
index d3cdf74..0000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>xmlrpc</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
- </natures>
-</projectDescription>
diff --git a/changelog-pre3.x.txt b/changelog-pre3.x.txt
deleted file mode 100644
index 9cef632..0000000
--- a/changelog-pre3.x.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-12
-- Migrate to new tomcat-servlet-api
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Dec 21 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-9
-- Require java >= 1:1.6.0
-- Fix classpaths to ensure building of all optional features
-- Remove stale patch
-
-* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-8
-- Migrate from old servlet api to new one
-
-* Thu Dec 9 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-7
-- Remove gcj support
-- Make jars/javadocs versionless
-- Add ws-commons-util Requires
-- Use apache-commons-codec
-- Drop unneeded patch for jsse
-
-* Thu Mar 11 2010 Peter Lemenkov <lemenkov(a)gmail.com> - 0:2.0.1-6.6
-- Added missing requires jpackage-utils
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-6.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-5.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4.5
-- drop repotag
-
-* Thu May 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4jpp.4
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> -
0:2.0.1-4jpp.3
-- Autorebuild for GCC 4.3
-
-* Tue Mar 27 2007 Matt Wringe <mwringe(a)redhat.com> 0:2.0.1-3jpp.3
-- Spec file clean up for Fedora Extras Review
-
-* Thu Mar 08 2007 Deepak Bhole <dbhole(a)redhat.com> 2.0.1-3jpp.2
-- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
-- Minor spec file cleanup
-
-* Fri Aug 04 2006 Vivek Lakshmanan <vivekl(a)redhat.com> - 0:2.0.1-3jpp.1
-- Merge with latest from JPP.
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub(a)redhat.com> - 0:2.0.1-1jpp_8.2fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_8.1fc
-- rebuild
-
-* Wed Mar 8 2006 Rafael Schloming <rafaels(a)redhat.com> - 0:2.0.1-1jpp_7fc
-- excluded s390 due to eclipse
-
-* Mon Mar 6 2006 Jeremy Katz <katzj(a)redhat.com> - 0:2.0.1-1jpp_6fc
-- stop scriptlet spew
-
-* Fri Feb 24 2006 Igor Foox <ifoox(a)redhat.com> - 0:2.0.1-1jpp_5fc
-- Added post/postun dependency on coreutils.
-
-* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_4fc
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_3fc
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Jan 25 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_2fc
-- ExcludeArch s390x and ppc64
-
-* Wed Jan 18 2006 Andrew Overholt <overholt(a)redhat.com> 0:2.0.1-1jpp_2fc
-- Comment out JPackage Distribution and Vendor tags
-
-* Wed Jan 18 2006 Jesse Keating <jkeating(a)redhat.com> 0:2.0.1-1jpp_2fc
-- bump for test
-
-* Wed Jan 18 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_1fc
-- Update to version 2.0.1
-- Natively compile
-
-* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2-0.b1.3jpp
-- Build with ant-1.6.2
-
-* Thu Apr 29 2004 David Walluck <david(a)jpackage.org> 0:1.2-0.b1.2jpp
-- add jar symlinks
-- remove %%buildroot in %%install
-
-* Tue May 06 2003 David Walluck <david(a)anti-microsoft.org> 0:1.2-0.b1.1jpp
-- 1.2-b1
-- update for JPackage 1.5
-
-* Mon Mar 18 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.1-1jpp
-- 1.1
-- generic servlet support
-- used source release
-- dropped patch
-- added applet jar
-
-* Mon Jan 21 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-3jpp
-- versioned dir for javadoc
-- no dependencies for javadoc package
-- dropped jsse package
-- adaptation to new servlet3 package
-- adaptation to new jsse package
-- section macro
-
-* Fri Dec 7 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-2jpp
-- javadoc into javadoc package
-
-* Sat Nov 3 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-1jpp
-- first JPackage release
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..5204a84
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Orphaned for 6+ weeks
diff --git a/sources b/sources
deleted file mode 100644
index f4bbd2c..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-f7817485fa6a6a500c49ec9515d1f3b9 apache-xmlrpc-3.1.3-src.tar.bz2
diff --git a/xmlrpc-client-addosgimanifest.patch b/xmlrpc-client-addosgimanifest.patch
deleted file mode 100644
index 437d78f..0000000
--- a/xmlrpc-client-addosgimanifest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pom.xml.sav 2010-02-06 17:44:57.000000000 +0200
-+++ pom.xml 2010-09-29 09:27:06.194857352 +0300
-@@ -48,6 +48,17 @@
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Version>${project.version}</Implementation-Version>
-+ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-+ <Bundle-Name>%Bundle-Name</Bundle-Name>
-+ <Bundle-Localization>plugin</Bundle-Localization>
-+ <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
-+ <Bundle-Version>${project.version}</Bundle-Version>
-+ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
-+ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.client,
org.apache.xmlrpc.client.util</Export-Package>
-+ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
-+ <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0,
J2SE-1.3</Bundle-RequiredExecutionEnvironment>
-+ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
-+ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
diff --git a/xmlrpc-common-addosgimanifest.patch b/xmlrpc-common-addosgimanifest.patch
deleted file mode 100644
index 4d4aeca..0000000
--- a/xmlrpc-common-addosgimanifest.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- pom.xml.sav 2010-02-06 17:44:50.000000000 +0200
-+++ pom.xml 2010-09-29 09:30:38.857857644 +0300
-@@ -48,6 +48,16 @@
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Version>${project.version}</Implementation-Version>
-+ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-+ <Bundle-Name>%Bundle-Name</Bundle-Name>
-+ <Bundle-Localization>plugin</Bundle-Localization>
-+
<Bundle-SymbolicName>org.apache.xmlrpc.common</Bundle-SymbolicName>
-+ <Bundle-Version>${project.version}</Bundle-Version>
-+ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.common,
org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer,
org.apache.xmlrpc.util</Export-Package>
-+ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
-+ <Bundle-RequiredExecutionEnvironment>J2SE-1.4,
CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
-+ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
-+ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
- </manifestEntries>
- </archive>
- </configuration>
diff --git a/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
b/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
deleted file mode 100644
index 53a0a98..0000000
--- a/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 495d6136d9de5c0bbddadffe11b0841c6aafcb34 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek(a)redhat.com>
-Date: Fri, 18 May 2018 15:22:49 +0200
-Subject: [PATCH 1/2] Disallow deserialization of <ex:serializable> tags
-
-Can be reenabled by setting JVM property
-org.apache.xmlrpc.allowInsecureDeserialization to 1.
-
-- Resolves CVE-2016-5003
----
- .../java/org/apache/xmlrpc/parser/SerializableParser.java | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
-index 18f25ac..c8bb7ed 100644
---- a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
-+++ b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
-@@ -29,6 +29,14 @@ import org.apache.xmlrpc.XmlRpcException;
- */
- public class SerializableParser extends ByteArrayParser {
- public Object getResult() throws XmlRpcException {
-+ if
(!"1".equals(System.getProperty("org.apache.xmlrpc.allowInsecureDeserialization")))
{
-+ throw new UnsupportedOperationException(
-+ "Deserialization of ex:serializable objects is
vulnerable to " +
-+ "remote execution attacks and is disabled by default.
" +
-+ "If you are sure the source data is trusted, you can
enable " +
-+ "it by setting
org.apache.xmlrpc.allowInsecureDeserialization " +
-+ "JVM property to 1");
-+ }
- try {
- byte[] res = (byte[]) super.getResult();
- ByteArrayInputStream bais = new ByteArrayInputStream(res);
---
-2.17.0
-
diff --git a/xmlrpc-disallow-loading-external-dtd.patch
b/xmlrpc-disallow-loading-external-dtd.patch
deleted file mode 100644
index f59b9c0..0000000
--- a/xmlrpc-disallow-loading-external-dtd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 338ab231b228bd36afda4ab31db724c6669579b2 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek(a)redhat.com>
-Date: Tue, 22 May 2018 10:53:28 +0200
-Subject: [PATCH 2/2] Disallow loading external DTD
-
----
- .../src/main/java/org/apache/xmlrpc/util/SAXParsers.java | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
-index b1034e7..49ef5de 100644
---- a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
-+++ b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
-@@ -48,6 +48,13 @@ public class SAXParsers {
- } catch (org.xml.sax.SAXException e) {
- // Ignore it
- }
-+ try {
-+
spf.setFeature("http://apache.org/xml/features/nonvalidating/load-ex...;,
false);
-+ } catch (javax.xml.parsers.ParserConfigurationException e) {
-+ // Ignore it
-+ } catch (org.xml.sax.SAXException e) {
-+ // Ignore it
-+ }
- }
-
- /** Creates a new instance of {@link XMLReader}.
---
-2.17.0
-
diff --git a/xmlrpc-javax-methods.patch b/xmlrpc-javax-methods.patch
deleted file mode 100644
index 0c66b6c..0000000
--- a/xmlrpc-javax-methods.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-From d6834da0b1556bb133a534d31bb94d08f38fa195 Mon Sep 17 00:00:00 2001
-From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
-Date: Mon, 16 Jun 2014 10:03:35 +0200
-Subject: [PATCH] Use servlet 3.1.0 API
-
----
- dist/pom.xml | 2 +-
- pom.xml | 4 +-
- server/pom.xml | 8 +++-
- .../xmlrpc/webserver/HttpServletRequestImpl.java | 54 ++++++++++++++++++++++
- .../xmlrpc/webserver/HttpServletResponseImpl.java | 26 ++++++++++-
- .../xmlrpc/webserver/ServletOutputStreamImpl.java | 5 ++
- 6 files changed, 94 insertions(+), 5 deletions(-)
-
-diff --git a/dist/pom.xml b/dist/pom.xml
-index 67aded6..c18c2eb 100644
---- a/dist/pom.xml
-+++ b/dist/pom.xml
-@@ -59,7 +59,7 @@
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
-- <artifactId>servlet-api</artifactId>
-+ <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
-diff --git a/pom.xml b/pom.xml
-index 3933da5..70c508e 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -344,8 +344,8 @@
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
-- <artifactId>servlet-api</artifactId>
-- <version>2.4</version>
-+ <artifactId>javax.servlet-api</artifactId>
-+ <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
-diff --git a/server/pom.xml b/server/pom.xml
-index 0d09544..01288c8 100644
---- a/server/pom.xml
-+++ b/server/pom.xml
-@@ -67,6 +67,12 @@
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
-+ <exclusions>
-+ <exclusion>
-+ <groupId>javax.servlet</groupId>
-+ <artifactId>servlet-api</artifactId>
-+ </exclusion>
-+ </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
-@@ -81,7 +87,7 @@
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
-- <artifactId>servlet-api</artifactId>
-+ <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
-diff --git a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
-index 3dc7e43..19b14a2 100644
---- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
-+++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
-@@ -31,6 +31,7 @@ import java.net.URLDecoder;
- import java.security.Principal;
- import java.util.ArrayList;
- import java.util.Collections;
-+import java.util.Collection;
- import java.util.Enumeration;
- import java.util.HashMap;
- import java.util.Iterator;
-@@ -39,10 +40,20 @@ import java.util.Locale;
- import java.util.Map;
- import java.util.StringTokenizer;
-
-+import javax.servlet.ReadListener;
- import javax.servlet.RequestDispatcher;
-+import javax.servlet.ServletException;
- import javax.servlet.ServletInputStream;
-+import javax.servlet.DispatcherType;
-+import javax.servlet.AsyncContext;
-+import javax.servlet.ServletContext;
-+import javax.servlet.ServletRequest;
-+import javax.servlet.ServletResponse;
- import javax.servlet.http.Cookie;
-+import javax.servlet.http.HttpUpgradeHandler;
-+import javax.servlet.http.Part;
- import javax.servlet.http.HttpServletRequest;
-+import javax.servlet.http.HttpServletResponse;
- import javax.servlet.http.HttpSession;
-
- import org.apache.xmlrpc.common.XmlRpcStreamConfig;
-@@ -66,6 +77,7 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- private String queryString;
- private String httpVersion;
- private final Map headers = new HashMap();
-+ private final Map parts = new HashMap();
- private final Map attributes = new HashMap();
- private Map parameters;
- private String characterEncoding;
-@@ -97,6 +109,18 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- }
- return c;
- }
-+
-+ public boolean isFinished() {
-+ return contentBytesRemaining == 0;
-+ }
-+
-+ public boolean isReady() {
-+ return true;
-+ }
-+
-+ public void setReadListener(ReadListener arg0) {
-+ throw new IllegalStateException("Not implemented.");
-+ }
- };
- }
-
-@@ -227,6 +251,12 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- return Collections.enumeration(list);
- }
-
-+ public Part getPart(String name) { throw new IllegalStateException("Not
implemented"); }
-+
-+ public Collection getParts() { throw new IllegalStateException("Not
implemented"); }
-+
-+ public boolean authenticate (HttpServletResponse response) { throw new
IllegalStateException("Not implemented"); }
-+
- public int getIntHeader(String pHeader) {
- String s = getHeader(pHeader);
- return s == null ? -1 : Integer.parseInt(s);
-@@ -242,6 +272,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
-
- public String getRemoteUser() { throw new IllegalStateException("Not
implemented"); }
-
-+ public void login(String username, String password) { throw new
IllegalStateException("Not implemented"); }
-+
-+ public void logout() { throw new IllegalStateException("Not implemented"); }
-+
- public String getRequestURI() { return uri; }
-
- public StringBuffer getRequestURL() {
-@@ -280,6 +314,20 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- return sb;
- }
-
-+ public AsyncContext getAsyncContext() { throw new IllegalStateException("Not
implemented"); }
-+
-+ public boolean isAsyncSupported() { return false; }
-+
-+ public boolean isAsyncStarted() { return false; }
-+
-+ public ServletContext getServletContext() { throw new IllegalStateException("Not
implemented"); }
-+
-+ public AsyncContext startAsync(ServletRequest req, ServletResponse resp) { throw new
IllegalStateException("Not implemented"); }
-+
-+ public AsyncContext startAsync() { throw new IllegalStateException("Not
implemented"); }
-+
-+ public DispatcherType getDispatcherType() { throw new IllegalStateException("Not
implemented"); }
-+
- public String getRequestedSessionId() { throw new IllegalStateException("Not
implemented"); }
-
- public String getServletPath() { return uri; }
-@@ -544,4 +592,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
- }
-
- protected String getHttpVersion() { return httpVersion; }
-+
-+ public long getContentLengthLong() { throw new IllegalStateException("Not
implemented."); }
-+
-+ public String changeSessionId() { throw new IllegalStateException("Not
implemented."); }
-+
-+ public HttpUpgradeHandler upgrade(Class arg0) { throw new
IllegalStateException("Not implemented."); }
- }
-diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
-index 6ba7018..5319dcf 100644
---- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
-+++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
-@@ -29,6 +29,8 @@ import java.util.Iterator;
- import java.util.List;
- import java.util.Locale;
- import java.util.Map;
-+import java.util.Collection;
-+import java.util.Collections;
- import java.util.StringTokenizer;
-
- import javax.servlet.ServletOutputStream;
-@@ -84,7 +86,7 @@ public class HttpServletResponseImpl implements HttpServletResponse {
- }
- }
-
-- private String getHeader(String pHeader) {
-+ public String getHeader(String pHeader) {
- String key = pHeader.toLowerCase();
- Object o = headers.get(key);
- if (o == null) {
-@@ -101,6 +103,26 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
- }
- }
-
-+ public Collection getHeaderNames() {
-+ return headers.keySet();
-+ }
-+
-+ public Collection getHeaders(String pHeader) {
-+ String key = pHeader.toLowerCase();
-+ Object o = headers.get(key);
-+ List list;
-+ if (o instanceof List) {
-+ list = (List) o;
-+ } else {
-+ list = Collections.singletonList(o);
-+ }
-+ return list;
-+ }
-+
-+ public int getStatus() {
-+ return status;
-+ }
-+
- public void addIntHeader(String pHeader, int pValue) {
- addHeader(pHeader, Integer.toString(pValue));
- }
-@@ -465,4 +487,6 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
- sb.append("\r\n");
- return sb.toString();
- }
-+
-+ public void setContentLengthLong(long arg0) { throw new IllegalStateException("Not
implemented."); }
- }
-diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
-index c2a53b1..86dbbb4 100644
---- a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
-+++ b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
-@@ -22,6 +22,7 @@ import java.io.IOException;
- import java.io.OutputStream;
-
- import javax.servlet.ServletOutputStream;
-+import javax.servlet.WriteListener;
-
-
- /** Default implementation of a servlet output stream.
-@@ -99,4 +100,8 @@ class ServletOutputStreamImpl extends ServletOutputStream {
- boolean isCommitted() {
- return committed;
- }
-+
-+ public boolean isReady() { return true; }
-+
-+ public void setWriteListener(WriteListener arg0) { throw new
IllegalStateException("Not implemented."); }
- }
---
-1.9.3
-
diff --git a/xmlrpc-server-addosgimanifest.patch b/xmlrpc-server-addosgimanifest.patch
deleted file mode 100644
index af54e20..0000000
--- a/xmlrpc-server-addosgimanifest.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- pom.xml 2014-07-07 11:24:52.668887604 -0400
-+++ pom.xml.sav 2014-07-07 11:25:06.174916380 -0400
-@@ -48,6 +48,12 @@
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Version>${project.version}</Implementation-Version>
-+ <Bundle-ManifestVersion>1</Bundle-ManifestVersion>
-+ <Bundle-Name>%Bundle-Name</Bundle-Name>
-+
<Bundle-SymbolicName>org.apache.xmlrpc.server</Bundle-SymbolicName>
-+ <Bundle-Version>${project.version}</Bundle-Version>
-+ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
-+
<Export-Package>org.apache.xmlrpc.server,org.apache.xmlrpc.webserver</Export-Package>
- </manifestEntries>
- </archive>
- </configuration>
diff --git a/xmlrpc.spec b/xmlrpc.spec
deleted file mode 100644
index 2979844..0000000
--- a/xmlrpc.spec
+++ /dev/null
@@ -1,181 +0,0 @@
-Name: xmlrpc
-Version: 3.1.3
-Release: 23%{?dist}
-Epoch: 1
-Summary: Java XML-RPC implementation
-License: ASL 2.0
-URL: http://ws.apache.org/xmlrpc/
-BuildArch: noarch
-
-Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version}-src...
-Patch0: %{name}-client-addosgimanifest.patch
-Patch1: %{name}-common-addosgimanifest.patch
-Patch2: %{name}-javax-methods.patch
-Patch3: %{name}-server-addosgimanifest.patch
-Patch4: %{name}-disallow-deserialization-of-ex-serializable-tags.patch
-Patch5: %{name}-disallow-loading-external-dtd.patch
-
-BuildRequires: maven-local
-BuildRequires: mvn(org.apache:apache:pom:)
-BuildRequires: mvn(commons-httpclient:commons-httpclient)
-BuildRequires: mvn(commons-logging:commons-logging)
-BuildRequires: mvn(javax.servlet:servlet-api)
-BuildRequires: mvn(org.apache.ws.commons.util:ws-commons-util)
-
-
-%description
-Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
-that uses XML over HTTP to implement remote procedure calls.
-Apache XML-RPC was previously known as Helma XML-RPC. If you have code
-using the Helma library, all you should have to do is change the import
-statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
-
-%package javadoc
-Summary: Javadoc for %{name}
-
-%description javadoc
-Javadoc for %{name}.
-
-%package common
-Summary: Common classes for XML-RPC client and server implementations
-# Provide xmlrpc is not here because it would be useless due to different jar names
-Obsoletes: %{name} < 3.1.3
-Obsoletes: %{name}3-common < 3.1.3-13
-Provides: %{name}3-common = 3.1.3-13
-
-%description common
-%{summary}.
-
-%package client
-Summary: XML-RPC client implementation
-Obsoletes: %{name}3-client < 3.1.3-13
-Provides: %{name}3-client = 3.1.3-13
-
-%description client
-%{summary}.
-
-%package server
-Summary: XML-RPC server implementation
-Obsoletes: %{name}3-server < 3.1.3-13
-Provides: %{name}3-server = 3.1.3-13
-
-%description server
-%{summary}.
-
-%prep
-%setup -q -n apache-%{name}-%{version}-src
-%patch2 -p1
-pushd client
-%patch0 -b .sav
-popd
-pushd common
-%patch1 -b .sav
-popd
-pushd server
-%patch3 -b .sav
-popd
-%patch4 -p1
-%patch5 -p1
-
-sed -i 's/\r//' LICENSE.txt
-
-%pom_disable_module dist
-%pom_remove_dep jaxme:jaxmeapi common
-# This dep is no longer supplied by ws-commons-util
-%pom_add_dep junit:junit:3.8.1:test
-
-%mvn_file :{*} @1
-%mvn_package :*-common %{name}
-
-%build
-# FIXME: ignore test failure because server part needs network
-%mvn_build -s -- -Dmaven.test.failure.ignore=true
-
-%install
-%mvn_install
-
-%files common -f .mfiles-%{name}
-%license LICENSE.txt NOTICE.txt
-
-%files client -f .mfiles-%{name}-client
-
-%files server -f .mfiles-%{name}-server
-
-%files javadoc -f .mfiles-javadoc
-%license LICENSE.txt NOTICE.txt
-
-%changelog
-* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri May 18 2018 Michael Simacek <msimacek(a)redhat.com> - 1:3.1.3-20
-- Disallow deserialization of <ex:serializable> tags by default
-- Resolves CVE-2016-5003
-- Disallow loading of external DTD
-- Resolves CVE-2016-5002
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jun 12 2017 Troy Dawson <tdawson(a)redhat.com> - 1:3.1.3-17
-- Add junit to pom deps. Was originally supplied by ws-commons-util (#1460767)
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Jan 12 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 1:3.1.3-15
-- Rebuild for readline 7.x
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Feb 13 2015 gil cattaneo <puntogil(a)libero.it> 1:3.1.3-12
-- introduce license macro
-
-* Thu Jul 10 2014 Sami Wagiaalla <swagiaal(a)redhat.com> - 1:3.1.3-11
-- Add OSGi info for xmlrpc-server jar.
-- export o.a.xmlrpc from xmlrpc-client jar.
-
-* Mon Jun 16 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:3.1.3-10
-- Use servlet 3.1.0 API
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1:3.1.3-8
-- Use Requires: java-headless rebuild (#1067528)
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:3.1.3-6
-- Update to current packaging guidelines
-
-* Fri May 17 2013 Alexander Kurtakov <akurtako(a)redhat.com> 1:3.1.3-5
-- Remove javax.xml.bind from osgi imports - it's part of the JVM now.
-- Drop the ws-jaxme dependency for the same reason.
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1:3.1.3-3
-- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
-- Replace maven BuildRequires with maven-local
-
-* Sat Oct 20 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.1.3-2
-- xmlrpc v2 had an Epoch so we need one here. Add it back
-
-* Fri Sep 14 2012 Alexander Kurtakov <akurtako(a)redhat.com> 3.1.3-1
-- First release of version 3.x package
commit 1fd6b41bcd33afd8523279dc303ea23fd16a5036
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 27 04:21:15 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index c430286..2979844 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 22%{?dist}
+Release: 23%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -105,6 +105,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Sat Jul 27 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 087a3b1d4b506b4408e73ca997b4bf36ce6ff0b0
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sun Feb 3 12:33:34 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index c2f876a..c430286 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 21%{?dist}
+Release: 22%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -105,6 +105,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 383187a645035d4d1ad39a1eaa8631ed15ea9277
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Jul 14 09:23:48 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 7b3b456..c2f876a 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 20%{?dist}
+Release: 21%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -105,6 +105,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Fri May 18 2018 Michael Simacek <msimacek(a)redhat.com> - 1:3.1.3-20
- Disallow deserialization of <ex:serializable> tags by default
- Resolves CVE-2016-5003
commit 2db59ec8a8b4d358802e98ce0151af84d7b93752
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Wed May 23 08:43:48 2018 +0200
Disallow loading of external DTD
Resolves CVE-2016-5002
diff --git a/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
b/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
index 5018eb6..53a0a98 100644
--- a/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
+++ b/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
@@ -1,7 +1,7 @@
From 495d6136d9de5c0bbddadffe11b0841c6aafcb34 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek(a)redhat.com>
Date: Fri, 18 May 2018 15:22:49 +0200
-Subject: [PATCH] Disallow deserialization of <ex:serializable> tags
+Subject: [PATCH 1/2] Disallow deserialization of <ex:serializable> tags
Can be reenabled by setting JVM property
org.apache.xmlrpc.allowInsecureDeserialization to 1.
diff --git a/xmlrpc-disallow-loading-external-dtd.patch
b/xmlrpc-disallow-loading-external-dtd.patch
new file mode 100644
index 0000000..f59b9c0
--- /dev/null
+++ b/xmlrpc-disallow-loading-external-dtd.patch
@@ -0,0 +1,30 @@
+From 338ab231b228bd36afda4ab31db724c6669579b2 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek(a)redhat.com>
+Date: Tue, 22 May 2018 10:53:28 +0200
+Subject: [PATCH 2/2] Disallow loading external DTD
+
+---
+ .../src/main/java/org/apache/xmlrpc/util/SAXParsers.java | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
+index b1034e7..49ef5de 100644
+--- a/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
++++ b/common/src/main/java/org/apache/xmlrpc/util/SAXParsers.java
+@@ -48,6 +48,13 @@ public class SAXParsers {
+ } catch (org.xml.sax.SAXException e) {
+ // Ignore it
+ }
++ try {
++
spf.setFeature("http://apache.org/xml/features/nonvalidating/load-ex...;,
false);
++ } catch (javax.xml.parsers.ParserConfigurationException e) {
++ // Ignore it
++ } catch (org.xml.sax.SAXException e) {
++ // Ignore it
++ }
+ }
+
+ /** Creates a new instance of {@link XMLReader}.
+--
+2.17.0
+
diff --git a/xmlrpc.spec b/xmlrpc.spec
index ccad587..7b3b456 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -13,6 +13,7 @@ Patch1: %{name}-common-addosgimanifest.patch
Patch2: %{name}-javax-methods.patch
Patch3: %{name}-server-addosgimanifest.patch
Patch4: %{name}-disallow-deserialization-of-ex-serializable-tags.patch
+Patch5: %{name}-disallow-loading-external-dtd.patch
BuildRequires: maven-local
BuildRequires: mvn(org.apache:apache:pom:)
@@ -74,6 +75,7 @@ pushd server
%patch3 -b .sav
popd
%patch4 -p1
+%patch5 -p1
sed -i 's/\r//' LICENSE.txt
@@ -106,6 +108,8 @@ sed -i 's/\r//' LICENSE.txt
* Fri May 18 2018 Michael Simacek <msimacek(a)redhat.com> - 1:3.1.3-20
- Disallow deserialization of <ex:serializable> tags by default
- Resolves CVE-2016-5003
+- Disallow loading of external DTD
+- Resolves CVE-2016-5002
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit ef4efbf91d241070f6f41950f7536049688a3a67
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Fri May 18 15:39:56 2018 +0200
Disallow deserialization of <ex:serializable> tags by default
- Resolves CVE-2016-5003
diff --git a/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
b/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
new file mode 100644
index 0000000..5018eb6
--- /dev/null
+++ b/xmlrpc-disallow-deserialization-of-ex-serializable-tags.patch
@@ -0,0 +1,35 @@
+From 495d6136d9de5c0bbddadffe11b0841c6aafcb34 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek(a)redhat.com>
+Date: Fri, 18 May 2018 15:22:49 +0200
+Subject: [PATCH] Disallow deserialization of <ex:serializable> tags
+
+Can be reenabled by setting JVM property
+org.apache.xmlrpc.allowInsecureDeserialization to 1.
+
+- Resolves CVE-2016-5003
+---
+ .../java/org/apache/xmlrpc/parser/SerializableParser.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
+index 18f25ac..c8bb7ed 100644
+--- a/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
++++ b/common/src/main/java/org/apache/xmlrpc/parser/SerializableParser.java
+@@ -29,6 +29,14 @@ import org.apache.xmlrpc.XmlRpcException;
+ */
+ public class SerializableParser extends ByteArrayParser {
+ public Object getResult() throws XmlRpcException {
++ if
(!"1".equals(System.getProperty("org.apache.xmlrpc.allowInsecureDeserialization")))
{
++ throw new UnsupportedOperationException(
++ "Deserialization of ex:serializable objects is
vulnerable to " +
++ "remote execution attacks and is disabled by default.
" +
++ "If you are sure the source data is trusted, you can
enable " +
++ "it by setting
org.apache.xmlrpc.allowInsecureDeserialization " +
++ "JVM property to 1");
++ }
+ try {
+ byte[] res = (byte[]) super.getResult();
+ ByteArrayInputStream bais = new ByteArrayInputStream(res);
+--
+2.17.0
+
diff --git a/xmlrpc.spec b/xmlrpc.spec
index e617061..ccad587 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 19%{?dist}
+Release: 20%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -12,6 +12,7 @@ Patch0: %{name}-client-addosgimanifest.patch
Patch1: %{name}-common-addosgimanifest.patch
Patch2: %{name}-javax-methods.patch
Patch3: %{name}-server-addosgimanifest.patch
+Patch4: %{name}-disallow-deserialization-of-ex-serializable-tags.patch
BuildRequires: maven-local
BuildRequires: mvn(org.apache:apache:pom:)
@@ -72,6 +73,7 @@ popd
pushd server
%patch3 -b .sav
popd
+%patch4 -p1
sed -i 's/\r//' LICENSE.txt
@@ -101,6 +103,10 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Fri May 18 2018 Michael Simacek <msimacek(a)redhat.com> - 1:3.1.3-20
+- Disallow deserialization of <ex:serializable> tags by default
+- Resolves CVE-2016-5003
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit 5b7a60c7fe55fbb24f6c1cdf35f6ba63237586c9
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 9 21:47:27 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 3fcce3f..e617061 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 18%{?dist}
+Release: 19%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -101,6 +101,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
commit d5ec53e08d8e44e93970c95362b801913f5da16c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jul 27 22:13:55 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 74c09de..3fcce3f 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 17%{?dist}
+Release: 18%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -101,6 +101,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
* Mon Jun 12 2017 Troy Dawson <tdawson(a)redhat.com> - 1:3.1.3-17
- Add junit to pom deps. Was originally supplied by ws-commons-util (#1460767)
commit 6b0ae9a5c0b28054507a2e6c899e740161d06df1
Author: Troy Dawson <tdawson(a)redhat.com>
Date: Mon Jun 12 09:42:59 2017 -0700
Add junit to pom deps
Signed-off-by: Mikolaj Izdebski <mizdebsk(a)redhat.com>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 98a267f..74c09de 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 16%{?dist}
+Release: 17%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -77,6 +77,9 @@ sed -i 's/\r//' LICENSE.txt
%pom_disable_module dist
%pom_remove_dep jaxme:jaxmeapi common
+# This dep is no longer supplied by ws-commons-util
+%pom_add_dep junit:junit:3.8.1:test
+
%mvn_file :{*} @1
%mvn_package :*-common %{name}
@@ -98,6 +101,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Mon Jun 12 2017 Troy Dawson <tdawson(a)redhat.com> - 1:3.1.3-17
+- Add junit to pom deps. Was originally supplied by ws-commons-util (#1460767)
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
commit 308daf7a186d5e72148ecedea763298f675f2d59
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 11 17:57:46 2017 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index eb4a037..98a267f 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 15%{?dist}
+Release: 16%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -98,6 +98,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
* Thu Jan 12 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 1:3.1.3-15
- Rebuild for readline 7.x
commit a8a7a1d8eae17746c95e4f538e3214894fc61a7c
Author: Igor Gnatenko <ignatenko(a)redhat.com>
Date: Thu Jan 12 17:30:44 2017 +0100
Rebuild for readline 7.x
Signed-off-by: Igor Gnatenko <ignatenko(a)redhat.com>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index e1a5079..eb4a037 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 14%{?dist}
+Release: 15%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -98,6 +98,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko(a)redhat.com> - 1:3.1.3-15
+- Rebuild for readline 7.x
+
* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
commit 7df5e8828a1b1426c06794f9624058fb5d1b814b
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 5 03:36:26 2016 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 0bff54f..e1a5079 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 13%{?dist}
+Release: 14%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -98,6 +98,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.1.3-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
commit ea8c222187c06f149c193625c1bcffbbcd131968
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Fri Jun 19 04:09:22 2015 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index f701769..0bff54f 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 12%{?dist}
+Release: 13%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -98,6 +98,9 @@ sed -i 's/\r//' LICENSE.txt
%license LICENSE.txt NOTICE.txt
%changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
* Fri Feb 13 2015 gil cattaneo <puntogil(a)libero.it> 1:3.1.3-12
- introduce license macro
commit dc08731b2c0019e2dce9c809e34df7120d7dc32c
Author: gil <puntogil(a)libero.it>
Date: Sat Feb 14 00:20:28 2015 +0100
introduce license macro
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 372a680..f701769 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 11%{?dist}
+Release: 12%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -88,17 +88,20 @@ sed -i 's/\r//' LICENSE.txt
%mvn_install
%files common -f .mfiles-%{name}
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
%files client -f .mfiles-%{name}-client
%files server -f .mfiles-%{name}-server
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
%changelog
-* Thu Jul 10 2014 Sami Wagiaalla <swagiaal(a)redhat.com> - 1:3.1.3-10
+* Fri Feb 13 2015 gil cattaneo <puntogil(a)libero.it> 1:3.1.3-12
+- introduce license macro
+
+* Thu Jul 10 2014 Sami Wagiaalla <swagiaal(a)redhat.com> - 1:3.1.3-11
- Add OSGi info for xmlrpc-server jar.
- export o.a.xmlrpc from xmlrpc-client jar.
commit db647bf94a16172f76eb6157c2f5dd968dd5beba
Author: Sami Wagiaalla <swagiaal(a)redhat.com>
Date: Thu Jul 10 09:46:22 2014 -0400
Add OSGi info for xmlrpc-server jar.
- export o.a.xmlrpc from xmlrpc-client jar.
diff --git a/xmlrpc-client-addosgimanifest.patch b/xmlrpc-client-addosgimanifest.patch
index 1b39a19..437d78f 100644
--- a/xmlrpc-client-addosgimanifest.patch
+++ b/xmlrpc-client-addosgimanifest.patch
@@ -10,7 +10,7 @@
+ <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
-+ <Export-Package>org.apache.xmlrpc.client,
org.apache.xmlrpc.client.util</Export-Package>
++ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.client,
org.apache.xmlrpc.client.util</Export-Package>
+ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0,
J2SE-1.3</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
diff --git a/xmlrpc-server-addosgimanifest.patch b/xmlrpc-server-addosgimanifest.patch
new file mode 100644
index 0000000..af54e20
--- /dev/null
+++ b/xmlrpc-server-addosgimanifest.patch
@@ -0,0 +1,15 @@
+--- pom.xml 2014-07-07 11:24:52.668887604 -0400
++++ pom.xml.sav 2014-07-07 11:25:06.174916380 -0400
+@@ -48,6 +48,12 @@
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${project.version}</Implementation-Version>
++ <Bundle-ManifestVersion>1</Bundle-ManifestVersion>
++ <Bundle-Name>%Bundle-Name</Bundle-Name>
++
<Bundle-SymbolicName>org.apache.xmlrpc.server</Bundle-SymbolicName>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
++
<Export-Package>org.apache.xmlrpc.server,org.apache.xmlrpc.webserver</Export-Package>
+ </manifestEntries>
+ </archive>
+ </configuration>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 258df85..372a680 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 10%{?dist}
+Release: 11%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -11,6 +11,7 @@ Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{ver
Patch0: %{name}-client-addosgimanifest.patch
Patch1: %{name}-common-addosgimanifest.patch
Patch2: %{name}-javax-methods.patch
+Patch3: %{name}-server-addosgimanifest.patch
BuildRequires: maven-local
BuildRequires: mvn(org.apache:apache:pom:)
@@ -68,6 +69,9 @@ popd
pushd common
%patch1 -b .sav
popd
+pushd server
+%patch3 -b .sav
+popd
sed -i 's/\r//' LICENSE.txt
@@ -94,6 +98,10 @@ sed -i 's/\r//' LICENSE.txt
%doc LICENSE.txt NOTICE.txt
%changelog
+* Thu Jul 10 2014 Sami Wagiaalla <swagiaal(a)redhat.com> - 1:3.1.3-10
+- Add OSGi info for xmlrpc-server jar.
+- export o.a.xmlrpc from xmlrpc-client jar.
+
* Mon Jun 16 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:3.1.3-10
- Use servlet 3.1.0 API
commit 778e72b35bcf0300a6cd14f1dceaa052fc5b133e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Jun 16 10:27:03 2014 +0200
Use servlet 3.1.0 API
diff --git a/xmlrpc-javax-methods.patch b/xmlrpc-javax-methods.patch
index 2a99d9f..0c66b6c 100644
--- a/xmlrpc-javax-methods.patch
+++ b/xmlrpc-javax-methods.patch
@@ -1,6 +1,75 @@
-diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java.fix
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
----
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java.fix 2012-07-24
14:49:54.000000000 -0400
-+++
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java 2012-07-24
18:20:17.000000000 -0400
+From d6834da0b1556bb133a534d31bb94d08f38fa195 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+Date: Mon, 16 Jun 2014 10:03:35 +0200
+Subject: [PATCH] Use servlet 3.1.0 API
+
+---
+ dist/pom.xml | 2 +-
+ pom.xml | 4 +-
+ server/pom.xml | 8 +++-
+ .../xmlrpc/webserver/HttpServletRequestImpl.java | 54 ++++++++++++++++++++++
+ .../xmlrpc/webserver/HttpServletResponseImpl.java | 26 ++++++++++-
+ .../xmlrpc/webserver/ServletOutputStreamImpl.java | 5 ++
+ 6 files changed, 94 insertions(+), 5 deletions(-)
+
+diff --git a/dist/pom.xml b/dist/pom.xml
+index 67aded6..c18c2eb 100644
+--- a/dist/pom.xml
++++ b/dist/pom.xml
+@@ -59,7 +59,7 @@
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
++ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+diff --git a/pom.xml b/pom.xml
+index 3933da5..70c508e 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -344,8 +344,8 @@
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
+- <version>2.4</version>
++ <artifactId>javax.servlet-api</artifactId>
++ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+diff --git a/server/pom.xml b/server/pom.xml
+index 0d09544..01288c8 100644
+--- a/server/pom.xml
++++ b/server/pom.xml
+@@ -67,6 +67,12 @@
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
++ <exclusions>
++ <exclusion>
++ <groupId>javax.servlet</groupId>
++ <artifactId>servlet-api</artifactId>
++ </exclusion>
++ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+@@ -81,7 +87,7 @@
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+- <artifactId>servlet-api</artifactId>
++ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+diff --git a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
+index 3dc7e43..19b14a2 100644
+--- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
++++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
@@ -31,6 +31,7 @@ import java.net.URLDecoder;
import java.security.Principal;
import java.util.ArrayList;
@@ -9,9 +78,13 @@ diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
-@@ -41,8 +42,15 @@ import java.util.StringTokenizer;
+@@ -39,10 +40,20 @@ import java.util.Locale;
+ import java.util.Map;
+ import java.util.StringTokenizer;
++import javax.servlet.ReadListener;
import javax.servlet.RequestDispatcher;
++import javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
+import javax.servlet.DispatcherType;
+import javax.servlet.AsyncContext;
@@ -19,13 +92,14 @@ diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import javax.servlet.http.Cookie;
++import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.Part;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import org.apache.xmlrpc.common.XmlRpcStreamConfig;
-@@ -66,6 +74,7 @@ public class HttpServletRequestImpl impl
+@@ -66,6 +77,7 @@ public class HttpServletRequestImpl implements HttpServletRequest {
private String queryString;
private String httpVersion;
private final Map headers = new HashMap();
@@ -33,7 +107,26 @@ diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm
private final Map attributes = new HashMap();
private Map parameters;
private String characterEncoding;
-@@ -227,6 +236,12 @@ public class HttpServletRequestImpl impl
+@@ -97,6 +109,18 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ }
+ return c;
+ }
++
++ public boolean isFinished() {
++ return contentBytesRemaining == 0;
++ }
++
++ public boolean isReady() {
++ return true;
++ }
++
++ public void setReadListener(ReadListener arg0) {
++ throw new IllegalStateException("Not implemented.");
++ }
+ };
+ }
+
+@@ -227,6 +251,12 @@ public class HttpServletRequestImpl implements HttpServletRequest {
return Collections.enumeration(list);
}
@@ -46,7 +139,7 @@ diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm
public int getIntHeader(String pHeader) {
String s = getHeader(pHeader);
return s == null ? -1 : Integer.parseInt(s);
-@@ -242,6 +257,10 @@ public class HttpServletRequestImpl impl
+@@ -242,6 +272,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
public String getRemoteUser() { throw new IllegalStateException("Not
implemented"); }
@@ -57,7 +150,7 @@ diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm
public String getRequestURI() { return uri; }
public StringBuffer getRequestURL() {
-@@ -280,6 +299,20 @@ public class HttpServletRequestImpl impl
+@@ -280,6 +314,20 @@ public class HttpServletRequestImpl implements HttpServletRequest {
return sb;
}
@@ -78,9 +171,21 @@ diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestIm
public String getRequestedSessionId() { throw new IllegalStateException("Not
implemented"); }
public String getServletPath() { return uri; }
-diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java.fix
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
----
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java.fix 2012-07-24
14:49:46.000000000 -0400
-+++
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java 2012-07-24
15:22:31.000000000 -0400
+@@ -544,4 +592,10 @@ public class HttpServletRequestImpl implements HttpServletRequest {
+ }
+
+ protected String getHttpVersion() { return httpVersion; }
++
++ public long getContentLengthLong() { throw new IllegalStateException("Not
implemented."); }
++
++ public String changeSessionId() { throw new IllegalStateException("Not
implemented."); }
++
++ public HttpUpgradeHandler upgrade(Class arg0) { throw new
IllegalStateException("Not implemented."); }
+ }
+diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
+index 6ba7018..5319dcf 100644
+--- a/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
++++ b/server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
@@ -29,6 +29,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -90,7 +195,7 @@ diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseI
import java.util.StringTokenizer;
import javax.servlet.ServletOutputStream;
-@@ -84,7 +86,7 @@ public class HttpServletResponseImpl imp
+@@ -84,7 +86,7 @@ public class HttpServletResponseImpl implements HttpServletResponse {
}
}
@@ -99,7 +204,7 @@ diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseI
String key = pHeader.toLowerCase();
Object o = headers.get(key);
if (o == null) {
-@@ -101,6 +103,26 @@ public class HttpServletResponseImpl imp
+@@ -101,6 +103,26 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
}
}
@@ -126,3 +231,34 @@ diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseI
public void addIntHeader(String pHeader, int pValue) {
addHeader(pHeader, Integer.toString(pValue));
}
+@@ -465,4 +487,6 @@ public class HttpServletResponseImpl implements HttpServletResponse
{
+ sb.append("\r\n");
+ return sb.toString();
+ }
++
++ public void setContentLengthLong(long arg0) { throw new IllegalStateException("Not
implemented."); }
+ }
+diff --git
a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
+index c2a53b1..86dbbb4 100644
+--- a/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
++++ b/server/src/main/java/org/apache/xmlrpc/webserver/ServletOutputStreamImpl.java
+@@ -22,6 +22,7 @@ import java.io.IOException;
+ import java.io.OutputStream;
+
+ import javax.servlet.ServletOutputStream;
++import javax.servlet.WriteListener;
+
+
+ /** Default implementation of a servlet output stream.
+@@ -99,4 +100,8 @@ class ServletOutputStreamImpl extends ServletOutputStream {
+ boolean isCommitted() {
+ return committed;
+ }
++
++ public boolean isReady() { return true; }
++
++ public void setWriteListener(WriteListener arg0) { throw new
IllegalStateException("Not implemented."); }
+ }
+--
+1.9.3
+
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 1c027f9..258df85 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -13,7 +13,7 @@ Patch1: %{name}-common-addosgimanifest.patch
Patch2: %{name}-javax-methods.patch
BuildRequires: maven-local
-BuildRequires: mvn(org.apache:apache)
+BuildRequires: mvn(org.apache:apache:pom:)
BuildRequires: mvn(commons-httpclient:commons-httpclient)
BuildRequires: mvn(commons-logging:commons-logging)
BuildRequires: mvn(javax.servlet:servlet-api)
@@ -61,7 +61,7 @@ Provides: %{name}3-server = 3.1.3-13
%prep
%setup -q -n apache-%{name}-%{version}-src
-%patch2 -b .sav
+%patch2 -p1
pushd client
%patch0 -b .sav
popd
@@ -94,6 +94,9 @@ sed -i 's/\r//' LICENSE.txt
%doc LICENSE.txt NOTICE.txt
%changelog
+* Mon Jun 16 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:3.1.3-10
+- Use servlet 3.1.0 API
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
commit f35522f3b983ab39ffe8c3e63796692199f9282e
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sun Jun 8 01:07:46 2014 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 9b16359..1c027f9 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -94,6 +94,9 @@ sed -i 's/\r//' LICENSE.txt
%doc LICENSE.txt NOTICE.txt
%changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1:3.1.3-8
- Use Requires: java-headless rebuild (#1067528)
commit 16e9536e35b3742aa46d4c7c3027229b41bc5146
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Mar 4 09:06:04 2014 +0100
Use Requires: java-headless rebuild (#1067528)
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 54eca03..9b16359 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -94,6 +94,9 @@ sed -i 's/\r//' LICENSE.txt
%doc LICENSE.txt NOTICE.txt
%changelog
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 1:3.1.3-8
+- Use Requires: java-headless rebuild (#1067528)
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
commit 0bd71fc4efa85ff5262efb99ef3f2c23d01a41a2
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sun Aug 4 03:31:11 2013 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index ee29b35..54eca03 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -94,6 +94,9 @@ sed -i 's/\r//' LICENSE.txt
%doc LICENSE.txt NOTICE.txt
%changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:3.1.3-6
- Update to current packaging guidelines
commit 2449421c8611008868c589d59623bdc762680353
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Jun 14 20:33:01 2013 +0200
Update to current packaging guidelines
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 5c1a899..ee29b35 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,35 +1,24 @@
-Name: xmlrpc
-Version: 3.1.3
-Release: 5%{?dist}
-Epoch: 1
-Summary: Java XML-RPC implementation
-License: ASL 2.0
-Group: Development/Libraries
-URL: http://ws.apache.org/xmlrpc/
-Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version}-src...
-# Add OSGi MANIFEST information
-Patch0: %{name}-client-addosgimanifest.patch
-Patch1: %{name}-common-addosgimanifest.patch
-Patch2: %{name}-javax-methods.patch
+Name: xmlrpc
+Version: 3.1.3
+Release: 6%{?dist}
+Epoch: 1
+Summary: Java XML-RPC implementation
+License: ASL 2.0
+URL: http://ws.apache.org/xmlrpc/
+BuildArch: noarch
+
+Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version}-src...
+Patch0: %{name}-client-addosgimanifest.patch
+Patch1: %{name}-common-addosgimanifest.patch
+Patch2: %{name}-javax-methods.patch
BuildRequires: maven-local
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: maven-site-plugin
-BuildRequires: ws-commons-util
-BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: tomcat-servlet-3.0-api
-BuildRequires: junit
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: apache-commons-logging
-
-BuildArch: noarch
+BuildRequires: mvn(org.apache:apache)
+BuildRequires: mvn(commons-httpclient:commons-httpclient)
+BuildRequires: mvn(commons-logging:commons-logging)
+BuildRequires: mvn(javax.servlet:servlet-api)
+BuildRequires: mvn(org.apache.ws.commons.util:ws-commons-util)
+
%description
Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -40,44 +29,32 @@ statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
%package javadoc
Summary: Javadoc for %{name}
-Group: Documentation
%description javadoc
Javadoc for %{name}.
%package common
Summary: Common classes for XML-RPC client and server implementations
-Group: Development/Libraries
# Provide xmlrpc is not here because it would be useless due to different jar names
Obsoletes: %{name} < 3.1.3
Obsoletes: %{name}3-common < 3.1.3-13
Provides: %{name}3-common = 3.1.3-13
-Requires: ws-commons-util
-Requires: jpackage-utils >= 0:1.6
-Requires: apache-commons-logging
%description common
%{summary}.
%package client
Summary: XML-RPC client implementation
-Group: Development/Libraries
-Requires: %{name}-common
-Requires: jakarta-commons-httpclient
Obsoletes: %{name}3-client < 3.1.3-13
-Provides: %{name}3-client = 3.1.3-13
+Provides: %{name}3-client = 3.1.3-13
%description client
%{summary}.
%package server
Summary: XML-RPC server implementation
-Group: Development/Libraries
-Requires: %{name}-client
-Requires: junit
-Requires: tomcat-servlet-3.0-api
Obsoletes: %{name}3-server < 3.1.3-13
-Provides: %{name}3-server = 3.1.3-13
+Provides: %{name}3-server = 3.1.3-13
%description server
%{summary}.
@@ -94,71 +71,32 @@ popd
sed -i 's/\r//' LICENSE.txt
-%pom_remove_dep jaxme:jaxmeapi
+%pom_disable_module dist
+%pom_remove_dep jaxme:jaxmeapi common
+%mvn_file :{*} @1
+%mvn_package :*-common %{name}
%build
-# ignore test failure because server part needs network
-mvn-rpmbuild \
- -e \
- -Dmaven.test.failure.ignore=true \
- install javadoc:aggregate
+# FIXME: ignore test failure because server part needs network
+%mvn_build -s -- -Dmaven.test.failure.ignore=true
%install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 client/target/%{name}-client-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-client.jar
-install -m 644 server/target/%{name}-server-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-server.jar
-install -m 644 common/target/%{name}-common-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-common.jar
-
-#compat symlinks remove in F-20
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-client.jar %{name}3-client.jar
-ln -s %{name}-server.jar %{name}3-server.jar
-ln -s %{name}-common.jar %{name}3-common.jar
-popd
-
-# install maven pom files
-install -Dm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-install -Dm 644 common/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-common.pom
-install -Dm 644 client/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-client.pom
-install -Dm 644 server/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server.pom
+%mvn_install
-# ... and maven depmaps
-%add_maven_depmap JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}-common.pom %{name}-common.jar
-%add_maven_depmap JPP-%{name}-client.pom %{name}-client.jar
-%add_maven_depmap JPP-%{name}-server.pom %{name}-server.jar
+%files common -f .mfiles-%{name}
+%doc LICENSE.txt NOTICE.txt
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%files client -f .mfiles-%{name}-client
-%files javadoc
-%doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/*
+%files server -f .mfiles-%{name}-server
-%files common
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavenpomdir}/JPP-%{name}-common.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}-common.jar
-%{_javadir}/%{name}3-common.jar
-
-%files client
-%{_mavenpomdir}/JPP-%{name}-client.pom
-%{_javadir}/%{name}-client.jar
-%{_javadir}/%{name}3-client.jar
-
-%files server
-%{_mavenpomdir}/JPP-%{name}-server.pom
-%{_javadir}/%{name}-server.jar
-%{_javadir}/%{name}3-server.jar
%changelog
+* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:3.1.3-6
+- Update to current packaging guidelines
+
* Fri May 17 2013 Alexander Kurtakov <akurtako(a)redhat.com> 1:3.1.3-5
- Remove javax.xml.bind from osgi imports - it's part of the JVM now.
- Drop the ws-jaxme dependency for the same reason.
@@ -170,7 +108,7 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
-* Sat Oct 20 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.1.3-2
+* Sat Oct 20 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.1.3-2
- xmlrpc v2 had an Epoch so we need one here. Add it back
* Fri Sep 14 2012 Alexander Kurtakov <akurtako(a)redhat.com> 3.1.3-1
commit ba5aa4a374902f0bda90c825e9ed8f2b87a3825e
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri May 17 14:33:33 2013 +0300
Remove javax.xml.bind from osgi imports - it's part of the JVM now.
- Drop the ws-jaxme dependency for the same reason.
diff --git a/xmlrpc-client-addosgimanifest.patch b/xmlrpc-client-addosgimanifest.patch
index 2ef2636..1b39a19 100644
--- a/xmlrpc-client-addosgimanifest.patch
+++ b/xmlrpc-client-addosgimanifest.patch
@@ -11,7 +11,7 @@
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
+ <Export-Package>org.apache.xmlrpc.client,
org.apache.xmlrpc.client.util</Export-Package>
-+ <Import-Package>javax.xml.bind, javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
++ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0,
J2SE-1.3</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
+ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
diff --git a/xmlrpc-common-addosgimanifest.patch b/xmlrpc-common-addosgimanifest.patch
index b136bbf..4d4aeca 100644
--- a/xmlrpc-common-addosgimanifest.patch
+++ b/xmlrpc-common-addosgimanifest.patch
@@ -10,7 +10,7 @@
+
<Bundle-SymbolicName>org.apache.xmlrpc.common</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.common,
org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer,
org.apache.xmlrpc.util</Export-Package>
-+ <Import-Package>javax.xml.bind, javax.xml.namespace,
javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
++ <Import-Package>javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.4,
CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
+ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
diff --git a/xmlrpc-jpp-depmap.xml b/xmlrpc-jpp-depmap.xml
deleted file mode 100644
index d622c4b..0000000
--- a/xmlrpc-jpp-depmap.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<dependencies>
- <dependency>
- <maven>
- <groupId>jaxme</groupId>
- <artifactId>jaxmeapi</artifactId>
- <version>0.5.1</version>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>jaxme/jaxmeapi</artifactId>
- <version>0.5.1</version>
- </jpp>
- </dependency>
-</dependencies>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 9963bf9..5c1a899 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,13 +1,12 @@
Name: xmlrpc
Version: 3.1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
Group: Development/Libraries
URL: http://ws.apache.org/xmlrpc/
Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version}-src...
-Source1: %{name}-jpp-depmap.xml
# Add OSGi MANIFEST information
Patch0: %{name}-client-addosgimanifest.patch
Patch1: %{name}-common-addosgimanifest.patch
@@ -23,7 +22,6 @@ BuildRequires: maven-javadoc-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-site-plugin
-BuildRequires: ws-jaxme
BuildRequires: ws-commons-util
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: tomcat-servlet-3.0-api
@@ -54,7 +52,6 @@ Group: Development/Libraries
Obsoletes: %{name} < 3.1.3
Obsoletes: %{name}3-common < 3.1.3-13
Provides: %{name}3-common = 3.1.3-13
-Requires: ws-jaxme
Requires: ws-commons-util
Requires: jpackage-utils >= 0:1.6
Requires: apache-commons-logging
@@ -97,11 +94,12 @@ popd
sed -i 's/\r//' LICENSE.txt
+%pom_remove_dep jaxme:jaxmeapi
+
%build
# ignore test failure because server part needs network
mvn-rpmbuild \
-e \
- -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
install javadoc:aggregate
@@ -161,6 +159,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadir}/%{name}3-server.jar
%changelog
+* Fri May 17 2013 Alexander Kurtakov <akurtako(a)redhat.com> 1:3.1.3-5
+- Remove javax.xml.bind from osgi imports - it's part of the JVM now.
+- Drop the ws-jaxme dependency for the same reason.
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
commit e038c2166d92b68078f466cccadf9d0f7dab0981
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Thu Feb 14 21:50:38 2013 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index cb02d38..9963bf9 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -161,6 +161,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadir}/%{name}3-server.jar
%changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1:3.1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1:3.1.3-3
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
commit 7c520a0c47dcbf44f7e5428cbfd9457cc98573e0
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Wed Feb 6 20:49:51 2013 +0100
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
diff --git a/xmlrpc.spec b/xmlrpc.spec
index e572d8e..cb02d38 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
Name: xmlrpc
Version: 3.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -13,7 +13,7 @@ Patch0: %{name}-client-addosgimanifest.patch
Patch1: %{name}-common-addosgimanifest.patch
Patch2: %{name}-javax-methods.patch
-BuildRequires: maven
+BuildRequires: maven-local
BuildRequires: maven-resources-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-surefire-plugin
@@ -161,6 +161,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadir}/%{name}3-server.jar
%changelog
+* Wed Feb 06 2013 Java SIG <java-devel(a)lists.fedoraproject.org> - 1:3.1.3-3
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
* Sat Oct 20 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.1.3-2
- xmlrpc v2 had an Epoch so we need one here. Add it back
commit f4b12f09650d60e755253462f4e38ddc4bc248bb
Author: Peter Robinson <pbrobinson(a)gmail.com>
Date: Sat Oct 20 12:53:04 2012 +0100
xmlrpc v2 had an Epoch so we need one here. Add it back
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 568dcc0..e572d8e 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,7 @@
Name: xmlrpc
Version: 3.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
+Epoch: 1
Summary: Java XML-RPC implementation
License: ASL 2.0
Group: Development/Libraries
@@ -160,5 +161,8 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadir}/%{name}3-server.jar
%changelog
+* Sat Oct 20 2012 Peter Robinson <pbrobinson(a)fedoraproject.org> 3.1.3-2
+- xmlrpc v2 had an Epoch so we need one here. Add it back
+
* Fri Sep 14 2012 Alexander Kurtakov <akurtako(a)redhat.com> 3.1.3-1
- First release of version 3.x package
commit 1fc74296971bda3ebf856eeb17ddbab47890513e
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Sep 14 11:27:53 2012 +0300
Move to xmlrpc version 3.x.
diff --git a/.gitignore b/.gitignore
index a8f88ef..6de88cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xmlrpc-2.0.1-src.tar.gz
+/apache-xmlrpc-3.1.3-src.tar.bz2
diff --git a/.project b/.project
new file mode 100644
index 0000000..d3cdf74
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>xmlrpc</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.linuxtools.rpm.rpmlint.rpmlintBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.linuxtools.rpm.rpmlint.rpmlintNature</nature>
+ </natures>
+</projectDescription>
diff --git a/changelog-pre3.x.txt b/changelog-pre3.x.txt
new file mode 100644
index 0000000..9cef632
--- /dev/null
+++ b/changelog-pre3.x.txt
@@ -0,0 +1,120 @@
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-12
+- Migrate to new tomcat-servlet-api
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Dec 21 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-9
+- Require java >= 1:1.6.0
+- Fix classpaths to ensure building of all optional features
+- Remove stale patch
+
+* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-8
+- Migrate from old servlet api to new one
+
+* Thu Dec 9 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-7
+- Remove gcj support
+- Make jars/javadocs versionless
+- Add ws-commons-util Requires
+- Use apache-commons-codec
+- Drop unneeded patch for jsse
+
+* Thu Mar 11 2010 Peter Lemenkov <lemenkov(a)gmail.com> - 0:2.0.1-6.6
+- Added missing requires jpackage-utils
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-6.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-5.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4.5
+- drop repotag
+
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4jpp.4
+- fix license tag
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> -
0:2.0.1-4jpp.3
+- Autorebuild for GCC 4.3
+
+* Tue Mar 27 2007 Matt Wringe <mwringe(a)redhat.com> 0:2.0.1-3jpp.3
+- Spec file clean up for Fedora Extras Review
+
+* Thu Mar 08 2007 Deepak Bhole <dbhole(a)redhat.com> 2.0.1-3jpp.2
+- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
+- Minor spec file cleanup
+
+* Fri Aug 04 2006 Vivek Lakshmanan <vivekl(a)redhat.com> - 0:2.0.1-3jpp.1
+- Merge with latest from JPP.
+
+* Sat Jul 22 2006 Jakub Jelinek <jakub(a)redhat.com> - 0:2.0.1-1jpp_8.2fc
+- Rebuilt
+
+* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_8.1fc
+- rebuild
+
+* Wed Mar 8 2006 Rafael Schloming <rafaels(a)redhat.com> - 0:2.0.1-1jpp_7fc
+- excluded s390 due to eclipse
+
+* Mon Mar 6 2006 Jeremy Katz <katzj(a)redhat.com> - 0:2.0.1-1jpp_6fc
+- stop scriptlet spew
+
+* Fri Feb 24 2006 Igor Foox <ifoox(a)redhat.com> - 0:2.0.1-1jpp_5fc
+- Added post/postun dependency on coreutils.
+
+* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_4fc
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_3fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Wed Jan 25 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_2fc
+- ExcludeArch s390x and ppc64
+
+* Wed Jan 18 2006 Andrew Overholt <overholt(a)redhat.com> 0:2.0.1-1jpp_2fc
+- Comment out JPackage Distribution and Vendor tags
+
+* Wed Jan 18 2006 Jesse Keating <jkeating(a)redhat.com> 0:2.0.1-1jpp_2fc
+- bump for test
+
+* Wed Jan 18 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_1fc
+- Update to version 2.0.1
+- Natively compile
+
+* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2-0.b1.3jpp
+- Build with ant-1.6.2
+
+* Thu Apr 29 2004 David Walluck <david(a)jpackage.org> 0:1.2-0.b1.2jpp
+- add jar symlinks
+- remove %%buildroot in %%install
+
+* Tue May 06 2003 David Walluck <david(a)anti-microsoft.org> 0:1.2-0.b1.1jpp
+- 1.2-b1
+- update for JPackage 1.5
+
+* Mon Mar 18 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.1-1jpp
+- 1.1
+- generic servlet support
+- used source release
+- dropped patch
+- added applet jar
+
+* Mon Jan 21 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-3jpp
+- versioned dir for javadoc
+- no dependencies for javadoc package
+- dropped jsse package
+- adaptation to new servlet3 package
+- adaptation to new jsse package
+- section macro
+
+* Fri Dec 7 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-2jpp
+- javadoc into javadoc package
+
+* Sat Nov 3 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-1jpp
+- first JPackage release
diff --git a/sources b/sources
index 281ba07..f4bbd2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b88cc15b25d9bd688b1889d2ad234125 xmlrpc-2.0.1-src.tar.gz
+f7817485fa6a6a500c49ec9515d1f3b9 apache-xmlrpc-3.1.3-src.tar.bz2
diff --git a/xmlrpc-client-addosgimanifest.patch b/xmlrpc-client-addosgimanifest.patch
new file mode 100644
index 0000000..2ef2636
--- /dev/null
+++ b/xmlrpc-client-addosgimanifest.patch
@@ -0,0 +1,20 @@
+--- pom.xml.sav 2010-02-06 17:44:57.000000000 +0200
++++ pom.xml 2010-09-29 09:27:06.194857352 +0300
+@@ -48,6 +48,17 @@
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${project.version}</Implementation-Version>
++ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
++ <Bundle-Name>%Bundle-Name</Bundle-Name>
++ <Bundle-Localization>plugin</Bundle-Localization>
++ <Bundle-SymbolicName>org.apache.xmlrpc</Bundle-SymbolicName>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Require-Bundle>org.apache.xmlrpc.common</Require-Bundle>
++ <Export-Package>org.apache.xmlrpc.client,
org.apache.xmlrpc.client.util</Export-Package>
++ <Import-Package>javax.xml.bind, javax.xml.namespace, javax.xml.parsers,
org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
++ <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0,
J2SE-1.3</Bundle-RequiredExecutionEnvironment>
++ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
++ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
diff --git a/xmlrpc-common-addosgimanifest.patch b/xmlrpc-common-addosgimanifest.patch
new file mode 100644
index 0000000..b136bbf
--- /dev/null
+++ b/xmlrpc-common-addosgimanifest.patch
@@ -0,0 +1,19 @@
+--- pom.xml.sav 2010-02-06 17:44:50.000000000 +0200
++++ pom.xml 2010-09-29 09:30:38.857857644 +0300
+@@ -48,6 +48,16 @@
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Version>${project.version}</Implementation-Version>
++ <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
++ <Bundle-Name>%Bundle-Name</Bundle-Name>
++ <Bundle-Localization>plugin</Bundle-Localization>
++
<Bundle-SymbolicName>org.apache.xmlrpc.common</Bundle-SymbolicName>
++ <Bundle-Version>${project.version}</Bundle-Version>
++ <Export-Package>org.apache.xmlrpc, org.apache.xmlrpc.common,
org.apache.xmlrpc.jaxb, org.apache.xmlrpc.parser, org.apache.xmlrpc.serializer,
org.apache.xmlrpc.util</Export-Package>
++ <Import-Package>javax.xml.bind, javax.xml.namespace,
javax.xml.parsers, org.apache.commons.httpclient, org.apache.commons.httpclient.auth,
org.apache.commons.httpclient.methods, org.apache.commons.httpclient.params,
org.apache.commons.logging, org.apache.ws.commons.serialize, org.apache.ws.commons.util,
org.w3c.dom, org.xml.sax, org.xml.sax.helpers</Import-Package>
++ <Bundle-RequiredExecutionEnvironment>J2SE-1.4,
CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
++ <Eclipse-BuddyPolicy>dependent</Eclipse-BuddyPolicy>
++ <Bundle-Vendor>%Bundle-Vendor.0</Bundle-Vendor>
+ </manifestEntries>
+ </archive>
+ </configuration>
diff --git a/xmlrpc-javax-methods.patch b/xmlrpc-javax-methods.patch
new file mode 100644
index 0000000..2a99d9f
--- /dev/null
+++ b/xmlrpc-javax-methods.patch
@@ -0,0 +1,128 @@
+diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java.fix
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java
+---
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java.fix 2012-07-24
14:49:54.000000000 -0400
++++
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletRequestImpl.java 2012-07-24
18:20:17.000000000 -0400
+@@ -31,6 +31,7 @@ import java.net.URLDecoder;
+ import java.security.Principal;
+ import java.util.ArrayList;
+ import java.util.Collections;
++import java.util.Collection;
+ import java.util.Enumeration;
+ import java.util.HashMap;
+ import java.util.Iterator;
+@@ -41,8 +42,15 @@ import java.util.StringTokenizer;
+
+ import javax.servlet.RequestDispatcher;
+ import javax.servlet.ServletInputStream;
++import javax.servlet.DispatcherType;
++import javax.servlet.AsyncContext;
++import javax.servlet.ServletContext;
++import javax.servlet.ServletRequest;
++import javax.servlet.ServletResponse;
+ import javax.servlet.http.Cookie;
++import javax.servlet.http.Part;
+ import javax.servlet.http.HttpServletRequest;
++import javax.servlet.http.HttpServletResponse;
+ import javax.servlet.http.HttpSession;
+
+ import org.apache.xmlrpc.common.XmlRpcStreamConfig;
+@@ -66,6 +74,7 @@ public class HttpServletRequestImpl impl
+ private String queryString;
+ private String httpVersion;
+ private final Map headers = new HashMap();
++ private final Map parts = new HashMap();
+ private final Map attributes = new HashMap();
+ private Map parameters;
+ private String characterEncoding;
+@@ -227,6 +236,12 @@ public class HttpServletRequestImpl impl
+ return Collections.enumeration(list);
+ }
+
++ public Part getPart(String name) { throw new IllegalStateException("Not
implemented"); }
++
++ public Collection getParts() { throw new IllegalStateException("Not
implemented"); }
++
++ public boolean authenticate (HttpServletResponse response) { throw new
IllegalStateException("Not implemented"); }
++
+ public int getIntHeader(String pHeader) {
+ String s = getHeader(pHeader);
+ return s == null ? -1 : Integer.parseInt(s);
+@@ -242,6 +257,10 @@ public class HttpServletRequestImpl impl
+
+ public String getRemoteUser() { throw new IllegalStateException("Not
implemented"); }
+
++ public void login(String username, String password) { throw new
IllegalStateException("Not implemented"); }
++
++ public void logout() { throw new IllegalStateException("Not implemented"); }
++
+ public String getRequestURI() { return uri; }
+
+ public StringBuffer getRequestURL() {
+@@ -280,6 +299,20 @@ public class HttpServletRequestImpl impl
+ return sb;
+ }
+
++ public AsyncContext getAsyncContext() { throw new IllegalStateException("Not
implemented"); }
++
++ public boolean isAsyncSupported() { return false; }
++
++ public boolean isAsyncStarted() { return false; }
++
++ public ServletContext getServletContext() { throw new IllegalStateException("Not
implemented"); }
++
++ public AsyncContext startAsync(ServletRequest req, ServletResponse resp) { throw new
IllegalStateException("Not implemented"); }
++
++ public AsyncContext startAsync() { throw new IllegalStateException("Not
implemented"); }
++
++ public DispatcherType getDispatcherType() { throw new IllegalStateException("Not
implemented"); }
++
+ public String getRequestedSessionId() { throw new IllegalStateException("Not
implemented"); }
+
+ public String getServletPath() { return uri; }
+diff -up
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java.fix
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java
+---
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java.fix 2012-07-24
14:49:46.000000000 -0400
++++
./server/src/main/java/org/apache/xmlrpc/webserver/HttpServletResponseImpl.java 2012-07-24
15:22:31.000000000 -0400
+@@ -29,6 +29,8 @@ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Locale;
+ import java.util.Map;
++import java.util.Collection;
++import java.util.Collections;
+ import java.util.StringTokenizer;
+
+ import javax.servlet.ServletOutputStream;
+@@ -84,7 +86,7 @@ public class HttpServletResponseImpl imp
+ }
+ }
+
+- private String getHeader(String pHeader) {
++ public String getHeader(String pHeader) {
+ String key = pHeader.toLowerCase();
+ Object o = headers.get(key);
+ if (o == null) {
+@@ -101,6 +103,26 @@ public class HttpServletResponseImpl imp
+ }
+ }
+
++ public Collection getHeaderNames() {
++ return headers.keySet();
++ }
++
++ public Collection getHeaders(String pHeader) {
++ String key = pHeader.toLowerCase();
++ Object o = headers.get(key);
++ List list;
++ if (o instanceof List) {
++ list = (List) o;
++ } else {
++ list = Collections.singletonList(o);
++ }
++ return list;
++ }
++
++ public int getStatus() {
++ return status;
++ }
++
+ public void addIntHeader(String pHeader, int pValue) {
+ addHeader(pHeader, Integer.toString(pValue));
+ }
diff --git a/xmlrpc-jpp-depmap.xml b/xmlrpc-jpp-depmap.xml
new file mode 100644
index 0000000..d622c4b
--- /dev/null
+++ b/xmlrpc-jpp-depmap.xml
@@ -0,0 +1,14 @@
+<dependencies>
+ <dependency>
+ <maven>
+ <groupId>jaxme</groupId>
+ <artifactId>jaxmeapi</artifactId>
+ <version>0.5.1</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>jaxme/jaxmeapi</artifactId>
+ <version>0.5.1</version>
+ </jpp>
+ </dependency>
+</dependencies>
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 7e9e325..568dcc0 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,62 +1,36 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
Name: xmlrpc
-Version: 2.0.1
-Release: 13%{?dist}
-Epoch: 0
+Version: 3.1.3
+Release: 1%{?dist}
Summary: Java XML-RPC implementation
License: ASL 2.0
-Group: Development/Java
-Url: http://xml.apache.org/%{name}/
-Source0: http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
-
-BuildRequires: java >= 1:1.6.0
-BuildRequires: ant
+Group: Development/Libraries
+URL: http://ws.apache.org/xmlrpc/
+Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/apache-xmlrpc-%{version}-src...
+Source1: %{name}-jpp-depmap.xml
+# Add OSGi MANIFEST information
+Patch0: %{name}-client-addosgimanifest.patch
+Patch1: %{name}-common-addosgimanifest.patch
+Patch2: %{name}-javax-methods.patch
+
+BuildRequires: maven
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: ws-jaxme
+BuildRequires: ws-commons-util
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: servlet3
+BuildRequires: tomcat-servlet-3.0-api
BuildRequires: junit
BuildRequires: jakarta-commons-httpclient
-BuildRequires: apache-commons-codec
-
-Requires: java >= 1:1.6.0
-Requires: jpackage-utils >= 0:1.6
-Requires: servlet3
-Requires: junit
-Requires: jakarta-commons-httpclient
-Requires: apache-commons-codec
-Requires: jpackage-utils
-Requires: ws-commons-util
-
-Buildarch: noarch
+BuildRequires: apache-commons-logging
+BuildArch: noarch
%description
Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -67,162 +41,124 @@ statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Java
-Requires: jpackage-utils
+Group: Documentation
%description javadoc
Javadoc for %{name}.
+%package common
+Summary: Common classes for XML-RPC client and server implementations
+Group: Development/Libraries
+# Provide xmlrpc is not here because it would be useless due to different jar names
+Obsoletes: %{name} < 3.1.3
+Obsoletes: %{name}3-common < 3.1.3-13
+Provides: %{name}3-common = 3.1.3-13
+Requires: ws-jaxme
+Requires: ws-commons-util
+Requires: jpackage-utils >= 0:1.6
+Requires: apache-commons-logging
+
+%description common
+%{summary}.
+
+%package client
+Summary: XML-RPC client implementation
+Group: Development/Libraries
+Requires: %{name}-common
+Requires: jakarta-commons-httpclient
+Obsoletes: %{name}3-client < 3.1.3-13
+Provides: %{name}3-client = 3.1.3-13
+
+%description client
+%{summary}.
+
+%package server
+Summary: XML-RPC server implementation
+Group: Development/Libraries
+Requires: %{name}-client
+Requires: junit
+Requires: tomcat-servlet-3.0-api
+Obsoletes: %{name}3-server < 3.1.3-13
+Provides: %{name}3-server = 3.1.3-13
+
+%description server
+%{summary}.
+
%prep
-%setup -q -n %{name}-%{version}
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+%setup -q -n apache-%{name}-%{version}-src
+%patch2 -b .sav
+pushd client
+%patch0 -b .sav
+popd
+pushd common
+%patch1 -b .sav
+popd
+sed -i 's/\r//' LICENSE.txt
%build
-export CLASSPATH=%(build-classpath commons-httpclient apache-commons-codec
tomcat-servlet-api junit 2>/dev/null)
-ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs -Dhave.deps=true jar
-ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs -Dhave.deps=true javadocs
+# ignore test failure because server part needs network
+mvn-rpmbuild \
+ -e \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
+ -Dmaven.test.failure.ignore=true \
+ install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -m 644 bin/%{name}-%{version}-applet.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-applet.jar
+install -m 644 client/target/%{name}-client-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-client.jar
+install -m 644 server/target/%{name}-server-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-server.jar
+install -m 644 common/target/%{name}-common-%{version}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-common.jar
+
+#compat symlinks remove in F-20
+pushd $RPM_BUILD_ROOT%{_javadir}
+ln -s %{name}-client.jar %{name}3-client.jar
+ln -s %{name}-server.jar %{name}3-server.jar
+ln -s %{name}-common.jar %{name}3-common.jar
+popd
+
+# install maven pom files
+install -Dm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+install -Dm 644 common/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-common.pom
+install -Dm 644 client/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-client.pom
+install -Dm 644 server/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server.pom
+
+# ... and maven depmaps
+%add_maven_depmap JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}-common.pom %{name}-common.jar
+%add_maven_depmap JPP-%{name}-client.pom %{name}-client.jar
+%add_maven_depmap JPP-%{name}-server.pom %{name}-server.jar
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
-%files
-%doc LICENSE.txt README.txt
-%{_javadir}/*
-
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files javadoc
-%{_javadocdir}/%{name}
+%doc LICENSE.txt NOTICE.txt
+%{_javadocdir}/*
+
+%files common
+%doc LICENSE.txt NOTICE.txt
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavenpomdir}/JPP-%{name}-common.pom
+%{_mavendepmapfragdir}/%{name}
+%{_javadir}/%{name}-common.jar
+%{_javadir}/%{name}3-common.jar
+
+%files client
+%{_mavenpomdir}/JPP-%{name}-client.pom
+%{_javadir}/%{name}-client.jar
+%{_javadir}/%{name}3-client.jar
+
+%files server
+%{_mavenpomdir}/JPP-%{name}-server.pom
+%{_javadir}/%{name}-server.jar
+%{_javadir}/%{name}3-server.jar
%changelog
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-12
-- Migrate to new tomcat-servlet-api
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Dec 21 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-9
-- Require java >= 1:1.6.0
-- Fix classpaths to ensure building of all optional features
-- Remove stale patch
-
-* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-8
-- Migrate from old servlet api to new one
-
-* Thu Dec 9 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-7
-- Remove gcj support
-- Make jars/javadocs versionless
-- Add ws-commons-util Requires
-- Use apache-commons-codec
-- Drop unneeded patch for jsse
-
-* Thu Mar 11 2010 Peter Lemenkov <lemenkov(a)gmail.com> - 0:2.0.1-6.6
-- Added missing requires jpackage-utils
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-6.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-5.5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4.5
-- drop repotag
-
-* Thu May 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4jpp.4
-- fix license tag
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> -
0:2.0.1-4jpp.3
-- Autorebuild for GCC 4.3
-
-* Tue Mar 27 2007 Matt Wringe <mwringe(a)redhat.com> 0:2.0.1-3jpp.3
-- Spec file clean up for Fedora Extras Review
-
-* Thu Mar 08 2007 Deepak Bhole <dbhole(a)redhat.com> 2.0.1-3jpp.2
-- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
-- Minor spec file cleanup
-
-* Fri Aug 04 2006 Vivek Lakshmanan <vivekl(a)redhat.com> - 0:2.0.1-3jpp.1
-- Merge with latest from JPP.
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub(a)redhat.com> - 0:2.0.1-1jpp_8.2fc
-- Rebuilt
-
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_8.1fc
-- rebuild
-
-* Wed Mar 8 2006 Rafael Schloming <rafaels(a)redhat.com> - 0:2.0.1-1jpp_7fc
-- excluded s390 due to eclipse
-
-* Mon Mar 6 2006 Jeremy Katz <katzj(a)redhat.com> - 0:2.0.1-1jpp_6fc
-- stop scriptlet spew
-
-* Fri Feb 24 2006 Igor Foox <ifoox(a)redhat.com> - 0:2.0.1-1jpp_5fc
-- Added post/postun dependency on coreutils.
-
-* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_4fc
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_3fc
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Jan 25 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_2fc
-- ExcludeArch s390x and ppc64
-
-* Wed Jan 18 2006 Andrew Overholt <overholt(a)redhat.com> 0:2.0.1-1jpp_2fc
-- Comment out JPackage Distribution and Vendor tags
-
-* Wed Jan 18 2006 Jesse Keating <jkeating(a)redhat.com> 0:2.0.1-1jpp_2fc
-- bump for test
-
-* Wed Jan 18 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_1fc
-- Update to version 2.0.1
-- Natively compile
-
-* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2-0.b1.3jpp
-- Build with ant-1.6.2
-
-* Thu Apr 29 2004 David Walluck <david(a)jpackage.org> 0:1.2-0.b1.2jpp
-- add jar symlinks
-- remove %%buildroot in %%install
-
-* Tue May 06 2003 David Walluck <david(a)anti-microsoft.org> 0:1.2-0.b1.1jpp
-- 1.2-b1
-- update for JPackage 1.5
-
-* Mon Mar 18 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.1-1jpp
-- 1.1
-- generic servlet support
-- used source release
-- dropped patch
-- added applet jar
-
-* Mon Jan 21 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-3jpp
-- versioned dir for javadoc
-- no dependencies for javadoc package
-- dropped jsse package
-- adaptation to new servlet3 package
-- adaptation to new jsse package
-- section macro
-
-* Fri Dec 7 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-2jpp
-- javadoc into javadoc package
-
-* Sat Nov 3 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-1jpp
-- first JPackage release
+* Fri Sep 14 2012 Alexander Kurtakov <akurtako(a)redhat.com> 3.1.3-1
+- First release of version 3.x package
commit 0d20769d77313b80bf541c510fe3738dd1e0dd23
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sun Jul 22 00:52:50 2012 -0500
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 5517d11..7e9e325 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -30,7 +30,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -106,6 +106,9 @@ cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-12
- Migrate to new tomcat-servlet-api
commit 680ad0ff80ba7dea59079e5a6061b7950185c0e3
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Jun 5 15:54:09 2012 +0200
Migrate to new tomcat-servlet-api
diff --git a/xmlrpc.spec b/xmlrpc.spec
index c7c3bde..5517d11 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -30,7 +30,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -41,14 +41,14 @@ Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
BuildRequires: java >= 1:1.6.0
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: servlet25
+BuildRequires: servlet3
BuildRequires: junit
BuildRequires: jakarta-commons-httpclient
BuildRequires: apache-commons-codec
Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.6
-Requires: servlet25
+Requires: servlet3
Requires: junit
Requires: jakarta-commons-httpclient
Requires: apache-commons-codec
@@ -80,7 +80,7 @@ find . -name "*.jar" -exec rm -f {} \;
%build
-export CLASSPATH=%(build-classpath commons-httpclient apache-commons-codec
tomcat6-servlet-2.5-api junit 2>/dev/null)
+export CLASSPATH=%(build-classpath commons-httpclient apache-commons-codec
tomcat-servlet-api junit 2>/dev/null)
ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs -Dhave.deps=true jar
ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs -Dhave.deps=true javadocs
@@ -98,16 +98,17 @@ cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt README.txt
%{_javadir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
+* Tue Jun 05 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-12
+- Migrate to new tomcat-servlet-api
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
commit ff3ced29b994cb31305538aae65d1a3ca4bd3d96
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Sat Jan 14 03:04:16 2012 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index d3168ae..c7c3bde 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -30,7 +30,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -108,6 +108,9 @@ cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
commit cef66157dcbd03c7b28af71a9c12b449379e45c8
Author: Dennis Gilmore <dennis(a)ausil.us>
Date: Mon Feb 7 23:32:29 2011 -0600
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 0605dc2..d3168ae 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -30,7 +30,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -108,6 +108,9 @@ cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Tue Dec 21 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-9
- Require java >= 1:1.6.0
- Fix classpaths to ensure building of all optional features
commit 0db29d8a87dc24b3a07f5e5e3974c3387c4c7758
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Dec 21 15:04:30 2010 +0100
Require java >= 1:1.6.0
- Fix classpaths to ensure building of all optional features
- Remove stale patch
diff --git a/xmlrpc-2.0.1-jessie.patch b/xmlrpc-2.0.1-jessie.patch
deleted file mode 100644
index dd6d12d..0000000
--- a/xmlrpc-2.0.1-jessie.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- ./src/java/org/apache/xmlrpc/secure/SecurityConstants.java.sav 2005-08-24
15:49:40.000000000 -0400
-+++ ./src/java/org/apache/xmlrpc/secure/SecurityConstants.java 2007-03-08
17:43:27.000000000 -0500
-@@ -26,7 +26,7 @@
- * default with setSecurityProviderClass().
- */
- public final static String DEFAULT_SECURITY_PROVIDER_CLASS =
-- "com.sun.net.ssl.internal.ssl.Provider";
-+ "gnu.javax.net.ssl.provider.Jessie";
-
- public final static String SECURITY_PROVIDER_CLASS =
- "security.provider";
-@@ -97,7 +97,7 @@
- * Default key manager type. You probably don't need to
- * override this default.
- */
-- public final static String DEFAULT_KEY_MANAGER_TYPE = "SunX509";
-+ public final static String DEFAULT_KEY_MANAGER_TYPE = "JessieX509";
-
- public final static String KEY_MANAGER_TYPE =
- "sun.ssl.keymanager.type";
-@@ -110,7 +110,7 @@
- * are using something other than the Sun JSSE.
- */
- public final static String DEFAULT_PROTOCOL_HANDLER_PACKAGES =
-- "com.sun.net.ssl.internal.www.protocol";
-+ "gnu.java.net.protocol";
-
- public final static String PROTOCOL_HANDLER_PACKAGES =
- "java.protocol.handler.pkgs";
---- ./src/java/org/apache/xmlrpc/secure/SecureWebServer.java.sav 2005-08-24
15:49:40.000000000 -0400
-+++ ./src/java/org/apache/xmlrpc/secure/SecureWebServer.java 2007-03-08
17:23:25.000000000 -0500
-@@ -30,8 +30,8 @@
- import org.apache.xmlrpc.XmlRpc;
- import org.apache.xmlrpc.XmlRpcServer;
-
--import com.sun.net.ssl.KeyManagerFactory;
--import com.sun.net.ssl.SSLContext;
-+import javax.net.ssl.KeyManagerFactory;
-+import javax.net.ssl.SSLContext;
-
- /**
- * A minimal web server that exclusively handles XML-RPC requests
---- ./src/java/org/apache/xmlrpc/secure/sunssl/SunSSLTransportFactory.java.sav 2005-08-24
15:49:40.000000000 -0400
-+++ ./src/java/org/apache/xmlrpc/secure/sunssl/SunSSLTransportFactory.java 2007-03-08
17:35:54.000000000 -0500
-@@ -29,10 +29,11 @@
- import org.apache.xmlrpc.XmlRpcTransportFactory;
- import org.apache.xmlrpc.secure.SecurityTool;
-
--import com.sun.net.ssl.HostnameVerifier;
--import com.sun.net.ssl.HttpsURLConnection;
--import com.sun.net.ssl.SSLContext;
--import com.sun.net.ssl.X509TrustManager;
-+import javax.net.ssl.HostnameVerifier;
-+import javax.net.ssl.HttpsURLConnection;
-+import javax.net.ssl.SSLContext;
-+import javax.net.ssl.SSLSession;
-+import javax.net.ssl.X509TrustManager;
-
- /**
- * Interface from XML-RPC to the HTTPS transport based on the
-@@ -55,14 +56,14 @@
- // The openTrustManager trusts all certificates
- private static X509TrustManager openTrustManager = new X509TrustManager()
- {
-- public boolean isClientTrusted(X509Certificate[] chain)
-+ public void checkClientTrusted(X509Certificate[] chain, String authType)
- {
-- return true;
-+ //return true;
- }
-
-- public boolean isServerTrusted(X509Certificate[] chain)
-+ public void checkServerTrusted(X509Certificate[] chain, String authType)
- {
-- return true;
-+ //return true;
- }
-
- public X509Certificate[] getAcceptedIssuers()
-@@ -74,7 +75,7 @@
- // The openHostnameVerifier trusts all hostnames
- private static HostnameVerifier openHostnameVerifier = new HostnameVerifier()
- {
-- public boolean verify(String hostname, String session)
-+ public boolean verify(String hostname, SSLSession session)
- {
- return true;
- }
-@@ -86,8 +87,8 @@
-
- properties.setProperty(XmlRpcTransportFactory.TRANSPORT_URL,
"(java.net.URL) - URL to connect to");
- properties.setProperty(XmlRpcTransportFactory.TRANSPORT_AUTH,
"(java.lang.String) - HTTP Basic Authentication string (encoded).");
-- properties.setProperty(TRANSPORT_TRUSTMANAGER,
"(com.sun.net.ssl.X509TrustManager) - X.509 Trust Manager to use");
-- properties.setProperty(TRANSPORT_HOSTNAMEVERIFIER,
"(com.sun.net.ssl.HostnameVerifier) - Hostname verifier to use");
-+ properties.setProperty(TRANSPORT_TRUSTMANAGER,
"(javax.net.ssl.X509TrustManager) - X.509 Trust Manager to use");
-+ properties.setProperty(TRANSPORT_HOSTNAMEVERIFIER,
"(javax.net.ssl.HostnameVerifier) - Hostname verifier to use");
-
- return properties;
- }
-@@ -99,7 +100,7 @@
- HostnameVerifier hostnameVerifier;
- SSLContext sslContext;
-
-- Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
-+ Security.addProvider(new gnu.javax.net.ssl.provider.Jessie());
-
- url = (URL) properties.get(XmlRpcTransportFactory.TRANSPORT_URL);
- auth = properties.getProperty(XmlRpcTransportFactory.TRANSPORT_AUTH);
---- ./build.xml.sav 2005-12-21 04:09:45.000000000 -0500
-+++ ./build.xml 2007-03-08 17:23:25.000000000 -0500
-@@ -94,7 +94,7 @@
-
- <target name="init" depends="env,copy-deps">
- <available
-- classname="com.sun.net.ssl.SSLContext"
-+ classname="javax.net.ssl.SSLContext"
- property="jsse.present"
- classpathref="classpath"
- />
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 3463b44..0605dc2 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -30,7 +30,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -38,12 +38,15 @@ Group: Development/Java
Url: http://xml.apache.org/%{name}/
Source0: http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
+BuildRequires: java >= 1:1.6.0
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: servlet25
BuildRequires: junit
BuildRequires: jakarta-commons-httpclient
BuildRequires: apache-commons-codec
+
+Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.6
Requires: servlet25
Requires: junit
@@ -77,7 +80,7 @@ find . -name "*.jar" -exec rm -f {} \;
%build
-export CLASSPATH=%(build-classpath jsse commons-httpclient commons-codec servletapi5
junit 2>/dev/null)
+export CLASSPATH=%(build-classpath commons-httpclient apache-commons-codec
tomcat6-servlet-2.5-api junit 2>/dev/null)
ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs -Dhave.deps=true jar
ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs -Dhave.deps=true javadocs
@@ -105,6 +108,11 @@ cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Tue Dec 21 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-9
+- Require java >= 1:1.6.0
+- Fix classpaths to ensure building of all optional features
+- Remove stale patch
+
* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-8
- Migrate from old servlet api to new one
commit 9967e2e72689ec646bc2320be6a8981375f1d8e4
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Dec 16 16:06:27 2010 +0100
Migrate from old servlet api to new one
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 80bb582..3463b44 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -30,7 +30,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -40,12 +40,12 @@ Source0:
http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: servletapi5
+BuildRequires: servlet25
BuildRequires: junit
BuildRequires: jakarta-commons-httpclient
BuildRequires: apache-commons-codec
Requires: jpackage-utils >= 0:1.6
-Requires: servletapi5
+Requires: servlet25
Requires: junit
Requires: jakarta-commons-httpclient
Requires: apache-commons-codec
@@ -105,6 +105,9 @@ cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Thu Dec 16 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-8
+- Migrate from old servlet api to new one
+
* Thu Dec 9 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-7
- Remove gcj support
- Make jars/javadocs versionless
commit 823e4a2a5d1a7de4bf2a553f653a832348d6d6dd
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Dec 9 15:48:35 2010 +0100
Various spec cleanups and fixes
- Remove gcj support
- Make jars/javadocs versionless
- Add ws-commons-util Requires
- Use apache-commons-codec
- Drop unneeded patch for jsse
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 57d7a36..80bb582 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -28,46 +28,32 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
-
-%define gcj_support
%{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
Name: xmlrpc
Version: 2.0.1
-Release: 6.6%{?dist}
+Release: 7%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
Group: Development/Java
Url: http://xml.apache.org/%{name}/
Source0: http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
-Patch0: %{name}-%{version}-jessie.patch
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: servletapi5
BuildRequires: junit
BuildRequires: jakarta-commons-httpclient
-BuildRequires: jakarta-commons-codec >= 1.3
-BuildRequires: jsse
+BuildRequires: apache-commons-codec
Requires: jpackage-utils >= 0:1.6
Requires: servletapi5
Requires: junit
Requires: jakarta-commons-httpclient
-Requires: jakarta-commons-codec >= 1.3
-Requires: jsse
+Requires: apache-commons-codec
Requires: jpackage-utils
+Requires: ws-commons-util
-%if ! %{gcj_support}
Buildarch: noarch
-%endif
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description
Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -89,7 +75,6 @@ Javadoc for %{name}.
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
-%patch0 -b .sav
%build
export CLASSPATH=%(build-classpath jsse commons-httpclient commons-codec servletapi5
junit 2>/dev/null)
@@ -101,53 +86,32 @@ rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 bin/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 bin/%{name}-%{version}-applet.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-applet-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
+install -m 644 bin/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 bin/%{name}-%{version}-applet.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-applet.jar
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
%files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
%doc LICENSE.txt README.txt
%{_javadir}/*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/xmlrpc-applet-2.0.1.jar.*
-%endif
%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
%changelog
+* Thu Dec 9 2010 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:2.0.1-7
+- Remove gcj support
+- Make jars/javadocs versionless
+- Add ws-commons-util Requires
+- Use apache-commons-codec
+- Drop unneeded patch for jsse
+
* Thu Mar 11 2010 Peter Lemenkov <lemenkov(a)gmail.com> - 0:2.0.1-6.6
- Added missing requires jpackage-utils
@@ -221,14 +185,14 @@ fi
- 1.2-b1
- update for JPackage 1.5
-* Mon Mar 18 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.1-1jpp
+* Mon Mar 18 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.1-1jpp
- 1.1
- generic servlet support
- used source release
- dropped patch
- added applet jar
-* Mon Jan 21 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-3jpp
+* Mon Jan 21 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-3jpp
- versioned dir for javadoc
- no dependencies for javadoc package
- dropped jsse package
commit 4857a6264d12279d5238fcfba4d17c6adcb2a6c3
Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org>
Date: Thu Jul 29 18:09:57 2010 +0000
dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index a8f88ef..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xmlrpc-2.0.1-src.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a8f88ef
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xmlrpc-2.0.1-src.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 494614f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmlrpc
-# $Id: Makefile,v 1.2 2007/10/15 19:32:20 notting Exp $
-NAME := xmlrpc
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo
"common/Makefile.common" ; } || { echo "ERROR: I can't figure out how
to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
commit 8f22f314590ca2e5fde8ff92b53581bb42fef452
Author: Peter Lemenkov <peter(a)fedoraproject.org>
Date: Thu Mar 11 12:46:00 2010 +0000
Missing requires jpackage-utils added
diff --git a/xmlrpc.spec b/xmlrpc.spec
index f2e2cd3..57d7a36 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -34,7 +34,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 6.5%{?dist}
+Release: 6.6%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -56,6 +56,7 @@ Requires: junit
Requires: jakarta-commons-httpclient
Requires: jakarta-commons-codec >= 1.3
Requires: jsse
+Requires: jpackage-utils
%if ! %{gcj_support}
Buildarch: noarch
@@ -78,6 +79,7 @@ statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Java
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -146,6 +148,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Thu Mar 11 2010 Peter Lemenkov <lemenkov(a)gmail.com> - 0:2.0.1-6.6
+- Added missing requires jpackage-utils
+
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-6.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
commit ae4e4fa46313cf3b5a2ab577741457576b424d07
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Wed Nov 25 22:41:00 2009 +0000
Fix typo that causes a failure to update the common directory. (releng
#2781)
diff --git a/Makefile b/Makefile
index b6f6716..494614f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: xmlrpc
-# $Id: Makefile,v 1.1 2006/01/06 00:20:17 fnasser Exp $
+# $Id: Makefile,v 1.2 2007/10/15 19:32:20 notting Exp $
NAME := xmlrpc
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
commit 7aede639f3362b30099ba2d31412241931789ea6
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Mon Jul 27 08:12:02 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index a9e9c1b..f2e2cd3 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -34,7 +34,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 5.5%{?dist}
+Release: 6.5%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -146,6 +146,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-6.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-5.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
commit 2466029ade3ae09c47d549cc6440ea57f0f5a30b
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Thu Feb 26 10:02:37 2009 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index bc0b504..a9e9c1b 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -34,7 +34,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 4.5%{?dist}
+Release: 5.5%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -146,6 +146,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
0:2.0.1-5.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4.5
- drop repotag
commit cf7c9efff7278adcd84521aca33222bf0f860c3d
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu Jul 10 20:46:30 2008 +0000
fix repotag
diff --git a/xmlrpc.spec b/xmlrpc.spec
index ad042d5..bc0b504 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -34,7 +34,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 4jpp.4%{?dist}
+Release: 4.5%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: ASL 2.0
@@ -146,6 +146,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4.5
+- drop repotag
+
* Thu May 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4jpp.4
- fix license tag
commit 70e2356196c42baec19bdf282bc9e77d645a8f78
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Thu May 29 15:53:17 2008 +0000
fix license tag
diff --git a/xmlrpc.spec b/xmlrpc.spec
index b80b7f3..ad042d5 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -34,10 +34,10 @@
Name: xmlrpc
Version: 2.0.1
-Release: 4jpp.3%{?dist}
+Release: 4jpp.4%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
-License: Apache Software License
+License: ASL 2.0
Group: Development/Java
Url: http://xml.apache.org/%{name}/
Source0: http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
@@ -146,6 +146,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Thu May 29 2008 Tom "spot" Callaway <tcallawa(a)redhat.com> -
0:2.0.1-4jpp.4
+- fix license tag
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> -
0:2.0.1-4jpp.3
- Autorebuild for GCC 4.3
commit eb78b79bfeef50418090cbd0c7bb4393eed60a4d
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Tue Feb 19 17:27:25 2008 +0000
- Autorebuild for GCC 4.3
diff --git a/xmlrpc.spec b/xmlrpc.spec
index bfddfcf..b80b7f3 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -34,7 +34,7 @@
Name: xmlrpc
Version: 2.0.1
-Release: 3jpp.3%{?dist}
+Release: 4jpp.3%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: Apache Software License
@@ -146,6 +146,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng(a)fedoraproject.org> -
0:2.0.1-4jpp.3
+- Autorebuild for GCC 4.3
+
* Tue Mar 27 2007 Matt Wringe <mwringe(a)redhat.com> 0:2.0.1-3jpp.3
- Spec file clean up for Fedora Extras Review
commit 1cba9c1c7d3f3ba1bb03a12b6864d83b9de7447c
Author: Bill Nottingham <notting(a)fedoraproject.org>
Date: Mon Oct 15 19:32:20 2007 +0000
makefile update to properly grab makefile.common
diff --git a/Makefile b/Makefile
index 119144b..b6f6716 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,21 @@
# Makefile for source rpm: xmlrpc
-# $Id$
+# $Id: Makefile,v 1.1 2006/01/06 00:20:17 fnasser Exp $
NAME := xmlrpc
SPECFILE = $(firstword $(wildcard *.spec))
-include ../common/Makefile.common
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f
$$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo
"$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo
"common/Makefile.common" ; } || { echo "ERROR: I can't figure out how
to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)
commit 08ecfac8993e1a8c5b177122fe55279e45ef2eba
Author: Matt Wringe <mwringe(a)fedoraproject.org>
Date: Thu Apr 26 18:40:51 2007 +0000
Spec file clean up for Fedora Extras Review
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 5ca273f..bfddfcf 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -34,13 +34,13 @@
Name: xmlrpc
Version: 2.0.1
-Release: 3jpp.2
+Release: 3jpp.3%{?dist}
Epoch: 0
Summary: Java XML-RPC implementation
License: Apache Software License
Group: Development/Java
Url: http://xml.apache.org/%{name}/
-Source0: http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
+Source0: http://www.apache.org/dist/ws/xmlrpc/sources/xmlrpc-2.0.1-src.tar.gz
Patch0: %{name}-%{version}-jessie.patch
BuildRequires: ant
@@ -60,7 +60,7 @@ Requires: jsse
%if ! %{gcj_support}
Buildarch: noarch
%endif
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -78,9 +78,6 @@ statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Java
-Requires(post): %{__rm}
-Requires(postun): %{__rm}
-Requires(post): /bin/ln
%description javadoc
Javadoc for %{name}.
@@ -118,15 +115,6 @@ cp -pr docs/apidocs/*
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
- rm -f %{_javadocdir}/%{name}
-fi
-
%if %{gcj_support}
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
@@ -158,6 +146,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Tue Mar 27 2007 Matt Wringe <mwringe(a)redhat.com> 0:2.0.1-3jpp.3
+- Spec file clean up for Fedora Extras Review
+
* Thu Mar 08 2007 Deepak Bhole <dbhole(a)redhat.com> 2.0.1-3jpp.2
- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
- Minor spec file cleanup
commit 301ad74bcd96dcdb73d1ffec97716296f78f894a
Author: Deepak Bhole <dbhole(a)fedoraproject.org>
Date: Thu Mar 8 23:23:20 2007 +0000
Minor spec file cleanup
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 25ed4bb..5ca273f 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -32,38 +32,40 @@
%define gcj_support
%{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define section free
-
-Name: xmlrpc
-Version: 2.0.1
-Release: 3jpp.2
-Epoch: 0
-Summary: Java XML-RPC implementation
-License: Apache Software License
-Group: Development/Java
-Url: http://xml.apache.org/%{name}/
-Source0: http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
+Name: xmlrpc
+Version: 2.0.1
+Release: 3jpp.2
+Epoch: 0
+Summary: Java XML-RPC implementation
+License: Apache Software License
+Group: Development/Java
+Url: http://xml.apache.org/%{name}/
+Source0: http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
Patch0: %{name}-%{version}-jessie.patch
-Requires: servletapi5
-Requires: jakarta-commons-httpclient
-Requires: jakarta-commons-codec >= 1.3
-Requires: junit
-BuildRequires: ant
-BuildRequires: jpackage-utils >= 0:1.6
-BuildRequires: servletapi5
-BuildRequires: junit
-BuildRequires: jakarta-commons-httpclient
-BuildRequires: jakarta-commons-codec >= 1.3
+
+BuildRequires: ant
+BuildRequires: jpackage-utils >= 0:1.6
+BuildRequires: servletapi5
+BuildRequires: junit
+BuildRequires: jakarta-commons-httpclient
+BuildRequires: jakarta-commons-codec >= 1.3
BuildRequires: jsse
+Requires: jpackage-utils >= 0:1.6
+Requires: servletapi5
+Requires: junit
+Requires: jakarta-commons-httpclient
+Requires: jakarta-commons-codec >= 1.3
+Requires: jsse
+
%if ! %{gcj_support}
-Buildarch: noarch
+Buildarch: noarch
%endif
-Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
%endif
%description
@@ -74,8 +76,8 @@ using the Helma library, all you should have to do is change the import
statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Development/Java
+Summary: Javadoc for %{name}
+Group: Development/Java
Requires(post): %{__rm}
Requires(postun): %{__rm}
Requires(post): /bin/ln
@@ -158,6 +160,7 @@ fi
%changelog
* Thu Mar 08 2007 Deepak Bhole <dbhole(a)redhat.com> 2.0.1-3jpp.2
- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
+- Minor spec file cleanup
* Fri Aug 04 2006 Vivek Lakshmanan <vivekl(a)redhat.com> - 0:2.0.1-3jpp.1
- Merge with latest from JPP.
commit aaabb1257b8f2d6fc18b49778c42eea1e81487ba
Author: Deepak Bhole <dbhole(a)fedoraproject.org>
Date: Thu Mar 8 23:16:17 2007 +0000
Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
diff --git a/xmlrpc-2.0.1-jessie.patch b/xmlrpc-2.0.1-jessie.patch
new file mode 100644
index 0000000..dd6d12d
--- /dev/null
+++ b/xmlrpc-2.0.1-jessie.patch
@@ -0,0 +1,119 @@
+--- ./src/java/org/apache/xmlrpc/secure/SecurityConstants.java.sav 2005-08-24
15:49:40.000000000 -0400
++++ ./src/java/org/apache/xmlrpc/secure/SecurityConstants.java 2007-03-08
17:43:27.000000000 -0500
+@@ -26,7 +26,7 @@
+ * default with setSecurityProviderClass().
+ */
+ public final static String DEFAULT_SECURITY_PROVIDER_CLASS =
+- "com.sun.net.ssl.internal.ssl.Provider";
++ "gnu.javax.net.ssl.provider.Jessie";
+
+ public final static String SECURITY_PROVIDER_CLASS =
+ "security.provider";
+@@ -97,7 +97,7 @@
+ * Default key manager type. You probably don't need to
+ * override this default.
+ */
+- public final static String DEFAULT_KEY_MANAGER_TYPE = "SunX509";
++ public final static String DEFAULT_KEY_MANAGER_TYPE = "JessieX509";
+
+ public final static String KEY_MANAGER_TYPE =
+ "sun.ssl.keymanager.type";
+@@ -110,7 +110,7 @@
+ * are using something other than the Sun JSSE.
+ */
+ public final static String DEFAULT_PROTOCOL_HANDLER_PACKAGES =
+- "com.sun.net.ssl.internal.www.protocol";
++ "gnu.java.net.protocol";
+
+ public final static String PROTOCOL_HANDLER_PACKAGES =
+ "java.protocol.handler.pkgs";
+--- ./src/java/org/apache/xmlrpc/secure/SecureWebServer.java.sav 2005-08-24
15:49:40.000000000 -0400
++++ ./src/java/org/apache/xmlrpc/secure/SecureWebServer.java 2007-03-08
17:23:25.000000000 -0500
+@@ -30,8 +30,8 @@
+ import org.apache.xmlrpc.XmlRpc;
+ import org.apache.xmlrpc.XmlRpcServer;
+
+-import com.sun.net.ssl.KeyManagerFactory;
+-import com.sun.net.ssl.SSLContext;
++import javax.net.ssl.KeyManagerFactory;
++import javax.net.ssl.SSLContext;
+
+ /**
+ * A minimal web server that exclusively handles XML-RPC requests
+--- ./src/java/org/apache/xmlrpc/secure/sunssl/SunSSLTransportFactory.java.sav 2005-08-24
15:49:40.000000000 -0400
++++ ./src/java/org/apache/xmlrpc/secure/sunssl/SunSSLTransportFactory.java 2007-03-08
17:35:54.000000000 -0500
+@@ -29,10 +29,11 @@
+ import org.apache.xmlrpc.XmlRpcTransportFactory;
+ import org.apache.xmlrpc.secure.SecurityTool;
+
+-import com.sun.net.ssl.HostnameVerifier;
+-import com.sun.net.ssl.HttpsURLConnection;
+-import com.sun.net.ssl.SSLContext;
+-import com.sun.net.ssl.X509TrustManager;
++import javax.net.ssl.HostnameVerifier;
++import javax.net.ssl.HttpsURLConnection;
++import javax.net.ssl.SSLContext;
++import javax.net.ssl.SSLSession;
++import javax.net.ssl.X509TrustManager;
+
+ /**
+ * Interface from XML-RPC to the HTTPS transport based on the
+@@ -55,14 +56,14 @@
+ // The openTrustManager trusts all certificates
+ private static X509TrustManager openTrustManager = new X509TrustManager()
+ {
+- public boolean isClientTrusted(X509Certificate[] chain)
++ public void checkClientTrusted(X509Certificate[] chain, String authType)
+ {
+- return true;
++ //return true;
+ }
+
+- public boolean isServerTrusted(X509Certificate[] chain)
++ public void checkServerTrusted(X509Certificate[] chain, String authType)
+ {
+- return true;
++ //return true;
+ }
+
+ public X509Certificate[] getAcceptedIssuers()
+@@ -74,7 +75,7 @@
+ // The openHostnameVerifier trusts all hostnames
+ private static HostnameVerifier openHostnameVerifier = new HostnameVerifier()
+ {
+- public boolean verify(String hostname, String session)
++ public boolean verify(String hostname, SSLSession session)
+ {
+ return true;
+ }
+@@ -86,8 +87,8 @@
+
+ properties.setProperty(XmlRpcTransportFactory.TRANSPORT_URL,
"(java.net.URL) - URL to connect to");
+ properties.setProperty(XmlRpcTransportFactory.TRANSPORT_AUTH,
"(java.lang.String) - HTTP Basic Authentication string (encoded).");
+- properties.setProperty(TRANSPORT_TRUSTMANAGER,
"(com.sun.net.ssl.X509TrustManager) - X.509 Trust Manager to use");
+- properties.setProperty(TRANSPORT_HOSTNAMEVERIFIER,
"(com.sun.net.ssl.HostnameVerifier) - Hostname verifier to use");
++ properties.setProperty(TRANSPORT_TRUSTMANAGER,
"(javax.net.ssl.X509TrustManager) - X.509 Trust Manager to use");
++ properties.setProperty(TRANSPORT_HOSTNAMEVERIFIER,
"(javax.net.ssl.HostnameVerifier) - Hostname verifier to use");
+
+ return properties;
+ }
+@@ -99,7 +100,7 @@
+ HostnameVerifier hostnameVerifier;
+ SSLContext sslContext;
+
+- Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
++ Security.addProvider(new gnu.javax.net.ssl.provider.Jessie());
+
+ url = (URL) properties.get(XmlRpcTransportFactory.TRANSPORT_URL);
+ auth = properties.getProperty(XmlRpcTransportFactory.TRANSPORT_AUTH);
+--- ./build.xml.sav 2005-12-21 04:09:45.000000000 -0500
++++ ./build.xml 2007-03-08 17:23:25.000000000 -0500
+@@ -94,7 +94,7 @@
+
+ <target name="init" depends="env,copy-deps">
+ <available
+- classname="com.sun.net.ssl.SSLContext"
++ classname="javax.net.ssl.SSLContext"
+ property="jsse.present"
+ classpathref="classpath"
+ />
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 16e2b1d..25ed4bb 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -36,13 +36,14 @@
Name: xmlrpc
Version: 2.0.1
-Release: 3jpp.1
+Release: 3jpp.2
Epoch: 0
Summary: Java XML-RPC implementation
License: Apache Software License
Group: Development/Java
Url: http://xml.apache.org/%{name}/
Source0: http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
+Patch0: %{name}-%{version}-jessie.patch
Requires: servletapi5
Requires: jakarta-commons-httpclient
Requires: jakarta-commons-codec >= 1.3
@@ -53,6 +54,7 @@ BuildRequires: servletapi5
BuildRequires: junit
BuildRequires: jakarta-commons-httpclient
BuildRequires: jakarta-commons-codec >= 1.3
+BuildRequires: jsse
%if ! %{gcj_support}
Buildarch: noarch
%endif
@@ -86,6 +88,8 @@ Javadoc for %{name}.
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
+%patch0 -b .sav
+
%build
export CLASSPATH=%(build-classpath jsse commons-httpclient commons-codec servletapi5
junit 2>/dev/null)
ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs -Dhave.deps=true jar
@@ -152,6 +156,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Thu Mar 08 2007 Deepak Bhole <dbhole(a)redhat.com> 2.0.1-3jpp.2
+- Add javax.net.ssl support to build org.apache.xmlrpc.secure.*
+
* Fri Aug 04 2006 Vivek Lakshmanan <vivekl(a)redhat.com> - 0:2.0.1-3jpp.1
- Merge with latest from JPP.
commit 05b757788d1f246446c6202729a61aaa5c49c357
Author: Vivek Lakshmanan <vivekl(a)fedoraproject.org>
Date: Sat Aug 5 00:18:54 2006 +0000
- Add _with_gcj_support to ensure native compilation.
diff --git a/xmlrpc.spec b/xmlrpc.spec
index b6e9594..16e2b1d 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -28,6 +28,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+%define _with_gcj_support 1
+
%define gcj_support
%{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
%define section free
commit b891086adacccbe41f71a8bf5da3828a0e502ff4
Author: Vivek Lakshmanan <vivekl(a)fedoraproject.org>
Date: Sat Aug 5 00:17:20 2006 +0000
- Merge with latest from JPP.
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 41f8519..b6e9594 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,12 +1,40 @@
-%define name xmlrpc
-%define version 2.0.1
-%define release 1jpp_8.2fc
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define gcj_support
%{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
%define section free
-%define gcj_support 1
-Name: %{name}
-Version: %{version}
-Release: %{release}
+Name: xmlrpc
+Version: 2.0.1
+Release: 3jpp.1
Epoch: 0
Summary: Java XML-RPC implementation
License: Apache Software License
@@ -14,28 +42,25 @@ Group: Development/Java
Url: http://xml.apache.org/%{name}/
Source0: http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
Requires: servletapi5
-Requires: commons-httpclient >= 2.0.2
-Requires: commons-codec >= 1.3
-Requires: junit >= 3.8.1
-%if %{gcj_support}
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): coreutils
-Requires(postun): coreutils
-BuildRequires: java-gcj-compat-devel >= 1.0.33
-%endif
+Requires: jakarta-commons-httpclient
+Requires: jakarta-commons-codec >= 1.3
+Requires: junit
BuildRequires: ant
-BuildRequires: jpackage-utils >= 0:1.5
+BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: servletapi5
-BuildRequires: junit >= 3.8.1
-BuildRequires: commons-httpclient >= 2.0.2
-BuildRequires: commons-codec >= 1.3
+BuildRequires: junit
+BuildRequires: jakarta-commons-httpclient
+BuildRequires: jakarta-commons-codec >= 1.3
+%if ! %{gcj_support}
+Buildarch: noarch
+%endif
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-#Distribution: JPackage
-#Vendor: JPackage Project
-# s390 excluded due to eclipse
-ExcludeArch: s390x ppc64 s390
+%if %{gcj_support}
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
%description
Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -47,12 +72,9 @@ statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Java
-%if %{gcj_support}
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(post): java-gcj-compat >= 1.0.33
-%endif
-Requires(postun): coreutils
-Requires(postun): coreutils
+Requires(post): %{__rm}
+Requires(postun): %{__rm}
+Requires(post): /bin/ln
%description javadoc
Javadoc for %{name}.
@@ -82,7 +104,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
%if %{gcj_support}
-aot-compile-rpm
+%{_bindir}/aot-compile-rpm
%endif
%clean
@@ -91,29 +113,46 @@ rm -rf $RPM_BUILD_ROOT
%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
-%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
-%endif
%postun javadoc
if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/%{name}
fi
+
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
%if %{gcj_support}
-%{_bindir}/rebuild-gcj-db
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
%endif
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt README.txt
%{_javadir}/*
+
+%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/xmlrpc-applet-2.0.1.jar.*
+%endif
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%changelog
+* Fri Aug 04 2006 Vivek Lakshmanan <vivekl(a)redhat.com> - 0:2.0.1-3jpp.1
+- Merge with latest from JPP.
+
* Sat Jul 22 2006 Jakub Jelinek <jakub(a)redhat.com> - 0:2.0.1-1jpp_8.2fc
- Rebuilt
commit 109e08346c38103b4509417d6a14ad85f034c0b7
Author: Jakub Jelinek <jakub(a)fedoraproject.org>
Date: Sat Jul 22 08:46:58 2006 +0000
Rebuilt
diff --git a/xmlrpc.spec b/xmlrpc.spec
index e46d437..41f8519 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp_8.1fc
+%define release 1jpp_8.2fc
%define section free
%define gcj_support 1
@@ -114,6 +114,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Sat Jul 22 2006 Jakub Jelinek <jakub(a)redhat.com> - 0:2.0.1-1jpp_8.2fc
+- Rebuilt
+
* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_8.1fc
- rebuild
commit 8634d05560c19ddc72443462d083791179b87454
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Jul 12 17:10:47 2006 +0000
bump
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 58b2d89..e46d437 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp_8fc
+%define release 1jpp_8.1fc
%define section free
%define gcj_support 1
@@ -114,7 +114,7 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_8fc
+* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_8.1fc
- rebuild
* Wed Mar 8 2006 Rafael Schloming <rafaels(a)redhat.com> - 0:2.0.1-1jpp_7fc
commit ee13ebfcc0209d9353907aadf475d1de4236f7df
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Wed Jul 12 08:54:42 2006 +0000
bumped for rebuild
diff --git a/xmlrpc.spec b/xmlrpc.spec
index d369731..58b2d89 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp_7fc
+%define release 1jpp_8fc
%define section free
%define gcj_support 1
@@ -114,6 +114,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_8fc
+- rebuild
+
* Wed Mar 8 2006 Rafael Schloming <rafaels(a)redhat.com> - 0:2.0.1-1jpp_7fc
- excluded s390 due to eclipse
commit 012bef5704752cc75e9853a56e3001a453b3827d
Author: rafaels <rafaels(a)fedoraproject.org>
Date: Wed Mar 8 20:55:18 2006 +0000
excluded s390 due to eclipse
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 4b93098..d369731 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp_6fc
+%define release 1jpp_7fc
%define section free
%define gcj_support 1
@@ -34,7 +34,8 @@ Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
#Distribution: JPackage
#Vendor: JPackage Project
-ExcludeArch: s390x ppc64
+# s390 excluded due to eclipse
+ExcludeArch: s390x ppc64 s390
%description
Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -113,6 +114,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Wed Mar 8 2006 Rafael Schloming <rafaels(a)redhat.com> - 0:2.0.1-1jpp_7fc
+- excluded s390 due to eclipse
+
* Mon Mar 6 2006 Jeremy Katz <katzj(a)redhat.com> - 0:2.0.1-1jpp_6fc
- stop scriptlet spew
commit a3507ac3d9935b12c6d652f1c9b4dacc5913efdc
Author: Jeremy Katz <katzj(a)fedoraproject.org>
Date: Mon Mar 6 22:47:54 2006 +0000
- stop scriptlet spew
diff --git a/xmlrpc.spec b/xmlrpc.spec
index c699df6..4b93098 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp_5fc
+%define release 1jpp_6fc
%define section free
%define gcj_support 1
@@ -46,6 +46,12 @@ statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Java
+%if %{gcj_support}
+Requires(post): java-gcj-compat >= 1.0.33
+Requires(post): java-gcj-compat >= 1.0.33
+%endif
+Requires(postun): coreutils
+Requires(postun): coreutils
%description javadoc
Javadoc for %{name}.
@@ -107,6 +113,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Mon Mar 6 2006 Jeremy Katz <katzj(a)redhat.com> - 0:2.0.1-1jpp_6fc
+- stop scriptlet spew
+
* Fri Feb 24 2006 Igor Foox <ifoox(a)redhat.com> - 0:2.0.1-1jpp_5fc
- Added post/postun dependency on coreutils.
commit 84ed0759dbc2318277d94f556b74d268ab918ccc
Author: Igor Foox <ifoox(a)fedoraproject.org>
Date: Fri Feb 24 16:36:18 2006 +0000
- Added post/postun dependency on coreutils.
diff --git a/xmlrpc.spec b/xmlrpc.spec
index e7fe338..c699df6 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp_4fc
+%define release 1jpp_5fc
%define section free
%define gcj_support 1
@@ -19,7 +19,9 @@ Requires: commons-codec >= 1.3
Requires: junit >= 3.8.1
%if %{gcj_support}
Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
+Requires(post): java-gcj-compat >= 1.0.33
+Requires(postun): coreutils
+Requires(postun): coreutils
BuildRequires: java-gcj-compat-devel >= 1.0.33
%endif
BuildRequires: ant
@@ -105,6 +107,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Fri Feb 24 2006 Igor Foox <ifoox(a)redhat.com> - 0:2.0.1-1jpp_5fc
+- Added post/postun dependency on coreutils.
+
* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_4fc
- bump again for double-long bug on ppc(64)
commit ac3a98bd584c075e1d5dfc5b424875afabd43168
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Sat Feb 11 06:12:48 2006 +0000
bump for bug in double-long on ppc(64)
diff --git a/xmlrpc.spec b/xmlrpc.spec
index c2d2152..e7fe338 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp_3fc
+%define release 1jpp_4fc
%define section free
%define gcj_support 1
@@ -105,6 +105,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_4fc
+- bump again for double-long bug on ppc(64)
+
* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_3fc
- rebuilt for new gcc4.1 snapshot and glibc changes
commit a176908ca6ac4d2457f46f730df18470c0955639
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Tue Feb 7 14:19:58 2006 +0000
bump for new gcc/glibc
diff --git a/xmlrpc.spec b/xmlrpc.spec
index a994e54..c2d2152 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp_2fc
+%define release 1jpp_3fc
%define section free
%define gcj_support 1
@@ -105,6 +105,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com> - 0:2.0.1-1jpp_3fc
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
* Wed Jan 25 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_2fc
- ExcludeArch s390x and ppc64
commit cdbb3caaf489b3cbd37775bd777ba84e2664047f
Author: Igor Foox <ifoox(a)fedoraproject.org>
Date: Wed Jan 25 21:17:27 2006 +0000
Excluding s390x and ppc64
diff --git a/xmlrpc.spec b/xmlrpc.spec
index f53bd14..a994e54 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -32,6 +32,8 @@ Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
#Distribution: JPackage
#Vendor: JPackage Project
+ExcludeArch: s390x ppc64
+
%description
Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
that uses XML over HTTP to implement remote procedure calls.
@@ -103,6 +105,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Wed Jan 25 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_2fc
+- ExcludeArch s390x and ppc64
+
* Wed Jan 18 2006 Andrew Overholt <overholt(a)redhat.com> 0:2.0.1-1jpp_2fc
- Comment out JPackage Distribution and Vendor tags
commit 79882fede03b210f52670f38c83564a745abac06
Author: Andrew Overholt <overholt(a)fedoraproject.org>
Date: Thu Jan 19 19:19:52 2006 +0000
- Comment out JPackage Distribution and Vendor tags
diff --git a/xmlrpc.spec b/xmlrpc.spec
index f3c08fd..f53bd14 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -29,8 +29,8 @@ BuildRequires: junit >= 3.8.1
BuildRequires: commons-httpclient >= 2.0.2
BuildRequires: commons-codec >= 1.3
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
-Distribution: JPackage
-Vendor: JPackage Project
+#Distribution: JPackage
+#Vendor: JPackage Project
%description
Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
@@ -103,10 +103,13 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
-* Wed Jan 18 2006 Jesse Keating <jkeating(a)rehdat.com> 0:2.0.1-1jpp_2fc
+* Wed Jan 18 2006 Andrew Overholt <overholt(a)redhat.com> 0:2.0.1-1jpp_2fc
+- Comment out JPackage Distribution and Vendor tags
+
+* Wed Jan 18 2006 Jesse Keating <jkeating(a)redhat.com> 0:2.0.1-1jpp_2fc
- bump for test
-* Wed Jan 18 2006 Igor Foox <ifoox(a)rehdat.com> 0:2.0.1-1jpp_1fc
+* Wed Jan 18 2006 Igor Foox <ifoox(a)redhat.com> 0:2.0.1-1jpp_1fc
- Update to version 2.0.1
- Natively compile
commit fbcc30f7fa2d1c32975f99c76d8feb0bc44efa84
Author: Jesse Keating <jkeating(a)fedoraproject.org>
Date: Thu Jan 19 18:55:50 2006 +0000
bump for test
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 329b07f..f3c08fd 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp_1fc
+%define release 1jpp_2fc
%define section free
%define gcj_support 1
@@ -103,6 +103,9 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Wed Jan 18 2006 Jesse Keating <jkeating(a)rehdat.com> 0:2.0.1-1jpp_2fc
+- bump for test
+
* Wed Jan 18 2006 Igor Foox <ifoox(a)rehdat.com> 0:2.0.1-1jpp_1fc
- Update to version 2.0.1
- Natively compile
commit 2bc89c3916f995dcbd94c96693e9b8f665406229
Author: Igor Foox <ifoox(a)fedoraproject.org>
Date: Thu Jan 19 17:54:56 2006 +0000
Fix release
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 1b1b052..329b07f 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,6 +1,6 @@
%define name xmlrpc
%define version 2.0.1
-%define release 1jpp
+%define release 1jpp_1fc
%define section free
%define gcj_support 1
commit c3eba7afbcb30381d32bde0cfcf7d7c83ce51bd3
Author: Igor Foox <ifoox(a)fedoraproject.org>
Date: Thu Jan 19 17:54:14 2006 +0000
Fixed source url
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 15bae26..1b1b052 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -12,7 +12,7 @@ Summary: Java XML-RPC implementation
License: Apache Software License
Group: Development/Java
Url: http://xml.apache.org/%{name}/
-Source0: http://mirrors.isc.org/pub/apache/ws/xmlrpc/source/xmlrpc-%{version}-src....
+Source0: http://www.apache.org/dist/ws/xmlrpc/source/xmlrpc-%{version}-src.tar.gz
Requires: servletapi5
Requires: commons-httpclient >= 2.0.2
Requires: commons-codec >= 1.3
commit 5d68323020bc4a384f04c5439ebd9f933ed3892f
Author: Igor Foox <ifoox(a)fedoraproject.org>
Date: Thu Jan 19 17:51:20 2006 +0000
auto-import xmlrpc-2.0.1-1jpp on branch devel from
xmlrpc-2.0.1-1jpp.src.rpm
diff --git a/.cvsignore b/.cvsignore
index a55f8c0..a8f88ef 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xmlrpc-1.2-b1-src.tar.gz
+xmlrpc-2.0.1-src.tar.gz
diff --git a/sources b/sources
index 2f2c8c7..281ba07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23432f342902b13db26b03b0784b8831 xmlrpc-1.2-b1-src.tar.gz
+b88cc15b25d9bd688b1889d2ad234125 xmlrpc-2.0.1-src.tar.gz
diff --git a/xmlrpc.spec b/xmlrpc.spec
index 3b0a665..15bae26 100644
--- a/xmlrpc.spec
+++ b/xmlrpc.spec
@@ -1,37 +1,8 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
%define name xmlrpc
-%define version 1.2
-%define release 0.b1.4jpp
+%define version 2.0.1
+%define release 1jpp
%define section free
+%define gcj_support 1
Name: %{name}
Version: %{version}
@@ -41,14 +12,22 @@ Summary: Java XML-RPC implementation
License: Apache Software License
Group: Development/Java
Url: http://xml.apache.org/%{name}/
-Source0: http://xml.apache.org/dist/xmlrpc/release/v1.2-b1/xmlrpc-1.2-b1-src.tar.gz
-Requires: servletapi4
-Requires: xerces-j2
+Source0: http://mirrors.isc.org/pub/apache/ws/xmlrpc/source/xmlrpc-%{version}-src....
+Requires: servletapi5
+Requires: commons-httpclient >= 2.0.2
+Requires: commons-codec >= 1.3
+Requires: junit >= 3.8.1
+%if %{gcj_support}
+Requires(post): java-gcj-compat >= 1.0.33
+Requires(postun): java-gcj-compat >= 1.0.33
+BuildRequires: java-gcj-compat-devel >= 1.0.33
+%endif
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: servletapi4
-BuildRequires: xerces-j2
-Buildarch: noarch
+BuildRequires: servletapi5
+BuildRequires: junit >= 3.8.1
+BuildRequires: commons-httpclient >= 2.0.2
+BuildRequires: commons-codec >= 1.3
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
Distribution: JPackage
Vendor: JPackage Project
@@ -68,14 +47,14 @@ Group: Development/Java
Javadoc for %{name}.
%prep
-%setup -q -n %{name}-%{version}-b1
+%setup -q -n %{name}-%{version}
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
%build
-export CLASSPATH=%(build-classpath jsse servletapi4 xerces-j2 2>/dev/null)
-ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs jar
-ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs javadocs
+export CLASSPATH=%(build-classpath jsse commons-httpclient commons-codec servletapi5
junit 2>/dev/null)
+ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs -Dhave.deps=true jar
+ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs -Dhave.deps=true javadocs
%install
rm -rf $RPM_BUILD_ROOT
@@ -91,30 +70,42 @@ ln -sf ${jar} ${jar/-%{version}/}; done)
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%if %{gcj_support}
+aot-compile-rpm
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
+%if %{gcj_support}
+%{_bindir}/rebuild-gcj-db
+%endif
%postun javadoc
if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/%{name}
fi
+%if %{gcj_support}
+%{_bindir}/rebuild-gcj-db
+%endif
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt README.txt
%{_javadir}/*
+%attr(-,root,root) %{_libdir}/gcj/%{name}
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%changelog
-* Thu Jan 05 2006 Fernando Nasser <fnasser(a)redhat.com> 0:1.2-0.b1.4jpp
-- First JPP 1.7 build
+* Wed Jan 18 2006 Igor Foox <ifoox(a)rehdat.com> 0:2.0.1-1jpp_1fc
+- Update to version 2.0.1
+- Natively compile
* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2-0.b1.3jpp
- Build with ant-1.6.2
commit 647a50feb57d40b6713533d2fe3405882774d04f
Author: Fernando Nasser <fnasser(a)fedoraproject.org>
Date: Fri Jan 6 00:20:27 2006 +0000
auto-import xmlrpc-1.2-0.b1.4jpp on branch devel from
xmlrpc-1.2-0.b1.4jpp.src.rpm
diff --git a/.cvsignore b/.cvsignore
index e69de29..a55f8c0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+xmlrpc-1.2-b1-src.tar.gz
diff --git a/sources b/sources
index e69de29..2f2c8c7 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+23432f342902b13db26b03b0784b8831 xmlrpc-1.2-b1-src.tar.gz
diff --git a/xmlrpc.spec b/xmlrpc.spec
new file mode 100644
index 0000000..3b0a665
--- /dev/null
+++ b/xmlrpc.spec
@@ -0,0 +1,149 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define name xmlrpc
+%define version 1.2
+%define release 0.b1.4jpp
+%define section free
+
+Name: %{name}
+Version: %{version}
+Release: %{release}
+Epoch: 0
+Summary: Java XML-RPC implementation
+License: Apache Software License
+Group: Development/Java
+Url: http://xml.apache.org/%{name}/
+Source0: http://xml.apache.org/dist/xmlrpc/release/v1.2-b1/xmlrpc-1.2-b1-src.tar.gz
+Requires: servletapi4
+Requires: xerces-j2
+BuildRequires: ant
+BuildRequires: jpackage-utils >= 0:1.5
+BuildRequires: servletapi4
+BuildRequires: xerces-j2
+Buildarch: noarch
+Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
+Distribution: JPackage
+Vendor: JPackage Project
+
+%description
+Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
+that uses XML over HTTP to implement remote procedure calls.
+Apache XML-RPC was previously known as Helma XML-RPC. If you have code
+using the Helma library, all you should have to do is change the import
+statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.
+
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Development/Java
+
+%description javadoc
+Javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}-%{version}-b1
+# remove all binary libs
+find . -name "*.jar" -exec rm -f {} \;
+
+%build
+export CLASSPATH=%(build-classpath jsse servletapi4 xerces-j2 2>/dev/null)
+ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs jar
+ant -Dbuild.dir=./bin -Dbuild.dest=./bin -Dsrc.dir=./src -Dfinal.name=%{name}-%{version}
-Djavadoc.destdir=./docs/apidocs javadocs
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -m 644 bin/%{name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 bin/%{name}-%{version}-applet.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-applet-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
+ln -sf ${jar} ${jar/-%{version}/}; done)
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+ rm -f %{_javadocdir}/%{name}
+fi
+
+%files
+%defattr(0644,root,root,0755)
+%doc LICENSE.txt README.txt
+%{_javadir}/*
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{name}-%{version}
+
+%changelog
+* Thu Jan 05 2006 Fernando Nasser <fnasser(a)redhat.com> 0:1.2-0.b1.4jpp
+- First JPP 1.7 build
+
+* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> 0:1.2-0.b1.3jpp
+- Build with ant-1.6.2
+
+* Thu Apr 29 2004 David Walluck <david(a)jpackage.org> 0:1.2-0.b1.2jpp
+- add jar symlinks
+- remove %%buildroot in %%install
+
+* Tue May 06 2003 David Walluck <david(a)anti-microsoft.org> 0:1.2-0.b1.1jpp
+- 1.2-b1
+- update for JPackage 1.5
+
+* Mon Mar 18 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.1-1jpp
+- 1.1
+- generic servlet support
+- used source release
+- dropped patch
+- added applet jar
+
+* Mon Jan 21 2002 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-3jpp
+- versioned dir for javadoc
+- no dependencies for javadoc package
+- dropped jsse package
+- adaptation to new servlet3 package
+- adaptation to new jsse package
+- section macro
+
+* Fri Dec 7 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-2jpp
+- javadoc into javadoc package
+
+* Sat Nov 3 2001 Guillaume Rousse <guillomovitch(a)users.sourceforge.net> 1.0-1jpp
+- first JPackage release