monsieurp    15/06/13 09:02:44

  Modified:             ChangeLog
  Added:                commons-httpclient-3.1-r1.ebuild
  Log:
  Add patch to mend SSLProtocolSocketFactory.java. EAPI 5 bump. Fix security 
bug 442292.
  
  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.65                 dev-java/commons-httpclient/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-httpclient/ChangeLog?rev=1.65&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-httpclient/ChangeLog?rev=1.65&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-httpclient/ChangeLog?r1=1.64&r2=1.65

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog   19 Dec 2011 12:33:32 -0000      1.64
+++ ChangeLog   13 Jun 2015 09:02:44 -0000      1.65
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-httpclient
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 
1.64 2011/12/19 12:33:32 sera Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-httpclient/ChangeLog,v 
1.65 2015/06/13 09:02:44 monsieurp Exp $
+
+*commons-httpclient-3.1-r1 (13 Jun 2015)
+
+  13 Jun 2015; Patrice Clement <[email protected]>
+  +commons-httpclient-3.1-r1.ebuild,
+  +files/commons-httpclient-3.1-SSLProtocolSocketFactory.java.patch:
+  Add patch to mend SSLProtocolSocketFactory.java. EAPI 5 bump. Fix security 
bug
+  442292.
 
   19 Dec 2011; Ralph Sennhauser <[email protected]>
   commons-httpclient-2.0.2-r1.ebuild:
@@ -282,4 +290,3 @@
   22 Mar 2003; Dylan Carlson <[email protected]>
   commons-httpclient-2.0_alpha3.ebuild:
   Initial import.
-



1.1                  
dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: commons-httpclient-3.1-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/dev-java/commons-httpclient/commons-httpclient-3.1-r1.ebuild,v
 1.1 2015/06/13 09:02:44 monsieurp Exp $

EAPI=5

JAVA_PKG_IUSE="doc examples source test"

inherit eutils java-pkg-2 java-ant-2

DESCRIPTION="The Jakarta Commons HttpClient library"
HOMEPAGE="http://hc.apache.org/";
SRC_URI="mirror://apache/httpcomponents/${PN}/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="3"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux 
~x86-linux ~x86-macos"
IUSE=""

# doesn't work with IBM JDK, bug #176133
RESTRICT="test"

CDEPEND="dev-java/commons-logging:0
        dev-java/commons-codec:0"
RDEPEND=">=virtual/jre-1.6
        ${CDEPEND}"
DEPEND=">=virtual/jdk-1.6
        test? ( dev-java/ant-junit:0 )
        ${CDEPEND}"

JAVA_ANT_ENCODING="ISO-8859-1"
JAVA_ANT_REWRITE_CLASSPATH="true"
EANT_GENTOO_CLASSPATH="commons-logging,commons-codec"
EANT_BUILD_TARGET="dist"
EANT_DOC_TARGET="doc"

java_prepare() {
        # patch against CVE-2012-{5783,6153}. See bug 442292.
        epatch "${FILESDIR}"/"${P}-SSLProtocolSocketFactory.java.patch"

        # generated docs go into docs/api
        rm -rf docs/apidocs

        # remove javadoc task from compile task
        sed -i -e 's/depends="compile,doc"/depends="compile"/' build.xml || die
        sed -i -e '/link/ d' build.xml || die

        mkdir lib && cd lib
        java-pkg_filter-compiler jikes
}

EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
EANT_TEST_TARGET="test"

src_install() {
        java-pkg_dojar dist/${PN}.jar

        # contains both html docs and javadoc in correct subdir
        if use doc ; then
                java-pkg_dojavadoc dist/docs/api
                java-pkg_dohtml -r dist/docs/*
        fi
        use source && java-pkg_dosrc src/java/*
        use examples && java-pkg_doexamples src/examples
}




Reply via email to