Attachment #212218 for bug #244642

View | Details | Raw Unified | Return to bug 244642
Collapse All | Expand All

Lines 2-8 Link Here

(-)www/tomcat-native/Makefile (-5 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tomcat-native	4	PORTNAME= tomcat-native
5	PORTVERSION= 1.2.21	5	PORTVERSION= 1.2.23
6	CATEGORIES= www java	6	CATEGORIES= www java
7	MASTER_SITES= APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source	7	MASTER_SITES= APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source
8	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	8	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
Lines 14-21 Link Here
14		14
15	LIB_DEPENDS= libapr-1.so:devel/apr1	15	LIB_DEPENDS= libapr-1.so:devel/apr1
16		16
17	WRKSRC= ${WRKDIR}/${DISTNAME}/native
18
19	USES= libtool ssl	17	USES= libtool ssl
20	USE_JAVA= yes	18	USE_JAVA= yes
21	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
Lines 24-35 Link Here
24	--with-java-home=${JAVA_HOME} \	22	--with-java-home=${JAVA_HOME} \
25	--with-ssl=${OPENSSLBASE}	23	--with-ssl=${OPENSSLBASE}
26		24
		25	WRKSRC= ${WRKDIR}/${DISTNAME}/native
		26
		27	SOVERSION= ${PORTVERSION:S/^1.//1}
27	PLIST_FILES= lib/libtcnative-1.a \	28	PLIST_FILES= lib/libtcnative-1.a \
28	lib/libtcnative-1.so \	29	lib/libtcnative-1.so \
29	lib/libtcnative-1.so.0 \	30	lib/libtcnative-1.so.0 \
30	lib/libtcnative-1.so.0.2.21	31	lib/libtcnative-1.so.0.${SOVERSION}
31		32
32	post-install:	33	post-install:
33	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.21	34	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.${SOVERSION}
34		35
35	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)www/tomcat-native/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1553515413	1	TIMESTAMP = 1583516376
2	SHA256 (tomcat-native-1.2.21-src.tar.gz) = 05bba41671cc91c531c366a9ccd930b38a107a0212c73181961f3cda508d5007	2	SHA256 (tomcat-native-1.2.23-src.tar.gz) = 5ae5940f759cfdd68384ecf61f2c4fd9b01eb430ab0d349c0b197df0b0c0c3c7
3	SIZE (tomcat-native-1.2.21-src.tar.gz) = 418909	3	SIZE (tomcat-native-1.2.23-src.tar.gz) = 419428

Lines 23-29 Link Here

(-)www/tomcat-native/files/patch-Makefile.in (-1 / +1 lines)
23	- $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \	23	- $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
24	- $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)	24	- $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
25	- $(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)	25	- $(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
26	- $(INSTALL_DATA) include/*.h $(DESTDIR)$(includedir)	26	- $(INSTALL_DATA) $(srcdir)/include/*.h $(DESTDIR)$(includedir)
27	- list='$(INSTALL_SUBDIRS)'; for i in $$list; do \	27	- list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
28	- ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \	28	- ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
29	- done	29	- done




--- src/ssl.c.orig	2019-06-26 11:12:00 UTC
+++ src/ssl.c
@@ -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;

Return to bug 244642

Lines 1-6 Link Here

(-)www/tomcat-native/files/patch-src_ssl.c (-2 / +13 lines)
1	--- src/ssl.c.orig 2017-01-23 08:26:47 UTC	1	--- src/ssl.c.orig 2019-06-26 11:12:00 UTC
2	+++ src/ssl.c	2	+++ src/ssl.c
3	@@ -428,6 +428,8 @@ static unsigned long ssl_thread_id(void)	3	@@ -24,6 +24,10 @@
		4	#include <sys/syscall.h>
		5	#endif
		6
		7	+#ifdef __FreeBSD__
		8	+#include <pthread_np.h>
		9	+#endif
		10	+
		11	#ifdef HAVE_OPENSSL
		12	#include "ssl_private.h"
		13
		14	@@ -472,6 +476,8 @@ static unsigned long ssl_thread_id(void)
4	uint64_t tid;	15	uint64_t tid;
5	pthread_threadid_np(NULL, &tid);	16	pthread_threadid_np(NULL, &tid);
6	return (unsigned long)tid;	17	return (unsigned long)tid;