monsieurp 15/06/13 21:24:01 Modified: ChangeLog Added: axis-1.4-r2.ebuild Log: EAPI 5 bump. Add patch against CVE-2014-3596. Fix security bug 520304. Signed-off-by: Patrice Clement <[email protected]> (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.28 www-servers/axis/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/axis/ChangeLog?rev=1.28&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/axis/ChangeLog?rev=1.28&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/axis/ChangeLog?r1=1.27&r2=1.28 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ChangeLog 22 Jan 2010 11:32:51 -0000 1.27 +++ ChangeLog 13 Jun 2015 21:24:01 -0000 1.28 @@ -1,6 +1,12 @@ # ChangeLog for www-servers/axis -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.27 2010/01/22 11:32:51 caster Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/www-servers/axis/ChangeLog,v 1.28 2015/06/13 21:24:01 monsieurp Exp $ + +*axis-1.4-r2 (13 Jun 2015) + + 13 Jun 2015; Patrice Clement <[email protected]> +axis-1.4-r2.ebuild, + +files/axis-1.4-JSSESocketFactory.java.patch: + EAPI 5 bump. Add patch against CVE-2014-3596. Fix security bug 520304. 22 Jan 2010; Vlastimil Babka <[email protected]> -axis-1.2_rc2-r3.ebuild, -files/axis-1.2-gentoo.patch, -axis-1.4.ebuild: @@ -109,4 +115,3 @@ 22 Jan 2005; Jan Brinkmann <[email protected]> +metadata.xml, +files/axis-1.2-gentoo.patch, +axis-1.2_rc2.ebuild: Initial import. Ebuild contributions by various people, see #38899. - 1.1 www-servers/axis/axis-1.4-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/axis/axis-1.4-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/axis/axis-1.4-r2.ebuild?rev=1.1&content-type=text/plain Index: axis-1.4-r2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-servers/axis/axis-1.4-r2.ebuild,v 1.1 2015/06/13 21:24:01 monsieurp Exp $ 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 <copy> 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 <available> 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 '/<bootclasspath refid="boot.classpath"/d' build.xml || die } src_install() { dodir /usr/share/${AXIS_NAME} mv build/lib/axis-ant.jar build/lib/ant-axis.jar || die java-pkg_dojar build/lib/axis.jar java-pkg_dojar build/lib/ant-axis.jar java-pkg_dojar build/lib/jaxrpc.jar java-pkg_register-ant-task dodir /usr/share/${AXIS_NAME}/webapps cp -pR "${S}"/webapps/axis "${D}"/usr/share/${AXIS_NAME}/webapps || die dodoc NOTICE README dohtml release-notes.html changelog.html if use doc; then java-pkg_dojavadoc build/javadocs/ dohtml -r docs/* dodoc xmls/* fi use source && java-pkg_dosrc src use examples && java-pkg_doexamples samples }
