summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2017-01-23 08:57:13 +0000
committerAlex Dupre <ale@FreeBSD.org>2017-01-23 08:57:13 +0000
commit91bb681537677700e80ee140dc1f0e7d0a0eb35a (patch)
tree10e3b26d2f0c209da4119850cfb85fc51ca04e92
parentAdd missing build dependency for benchmarks/sipp (diff)
Update to 1.2.10 release.
-rw-r--r--www/tomcat-native/Makefile6
-rw-r--r--www/tomcat-native/distinfo6
-rw-r--r--www/tomcat-native/files/patch-src_ssl.c11
3 files changed, 17 insertions, 6 deletions
diff --git a/www/tomcat-native/Makefile b/www/tomcat-native/Makefile
index 575f5ddc260f..11b81eb0c226 100644
--- a/www/tomcat-native/Makefile
+++ b/www/tomcat-native/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tomcat-native
-PORTVERSION= 1.2.7
+PORTVERSION= 1.2.10
CATEGORIES= www java
MASTER_SITES= APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -28,10 +28,10 @@ CONFIGURE_ARGS= --with-apr=${LOCALBASE} \
PLIST_FILES= lib/libtcnative-1.a \
lib/libtcnative-1.so \
lib/libtcnative-1.so.0 \
- lib/libtcnative-1.so.0.2.7
+ lib/libtcnative-1.so.0.2.10
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.7
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.10
.include <bsd.port.pre.mk>
diff --git a/www/tomcat-native/distinfo b/www/tomcat-native/distinfo
index 64624d37c936..d964149fba9d 100644
--- a/www/tomcat-native/distinfo
+++ b/www/tomcat-native/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466667598
-SHA256 (tomcat-native-1.2.7-src.tar.gz) = 19e87bc6ea7f763bf9e6515f8c31d8e9bb3e0c1132b36769cdf32c6702723d25
-SIZE (tomcat-native-1.2.7-src.tar.gz) = 390573
+TIMESTAMP = 1485159741
+SHA256 (tomcat-native-1.2.10-src.tar.gz) = 553a796f1efb9d52a22a24636baca45ae265327f2a2d2f3169436b4012df9c35
+SIZE (tomcat-native-1.2.10-src.tar.gz) = 391853
diff --git a/www/tomcat-native/files/patch-src_ssl.c b/www/tomcat-native/files/patch-src_ssl.c
new file mode 100644
index 000000000000..ea51dcc623a1
--- /dev/null
+++ b/www/tomcat-native/files/patch-src_ssl.c
@@ -0,0 +1,11 @@
+--- src/ssl.c.orig 2017-01-23 08:26:47 UTC
++++ src/ssl.c
+@@ -428,6 +428,8 @@ static unsigned long ssl_thread_id(void)
+ uint64_t tid;
+ pthread_threadid_np(NULL, &tid);
+ return (unsigned long)tid;
++#elif defined(__FreeBSD__)
++ return (unsigned long)pthread_threadid_np();
+ #elif defined(__linux__)
+ return (unsigned long)syscall(SYS_gettid);
+ #else