chainsaw    15/01/05 11:12:33

  Modified:             ChangeLog
  Added:                elasticsearch-1.4.0.ebuild
                        elasticsearch-1.3.2-r2.ebuild
  Removed:              elasticsearch-1.3.2-r1.ebuild
                        elasticsearch-1.3.2.ebuild
  Log:
  Version bump by Ferenc Erki closes bug #525582. Mitigation and bump for 
cross-site scripting vulnerability by Ferenci Erki for security bug 524682.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
0xB5058F9A)

Revision  Changes    Path
1.8                  app-misc/elasticsearch/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/ChangeLog?rev=1.8&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/ChangeLog?rev=1.8&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog   6 Oct 2014 14:36:26 -0000       1.7
+++ ChangeLog   5 Jan 2015 11:12:33 -0000       1.8
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/elasticsearch
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.7 
2014/10/06 14:36:26 chainsaw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.8 
2015/01/05 11:12:33 chainsaw Exp $
+
+*elasticsearch-1.4.0 (05 Jan 2015)
+*elasticsearch-1.3.2-r2 (05 Jan 2015)
+
+  05 Jan 2015; Tony Vroon <[email protected]> -elasticsearch-1.3.2.ebuild,
+  -elasticsearch-1.3.2-r1.ebuild, +elasticsearch-1.3.2-r2.ebuild,
+  +elasticsearch-1.4.0.ebuild, +files/1.3.2-http_cors_disable.patch:
+  Version bump by Ferenc Erki closes bug #525582. Mitigation and bump for
+  cross-site scripting vulnerability by Ferenci Erki for security bug 524682.
 
 *elasticsearch-1.3.2-r1 (06 Oct 2014)
 



1.1                  app-misc/elasticsearch/elasticsearch-1.4.0.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.4.0.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.4.0.ebuild?rev=1.1&content-type=text/plain

Index: elasticsearch-1.4.0.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.4.0.ebuild,v 1.1 
2015/01/05 11:12:33 chainsaw Exp $

EAPI=5

inherit eutils systemd user

MY_PN="${PN%-bin}"
DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
HOMEPAGE="http://www.elasticsearch.org/";
SRC_URI="http://download.${MY_PN}.org/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz";
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"

RESTRICT="strip"
QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"

RDEPEND="virtual/jre:1.7"

pkg_setup() {
        enewgroup ${MY_PN}
        enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
}

src_prepare() {
        rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
        rm -rf bin/*.{bat,exe}
        rm lib/sigar/libsigar-ia64-linux.so
        rm LICENSE.txt

        use amd64 && {
                rm lib/sigar/libsigar-x86-linux.so
        }

        use x86 && {
                rm lib/sigar/libsigar-amd64-linux.so
        }
}

src_install() {
        dodir /etc/${MY_PN}

        insinto /usr/share/doc/${P}/examples
        doins bin/${MY_PN}.in.sh
        doins config/*
        rm bin/${MY_PN}.in.sh
        rm -rf config

        insinto /usr/share/${MY_PN}
        doins -r ./*
        chmod +x "${D}"/usr/share/${MY_PN}/bin/*

        keepdir /var/{lib,log}/${MY_PN}

        local rcscript=elasticsearch.init3
        local eshome="/usr/share/${MY_PN}"
        local jarfile="${MY_PN}-${PV}.jar"
        local 
esclasspath="${eshome}/lib/${jarfile}:${eshome}/lib/*:${eshome}/lib/sigar/*"

        cp "${FILESDIR}/${rcscript}" "${T}" || die
        sed -i \
                -e "s|@ES_CLASS_PATH@|${esclasspath}|" \
                "${T}/${rcscript}" \
                || die "failed to filter ${rcscript}"

        newinitd "${T}/${rcscript}" "${MY_PN}"
        newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
        systemd_newunit "${FILESDIR}"/${PN}.service2 "${PN}.service"
}

pkg_postinst() {
        elog
        elog "You may create multiple instances of ${MY_PN} by"
        elog "symlinking the init script:"
        elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
        elog
        elog "Each of the example files in /usr/share/doc/${P}/examples"
        elog "should be extracted to the proper configuration directory:"
        elog "/etc/${MY_PN} (for standard init)"
        elog "/etc/${MY_PN}/instance (for symlinked init)"
        elog
}



1.1                  app-misc/elasticsearch/elasticsearch-1.3.2-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.3.2-r2.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.3.2-r2.ebuild?rev=1.1&content-type=text/plain

Index: elasticsearch-1.3.2-r2.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.3.2-r2.ebuild,v 
1.1 2015/01/05 11:12:33 chainsaw Exp $

EAPI=5

inherit eutils systemd user

MY_PN="${PN%-bin}"
DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
HOMEPAGE="http://www.elasticsearch.org/";
SRC_URI="http://download.${MY_PN}.org/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz";
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"

RESTRICT="strip"
QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"

RDEPEND="virtual/jre:1.7"

pkg_setup() {
        enewgroup ${MY_PN}
        enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
}

src_prepare() {
        rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
        rm lib/sigar/libsigar-ia64-linux.so
        rm LICENSE.txt

        use amd64 && {
                rm lib/sigar/libsigar-x86-linux.so
        }

        use x86 && {
                rm lib/sigar/libsigar-amd64-linux.so
        }

        # Security bug #524682
        epatch "${FILESDIR}/${PV}-http_cors_disable.patch"
}

src_install() {
        dodir /etc/${MY_PN}

        insinto /usr/share/doc/${P}/examples
        doins bin/${MY_PN}.in.sh
        doins config/*
        rm bin/${MY_PN}.in.sh
        rm -rf config

        insinto /usr/share/${MY_PN}
        doins -r ./*
        chmod +x "${D}"/usr/share/${MY_PN}/bin/*

        keepdir /var/{lib,log}/${MY_PN}

        local rcscript=elasticsearch.init3
        local eshome="/usr/share/${MY_PN}"
        local jarfile="${MY_PN}-${PV}.jar"
        local 
esclasspath="${eshome}/lib/${jarfile}:${eshome}/lib/*:${eshome}/lib/sigar/*"

        cp "${FILESDIR}/${rcscript}" "${T}" || die
        sed -i \
                -e "s|@ES_CLASS_PATH@|${esclasspath}|" \
                "${T}/${rcscript}" \
                || die "failed to filter ${rcscript}"

        newinitd "${T}/${rcscript}" "${MY_PN}"
        newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
        systemd_newunit "${FILESDIR}"/${PN}.service2 "${PN}.service"
}

pkg_postinst() {
        elog
        elog "You may create multiple instances of ${MY_PN} by"
        elog "symlinking the init script:"
        elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
        elog
        elog "Each of the example files in /usr/share/doc/${P}/examples"
        elog "should be extracted to the proper configuration directory:"
        elog "/etc/${MY_PN} (for standard init)"
        elog "/etc/${MY_PN}/instance (for symlinked init)"
        elog
}




Reply via email to