From 1eda279c03ccc5f25e2c33ab305f6f81ea315d7b Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Mon, 26 Oct 2015 23:25:21 +0000 Subject: [PATCH] www-servers/axis: Remove obsolete package Axis is alive upstream but we have no immediate plans to bump it. --- www-servers/axis/Manifest | 1 - www-servers/axis/axis-1.4-r2.ebuild | 139 ------- .../axis-1.4-JSSESocketFactory.java.patch | 342 ------------------ .../axis/files/axis-1.4-build.xml.patch | 15 - www-servers/axis/files/axis-1.4-java6.patch | 16 - .../axis/files/axis-1.4-path_refs.xml.patch | 20 - .../axis/files/axis-1.4-targets.xml.patch | 86 ----- .../axis/files/axis-1.4-tools-build.xml.patch | 26 -- www-servers/axis/files/build.properties | 15 - www-servers/axis/metadata.xml | 13 - 10 files changed, 673 deletions(-) delete mode 100644 www-servers/axis/Manifest delete mode 100644 www-servers/axis/axis-1.4-r2.ebuild delete mode 100644 www-servers/axis/files/axis-1.4-JSSESocketFactory.java.patch delete mode 100644 www-servers/axis/files/axis-1.4-build.xml.patch delete mode 100644 www-servers/axis/files/axis-1.4-java6.patch delete mode 100644 www-servers/axis/files/axis-1.4-path_refs.xml.patch delete mode 100644 www-servers/axis/files/axis-1.4-targets.xml.patch delete mode 100644 www-servers/axis/files/axis-1.4-tools-build.xml.patch delete mode 100644 www-servers/axis/files/build.properties delete mode 100644 www-servers/axis/metadata.xml diff --git a/www-servers/axis/Manifest b/www-servers/axis/Manifest deleted file mode 100644 index a574a72dd1b8..000000000000 --- a/www-servers/axis/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST axis-src-1_4.tar.gz 17041546 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572 SHA512 7d08212b04702e76c960ad772a475f5765fef7f9ebe0aea3d4b949c6ba28a62500e8a76a43c7364b7caf36b7f27aee8592744256154670c7a24d29c5c1518258 WHIRLPOOL cf359caa9e645bdefb7c2ff012673dc64af9d4cc4bbe2a082cb64bcb0211d3a844ef797738ae1a3e9f978d0bbd8dc42bac9ecbdf4c734dd30ff52da18bdd7a91 diff --git a/www-servers/axis/axis-1.4-r2.ebuild b/www-servers/axis/axis-1.4-r2.ebuild deleted file mode 100644 index a247f2beee12..000000000000 --- a/www-servers/axis/axis-1.4-r2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -WANT_ANT_TASKS="ant-nodeps ant-trax" -JAVA_PKG_IUSE="doc source examples" - -inherit eutils java-pkg-2 java-ant-2 - -MY_PV="${PV//./_}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Apache's Axis1 implementation of the SOAP (Simple Object Access Protocol)" -HOMEPAGE="http://ws.apache.org/axis/index.html" -SRC_URI="mirror://apache/ws/${PN}/${MY_PV}/${PN}-src-${MY_PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="amd64 x86" -IUSE="debug" - -CDEPEND="dev-java/commons-discovery:0 - dev-java/wsdl4j:0 - dev-java/sun-jaf:0 - dev-java/commons-logging:0 - java-virtuals/javamail:0 - dev-java/ant-core:0 - dev-java/bsf:2.3 - dev-java/castor:1.0 - dev-java/commons-httpclient:3 - dev-java/commons-net:0 - dev-java/sun-jimi:0 - dev-java/servletapi:2.4 - dev-java/saaj:0 - dev-java/jax-rpc:0 - dev-java/log4j:0 - dev-java/xml-commons:0 - dev-java/xml-xmlbeans:1" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" - -# uses enum as identifier -JAVA_PKG_WANT_SOURCE="1.4" -JAVA_PKG_WANT_TARGET="1.4" - -S="${WORKDIR}/${MY_P}" - -AXIS_NAME="${PN}-${SLOT}" - -# not declared mandatory but fails without it -# mailapi.jar would be enough but that's only in -bin, mail.jar superseedes -EANT_GENTOO_CLASSPATH="sun-jaf,javamail,log4j,xml-xmlbeans-1,servletapi-2.4,bsf-2.3,sun-jimi,commons-httpclient-3,castor-1.0,xml-commons,commons-net" -EANT_EXTRA_ARGS="-Ddeprecation=false -Dbase.path=/opt --Dservlet.jar=servlet-api.jar -Dwsdl4j-1.5.1.jar=wsdl4j.jar --Dcommons-logging-1.0.4.jar=commons-logging.jar" -EANT_BUILD_TARGET="compile" -EANT_DOC_TARGET="javadocs" -EANT_NEEDS_TOOLS="true" - -#TODO-tests require Atlassian clover, need to figure out which ones -RESTRICT="test" - -java_prepare() { - # remove some actions - epatch "${FILESDIR}/${P}-build.xml.patch" - # remove exact lib paths and global java.classpath from classpath - epatch "${FILESDIR}/${P}-path_refs.xml.patch" - # add missing target to javac, xml rewriting would break entities - epatch "${FILESDIR}/${P}-tools-build.xml.patch" - # remove most of checks - epatch "${FILESDIR}/${P}-targets.xml.patch" - # this clashes with java6 method - epatch "${FILESDIR}/${P}-java6.patch" - - # fix CVE-2014-3596 and bug 520304 - epatch "${FILESDIR}/${P}-JSSESocketFactory.java.patch" - - # and replace them with predefined properties - cp "${FILESDIR}/build.properties" . \ - || die "failed to copy build.properties from ${FILESDIR}" - - rm -rf "${S}"/docs/apiDocs || die - - #Remove test till they are working - rm -rf "${S}"/test || die - #cd "${S}"/test - #mv build_ant.xml build.xml - cd "${S}"/webapps/axis/WEB-INF/lib - rm -v *.jar || die - - cd "${S}/lib" - mv saaj.jar endorsed/ || die - rm -v *.jar || die - java-pkg_jar-from --build-only ant-core - java-pkg_jar-from wsdl4j wsdl4j.jar - java-pkg_jar-from commons-logging commons-logging.jar - java-pkg_jar-from commons-discovery commons-discovery.jar - - if use debug; then - EANT_EXTRA_ARGS+=" -Ddebug=on" - else - EANT_EXTRA_ARGS+=" -Ddebug=off" - fi - - cd "${S}" - java-ant_rewrite-classpath - java-ant_rewrite-bootclasspath auto build.xml "lib/endorsed/xml-apis-2.6.2.jar:lib/endorsed/xercesImpl-2.6.2.jar:lib/endorsed/saaj.jar" - sed -i '/ != <" + cnTested + ">"); -+ } -+ -+ private static boolean verifyHostName(final String host, final String cn){ -+ if (doWildCard(cn) && !isIPAddress(host)) { -+ return matchesWildCard(cn, host); -+ } -+ return host.equalsIgnoreCase(cn); -+ } -+ private static boolean doWildCard(String cn) { -+ // Contains a wildcard -+ // wildcard in the first block -+ // not an ipaddress (ip addres must explicitily be equal) -+ // not using 2nd level common tld : ex: not for *.co.uk -+ String parts[] = cn.split("\\."); -+ return parts.length >= 3 && -+ parts[0].endsWith("*") && -+ acceptableCountryWildcard(cn) && -+ !isIPAddress(cn); -+ } -+ -+ private static final Pattern IPV4_PATTERN = -+ Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$"); -+ -+ private static final Pattern IPV6_STD_PATTERN = -+ Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$"); -+ -+ private static final Pattern IPV6_HEX_COMPRESSED_PATTERN = -+ Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$"); -+ -+ -+ private static boolean isIPAddress(final String hostname) { -+ return hostname != null -+ && ( -+ IPV4_PATTERN.matcher(hostname).matches() -+ || IPV6_STD_PATTERN.matcher(hostname).matches() -+ || IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches() -+ ); -+ -+ } -+ -+ private static boolean acceptableCountryWildcard(final String cn) { -+ // The CN better have at least two dots if it wants wildcard action, -+ // but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc... -+ // The [*.co.uk] problem is an interesting one. Should we just -+ // hope that CA's would never foolishly allow such a -+ // certificate to happen? -+ -+ String[] parts = cn.split("\\."); -+ // Only checks for 3 levels, with country code of 2 letters. -+ if (parts.length > 3 || parts[parts.length - 1].length() != 2) { -+ return true; -+ } -+ String countryCode = parts[parts.length - 2]; -+ return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0; -+ } -+ -+ private static boolean matchesWildCard(final String cn, -+ final String hostName) { -+ String parts[] = cn.split("\\."); -+ boolean match = false; -+ String firstpart = parts[0]; -+ if (firstpart.length() > 1) { -+ // server∗ -+ // e.g. server -+ String prefix = firstpart.substring(0, firstpart.length() - 1); -+ // skipwildcard part from cn -+ String suffix = cn.substring(firstpart.length()); -+ // skip wildcard part from host -+ String hostSuffix = hostName.substring(prefix.length()); -+ match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix); -+ } else { -+ match = hostName.endsWith(cn.substring(1)); -+ } -+ if (match) { -+ // I f we ’ r e i n s t r i c t mode , -+ // [ ∗.foo.com] is not allowed to match [a.b.foo.com] -+ match = countDots(hostName) == countDots(cn); -+ } -+ return match; -+ } -+ -+ private static int countDots(final String data) { -+ int dots = 0; -+ for (int i = 0; i < data.length(); i++) { -+ if (data.charAt(i) == '.') { -+ dots += 1; -+ } -+ } -+ return dots; -+ } -+ -+ -+ private static String[] getCNs(X509Certificate cert) { -+ // Note: toString() seems to do a better job than getName() -+ // -+ // For example, getName() gives me this: -+ // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d -+ // -+ // whereas toString() gives me this: -+ // EMAILADDRESS=juliusdavies@cucbc.com -+ String subjectPrincipal = cert.getSubjectX500Principal().toString(); -+ -+ return getCNs(subjectPrincipal); -+ -+ } -+ private static String[] getCNs(String subjectPrincipal) { -+ if (subjectPrincipal == null) { -+ return null; -+ } -+ final List cns = new ArrayList(); -+ try { -+ final LdapName subjectDN = new LdapName(subjectPrincipal); -+ final List rdns = subjectDN.getRdns(); -+ for (int i = rdns.size() - 1; i >= 0; i--) { -+ final Rdn rds = (Rdn) rdns.get(i); -+ final Attributes attributes = rds.toAttributes(); -+ final Attribute cn = attributes.get("cn"); -+ if (cn != null) { -+ try { -+ final Object value = cn.get(); -+ if (value != null) { -+ cns.add(value.toString()); -+ } -+ } -+ catch (NamingException ignore) {} -+ } -+ } -+ } -+ catch (InvalidNameException ignore) { } -+ return cns.isEmpty() ? null : (String[]) cns.toArray(new String[ cns.size() ]); -+ } -+ - } diff --git a/www-servers/axis/files/axis-1.4-build.xml.patch b/www-servers/axis/files/axis-1.4-build.xml.patch deleted file mode 100644 index 92e5116934da..000000000000 --- a/www-servers/axis/files/axis-1.4-build.xml.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- build.xml.orig 2006-04-23 03:57:27.000000000 +0200 -+++ build.xml 2006-10-01 21:18:20.000000000 +0200 -@@ -223,10 +223,12 @@ - - - -+ - - diff --git a/www-servers/axis/files/axis-1.4-java6.patch b/www-servers/axis/files/axis-1.4-java6.patch deleted file mode 100644 index 2e9bd4289900..000000000000 --- a/www-servers/axis/files/axis-1.4-java6.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/org/apache/axis/i18n/ProjectResourceBundle.java.orig 2006-04-23 03:57:27.000000000 +0200 -+++ src/org/apache/axis/i18n/ProjectResourceBundle.java 2009-11-08 19:08:20.000000000 +0100 -@@ -357,13 +357,6 @@ - return resourceName; - } - -- /** -- * Clears the internal cache -- */ -- public static void clearCache() -- { -- bundleCache.clear(); -- } - - public String toString() { - return resourceName; diff --git a/www-servers/axis/files/axis-1.4-path_refs.xml.patch b/www-servers/axis/files/axis-1.4-path_refs.xml.patch deleted file mode 100644 index 7c0ad2455bd4..000000000000 --- a/www-servers/axis/files/axis-1.4-path_refs.xml.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xmls/path_refs.xml.orig 2006-04-23 03:56:52.000000000 +0200 -+++ xmls/path_refs.xml 2006-10-01 15:31:34.000000000 +0200 -@@ -1,4 +1,5 @@ - -+ - - - -- - - - diff --git a/www-servers/axis/files/axis-1.4-targets.xml.patch b/www-servers/axis/files/axis-1.4-targets.xml.patch deleted file mode 100644 index 1f5f63ee1831..000000000000 --- a/www-servers/axis/files/axis-1.4-targets.xml.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- xmls/targets.xml.orig 2006-10-01 15:08:41.000000000 +0200 -+++ xmls/targets.xml 2006-10-01 15:14:27.000000000 +0200 -@@ -84,6 +84,7 @@ - - - -+ - -- -+ - - - -@@ -185,7 +186,7 @@ - - - -- -+ - - - -@@ -201,7 +202,7 @@ - - - -- -+ - - - -@@ -229,7 +230,7 @@ - - - -- -+ - - - diff --git a/www-servers/axis/files/axis-1.4-tools-build.xml.patch b/www-servers/axis/files/axis-1.4-tools-build.xml.patch deleted file mode 100644 index ce9759264eda..000000000000 --- a/www-servers/axis/files/axis-1.4-tools-build.xml.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- tools/build.xml.orig 2006-10-02 10:18:43.000000000 +0200 -+++ tools/build.xml 2006-10-02 10:21:34.000000000 +0200 -@@ -66,6 +66,7 @@ - - -@@ -77,6 +78,7 @@ - - -@@ -88,6 +90,7 @@ - - diff --git a/www-servers/axis/files/build.properties b/www-servers/axis/files/build.properties deleted file mode 100644 index 9387391ab441..000000000000 --- a/www-servers/axis/files/build.properties +++ /dev/null @@ -1,15 +0,0 @@ -source=1.4 -target=1.4 - -activation.present=true -commons-discovery.present=true -commons-logging.present=true -wsdl4j.present=true -mailapi.present=true - -bsf.present=true -castor.present=true -commons-httpclient.present=true -commons-net.present=true -jimi.present=true -servlet.present=true diff --git a/www-servers/axis/metadata.xml b/www-servers/axis/metadata.xml deleted file mode 100644 index d75e8a6c1c56..000000000000 --- a/www-servers/axis/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -java - - -Apache Axis is an implementation of the SOAP ("Simple Object Access Protocol") submission to W3C. - -From the draft W3C specification: - -SOAP is a lightweight protocol for exchange of information in a decentralized, distributed environment. It is an XML based protocol that consists of three parts: an envelope that defines a framework for describing what is in a message and how to process it, a set of encoding rules for expressing instances of application-defined datatypes, and a convention for representing remote procedure calls and responses. - - -- 2.26.2