[GUMP@vmgump]: Project tomcat-trunk-test-apr (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test-apr has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 8 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test-apr : Tomcat 9.x, a web server implementing the Java Servlet 4.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/logs-APR -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-trunk/output/test-tmp-APR/logs] The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test-apr/gump_work/build_tomcat-trunk_tomcat-trunk-test-apr.html Work Name: build_tomcat-trunk_tomcat-trunk-test-apr (Type: Build) Work ended in a state of : Failed Elapsed: 56 mins 26 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.3-SNAPSHOT.jar -Dtest.reports=output/logs-APR -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151031-native-src.tar.gz -Dexamples.sources.skip=true -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.5-201506032000/ecj-4.5.jar -Dtest.apr.loc=/srv/gump/public/workspace/tomcat-native-trunk/dest-20151031/lib -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20151031.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20151031-native-src.tar.gz -Dtest.temp=output/test-tmp-APR -Dtest.accesslog=true - Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-master/dest-20151031/bin/openssl -Dexecute.test.apr=true -Dtest.excludePerformance=true -Dexecute.test.nio2=false -Deasymock.jar=/srv/gump/public/workspace/easymock/core/target/easymock-3.5-SNAPSHOT.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/g
Re: [VOTE] Release Apache Tomcat Native 1.2.0
On 31/10/2015 02:15, Konstantin Kolinko wrote: > 2015-10-22 13:47 GMT+03:00 Mark Thomas : >> Version 1.2.0 includes the following changes: >> - Windows binaries built with APR 1.5.1 and OpenSSL 1.0.2d >> - ALPN support >> >> The proposed release artefacts can be found at [1], >> and the build was done using tag [2]. >> >> The Apache Tomcat Native 1.2.0 is >> [ ] Stable, go ahead and release >> [ ] Broken because of ... > > > Is there an expectation that this library works with Tomcat 7, Tomcat 8? > (E.g. download links for 1.1.33 were removed from download page). Yes. > It does not! Then that needs to be fixed. > Running Tomcat 7 tests all HTTP tests pass, but an HTTPS test crashes > (org.apache.tomcat.util.net.TestSsl) > > Essentially, > > [junit] Caused by: java.lang.NoSuchMethodError: sniCallBack > [junit] at org.apache.tomcat.jni.SSLContext.make(Native Method) > [junit] at > org.apache.tomcat.util.net.AprEndpoint.bind(AprEndpoint.java:573) > [junit] at > org.apache.tomcat.util.net.AbstractEndpoint.init(AbstractEndpoint.java:651) > [junit] at > org.apache.coyote.AbstractProtocol.init(AbstractProtocol.java:434) > [junit] at > org.apache.catalina.connector.Connector.initInternal(Connector.java:978) > [junit] at > org.apache.catalina.util.LifecycleBase.init(LifecycleBase.java:102) > [junit] ... 33 more > > The above is followed by a JVM crash on a subsequent test. > I filed it into Bugzilla, > https://bz.apache.org/bugzilla/show_bug.cgi?id=58566 > > On a good side, non-SSL tests do pass. (Tomcat 7, skipping websocket tests) > > I think immediate action is to restore download links for 1.1.33. Thanks for taking care of that. > Maybe clarify the release announcement at http://tomcat.apache.org/. > (Add a note that this library targets not-yet-released versions of > Tomcat). It doesn't. It should work with all Tomcat versions. There appear to be multiple issues with 1.2.0 of varying severity. My plan is to get them fixed and then roll 1.2.1. Given the regressions, I don't intend to e-mail out the announcement for 1.2.0. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.2.0
2015-10-31 9:10 GMT+01:00 Mark Thomas : > > Essentially, > > > > [junit] Caused by: java.lang.NoSuchMethodError: sniCallBack > > [junit] at org.apache.tomcat.jni.SSLContext.make(Native Method) > > Ah, yes, ok, native 1.2 assumes SNI, and the old Java classes [org.apache.tomcat.jni] don't have it. What's the strategy here ? Should the Java APIs be updated, or is the native code supposed to behave better ? Rémy
svn commit: r1711583 - /tomcat/native/trunk/native/src/ssl.c
Author: rjung
Date: Sat Oct 31 10:04:26 2015
New Revision: 1711583
URL: http://svn.apache.org/viewvc?rev=1711583&view=rev
Log:
Fix compiler warning: remove unused variable.
Modified:
tomcat/native/trunk/native/src/ssl.c
Modified: tomcat/native/trunk/native/src/ssl.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/ssl.c?rev=1711583&r1=1711582&r2=1711583&view=diff
==
--- tomcat/native/trunk/native/src/ssl.c (original)
+++ tomcat/native/trunk/native/src/ssl.c Sat Oct 31 10:04:26 2015
@@ -641,7 +641,6 @@ static int ssl_rand_make(const char *fil
TCN_IMPLEMENT_CALL(jint, SSL, initialize)(TCN_STDARGS, jstring engine)
{
-int r = 0;
jclass clazz;
jclass sClazz;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711584 - /tomcat/native/trunk/native/src/sslutils.c
Author: rjung Date: Sat Oct 31 10:05:17 2015 New Revision: 1711584 URL: http://svn.apache.org/viewvc?rev=1711584&view=rev Log: Add a note about a compiler warning concerning use of uninitialized variables. Don't know how to fix right now. Modified: tomcat/native/trunk/native/src/sslutils.c Modified: tomcat/native/trunk/native/src/sslutils.c URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslutils.c?rev=1711584&r1=1711583&r2=1711584&view=diff == --- tomcat/native/trunk/native/src/sslutils.c (original) +++ tomcat/native/trunk/native/src/sslutils.c Sat Oct 31 10:05:17 2015 @@ -624,6 +624,7 @@ int select_next_proto(SSL *ssl, const un // There were no match but we just select our last protocol and hope the other peer support it. // // decrement the pointer again so the pointer points to the start of the protocol. + /* XXX compiler warning: 'proto_len' and 'p' may be used uninitialized in this function */ p -= proto_len; *out = p; *outlen = proto_len; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711585 - /tomcat/native/trunk/jnirelease.sh
Author: rjung
Date: Sat Oct 31 10:14:22 2015
New Revision: 1711585
URL: http://svn.apache.org/viewvc?rev=1711585&view=rev
Log:
Files "KEYS" and "download_deps.sh" were removed
twice from Unix/Linux sources instead once from
those and once from Win sources.
Modified:
tomcat/native/trunk/jnirelease.sh
Modified: tomcat/native/trunk/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=1711585&r1=1711584&r2=1711585&view=diff
==
--- tomcat/native/trunk/jnirelease.sh (original)
+++ tomcat/native/trunk/jnirelease.sh Sat Oct 31 10:14:22 2015
@@ -253,7 +253,7 @@ if [ $? -ne 0 ]; then
echo ""
exit 1
fi
-rm -f ${JKJNIDIST}/KEYS ${JKJNIDIST}/download_deps.sh
+rm -f ${JKWINDIST}/KEYS ${JKWINDIST}/download_deps.sh
top="`pwd`"
cd ${JKWINDIST}/xdocs
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711587 - /tomcat/native/trunk/README.txt
Author: fschumacher Date: Sat Oct 31 10:24:44 2015 New Revision: 1711587 URL: http://svn.apache.org/viewvc?rev=1711587&view=rev Log: Java 1.8 is needed for compilation with ant Modified: tomcat/native/trunk/README.txt Modified: tomcat/native/trunk/README.txt URL: http://svn.apache.org/viewvc/tomcat/native/trunk/README.txt?rev=1711587&r1=1711586&r2=1711587&view=diff == --- tomcat/native/trunk/README.txt (original) +++ tomcat/native/trunk/README.txt Sat Oct 31 10:24:44 2015 @@ -38,7 +38,7 @@ http://tomcat.apache.org/tomcat-8.0-doc/ Building -To build the Java API. Note that Java 1.7 is required to build the Java API. +To build the Java API. Note that Java 1.8 is required to build the Java API. > ant To build the native part see native/BUILDING. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711591 - /tomcat/native/trunk/native/buildconf
Author: rjung
Date: Sat Oct 31 10:48:35 2015
New Revision: 1711591
URL: http://svn.apache.org/viewvc?rev=1711591&view=rev
Log:
buildconf updates:
- don't use "test" when not needed
- indent "case"
- add some checks for contents needed in apr
source directory
- add success check for gen-build.py
- rewrite autoconf success check using same
style
- replace use of "cut" with "sed", which is
already used in other places
- remove unneeded subshell "()" construct
- add console output for final version and
release number used in spec file
Modified:
tomcat/native/trunk/native/buildconf
Modified: tomcat/native/trunk/native/buildconf
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/buildconf?rev=1711591&r1=1711590&r2=1711591&view=diff
==
--- tomcat/native/trunk/native/buildconf (original)
+++ tomcat/native/trunk/native/buildconf Sat Oct 31 10:48:35 2015
@@ -21,7 +21,7 @@
# --with-apr=[directory]
apr_src_dir=`pwd`/srclib/apr-1.5.2
-while test $# -gt 0
+while [ $# -gt 0 ]
do
# Normalize
case "$1" in
@@ -31,15 +31,14 @@ do
case "$1" in
--with-apr=*)
- apr_src_dir=$optarg
- ;;
+apr_src_dir=$optarg
+;;
esac
shift
done
-if test -d "$apr_src_dir"
-then
+if [ -d "$apr_src_dir" ]; then
echo ""
echo "Looking for apr source in $apr_src_dir"
else
@@ -50,21 +49,29 @@ else
exit 1
fi
+if [ ! -d "$apr_src_dir/build" ]; then
+ echo "Directory '$apr_src_dir/build' missing - wrong apr source directory?"
+ exit 1
+fi
+
# Remove some files, then copy them from apr source tree
-rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \
- build/config.guess build/config.sub
-cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
- $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \
- $apr_src_dir/build/config.sub build
+for file in apr_common.m4 find_apr.m4 install.sh config.guess config.sub
+do
+ if [ ! -f "$apr_src_dir/build/$file" ]; then
+echo "File '$apr_src_dir/build/$file' missing - wrong apr source
directory?"
+exit 1
+ fi
+ rm -f build/$file
+ cp $apr_src_dir/build/$file build/
+done
# Remove aclocal.m4 as it'll break some builds...
rm -rf aclocal.m4 autom4te*.cache
echo "Creating configure ..."
### do some work to toss config.cache?
-if ${AUTOCONF:-autoconf}; then
- :
-else
+${AUTOCONF:-autoconf}
+if [ $? -gt 0 ]; then
echo "autoconf failed"
exit 1
fi
@@ -74,23 +81,27 @@ fi
#
echo "Generating 'make' outputs ..."
$apr_src_dir/build/gen-build.py make
+if [ $? -gt 0 ]; then
+ echo "Creating build-outputs.mk failed"
+ exit 1
+fi
# Remove autoconf cache again
rm -rf autom4te*.cache
# Create RPM Spec file
-if [ -f `which cut` ]; then
- echo rebuilding rpm spec file
- ( REVISION=`build/get-version.sh all include/tcn_version.h TCN`
-VERSION=`echo $REVISION | cut -d- -s -f1`
-RELEASE=`echo $REVISION | cut -d- -s -f2`
-if [ "x$VERSION" = "x" ]; then
- VERSION=$REVISION
- RELEASE=1
-fi
-cat ./build/rpm/tcnative.spec.in | \
-sed -e "s/TCN_VERSION/$VERSION/" \
--e "s/TCN_RELEASE/$RELEASE/" \
-> tcnative.spec )
+echo rebuilding rpm spec file
+REVISION=`build/get-version.sh all include/tcn_version.h TCN`
+# Strip everything behind "-"
+VERSION=`echo $REVISION | sed -e 's/-.*//'`
+# Strip everything before "-"
+RELEASE=`echo $REVISION | sed -e 's/.*-//'`
+# Handle case of no "-" in REVISION
+if [ "x$RELEASE" = "xREVISION" ]; then
+ RELEASE=1
fi
-
+echo "Using version '$VERSION' and release '$RELEASE' in RPM spec file"
+sed -e "s/TCN_VERSION/$VERSION/" \
+-e "s/TCN_RELEASE/$RELEASE/" \
+./build/rpm/tcnative.spec.in \
+> tcnative.spec
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711593 - in /tomcat/native/branches/1.1.x: ./ native/buildconf
Author: rjung
Date: Sat Oct 31 11:11:25 2015
New Revision: 1711593
URL: http://svn.apache.org/viewvc?rev=1711593&view=rev
Log:
buildconf updates:
- don't use "test" when not needed
- indent "case"
- add some checks for contents needed in apr
source directory
- add success check for gen-build.py
- rewrite autoconf success check using same
style
- replace use of "cut" with "sed", which is
already used in other places
- remove unneeded subshell "()" construct
- add console output for final version and
release number used in spec file
Backport of r1711591 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/buildconf
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 31 11:11:25 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681314,1681323,1681419,1681505,1681507,1681509,1681520
+/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/buildconf
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/buildconf?rev=1711593&r1=1711592&r2=1711593&view=diff
==
--- tomcat/native/branches/1.1.x/native/buildconf (original)
+++ tomcat/native/branches/1.1.x/native/buildconf Sat Oct 31 11:11:25 2015
@@ -21,7 +21,7 @@
# --with-apr=[directory]
apr_src_dir=`pwd`/srclib/apr-1.3.9
-while test $# -gt 0
+while [ $# -gt 0 ]
do
# Normalize
case "$1" in
@@ -31,15 +31,14 @@ do
case "$1" in
--with-apr=*)
- apr_src_dir=$optarg
- ;;
+apr_src_dir=$optarg
+;;
esac
shift
done
-if test -d "$apr_src_dir"
-then
+if [ -d "$apr_src_dir" ]; then
echo ""
echo "Looking for apr source in $apr_src_dir"
else
@@ -50,21 +49,29 @@ else
exit 1
fi
+if [ ! -d "$apr_src_dir/build" ]; then
+ echo "Directory '$apr_src_dir/build' missing - wrong apr source directory?"
+ exit 1
+fi
+
# Remove some files, then copy them from apr source tree
-rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \
- build/config.guess build/config.sub
-cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
- $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \
- $apr_src_dir/build/config.sub build
+for file in apr_common.m4 find_apr.m4 install.sh config.guess config.sub
+do
+ if [ ! -f "$apr_src_dir/build/$file" ]; then
+echo "File '$apr_src_dir/build/$file' missing - wrong apr source
directory?"
+exit 1
+ fi
+ rm -f build/$file
+ cp $apr_src_dir/build/$file build/
+done
# Remove aclocal.m4 as it'll break some builds...
rm -rf aclocal.m4 autom4te*.cache
echo "Creating configure ..."
### do some work to toss config.cache?
-if ${AUTOCONF:-autoconf}; then
- :
-else
+${AUTOCONF:-autoconf}
+if [ $? -gt 0 ]; then
echo "autoconf failed"
exit 1
fi
@@ -74,23 +81,27 @@ fi
#
echo "Generating 'make' outputs ..."
$apr_src_dir/build/gen-build.py make
+if [ $? -gt 0 ]; then
+ echo "Creating build-outputs.mk failed"
+ exit 1
+fi
# Remove autoconf cache again
rm -rf autom4te*.cache
# Create RPM Spec file
-if [ -f `which cut` ]; then
- echo rebuilding rpm spec file
- ( REVISION=`build/get-version.sh all include/tcn_version.h TCN`
-VERSION=`echo $REVISION | cut -d- -s -f1`
-RELEASE=`echo $REVISION | cut -d- -s -f2`
-if [ "x$VERSION" = "x" ]; then
- VERSION=$REVISION
- RELEASE=1
-fi
-cat ./build/rpm/tcnative.spec.in | \
-sed -e "s/TCN_VERSION/$VERSION/" \
--e "s/TCN_RELEASE/$RELEASE/" \
-> tcnative.spec )
+echo rebuilding rpm spec file
+REVISION=`build/get-version.sh all include/tcn_version.h TCN`
+# Strip everything behind "-"
+VERSION=`echo $REV
svn commit: r1711599 - in /tomcat/native/branches/1.1.x: ./ native/tcnative.pc.in
Author: rjung
Date: Sat Oct 31 11:36:50 2015
New Revision: 1711599
URL: http://svn.apache.org/viewvc?rev=1711599&view=rev
Log:
Fix "wrong" version variable for APR.
The result was correct in effect, but
wrong in how it was obtained.
Backport of r1681306 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/tcnative.pc.in
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 31 11:36:50 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591
+/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/tcnative.pc.in
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/tcnative.pc.in?rev=1711599&r1=1711598&r2=1711599&view=diff
==
--- tomcat/native/branches/1.1.x/native/tcnative.pc.in (original)
+++ tomcat/native/branches/1.1.x/native/tcnative.pc.in Sat Oct 31 11:36:50 2015
@@ -25,6 +25,6 @@ Name: Tomcat native Java
Description: Companion Native Java library
Version: @TCNATIVE_DOTTED_VERSION@
# assume that tcnative requires libapr of same major version
-Requires: apr-@TCNATIVE_MAJOR_VERSION@
+Requires: apr-1
Libs: -L${libdir} -l@TCNATIVE_LIBNAME@ @TCNATIVE_EXPORT_LIBS@
Cflags: -I${includedir}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711603 - in /tomcat/native/trunk/native: libtcnative.dsp os/win32/libtcnative.rc tcnative.dsp
Author: rjung Date: Sat Oct 31 11:43:27 2015 New Revision: 1711603 URL: http://svn.apache.org/viewvc?rev=1711603&view=rev Log: tcnative trunk is a 1.2.x branch, so the dll major version is still 1. Modified: tomcat/native/trunk/native/libtcnative.dsp tomcat/native/trunk/native/os/win32/libtcnative.rc tomcat/native/trunk/native/tcnative.dsp Modified: tomcat/native/trunk/native/libtcnative.dsp URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/libtcnative.dsp?rev=1711603&r1=1711602&r2=1711603&view=diff == --- tomcat/native/trunk/native/libtcnative.dsp (original) +++ tomcat/native/trunk/native/libtcnative.dsp Sat Oct 31 11:43:27 2015 @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE0" /subsystem:windows /dll /debug /machine:I386 /opt:ref -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE0" /subsystem:windows /dll /debug /machine:I386 /out:"Release/libtcnative-2.dll" /libpath:"./srclib/openssl/out32" /libpath:"./srclib/openssl/out32dll" /opt:ref +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE0" /subsystem:windows /dll /debug /machine:I386 /out:"Release/libtcnative-1.dll" /libpath:"./srclib/openssl/out32" /libpath:"./srclib/openssl/out32dll" /opt:ref !ELSEIF "$(CFG)" == "libtcnative - Win32 Debug" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE0" /subsystem:windows /dll /incremental:no /debug /machine:I386 -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE0" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/libtcnative-2.dll" /libpath:"./srclib/openssl/out32" /libpath:"./srclib/openssl/out32dll" +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE0" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/libtcnative-1.dll" /libpath:"./srclib/openssl/out32" /libpath:"./srclib/openssl/out32dll" !ENDIF Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1711603&r1=1711602&r2=1711603&view=diff == --- tomcat/native/trunk/native/os/win32/libtcnative.rc (original) +++ tomcat/native/trunk/native/os/win32/libtcnative.rc Sat Oct 31 11:43:27 2015 @@ -56,9 +56,9 @@ BEGIN VALUE "CompanyName", "Apache Software Foundation\0" VALUE "FileDescription", "Tomcat Native Java Library\0" VALUE "FileVersion", TCN_VERSION "\0" -VALUE "InternalName", "libtcnative-2\0" +VALUE "InternalName", "libtcnative-1\0" VALUE "LegalCopyright", TCN_COPYRIGHT "\0" -VALUE "OriginalFilename", "libtcnative-2.dll\0" +VALUE "OriginalFilename", "libtcnative-1.dll\0" VALUE "ProductName", "Tomcat Native Java Library\0" VALUE "ProductVersion", TCN_VERSION "\0" END @@ -68,3 +68,4 @@ BEGIN VALUE "Translation", 0x409, 1200 END END + Modified: tomcat/native/trunk/native/tcnative.dsp URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/tcnative.dsp?rev=1711603&r1=1711602&r2=1711603&view=diff == --- tomcat/native/trunk/native/tcnative.dsp (original) +++ tomcat/native/trunk/native/tcnative.dsp Sat Oct 31 11:43:27 2015 @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib /nologo /base:"0x6EE0" /subsystem:windows /dll /debug /machine:I386 /opt:ref -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE0" /subsystem:windows /dll /debug /machine:I386 /out:"LibR/tcnative-2.dll" /libpath:"./srclib/openssl/out32" /libpath:"./srclib/openssl/out32dll" /opt:ref +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib psapi.lib ole32.lib shlwapi.lib rpcrt4.lib libeay32.lib ssleay32.lib /nologo /base:"0x6EE0" /subsystem:windows /dll /debug /machin
svn commit: r1711604 - /tomcat/native/trunk/native/BUILDING
Author: rjung
Date: Sat Oct 31 11:49:51 2015
New Revision: 1711604
URL: http://svn.apache.org/viewvc?rev=1711604&view=rev
Log:
We are still at library version 1.
Modified:
tomcat/native/trunk/native/BUILDING
Modified: tomcat/native/trunk/native/BUILDING
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/BUILDING?rev=1711604&r1=1711603&r2=1711604&view=diff
==
--- tomcat/native/trunk/native/BUILDING (original)
+++ tomcat/native/trunk/native/BUILDING Sat Oct 31 11:49:51 2015
@@ -31,7 +31,7 @@ Building from the svn tree
Testing the build
-
-The make should produce a .so file named libtcnative-2.so.
+The make should produce a .so file named libtcnative-1.so.
Build the jar containing the examples by
> cd ..
@@ -54,11 +54,11 @@ NOTES
- configure --disable-openssl: Configure without ssl support.
- To use it in Tomcat you may have to add in bin/setenv.sh:
LD_LIBRARY_PATH=openssl_install_location/lib; export LD_LIBRARY_PATH
-(use ldd ./.libs/libtcnative-2.so to check it).
+(use ldd ./.libs/libtcnative-1.so to check it).
- quick testing: openssl s_client -connect localhost:8443
- For MAC OS X you must manually add a link
cd ${tcnative installdir}
-ln -d libtcnative-2.dylib libtcnative-2.jnilib
+ln -d libtcnative-1.dylib libtcnative-1.jnilib
Building statically linked library on Unixes
@@ -82,7 +82,7 @@ Apr by default builds both static and dy
> make
> make install
-After that edit the ~/natives/apr/lib/libapr-2.la file
+After that edit the ~/natives/apr/lib/libapr-1.la file
and comment or delete the following sections:
dlname='...' and library_names='...'
This is needed so that libtool picks the static version of the library.
@@ -93,7 +93,7 @@ Build Tomcat native by executing
> make
> make install
-That's it. You have just build libtcnative-2.so with statically linked
+That's it. You have just build libtcnative-1.so with statically linked
apr and openssl.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711606 - /tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in
Author: rjung Date: Sat Oct 31 11:58:19 2015 New Revision: 1711606 URL: http://svn.apache.org/viewvc?rev=1711606&view=rev Log: Typo in spec file changelog. Modified: tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in Modified: tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in?rev=1711606&r1=1711605&r2=1711606&view=diff == --- tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in (original) +++ tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in Sat Oct 31 11:58:19 2015 @@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jan 04 2010 Rainer Jung 1.0.0-2 -- Decouple apr major lib version form tcnative lib version +- Decouple apr major lib version from tcnative lib version * Tue Jun 22 2004 Mladen Turk 1.0.0-1 - update to support v1.0.2 of APR - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711607 - /tomcat/native/trunk/native/build/rpm/tcnative.spec.in
Author: rjung Date: Sat Oct 31 11:58:53 2015 New Revision: 1711607 URL: http://svn.apache.org/viewvc?rev=1711607&view=rev Log: Fix tcn version number in trunk spec file. Modified: tomcat/native/trunk/native/build/rpm/tcnative.spec.in Modified: tomcat/native/trunk/native/build/rpm/tcnative.spec.in URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/rpm/tcnative.spec.in?rev=1711607&r1=1711606&r2=1711607&view=diff == --- tomcat/native/trunk/native/build/rpm/tcnative.spec.in (original) +++ tomcat/native/trunk/native/build/rpm/tcnative.spec.in Sat Oct 31 11:58:53 2015 @@ -15,7 +15,7 @@ # limitations under the License. # -%define tcnver 2 +%define tcnver 1 %define aprver 1 Summary: Tomcat Native Java library @@ -92,8 +92,8 @@ rm -rf $RPM_BUILD_ROOT %doc --parents html %changelog -* Mon Jan 04 2010 Rainer Jung 2.0.0-1 -- update for tcnative 2.0 +* Sat Oct 31 2015 Rainer Jung 1.2.0-1 +- update for tcnative 1.2 * Tue Jun 22 2004 Mladen Turk 1.0.0-1 - update to support v1.0.2 of APR - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711609 - /tomcat/native/trunk/native/build/rpm/tcnative.spec.in
Author: rjung
Date: Sat Oct 31 12:09:41 2015
New Revision: 1711609
URL: http://svn.apache.org/viewvc?rev=1711609&view=rev
Log:
Try to fix apr version dependency expression
in tcnative RPM spec file.
Modified:
tomcat/native/trunk/native/build/rpm/tcnative.spec.in
Modified: tomcat/native/trunk/native/build/rpm/tcnative.spec.in
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/rpm/tcnative.spec.in?rev=1711609&r1=1711608&r2=1711609&view=diff
==
--- tomcat/native/trunk/native/build/rpm/tcnative.spec.in (original)
+++ tomcat/native/trunk/native/build/rpm/tcnative.spec.in Sat Oct 31 12:09:41
2015
@@ -16,7 +16,8 @@
#
%define tcnver 1
-%define aprver 1
+%define aprmajor 1
+%define aprminor 5
Summary: Tomcat Native Java library
Name: tcnative
@@ -27,8 +28,7 @@ Group: System Environment/Libraries
URL: http://apr.apache.org/
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-# XXX The part "apr-devel >= 0:{version}-{release}" is probably wrong
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release},
openssl >= 1.0.2
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl >= 1.0.2
%description
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -38,8 +38,7 @@ contains additional utility interfaces f
%package devel
Group: Development/Libraries
Summary: Tomcat Native development kit
-# XXX The part "apr-devel >= 0:{version}-{release}" is probably wrong
-Requires: tcnative = %{version}-%{release}, apr-devel >=
0:{version}-{release}, openssl-devel >= 1.0.2
+Requires: tcnative = %{version}-%{release}, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl-devel >= 1.0.2
%description devel
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -51,7 +50,7 @@ contains additional utility interfaces f
%build
%configure --with-apr=%{_prefix} \
---includedir=%{_includedir}/apr-%{aprver}
+--includedir=%{_includedir}/apr-%{aprmajor}
make %{?_smp_mflags} && make dox
%check
@@ -88,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libtcnative-%{tcnver}.*a
%{_libdir}/libtcnative-%{tcnver}.so
%{_libdir}/pkgconfig/tcnative-%{tcnver}.pc
-%{_includedir}/apr-%{aprver}/*.h
+%{_includedir}/apr-%{aprmajor}/*.h
%doc --parents html
%changelog
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711610 - in /tomcat/native/branches/1.1.x: ./ native/build/rpm/tcnative.spec.in
Author: rjung
Date: Sat Oct 31 12:11:40 2015
New Revision: 1711610
URL: http://svn.apache.org/viewvc?rev=1711610&view=rev
Log:
Try to fix apr version dependency expression
in tcnative RPM spec file.
Backport of r1711609 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in
Propchange: tomcat/native/branches/1.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 31 12:11:40 2015
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591
+/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in?rev=1711610&r1=1711609&r2=1711610&view=diff
==
--- tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in (original)
+++ tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in Sat Oct 31
12:11:40 2015
@@ -16,7 +16,8 @@
#
%define tcnver 1
-%define aprver 1
+%define aprmajor 1
+%define aprminor 3
Summary: Tomcat Native Java library
Name: tcnative
@@ -27,7 +28,7 @@ Group: System Environment/Libraries
URL: http://apr.apache.org/
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release},
openssl >= 0.9.8
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl >= 0.9.8
%description
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -37,7 +38,7 @@ contains additional utility interfaces f
%package devel
Group: Development/Libraries
Summary: Tomcat Native development kit
-Requires: tcnative = %{version}-%{release}, apr-devel >=
0:{version}-{release}, openssl-devel >= 0.9.8
+Requires: tcnative = %{version}-%{release}, apr-devel >=
%{aprmajor}.%{aprminor}.0, openssl-devel >= 0.9.8
%description devel
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -49,7 +50,7 @@ contains additional utility interfaces f
%build
%configure --with-apr=%{_prefix} \
---includedir=%{_includedir}/apr-%{aprver}
+--includedir=%{_includedir}/apr-%{aprmajor}
make %{?_smp_mflags} && make dox
%check
@@ -86,7 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libtcnative-%{tcnver}.*a
%{_libdir}/libtcnative-%{tcnver}.so
%{_libdir}/pkgconfig/tcnative-%{tcnver}.pc
-%{_includedir}/apr-%{aprver}/*.h
+%{_includedir}/apr-%{aprmajor}/*.h
%doc --parents html
%changelog
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711619 - /tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in
Author: rjung Date: Sat Oct 31 12:26:41 2015 New Revision: 1711619 URL: http://svn.apache.org/viewvc?rev=1711619&view=rev Log: It seems we still want to support APR 1.2.x for tcnative 1.1.x. Modified: tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in Modified: tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in?rev=1711619&r1=1711618&r2=1711619&view=diff == --- tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in (original) +++ tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in Sat Oct 31 12:26:41 2015 @@ -17,7 +17,7 @@ %define tcnver 1 %define aprmajor 1 -%define aprminor 3 +%define aprminor 2 Summary: Tomcat Native Java library Name: tcnative - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711620 - /tomcat/native/trunk/native/build/rpm/tcnative.spec.in
Author: rjung Date: Sat Oct 31 12:27:15 2015 New Revision: 1711620 URL: http://svn.apache.org/viewvc?rev=1711620&view=rev Log: It seems we still want to support APR 1.4 for tcnative trunk (=1.2.x). Modified: tomcat/native/trunk/native/build/rpm/tcnative.spec.in Modified: tomcat/native/trunk/native/build/rpm/tcnative.spec.in URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/build/rpm/tcnative.spec.in?rev=1711620&r1=1711619&r2=1711620&view=diff == --- tomcat/native/trunk/native/build/rpm/tcnative.spec.in (original) +++ tomcat/native/trunk/native/build/rpm/tcnative.spec.in Sat Oct 31 12:27:15 2015 @@ -17,7 +17,7 @@ %define tcnver 1 %define aprmajor 1 -%define aprminor 5 +%define aprminor 4 Summary: Tomcat Native Java library Name: tcnative - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711621 - /tomcat/native/trunk/native/BUILDING
Author: rjung Date: Sat Oct 31 12:27:37 2015 New Revision: 1711621 URL: http://svn.apache.org/viewvc?rev=1711621&view=rev Log: Add a note on required libraries and versions. Modified: tomcat/native/trunk/native/BUILDING Modified: tomcat/native/trunk/native/BUILDING URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/BUILDING?rev=1711621&r1=1711620&r2=1711621&view=diff == --- tomcat/native/trunk/native/BUILDING (original) +++ tomcat/native/trunk/native/BUILDING Sat Oct 31 12:27:37 2015 @@ -15,6 +15,11 @@ limitations under the License. +Prerequisites +- + +You need OpenSSL version 1.0.2 or higher and APR version 1.4.0 or higher. + Building from source package - @@ -95,6 +100,3 @@ Build Tomcat native by executing That's it. You have just build libtcnative-1.so with statically linked apr and openssl. - - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.2.0
On 31 October 2015 09:33:36 GMT+00:00, "Rémy Maucherat" wrote: >2015-10-31 9:10 GMT+01:00 Mark Thomas : > >> > Essentially, >> > >> > [junit] Caused by: java.lang.NoSuchMethodError: sniCallBack >> > [junit] at org.apache.tomcat.jni.SSLContext.make(Native >Method) >> > Ah, yes, ok, native 1.2 assumes SNI, and the old Java classes >[org.apache.tomcat.jni] don't have it. What's the strategy here ? >Should >the Java APIs be updated, or is the native code supposed to behave >better ? My preference would be for the native code to behave better but I don't know how easy that is to implement. That way native 1.2.x can be used with current and previous 6.0.x, 7.0.x and 8.0.x releases. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711626 - in /tomcat/native/branches/1.1.x: ./ xdocs/miscellaneous/changelog.xml xdocs/style.xsl
Author: rjung Date: Sat Oct 31 12:49:07 2015 New Revision: 1711626 URL: http://svn.apache.org/viewvc?rev=1711626&view=rev Log: Try to make the changelog.xml served by SVN-HTTP viewable in a browser. As Konstantin Kolinko mentioned in http://markmail.org/message/6dnqc57hqld7ohzm, this probably will not work when viewing the file locally. Backport of r1532601 from trunk. Modified: tomcat/native/branches/1.1.x/ (props changed) tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (contents, props changed) tomcat/native/branches/1.1.x/xdocs/style.xsl (props changed) Propchange: tomcat/native/branches/1.1.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 31 12:49:07 2015 @@ -1,3 +1,3 @@ -/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609 +/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609 /tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769 /tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083 Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1711626&r1=1711625&r2=1711626&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Sat Oct 31 12:49:07 2015 @@ -18,6 +18,7 @@ ]> + &project; Propchange: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml -- svn:mime-type = text/xml Propchange: tomcat/native/branches/1.1.x/xdocs/style.xsl -- svn:mime-type = text/xslt+xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711627 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml
Author: rjung Date: Sat Oct 31 12:51:21 2015 New Revision: 1711627 URL: http://svn.apache.org/viewvc?rev=1711627&view=rev Log: Fix broken menu item introduced in 1669770. Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml?rev=1711627&r1=1711626&r2=1711627&view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/project.xml Sat Oct 31 12:51:21 2015 @@ -34,7 +34,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711641 - in /tomcat/tc8.0.x/trunk: ./ webapps/docs/config/filter.xml
Author: violetagg Date: Sat Oct 31 14:43:19 2015 New Revision: 1711641 URL: http://svn.apache.org/viewvc?rev=1711641&view=rev Log: Merged revision 1709960 from tomcat/trunk: Remove extra white spaces Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/webapps/docs/config/filter.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 31 14:43:19 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657 609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1 37,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,168577 2,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1688563,1688841,1688878,165,1688896,1688901,1689345-1689346,1689357,1689656,1689675-1689677,1689679,1689687,1689825,1689856,1689918,1690011,1690021,1690054,1690080,1690209,1691134,1691487,1691813,1692744-1692747,1692849,1693088,1693105,1693429,1693461,1694058,1694111,1694290,1694501,1694548,1694658,1694660,1694788,1694872,1694878,1695006,1695354,1695371,1695379,1695459,1695582,1695706,1695778,1696199,1696272,1696280,169636
svn commit: r1711642 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/config/filter.xml
Author: violetagg Date: Sat Oct 31 14:44:18 2015 New Revision: 1711642 URL: http://svn.apache.org/viewvc?rev=1711642&view=rev Log: Merged revision 1709960 from tomcat/trunk: Remove extra white spaces Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/config/filter.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 31 14:44:18 2015 @@ -1,2 +1,2 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988,1667553 -1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702739,1702742,1702744,1702 748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578 -/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114 ,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342 498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,13
buildbot exception in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a build exception on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/134 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1711642 Blamelist: violetagg BUILD FAILED: exception upload_2 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1711591 - /tomcat/native/trunk/native/buildconf
2015-10-31 13:48 GMT+03:00 : > Author: rjung > Date: Sat Oct 31 10:48:35 2015 > New Revision: 1711591 > > URL: http://svn.apache.org/viewvc?rev=1711591&view=rev > Log: > buildconf updates: > - don't use "test" when not needed > - indent "case" > - add some checks for contents needed in apr > source directory > - add success check for gen-build.py > - rewrite autoconf success check using same > style > - replace use of "cut" with "sed", which is > already used in other places > - remove unneeded subshell "()" construct > - add console output for final version and > release number used in spec file > > Modified: > tomcat/native/trunk/native/buildconf > > +echo rebuilding rpm spec file > +REVISION=`build/get-version.sh all include/tcn_version.h TCN` > +# Strip everything behind "-" > +VERSION=`echo $REVISION | sed -e 's/-.*//'` > +# Strip everything before "-" > +RELEASE=`echo $REVISION | sed -e 's/.*-//'` > +# Handle case of no "-" in REVISION > +if [ "x$RELEASE" = "xREVISION" ]; then I think the above was intended to be = "x$REVISION", that is that sed made no replacements. The same in 1.1.x copy of this file. > + RELEASE=1 > fi > - > +echo "Using version '$VERSION' and release '$RELEASE' in RPM spec file" > +sed -e "s/TCN_VERSION/$VERSION/" \ > +-e "s/TCN_RELEASE/$RELEASE/" \ > +./build/rpm/tcnative.spec.in \ > +> tcnative.spec Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711651 - /tomcat/native/trunk/native/buildconf
Author: rjung Date: Sat Oct 31 16:36:10 2015 New Revision: 1711651 URL: http://svn.apache.org/viewvc?rev=1711651&view=rev Log: Fix typo in new shell expression. Thanks Konstantin. Modified: tomcat/native/trunk/native/buildconf Modified: tomcat/native/trunk/native/buildconf URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/buildconf?rev=1711651&r1=1711650&r2=1711651&view=diff == --- tomcat/native/trunk/native/buildconf (original) +++ tomcat/native/trunk/native/buildconf Sat Oct 31 16:36:10 2015 @@ -97,7 +97,7 @@ VERSION=`echo $REVISION | sed -e 's/-.*/ # Strip everything before "-" RELEASE=`echo $REVISION | sed -e 's/.*-//'` # Handle case of no "-" in REVISION -if [ "x$RELEASE" = "xREVISION" ]; then +if [ "x$RELEASE" = "x$REVISION" ]; then RELEASE=1 fi echo "Using version '$VERSION' and release '$RELEASE' in RPM spec file" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711652 - in /tomcat/native/branches/1.1.x: ./ native/buildconf
Author: rjung Date: Sat Oct 31 16:37:36 2015 New Revision: 1711652 URL: http://svn.apache.org/viewvc?rev=1711652&view=rev Log: Fix typo in new shell expression. Thanks Konstantin. Backport of r1711651 from trunk. Modified: tomcat/native/branches/1.1.x/ (props changed) tomcat/native/branches/1.1.x/native/buildconf Propchange: tomcat/native/branches/1.1.x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 31 16:37:36 2015 @@ -1,3 +1,3 @@ -/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609 +/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609,1711651 /tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769 /tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083 Modified: tomcat/native/branches/1.1.x/native/buildconf URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/buildconf?rev=1711652&r1=1711651&r2=1711652&view=diff == --- tomcat/native/branches/1.1.x/native/buildconf (original) +++ tomcat/native/branches/1.1.x/native/buildconf Sat Oct 31 16:37:36 2015 @@ -97,7 +97,7 @@ VERSION=`echo $REVISION | sed -e 's/-.*/ # Strip everything before "-" RELEASE=`echo $REVISION | sed -e 's/.*-//'` # Handle case of no "-" in REVISION -if [ "x$RELEASE" = "xREVISION" ]; then +if [ "x$RELEASE" = "x$REVISION" ]; then RELEASE=1 fi echo "Using version '$VERSION' and release '$RELEASE' in RPM spec file" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1711591 - /tomcat/native/trunk/native/buildconf
Am 31.10.2015 um 16:29 schrieb Konstantin Kolinko: 2015-10-31 13:48 GMT+03:00 : Author: rjung Date: Sat Oct 31 10:48:35 2015 New Revision: 1711591 URL: http://svn.apache.org/viewvc?rev=1711591&view=rev Log: buildconf updates: - don't use "test" when not needed - indent "case" - add some checks for contents needed in apr source directory - add success check for gen-build.py - rewrite autoconf success check using same style - replace use of "cut" with "sed", which is already used in other places - remove unneeded subshell "()" construct - add console output for final version and release number used in spec file Modified: tomcat/native/trunk/native/buildconf +echo rebuilding rpm spec file +REVISION=`build/get-version.sh all include/tcn_version.h TCN` +# Strip everything behind "-" +VERSION=`echo $REVISION | sed -e 's/-.*//'` +# Strip everything before "-" +RELEASE=`echo $REVISION | sed -e 's/.*-//'` +# Handle case of no "-" in REVISION +if [ "x$RELEASE" = "xREVISION" ]; then I think the above was intended to be = "x$REVISION", that is that sed made no replacements. The same in 1.1.x copy of this file. Oups, thanks, fixed in r1711651 and r1711652. Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58566] NoSuchMethodError and JVM crash when running HTTPS test with Tomcat 7 (o.a.t.util.net.TestSsl)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58566 Mark Thomas changed: What|Removed |Added OS||All --- Comment #3 from Mark Thomas --- I am not concerned about the potential race condition here. In Tomcat, starting of multiple connectors is always single threaded. In theory, connectors could be started in parallel via the embedded API but even then the likelihood of a race is low and, as it happens, the fix for the method not being present should prevent any crashes if the race occurs. I have a fix for this that enables 1.2.x to work with current 7.0.x trunk. I'll be committing that fix shortly. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711667 - in /tomcat/native/trunk/native: ./ src/sslcontext.c
Author: markt
Date: Sat Oct 31 18:57:58 2015
New Revision: 1711667
URL: http://svn.apache.org/viewvc?rev=1711667&view=rev
Log:
Update ignores
Modified:
tomcat/native/trunk/native/ (props changed)
tomcat/native/trunk/native/src/sslcontext.c
Propchange: tomcat/native/trunk/native/
--
--- svn:ignore (added)
+++ svn:ignore Sat Oct 31 18:57:58 2015
@@ -0,0 +1,9 @@
+.make.dirs
+Makefile
+build-outputs.mk
+config.log
+config.nice
+config.status
+configure
+tcnative.pc
+tcnative.spec
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1711667&r1=1711666&r2=1711667&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Sat Oct 31 18:57:58 2015
@@ -106,12 +106,14 @@ int ssl_callback_ServerNameIndication(SS
hostname = (*env)->NewStringUTF(env, servername);
original_ssl_context = P2J(c->ctx);
-// Make the call
-new_ssl_context = (*env)->CallStaticLongMethod(env,
-ssl_context_class,
-sni_java_callback,
-
original_ssl_context,
-hostname);
+// Make the call only if the statis methos exists
+if (sni_java_callback != 0) {
+new_ssl_context = (*env)->CallStaticLongMethod(env,
+ ssl_context_class,
+ sni_java_callback,
+ original_ssl_context,
+ hostname);
+}
if (original_ssl_context != new_ssl_context) {
SSL_set_SSL_CTX(ssl, J2P(new_ssl_context, SSL_CTX *));
@@ -283,6 +285,10 @@ TCN_IMPLEMENT_CALL(jlong, SSLContext, ma
ssl_context_class = (*e)->NewGlobalRef(e, o);
sni_java_callback = (*e)->GetStaticMethodID(e, ssl_context_class,
"sniCallBack",
"(JLjava/lang/String;)J");
+/* Older Tomcat versions may not have this static method */
+if ( JNI_TRUE == (*e)->ExceptionCheck(e) ) {
+(*e)->ExceptionClear(e);
+}
}
/* Set up OpenSSL call back if SNI is provided by the client */
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711668 - /tomcat/native/trunk/native/build/
Author: markt Date: Sat Oct 31 18:59:59 2015 New Revision: 1711668 URL: http://svn.apache.org/viewvc?rev=1711668&view=rev Log: Update ignores Modified: tomcat/native/trunk/native/build/ (props changed) Propchange: tomcat/native/trunk/native/build/ -- --- svn:ignore (added) +++ svn:ignore Sat Oct 31 18:59:59 2015 @@ -0,0 +1,6 @@ +apr_common.m4 +config.guess +config.sub +find_apr.m4 +install.sh +rules.mk - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn propchange: r1711667 - svn:log
Author: markt Revision: 1711667 Modified property: svn:log Modified: svn:log at Sat Oct 31 19:02:46 2015 -- --- svn:log (original) +++ svn:log Sat Oct 31 19:02:46 2015 @@ -1 +1,3 @@ +Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58566 +Allow Tomcat Native 1.2.x to be used with Tomcat versions that do not have the necessary Java code to support SNI. Update ignores - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58566] NoSuchMethodError and JVM crash when running HTTPS test with Tomcat 7 (o.a.t.util.net.TestSsl)
https://bz.apache.org/bugzilla/show_bug.cgi?id=58566 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #4 from Mark Thomas --- Fixed in trunk for 1.2.1 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711670 - in /tomcat/native/trunk/native: include/tcn_version.h os/win32/libtcnative.rc
Author: markt
Date: Sat Oct 31 19:05:32 2015
New Revision: 1711670
URL: http://svn.apache.org/viewvc?rev=1711670&view=rev
Log:
Update version to 1.2.1
Modified:
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/os/win32/libtcnative.rc
Modified: tomcat/native/trunk/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_version.h?rev=1711670&r1=1711669&r2=1711670&view=diff
==
--- tomcat/native/trunk/native/include/tcn_version.h (original)
+++ tomcat/native/trunk/native/include/tcn_version.h Sat Oct 31 19:05:32 2015
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 0
+#define TCN_PATCH_VERSION 1
/**
* This symbol is defined for internal, "development" copies of TCN. This
Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1711670&r1=1711669&r2=1711670&view=diff
==
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Sat Oct 31 19:05:32 2015
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "1.2.0"
+#define TCN_VERSION "1.2.1"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,0,0
- PRODUCTVERSION 1,2,0,0
+ FILEVERSION 1,2,1,0
+ PRODUCTVERSION 1,2,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711673 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Author: markt Date: Sat Oct 31 19:09:07 2015 New Revision: 1711673 URL: http://svn.apache.org/viewvc?rev=1711673&view=rev Log: Update changelog Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1711673&r1=1711672&r2=1711673&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Sat Oct 31 19:09:07 2015 @@ -34,7 +34,15 @@ This is the Changelog for Tomcat Native 1.2. - + + + + 58566: Enable Tomcat Native 1.2.x to work with Tomcat releases + that do not have the necessary Java code to support SNI. (markt) + + + + Add support for TLS extension ALPN. (markt) @@ -44,6 +52,9 @@ (markt) + Add support for OpenSSL BIO. (jfclere) + + Support wakeable pollsets and add Poll.interrupt() API. (mturk) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711675 - /tomcat/native/trunk/native/src/sslcontext.c
Author: markt
Date: Sat Oct 31 19:13:13 2015
New Revision: 1711675
URL: http://svn.apache.org/viewvc?rev=1711675&view=rev
Log:
Fix comment typos
Modified:
tomcat/native/trunk/native/src/sslcontext.c
Modified: tomcat/native/trunk/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/src/sslcontext.c?rev=1711675&r1=1711674&r2=1711675&view=diff
==
--- tomcat/native/trunk/native/src/sslcontext.c (original)
+++ tomcat/native/trunk/native/src/sslcontext.c Sat Oct 31 19:13:13 2015
@@ -106,7 +106,7 @@ int ssl_callback_ServerNameIndication(SS
hostname = (*env)->NewStringUTF(env, servername);
original_ssl_context = P2J(c->ctx);
-// Make the call only if the statis methos exists
+// Make the call only if the static method exists
if (sni_java_callback != 0) {
new_ssl_context = (*env)->CallStaticLongMethod(env,
ssl_context_class,
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1711677 - /tomcat/native/trunk/
Author: markt Date: Sat Oct 31 19:14:02 2015 New Revision: 1711677 URL: http://svn.apache.org/viewvc?rev=1711677&view=rev Log: Update ignores Modified: tomcat/native/trunk/ (props changed) Propchange: tomcat/native/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sat Oct 31 19:14:02 2015 @@ -1 +1,2 @@ dist +.project - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Plan for Tomcat native 1.2.1
Given the issues with 1.2.0, I'd like to get 1.2.1 out sooner rather than later and then use that with 9.0.0.RC1. I think all the issues discovered so far have been fixed. If you know of one that hasn't, please speak up. Also, don't forget to update the changelog for the fixes you have made. I'm currently planning on tagging 1.2.1 this coming Monday (2015-11-02). Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plan for Tomcat native 1.2.1
2015-10-31 22:17 GMT+03:00 Mark Thomas : > Given the issues with 1.2.0, I'd like to get 1.2.1 out sooner rather > than later and then use that with 9.0.0.RC1. > > I think all the issues discovered so far have been fixed. If you know of > one that hasn't, please speak up. I think that Bill's commit to s/SSL/TLS/ in a constant name has to be applied to trunk as well. http://svn.apache.org/viewvc?view=revision&revision=1711567 Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plan for Tomcat native 1.2.1
2015-10-31 20:17 GMT+01:00 Mark Thomas : > Given the issues with 1.2.0, I'd like to get 1.2.1 out sooner rather > than later and then use that with 9.0.0.RC1. > > I think all the issues discovered so far have been fixed. If you know of > one that hasn't, please speak up. > > Also, don't forget to update the changelog for the fixes you have made. > > I'm currently planning on tagging 1.2.1 this coming Monday (2015-11-02). > > +1 Thanks for fixing it so quickly. Rémy
[GUMP@vmgump]: Project tomcat-native-make (in module tomcat-native) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-native-make has an issue affecting its community integration. This issue affects 4 projects, and has been outstanding for 3 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-native-make : Tomcat native library using Apache Portable Runtime - tomcat-native-make-install : Tomcat native library using Apache Portable Runtime - tomcat-tc7.0.x-test-apr : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... - tomcat-tc8.0.x-test-apr : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://vmgump.apache.org/gump/public/tomcat-native/tomcat-native-make/gump_work/build_tomcat-native_tomcat-native-make.html Work Name: build_tomcat-native_tomcat-native-make (Type: Build) Work ended in a state of : Failed Elapsed: 18 secs Command Line: make [Working Directory: /srv/gump/public/workspace/tomcat-native/native] - make[1]: Entering directory `/srv/gump/public/workspace/tomcat-native/native' /bin/bash /srv/gump/public/workspace/apr-1/dest-20151101/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20151101/include -I/srv/gump/public/workspace/apr-1/dest-20151101/include/apr-1 -o src/address.lo -c src/address.c && touch src/address.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151101/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20151101/include -I/srv/gump/public/workspace/apr-1/dest-20151101/include/apr-1 -o src/bb.lo -c src/bb.c && touch src/bb.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151101/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20151101/include -I/srv/gump/public/workspace/apr-1/dest-20151101/include/apr-1 -o src/dir.lo -c src/dir.c && touch src/dir.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151101/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20151101/include -I/srv/gump/public/workspace/apr-1/dest-20151101/include/apr-1 -o src/error.lo -c src/error.c && touch src/error.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151101/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20151101/include -I/srv/gump/public/workspace/apr-1/dest-20151101/include/apr-1 -o src/file.lo -c src/file.c && touch src/file.lo /bin/bash /srv/gump/public/workspace/apr-1/dest-20151101/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -DHAVE_CONFIG_H -DLINUX -D_REENTRANT -D_GNU_SOURCE -g -O2 -DHAVE_OPENSSL -DHAVE_POOL_PRE_CLEANUP -I/srv/gump/public/workspace/tomcat-native/native/include -I/usr/lib/jvm/java-8-oracle/include -I/usr/lib/jvm/java-8-oracle/include/linux -I/srv/gump/public/workspace/openssl-master/dest-20151101/include -I/srv/gump/public/workspace/apr-1/dest-20151101/include/apr-1 -o src/info.lo -c src/info.c && touch src/info.lo /bin/bash /srv/gump/public/workspace/apr-1/dest
