* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-5.5.25.ebuild
@ 2007-09-08 18:28 William Thomson (wltjr)
0 siblings, 0 replies; 4+ messages in thread
From: William Thomson (wltjr) @ 2007-09-08 18:28 UTC (permalink / raw
To: gentoo-commits
wltjr 07/09/08 18:28:30
Modified: ChangeLog
Added: tomcat-5.5.25.ebuild
Log:
Bumped to latest release, unified multiple patch files into two, partly result of having to re-create patches. Dropped ~x86-fbsd keyword due to it missing on a dep per bug #191729.
(Portage version: 2.1.3.7)
Revision Changes Path
1.164 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.164&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.164&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.163&r2=1.164
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- ChangeLog 8 Sep 2007 00:26:15 -0000 1.163
+++ ChangeLog 8 Sep 2007 18:28:30 -0000 1.164
@@ -1,6 +1,16 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.163 2007/09/08 00:26:15 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.164 2007/09/08 18:28:30 wltjr Exp $
+
+*tomcat-5.5.25 (08 Sep 2007)
+
+ 08 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+ +files/5.5/jsr152_jsr154_examples_build_xml.patch,
+ +files/5.5/main_tomcat_catalina_jasper_build_xml.patch,
+ +tomcat-5.5.25.ebuild:
+ Bumped to latest release, unified multiple patch files into two, partly
+ result of having to re-create patches. Dropped ~x86-fbsd keyword due to it
+ missing on a dep per bug #191729.
08 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
-files/5.5/tomcat.conf, -files/5.5/tomcat.init, -tomcat-5.5.23-r1.ebuild,
1.1 www-servers/tomcat/tomcat-5.5.25.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?rev=1.1&content-type=text/plain
Index: tomcat-5.5.25.ebuild
===================================================================
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.1 2007/09/08 18:28:30 wltjr Exp $
WANT_ANT_TASKS="ant-trax"
inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="Tomcat Servlet-2.4/JSP-2.0 Container"
MY_P="apache-${P}-src"
SLOT="5.5"
SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
HOMEPAGE="http://tomcat.apache.org/"
KEYWORDS="~amd64 -ppc -ppc64 ~x86"
LICENSE="Apache-2.0"
IUSE="admin java5 doc examples source test"
RDEPEND="=dev-java/eclipse-ecj-3.3*
=dev-java/commons-beanutils-1.7*
>=dev-java/commons-collections-3.1
>=dev-java/commons-daemon-1.0.1
>=dev-java/commons-dbcp-1.2.1
>=dev-java/commons-digester-1.7
>=dev-java/commons-fileupload-1.1
=dev-java/commons-httpclient-2.0*
>=dev-java/commons-io-1.1
>=dev-java/commons-el-1.0
>=dev-java/commons-launcher-0.9
>=dev-java/commons-logging-1.0.4
>=dev-java/commons-modeler-2.0
>=dev-java/commons-pool-1.2
>=dev-java/junit-3.8.1
>=dev-java/log4j-1.2.9
>=dev-java/saxpath-1.0
~dev-java/tomcat-servlet-api-${PV}
dev-java/ant-core
admin? ( =dev-java/struts-1.2* )
dev-java/sun-javamail
java5? ( >=virtual/jre-1.5 )
!java5? (
=virtual/jre-1.4*
dev-java/sun-jaf
=dev-java/mx4j-core-3*
>=dev-java/xerces-2.7.1
=dev-java/xml-commons-external-1.3*
)"
DEPEND="java5? ( >=virtual/jdk-1.5 )
!java5? ( =virtual/jdk-1.4* )
${RDEPEND}"
S=${WORKDIR}/${MY_P}
TOMCAT_NAME="${PN}-${SLOT}"
WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
pkg_setup() {
java-pkg-2_pkg_setup
# new user for tomcat
enewgroup tomcat
enewuser tomcat -1 -1 /dev/null tomcat
java-pkg_filter-compiler ecj-3.1 ecj-3.2
}
src_unpack() {
unpack ${A}
cd ${S}
epatch "${FILESDIR}/${SLOT}/main_tomcat_catalina_jasper_build_xml.patch"
use examples && epatch "${FILESDIR}/${SLOT}/jsr152_jsr154_examples_build_xml.patch"
# avoid packed jars :-)
mkdir -p ${S}/build/build/common
cd ${S}/build/build
mkdir ./bin && cd ./bin
java-pkg_jar-from commons-logging commons-logging-api.jar
java-pkg_jar-from commons-daemon
if ! use java5; then
java-pkg_jar-from mx4j-core-3.0 mx4j.jar jmx.jar
java-pkg_jar-from mx4j-core-3.0 mx4j-rjmx.jar jmx-remote.jar
mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed
java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
java-pkg_jar-from xerces-2 xercesImpl.jar
fi
mkdir ${S}/build/build/common/lib && cd ${S}/build/build/common/lib
java-pkg_jar-from ant-core
java-pkg_jar-from commons-collections
java-pkg_jar-from commons-dbcp
java-pkg_jar-from commons-el
java-pkg_jar-from commons-pool
java-pkg_jar-from tomcat-servlet-api-2.4
mkdir -p ${S}/build/build/server/lib && cd ${S}/build/build/server/lib
java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
java-pkg_jar-from commons-digester
java-pkg_jar-from commons-modeler
}
src_compile(){
local antflags="-Dbase.path=${T}"
antflags="${antflags} -Dservletapi.build.notrequired=true"
antflags="${antflags} -Djspapi.build.notrequired=true"
antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjars commons-daemon)"
antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
antflags="${antflags} -Dcommons-dbcp.jar=$(java-pkg_getjars commons-dbcp)"
antflags="${antflags} -Dcommons-el.jar=$(java-pkg_getjars commons-el)"
antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
antflags="${antflags} -Dcommons-httpclient.jar=$(java-pkg_getjars commons-httpclient)"
antflags="${antflags} -Dcommons-launcher.jar=$(java-pkg_getjars commons-launcher)"
antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
antflags="${antflags} -Dcommons-pool.jar=$(java-pkg_getjars commons-pool)"
antflags="${antflags} -Dcommons-modeler.jar=$(java-pkg_getjars commons-modeler)"
antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
antflags="${antflags} -Djsp-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 jsp-api.jar)"
antflags="${antflags} -Djunit.jar=$(java-pkg_getjars junit)"
antflags="${antflags} -Dlog4j.jar=$(java-pkg_getjars log4j)"
antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail mail.jar)"
antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
antflags="${antflags} -Dservlet-api.jar=$(java-pkg_getjar tomcat-servlet-api-2.4 servlet-api.jar)"
if use admin; then
antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
antflags="${antflags} -Dstruts.home=/usr/share/struts"
else
antflags="${antflags} -Dadmin.build.notrequired=true"
antflags="${antflags} -Dadmin.precompile.notrequired=true"
fi
if ! use examples; then
antflags="${antflags} -Dexamples.build.notrequired=true"
antflags="${antflags} -Dexamples.precompile.notrequired=true"
fi
antflags="${antflags} -Djasper.home=${S}/jasper"
if ! use java5; then
antflags="${antflags} -Dactivation.jar=$(java-pkg_getjars sun-jaf)"
antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j.jar)"
antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-core-3.0 mx4j-rjmx.jar)"
antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xml-commons-external-1.3 xml-apis.jar)"
fi
eant ${antflags}
}
src_install() {
cd ${S}/build/build
# init.d, conf.d
newinitd ${FILESDIR}/${SLOT}/tomcat.init.2 ${TOMCAT_NAME}
newconfd ${FILESDIR}/${SLOT}/tomcat.conf.2 ${TOMCAT_NAME}
# create dir structure
diropts -m755 -o tomcat -g tomcat
dodir /usr/share/${TOMCAT_NAME}
keepdir /var/log/${TOMCAT_NAME}/
keepdir /var/tmp/${TOMCAT_NAME}/
keepdir /var/run/${TOMCAT_NAME}/
local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
dodir ${CATALINA_BASE}
keepdir ${CATALINA_BASE}/shared/lib
keepdir ${CATALINA_BASE}/shared/classes
keepdir /usr/share/${TOMCAT_NAME}/common/lib
dodir /etc/${TOMCAT_NAME}
fperms 750 /etc/${TOMCAT_NAME}
diropts -m0755
# we don't need dos scripts
rm -f bin/*.bat
# copy the manager and admin context's to the right position
mkdir -p conf/Catalina/localhost
if use admin; then
cp ${S}/container/webapps/admin/admin.xml \
conf/Catalina/localhost
fi
cp ${S}/container/webapps/manager/manager.xml \
conf/Catalina/localhost
# make the jars available via java-pkg_getjar and jar-from, etc
base=$(pwd)
libdirs="common/lib server/lib"
for dir in ${libdirs}
do
cd ${dir}
for jar in *.jar;
do
# replace the file with a symlink
if [ ! -L ${jar} ]; then
java-pkg_dojar ${jar}
rm -f ${jar}
ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar}
fi
done
cd ${base}
done
# replace a packed struts.jar
if the use admin; then
cd server/webapps/admin/WEB-INF/lib
rm -f struts.jar
java-pkg_jar-from struts-1.2 struts.jar
cd ${base}
else
rm -fR server/webapps/admin
fi
cd server/webapps/manager/WEB-INF/lib
java-pkg_jar-from commons-fileupload
java-pkg_jar-from commons-io-1
cd ${base}
# replace the default pw with a random one, see #92281
local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
sed -e s:SHUTDOWN:${randpw}: -i conf/{server,server-minimal}.xml
# copy over the directories
chown -R tomcat:tomcat webapps/* conf/*
cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
cp -HR bin common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
# replace catalina.policy with gentoo specific one bug #176701
cp ${FILESDIR}/${SLOT}/catalina.policy ${D}/etc/${TOMCAT_NAME} || die "failed to replace catalina.policy"
keepdir ${WEBAPPS_DIR}
set_webapps_perms ${D}/${WEBAPPS_DIR}
# Copy over webapps, some controlled by use flags
cp -p ../RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps
if use doc; then
cp -pr webapps/tomcat-docs ${D}${CATALINA_BASE}/webapps
fi
if use examples; then
cp -pr webapps/{jsp-examples,servlets-examples,webdav} \
${D}${CATALINA_BASE}/webapps
fi
# symlink the directories to make CATALINA_BASE possible
dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
dodoc ${S}/build/{RELEASE-NOTES,RUNNING.txt}
fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
}
pkg_postinst() {
#due to previous ebuild bloopers, make sure everything is correct
chown root:root /etc/init.d/${TOMCAT_NAME}
chown root:root /etc/conf.d/${TOMCAT_NAME}
elog
elog " This ebuild implements a new filesystem layout for tomcat"
elog " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
elog " for more information!."
elog
ewarn "naming-factory-dbcp.jar is not built at this time. Please fetch"
ewarn "jar from upstream binary if you need it. Gentoo Bug # 144276"
elog
ewarn "The manager webapps have known exploits, please refer to"
ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
if use examples ; then
elog
ewarn "The examples webapp has a known exploit, please refer to"
ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
fi
elog
elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
elog " may not get seen. Thank you."
elog
}
#helpers
set_webapps_perms() {
chown tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
chmod 750 ${1} || die "Failed to change permissions off ${1}."
}
pkg_config() {
# Better suggestions are welcome
local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
elog "The default home directory for Tomcat is /dev/null."
elog "You need to change it if your applications needs it to"
elog "be an actual directory. Current home directory:"
elog "${currentdir}"
elog ""
elog "Do you want to change it [yes/no]?"
local answer
read answer
if [[ "${answer}" == "yes" ]]; then
elog ""
elog "Suggestions:"
elog "${WEBAPPS_DIR}"
elog ""
elog "If you want to suggest a directory, file a bug to"
elog "http://bugs.gentoo.org"
elog ""
elog "Enter home directory:"
local homedir
read homedir
elog ""
elog "Setting home directory to: ${homedir}"
/usr/sbin/usermod -d"${homedir}" tomcat
elog "You can run emerge --config =${PF}"
elog "again to change to homedir"
elog "at any time."
fi
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-5.5.25.ebuild
@ 2007-09-21 14:49 William Thomson (wltjr)
0 siblings, 0 replies; 4+ messages in thread
From: William Thomson (wltjr) @ 2007-09-21 14:49 UTC (permalink / raw
To: gentoo-commits
wltjr 07/09/21 14:49:42
Modified: ChangeLog tomcat-5.5.25.ebuild
Log:
Removed the from if clause :( no clue how that was added.
(Portage version: 2.1.3.9)
Revision Changes Path
1.165 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.165&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.165&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.164&r2=1.165
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- ChangeLog 8 Sep 2007 18:28:30 -0000 1.164
+++ ChangeLog 21 Sep 2007 14:49:42 -0000 1.165
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.164 2007/09/08 18:28:30 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.165 2007/09/21 14:49:42 wltjr Exp $
+
+ 21 Sep 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+ tomcat-5.5.25.ebuild:
+ Removed the from if clause :( no clue how that was added.
*tomcat-5.5.25 (08 Sep 2007)
1.3 www-servers/tomcat/tomcat-5.5.25.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?r1=1.2&r2=1.3
Index: tomcat-5.5.25.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tomcat-5.5.25.ebuild 9 Sep 2007 03:00:18 -0000 1.2
+++ tomcat-5.5.25.ebuild 21 Sep 2007 14:49:42 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.2 2007/09/09 03:00:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.3 2007/09/21 14:49:42 wltjr Exp $
WANT_ANT_TASKS="ant-trax"
@@ -209,7 +209,7 @@
done
# replace a packed struts.jar
- if the use admin; then
+ if use admin; then
cd server/webapps/admin/WEB-INF/lib
rm -f struts.jar
java-pkg_jar-from struts-1.2 struts.jar
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-5.5.25.ebuild
@ 2007-10-12 8:23 Christian Faulhammer (opfer)
0 siblings, 0 replies; 4+ messages in thread
From: Christian Faulhammer (opfer) @ 2007-10-12 8:23 UTC (permalink / raw
To: gentoo-commits
opfer 07/10/12 08:23:19
Modified: ChangeLog tomcat-5.5.25.ebuild
Log:
stable x86, security bug 195571
(Portage version: 2.1.3.9)
Revision Changes Path
1.168 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.167&r2=1.168
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- ChangeLog 12 Oct 2007 02:47:16 -0000 1.167
+++ ChangeLog 12 Oct 2007 08:23:18 -0000 1.168
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.167 2007/10/12 02:47:16 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.168 2007/10/12 08:23:18 opfer Exp $
+
+ 12 Oct 2007; Christian Faulhammer <opfer@gentoo.org> tomcat-5.5.25.ebuild:
+ stable x86, security bug 195571
12 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
tomcat-5.5.25.ebuild, tomcat-6.0.14.ebuild:
1.5 www-servers/tomcat/tomcat-5.5.25.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?r1=1.4&r2=1.5
Index: tomcat-5.5.25.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat-5.5.25.ebuild 12 Oct 2007 02:47:16 -0000 1.4
+++ tomcat-5.5.25.ebuild 12 Oct 2007 08:23:18 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.4 2007/10/12 02:47:16 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.5 2007/10/12 08:23:18 opfer Exp $
WANT_ANT_TASKS="ant-trax"
@@ -12,7 +12,7 @@
SLOT="5.5"
SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 -ppc -ppc64 ~x86"
+KEYWORDS="amd64 -ppc -ppc64 x86"
LICENSE="Apache-2.0"
IUSE="admin java5 doc examples source test"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-5.5.25.ebuild
@ 2007-10-12 11:38 Roy Marples (uberlord)
0 siblings, 0 replies; 4+ messages in thread
From: Roy Marples (uberlord) @ 2007-10-12 11:38 UTC (permalink / raw
To: gentoo-commits
uberlord 07/10/12 11:38:24
Modified: ChangeLog tomcat-5.5.25.ebuild
Log:
Added ~x86-fbsd back again, #195571
(Portage version: 2.1.3.12)
Revision Changes Path
1.169 www-servers/tomcat/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.169&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.169&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.168&r2=1.169
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- ChangeLog 12 Oct 2007 08:23:18 -0000 1.168
+++ ChangeLog 12 Oct 2007 11:38:23 -0000 1.169
@@ -1,6 +1,9 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.168 2007/10/12 08:23:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.169 2007/10/12 11:38:23 uberlord Exp $
+
+ 12 Oct 2007; Roy Marples <uberlord@gentoo.org> tomcat-5.5.25.ebuild:
+ Added ~x86-fbsd back again, #195571
12 Oct 2007; Christian Faulhammer <opfer@gentoo.org> tomcat-5.5.25.ebuild:
stable x86, security bug 195571
1.6 www-servers/tomcat/tomcat-5.5.25.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild?r1=1.5&r2=1.6
Index: tomcat-5.5.25.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tomcat-5.5.25.ebuild 12 Oct 2007 08:23:18 -0000 1.5
+++ tomcat-5.5.25.ebuild 12 Oct 2007 11:38:23 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.5 2007/10/12 08:23:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.25.ebuild,v 1.6 2007/10/12 11:38:23 uberlord Exp $
WANT_ANT_TASKS="ant-trax"
@@ -12,7 +12,7 @@
SLOT="5.5"
SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 -ppc -ppc64 x86"
+KEYWORDS="amd64 -ppc -ppc64 x86 ~x86-fbsd"
LICENSE="Apache-2.0"
IUSE="admin java5 doc examples source test"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-10-12 12:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-08 18:28 [gentoo-commits] gentoo-x86 commit in www-servers/tomcat: ChangeLog tomcat-5.5.25.ebuild William Thomson (wltjr)
-- strict thread matches above, loose matches on Subject: below --
2007-09-21 14:49 William Thomson (wltjr)
2007-10-12 8:23 Christian Faulhammer (opfer)
2007-10-12 11:38 Roy Marples (uberlord)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox