svn commit: r567474 - in head/devel: node-thrift rubygem-thrift thrift thrift-c_glib thrift-cpp thrift-cpp/files
Matthias Fechner
mfechner at FreeBSD.org
Sat Mar 6 10:01:12 UTC 2021
Author: mfechner
Date: Sat Mar 6 10:01:09 2021
New Revision: 567474
URL: https://svnweb.freebsd.org/changeset/ports/567474
Log:
Security related update to 0.14.0.
Changelog:
https://github.com/apache/thrift/blob/master/CHANGES.md
In the changelog I cannot find the information that this includes a security related fix.
Neither in CVE database:
https://www.cvedetails.com/product/38295/Apache-Thrift.html?vendor_id=45
But gitlab mentions it that it updates to version 0.14.0 to mitigate security concerns:
https://about.gitlab.com/releases/2021/03/04/security-release-gitlab-13-9-2-released/
This update is therefor required for the gitlab-ce security update to 13.9.2.
Changed build system to cmake, this fixed problems if openssl from ports is used.
It also improves the build performance by factor of CPUs available.
Cmake also seems to be the recommended build system.
Added:
head/devel/thrift-cpp/files/patch-lib_cpp_src_thrift_transport_SocketCommon.cpp (contents, props changed)
head/devel/thrift-cpp/files/patch-lib_cpp_src_thrift_transport_TSocket.cpp (contents, props changed)
head/devel/thrift/pkg-plist (contents, props changed)
Modified:
head/devel/node-thrift/pkg-plist
head/devel/rubygem-thrift/distinfo
head/devel/thrift-c_glib/Makefile
head/devel/thrift-c_glib/pkg-plist
head/devel/thrift-cpp/Makefile
head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc
head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h
head/devel/thrift-cpp/pkg-plist
head/devel/thrift/Makefile
head/devel/thrift/bsd.thrift.mk
head/devel/thrift/distinfo
Modified: head/devel/node-thrift/pkg-plist
==============================================================================
--- head/devel/node-thrift/pkg-plist Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/node-thrift/pkg-plist Sat Mar 6 10:01:09 2021 (r567474)
@@ -1,4 +1,5 @@
lib/node/thrift
+lib/node_modules/thrift/CMakeLists.txt
lib/node_modules/thrift/Makefile.am
lib/node_modules/thrift/Makefile.in
lib/node_modules/thrift/README.md
Modified: head/devel/rubygem-thrift/distinfo
==============================================================================
--- head/devel/rubygem-thrift/distinfo Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/rubygem-thrift/distinfo Sat Mar 6 10:01:09 2021 (r567474)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613998762
-SHA256 (rubygem/thrift-0.13.0.gem) = 580431d8154c5203c0c1b14139a68dd4d94232edb49d36b30fe581de2a330720
-SIZE (rubygem/thrift-0.13.0.gem) = 75264
+TIMESTAMP = 1614981436
+SHA256 (rubygem/thrift-0.14.0.gem) = b648fdec62324fcc6b1c420248c63bc2d6b819303d6122b228294fc2284798ec
+SIZE (rubygem/thrift-0.14.0.gem) = 75776
Modified: head/devel/thrift-c_glib/Makefile
==============================================================================
--- head/devel/thrift-c_glib/Makefile Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/thrift-c_glib/Makefile Sat Mar 6 10:01:09 2021 (r567474)
@@ -17,30 +17,16 @@ BUILDIR= ${WRKDIR}/${DISTNAME}/lib/c_glib
DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo
-USES= autoreconf compiler:c++11-lang gmake gnome libtool pathfix \
- pkgconfig
-GNU_CONFIGURE= yes
+USES= bison cmake compiler:c++11-lang gnome libtool pathfix \
+ pkgconfig ssl
+CMAKE_ON= BUILD_C_GLIB BUILD_SHARED_LIBS
+CMAKE_OFF= BUILD_CPP BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL
USE_GNOME= glib20
USE_LDCONFIG= yes
-MAKE_JOBS_UNSAFE= yes
-INSTALL_TARGET= install-strip
.include "../thrift/bsd.thrift.mk"
-CONFIGURE_ARGS+= \
- --with-c_glib \
- --without-cpp \
- --without-qt4 \
- --without-csharp \
- --without-erlang \
- --without-haskell \
- --without-java \
- --without-perl \
- --without-php \
- --without-php_extension \
- --without-python \
- --without-ruby \
- --without-go
+PLIST_SUB+= PORTVERSION="${PORTVERSION}"
post-patch:
@${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/compiler/cpp/Makefile.am \
Modified: head/devel/thrift-c_glib/pkg-plist
==============================================================================
--- head/devel/thrift-c_glib/pkg-plist Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/thrift-c_glib/pkg-plist Sat Mar 6 10:01:09 2021 (r567474)
@@ -1,5 +1,5 @@
@comment bin/thrift
-include/thrift/c_glib/config.h
+include/thrift/config.h
include/thrift/c_glib/processor/thrift_dispatch_processor.h
include/thrift/c_glib/processor/thrift_multiplexed_processor.h
include/thrift/c_glib/processor/thrift_processor.h
@@ -16,6 +16,7 @@ include/thrift/c_glib/server/thrift_server.h
include/thrift/c_glib/server/thrift_simple_server.h
include/thrift/c_glib/thrift.h
include/thrift/c_glib/thrift_application_exception.h
+include/thrift/c_glib/thrift_configuration.h
include/thrift/c_glib/thrift_struct.h
include/thrift/c_glib/transport/thrift_buffered_transport.h
include/thrift/c_glib/transport/thrift_buffered_transport_factory.h
@@ -30,8 +31,9 @@ include/thrift/c_glib/transport/thrift_socket.h
include/thrift/c_glib/transport/thrift_ssl_socket.h
include/thrift/c_glib/transport/thrift_transport.h
include/thrift/c_glib/transport/thrift_transport_factory.h
-lib/libthrift_c_glib.a
lib/libthrift_c_glib.so
-lib/libthrift_c_glib.so.0
-lib/libthrift_c_glib.so.0.0.0
-libdata/pkgconfig/thrift_c_glib.pc
+lib/libthrift_c_glib.so.%%PORTVERSION%%
+lib/cmake/thrift/ThriftConfig.cmake
+lib/cmake/thrift/ThriftConfigVersion.cmake
+lib/cmake/thrift/thrift_c_glibTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/thrift/thrift_c_glibTargets.cmake
Modified: head/devel/thrift-cpp/Makefile
==============================================================================
--- head/devel/thrift-cpp/Makefile Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/thrift-cpp/Makefile Sat Mar 6 10:01:09 2021 (r567474)
@@ -20,32 +20,13 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo
-BROKEN_SSL= openssl
-BROKEN_SSL_REASON_openssl= 'configure: error: "Error: libcrypto required."'
-
-USES= autoreconf pkgconfig gmake compiler:c++11-lang \
+USES= bison cmake pkgconfig compiler:c++11-lang \
libtool pathfix ssl
-GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
PLIST_SUB= PORTVERSION="${THRIFT_PORTVERSION}"
-
-CONFIGURE_ARGS+= \
- --without-c_glib \
- --with-cpp \
- --with-boost-libdir="${LOCALBASE}/lib" \
- --without-csharp \
- --without-erlang \
- --without-haskell \
- --without-java \
- --without-perl \
- --without-php \
- --without-php_extension \
- --without-python \
- --without-ruby \
- --without-lua \
- --with-qt5=no \
- --without-go
+CMAKE_ON= BUILD_CPP BUILD_SHARED_LIBS
+CMAKE_OFF= BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL
.include <bsd.port.pre.mk>
Modified: head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc
==============================================================================
--- head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__protocol__TBinaryProtocol.tcc Sat Mar 6 10:01:09 2021 (r567474)
@@ -1,6 +1,6 @@
---- lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig 2015-10-13 19:19:23 UTC
+--- lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc.orig 2021-02-04 23:07:31 UTC
+++ lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
-@@ -24,6 +24,8 @@
+@@ -25,6 +25,8 @@
#include <limits>
Modified: head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h
==============================================================================
--- head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/thrift-cpp/files/patch-lib__cpp__src__thrift__server__TNonblockingServer.h Sat Mar 6 10:01:09 2021 (r567474)
@@ -1,6 +1,6 @@
---- lib/cpp/src/thrift/server/TNonblockingServer.h.orig 2015-10-13 19:19:36 UTC
+--- lib/cpp/src/thrift/server/TNonblockingServer.h.orig 2021-02-04 23:07:31 UTC
+++ lib/cpp/src/thrift/server/TNonblockingServer.h
-@@ -41,6 +41,9 @@
+@@ -43,6 +43,9 @@
#include <event2/event_compat.h>
#include <event2/event_struct.h>
Added: head/devel/thrift-cpp/files/patch-lib_cpp_src_thrift_transport_SocketCommon.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/thrift-cpp/files/patch-lib_cpp_src_thrift_transport_SocketCommon.cpp Sat Mar 6 10:01:09 2021 (r567474)
@@ -0,0 +1,14 @@
+--- lib/cpp/src/thrift/transport/SocketCommon.cpp.orig 2021-03-05 23:09:13 UTC
++++ lib/cpp/src/thrift/transport/SocketCommon.cpp
+@@ -24,6 +24,11 @@
+
+ #ifndef _WIN32
+
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++
+ #include <thrift/thrift-config.h>
+
+ #ifdef HAVE_UNISTD_H
Added: head/devel/thrift-cpp/files/patch-lib_cpp_src_thrift_transport_TSocket.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/thrift-cpp/files/patch-lib_cpp_src_thrift_transport_TSocket.cpp Sat Mar 6 10:01:09 2021 (r567474)
@@ -0,0 +1,11 @@
+--- lib/cpp/src/thrift/transport/TSocket.cpp.orig 2021-03-05 22:48:17 UTC
++++ lib/cpp/src/thrift/transport/TSocket.cpp
+@@ -460,7 +460,7 @@ void TSocket::local_open() {
+ #ifdef _WIN32
+ error == WSANO_DATA
+ #else
+- error == EAI_NODATA
++ error == EAI_NONAME
+ #endif
+ ) {
+ hints.ai_flags &= ~AI_ADDRCONFIG;
Modified: head/devel/thrift-cpp/pkg-plist
==============================================================================
--- head/devel/thrift-cpp/pkg-plist Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/thrift-cpp/pkg-plist Sat Mar 6 10:01:09 2021 (r567474)
@@ -1,6 +1,7 @@
@comment bin/thrift
include/thrift/TApplicationException.h
include/thrift/TBase.h
+include/thrift/TConfiguration.h
include/thrift/TDispatchProcessor.h
include/thrift/TLogging.h
include/thrift/TOutput.h
@@ -33,14 +34,18 @@ include/thrift/protocol/TBinaryProtocol.tcc
include/thrift/protocol/TCompactProtocol.h
include/thrift/protocol/TCompactProtocol.tcc
include/thrift/protocol/TDebugProtocol.h
+include/thrift/protocol/TEnum.h
include/thrift/protocol/THeaderProtocol.h
include/thrift/protocol/TJSONProtocol.h
+include/thrift/protocol/TList.h
+include/thrift/protocol/TMap.h
include/thrift/protocol/TMultiplexedProtocol.h
include/thrift/protocol/TProtocol.h
include/thrift/protocol/TProtocolDecorator.h
include/thrift/protocol/TProtocolException.h
include/thrift/protocol/TProtocolTap.h
include/thrift/protocol/TProtocolTypes.h
+include/thrift/protocol/TSet.h
include/thrift/protocol/TVirtualProtocol.h
include/thrift/qt/TQIODeviceTransport.h
include/thrift/qt/TQTcpServer.h
@@ -54,6 +59,7 @@ include/thrift/server/TThreadedServer.h
include/thrift/thrift-config.h
include/thrift/thrift_export.h
include/thrift/transport/PlatformSocket.h
+include/thrift/transport/SocketCommon.h
include/thrift/transport/TBufferTransports.h
include/thrift/transport/TFDTransport.h
include/thrift/transport/TFileTransport.h
@@ -74,23 +80,38 @@ include/thrift/transport/TShortReadTransport.h
include/thrift/transport/TSimpleFileTransport.h
include/thrift/transport/TSocket.h
include/thrift/transport/TSocketPool.h
+include/thrift/transport/TSocketUtils.h
include/thrift/transport/TTransport.h
include/thrift/transport/TTransportException.h
include/thrift/transport/TTransportUtils.h
include/thrift/transport/TVirtualTransport.h
+include/thrift/transport/TWebSocketServer.h
include/thrift/transport/TZlibTransport.h
-lib/libthrift-%%PORTVERSION%%.so
-lib/libthrift.a
+include/thrift/windows/GetTimeOfDay.h
+include/thrift/windows/Operators.h
+include/thrift/windows/OverlappedSubmissionThread.h
+include/thrift/windows/SocketPair.h
+include/thrift/windows/Sync.h
+include/thrift/windows/TWinsockSingleton.h
+include/thrift/windows/WinFcntl.h
+include/thrift/windows/config.h
lib/libthrift.so
lib/libthrift.so.0
-lib/libthriftnb-%%PORTVERSION%%.so
-lib/libthriftnb.a
+lib/libthrift.so.%%PORTVERSION%%
lib/libthriftnb.so
lib/libthriftnb.so.0
-lib/libthriftz-%%PORTVERSION%%.so
-lib/libthriftz.a
+lib/libthriftnb.so.%%PORTVERSION%%
lib/libthriftz.so
lib/libthriftz.so.0
+lib/libthriftz.so.%%PORTVERSION%%
+lib/cmake/thrift/ThriftConfig.cmake
+lib/cmake/thrift/ThriftConfigVersion.cmake
+lib/cmake/thrift/thriftTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/thrift/thriftTargets.cmake
+lib/cmake/thrift/thriftnbTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/thrift/thriftnbTargets.cmake
+lib/cmake/thrift/thriftzTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/thrift/thriftzTargets.cmake
libdata/pkgconfig/thrift-nb.pc
libdata/pkgconfig/thrift-z.pc
libdata/pkgconfig/thrift.pc
Modified: head/devel/thrift/Makefile
==============================================================================
--- head/devel/thrift/Makefile Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/thrift/Makefile Sat Mar 6 10:01:09 2021 (r567474)
@@ -13,13 +13,9 @@ COMMENT= Framework for scalable cross-language service
LICENSE= APACHE20
-USES= autoreconf compiler:c++11-lang libtool pkgconfig
-GNU_CONFIGURE= yes
+USES= bison cmake compiler:c++11-lang libtool pkgconfig
USE_LDCONFIG= yes
-MAKE_JOBS_UNSAFE= yes
-CONFIGURE_ENV+= ${MAKE_ENV}
-
# For C++ support, use devel/thrift-cpp
# For C glib support, use devel/thrift-c_glib.
# For Perl support, use devel/p5-Thrift.
@@ -29,22 +25,7 @@ CONFIGURE_ENV+= ${MAKE_ENV}
# For nodejs support, use devel/node-thrift.
# Other languages are not yet supported, please feel free to contribute
# using one of the leaf ports as an example.
-CONFIGURE_ARGS+= \
- --without-c_glib \
- --without-cpp \
- --without-qt4 \
- --without-csharp \
- --without-erlang \
- --without-haskell \
- --without-java \
- --without-perl \
- --without-php \
- --without-php_extension \
- --without-python \
- --without-ruby \
- --without-go
-
-PLIST_FILES= bin/thrift
+CMAKE_OFF= BUILD_CPP BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL
.include <bsd.port.pre.mk>
.include "bsd.thrift.mk"
Modified: head/devel/thrift/bsd.thrift.mk
==============================================================================
--- head/devel/thrift/bsd.thrift.mk Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/thrift/bsd.thrift.mk Sat Mar 6 10:01:09 2021 (r567474)
@@ -5,7 +5,7 @@
# in your makefile, set:
# PORTVERSION= ${THRIFT_PORTVERSION}
# see $PORTSDIR/devel/thrift for examples
-THRIFT_PORTVERSION= 0.13.0
+THRIFT_PORTVERSION= 0.14.0
CONFIGURE_ARGS+= \
--without-tests
Modified: head/devel/thrift/distinfo
==============================================================================
--- head/devel/thrift/distinfo Sat Mar 6 09:09:23 2021 (r567473)
+++ head/devel/thrift/distinfo Sat Mar 6 10:01:09 2021 (r567474)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613998298
-SHA256 (thrift-0.13.0.tar.gz) = 7ad348b88033af46ce49148097afe354d513c1fca7c607b59c33ebb6064b5179
-SIZE (thrift-0.13.0.tar.gz) = 4154357
+TIMESTAMP = 1614981388
+SHA256 (thrift-0.14.0.tar.gz) = 8dcb64f63126522e1a3fd65bf6e5839bc3d3f1e13eb514ce0c2057c9b898ff71
+SIZE (thrift-0.14.0.tar.gz) = 4180456
Added: head/devel/thrift/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/thrift/pkg-plist Sat Mar 6 10:01:09 2021 (r567474)
@@ -0,0 +1,3 @@
+bin/thrift
+lib/cmake/thrift/ThriftConfig.cmake
+lib/cmake/thrift/ThriftConfigVersion.cmake
More information about the svn-ports-head
mailing list