svn commit: r528004 - in head/www/tomcat-native: . files
Alex Dupre
ale at FreeBSD.org
Sun Mar 8 08:25:49 UTC 2020
Author: ale
Date: Sun Mar 8 08:25:47 2020
New Revision: 528004
URL: https://svnweb.freebsd.org/changeset/ports/528004
Log:
Update to 1.2.23 release.
PR: 244642
Submitted by: Michael Osipov <michael.osipov at siemens.com>
Modified:
head/www/tomcat-native/Makefile
head/www/tomcat-native/distinfo
head/www/tomcat-native/files/patch-Makefile.in
head/www/tomcat-native/files/patch-src_ssl.c
Modified: head/www/tomcat-native/Makefile
==============================================================================
--- head/www/tomcat-native/Makefile Sun Mar 8 08:15:03 2020 (r528003)
+++ head/www/tomcat-native/Makefile Sun Mar 8 08:25:47 2020 (r528004)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tomcat-native
-PORTVERSION= 1.2.21
+PORTVERSION= 1.2.23
CATEGORIES= www java
MASTER_SITES= APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -14,8 +14,6 @@ LICENSE= APACHE20
LIB_DEPENDS= libapr-1.so:devel/apr1
-WRKSRC= ${WRKDIR}/${DISTNAME}/native
-
USES= libtool ssl
USE_JAVA= yes
USE_LDCONFIG= yes
@@ -24,12 +22,15 @@ CONFIGURE_ARGS= --with-apr=${LOCALBASE} \
--with-java-home=${JAVA_HOME} \
--with-ssl=${OPENSSLBASE}
+WRKSRC= ${WRKDIR}/${DISTNAME}/native
+
+SOVERSION= ${PORTVERSION:S/^1.//1}
PLIST_FILES= lib/libtcnative-1.a \
lib/libtcnative-1.so \
lib/libtcnative-1.so.0 \
- lib/libtcnative-1.so.0.2.21
+ lib/libtcnative-1.so.0.${SOVERSION}
post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.21
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.${SOVERSION}
.include <bsd.port.mk>
Modified: head/www/tomcat-native/distinfo
==============================================================================
--- head/www/tomcat-native/distinfo Sun Mar 8 08:15:03 2020 (r528003)
+++ head/www/tomcat-native/distinfo Sun Mar 8 08:25:47 2020 (r528004)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553515413
-SHA256 (tomcat-native-1.2.21-src.tar.gz) = 05bba41671cc91c531c366a9ccd930b38a107a0212c73181961f3cda508d5007
-SIZE (tomcat-native-1.2.21-src.tar.gz) = 418909
+TIMESTAMP = 1583516376
+SHA256 (tomcat-native-1.2.23-src.tar.gz) = 5ae5940f759cfdd68384ecf61f2c4fd9b01eb430ab0d349c0b197df0b0c0c3c7
+SIZE (tomcat-native-1.2.23-src.tar.gz) = 419428
Modified: head/www/tomcat-native/files/patch-Makefile.in
==============================================================================
--- head/www/tomcat-native/files/patch-Makefile.in Sun Mar 8 08:15:03 2020 (r528003)
+++ head/www/tomcat-native/files/patch-Makefile.in Sun Mar 8 08:25:47 2020 (r528004)
@@ -23,7 +23,7 @@
- $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
- $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
- $(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
-- $(INSTALL_DATA) include/*.h $(DESTDIR)$(includedir)
+- $(INSTALL_DATA) $(srcdir)/include/*.h $(DESTDIR)$(includedir)
- list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
- ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
- done
Modified: head/www/tomcat-native/files/patch-src_ssl.c
==============================================================================
--- head/www/tomcat-native/files/patch-src_ssl.c Sun Mar 8 08:15:03 2020 (r528003)
+++ head/www/tomcat-native/files/patch-src_ssl.c Sun Mar 8 08:25:47 2020 (r528004)
@@ -1,6 +1,17 @@
---- src/ssl.c.orig 2017-01-23 08:26:47 UTC
+--- src/ssl.c.orig 2019-06-26 11:12:00 UTC
+++ src/ssl.c
-@@ -428,6 +428,8 @@ static unsigned long ssl_thread_id(void)
+@@ -24,6 +24,10 @@
+ #include <sys/syscall.h>
+ #endif
+
++#ifdef __FreeBSD__
++#include <pthread_np.h>
++#endif
++
+ #ifdef HAVE_OPENSSL
+ #include "ssl_private.h"
+
+@@ -472,6 +476,8 @@ static unsigned long ssl_thread_id(void)
uint64_t tid;
pthread_threadid_np(NULL, &tid);
return (unsigned long)tid;
More information about the svn-ports-head
mailing list