Attachment #214110 for bug #246179

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

Lines 2-8 Link Here

(-)www/tomcat-native/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= tomcat-native	4	PORTNAME= tomcat-native
5	PORTVERSION= 1.2.23	5	PORTVERSION= 1.2.24
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 1-3 Link Here

(-)www/tomcat-native/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1583516376	1	TIMESTAMP = 1588237850
2	SHA256 (tomcat-native-1.2.23-src.tar.gz) = 5ae5940f759cfdd68384ecf61f2c4fd9b01eb430ab0d349c0b197df0b0c0c3c7	2	SHA256 (tomcat-native-1.2.24-src.tar.gz) = 037f52f9a345e766a7dde8361c55b3b69045928f9a8068a406612b603819e76c
3	SIZE (tomcat-native-1.2.23-src.tar.gz) = 419428	3	SIZE (tomcat-native-1.2.24-src.tar.gz) = 419572




--- Makefile.in.orig	2018-12-20 18:48:22 UTC
+++ Makefile.in
@@ -49,13 +49,9 @@ TARGETS = $(TARGET_LIB)
 @INCLUDE_RULES@
 @INCLUDE_OUTPUTS@
 
-ifneq ($(CC_OLD),$(CC))
-    CC=$(CC_OLD)
-endif
+CC=$(CC_OLD)
 
-ifneq ($(LIBTOOL_OLD),$(LIBTOOL))
-    LIBTOOL=$(LIBTOOL_OLD)
-endif
+LIBTOOL=$(LIBTOOL_OLD)
 
 LINK          = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
 CLEAN_SUBDIRS = test
@@ -77,13 +73,7 @@ top_blddir=@abs_builddir@
 
 
 install: $(TARGET_LIB)
-	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
-		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
-	$(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
-	$(INSTALL_DATA) $(srcdir)/include/*.h $(DESTDIR)$(includedir)
-	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
-		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
-	done
+	$(APR_MKDIR) $(DESTDIR)$(libdir)
 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
 
 $(TARGET_LIB): $(OBJECTS)




--- 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;
+#elif defined(__FreeBSD__)
+    return (unsigned long)pthread_getthreadid_np();
 #elif defined(__linux__)
     return (unsigned long)syscall(SYS_gettid);
 #else

Return to bug 246179

Lines 1-33 Link Here

(-)www/tomcat-native/files/patch-Makefile.in (-33 lines)
1	--- Makefile.in.orig 2018-12-20 18:48:22 UTC
2	+++ Makefile.in
3	@@ -49,13 +49,9 @@ TARGETS = $(TARGET_LIB)
4	@INCLUDE_RULES@
5	@INCLUDE_OUTPUTS@
6
7	-ifneq ($(CC_OLD),$(CC))
8	- CC=$(CC_OLD)
9	-endif
10	+CC=$(CC_OLD)
11
12	-ifneq ($(LIBTOOL_OLD),$(LIBTOOL))
13	- LIBTOOL=$(LIBTOOL_OLD)
14	-endif
15	+LIBTOOL=$(LIBTOOL_OLD)
16
17	LINK = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
18	CLEAN_SUBDIRS = test
19	@@ -77,13 +73,7 @@ top_blddir=@abs_builddir@
20
21
22	install: $(TARGET_LIB)
23	- $(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
24	- $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
25	- $(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
26	- $(INSTALL_DATA) $(srcdir)/include/*.h $(DESTDIR)$(includedir)
27	- list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
28	- ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
29	- done
30	+ $(APR_MKDIR) $(DESTDIR)$(libdir)
31	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
32
33	$(TARGET_LIB): $(OBJECTS)

Lines 1-22 Link Here

(-)www/tomcat-native/files/patch-src_ssl.c (-22 lines)
1	--- src/ssl.c.orig 2019-06-26 11:12:00 UTC
2	+++ src/ssl.c
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)
15	uint64_t tid;
16	pthread_threadid_np(NULL, &tid);
17	return (unsigned long)tid;
18	+#elif defined(__FreeBSD__)
19	+ return (unsigned long)pthread_getthreadid_np();
20	#elif defined(__linux__)
21	return (unsigned long)syscall(SYS_gettid);
22	#else