Skip to content

Commit 210200c

Browse files
committed
TCP input TLS - Add OpenSSL dependency
1 parent 72763c5 commit 210200c

File tree

6 files changed

+13
-8
lines changed

6 files changed

+13
-8
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: startsWith(matrix.image, 'ubuntu') || startsWith(matrix.image, 'debian')
3535
run: |
3636
apt-get update
37-
apt-get -y install git gcc g++ cmake make libxml2-dev liblz4-dev libzstd-dev
37+
apt-get -y install git gcc g++ cmake make libxml2-dev liblz4-dev libzstd-dev libssl-dev
3838
apt-get -y install python3-docutils zlib1g-dev pkg-config
3939
apt-get -y install librdkafka-dev
4040
env:
@@ -69,7 +69,7 @@ jobs:
6969
- name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux)
7070
if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux')
7171
run: |
72-
yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel
72+
yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel openssl-devel
7373
yum -y install zlib-devel pkgconfig librdkafka-devel
7474
yum -y install python3-docutils || yum -y install python-docutils
7575

.github/workflows/packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install dependencies for libfds and IPFIXcol2 (Ubuntu/Debian)
4141
run: |
4242
apt-get update
43-
apt-get -y install git gcc g++ cmake make libxml2-dev liblz4-dev libzstd-dev
43+
apt-get -y install git gcc g++ cmake make libxml2-dev liblz4-dev libzstd-dev libssl-dev
4444
apt-get -y install python3-docutils zlib1g-dev pkg-config librdkafka-dev
4545
apt-get -y install debhelper devscripts build-essential fakeroot zip
4646
env:
@@ -143,7 +143,7 @@ jobs:
143143
- name: Install dependencies for libfds and IPFIXcol2 (Rocky Linux, Oracle Linux)
144144
if: contains(matrix.image, 'rockylinux') || contains(matrix.image, 'oraclelinux')
145145
run: |
146-
yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel
146+
yum -y install git gcc gcc-c++ cmake make libxml2-devel lz4-devel libzstd-devel openssl-devel
147147
yum -y install zlib-devel pkgconfig rpm-build librdkafka-devel
148148
yum -y install python3-docutils || yum -y install python-docutils
149149

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
9595
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
9696
find_package(Threads REQUIRED)
9797

98+
# Find OpenSSL
99+
find_package(OpenSSL REQUIRED)
100+
98101
# ------------------------------------------------------------------------------
99102
# Project components
100103
add_subdirectory(include)

pkg/deb/templates/control.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ Standards-Version: 3.9.8
77
Build-Depends: debhelper (>= 9), cmake (>= 2.8.8), make (>= 4.0),
88
libfds-dev, gcc (>= 4.8), g++ (>= 4.8), pkg-config,
99
zlib1g-dev, python3-docutils | python-docutils,
10-
librdkafka-dev
10+
librdkafka-dev, libssl-dev
1111

1212
Package: @CPACK_PACKAGE_NAME@
1313
Architecture: any
1414
Depends: ${shlibs:Depends}, ${misc:Depends}, libfds (>= 0.2.0), zlib1g,
15-
librdkafka1 (>= 0.9.3)
15+
librdkafka1 (>= 0.9.3), libssl-dev
1616
Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
1717
IPFIXcol is a flexible IPFIX (RFC 7011) flow data collector designed to
1818
be extensible by plugins.

pkg/rpm/ipfixcol2.spec.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Packager: @CPACK_PACKAGE_CONTACT@
1313
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
1414
BuildRequires: gcc >= 4.8, gcc-c++ >= 4.8, cmake >= 2.8.8, make
1515
BuildRequires: libfds-devel, /usr/bin/rst2man, zlib-devel
16-
BuildRequires: librdkafka-devel
17-
Requires: libfds >= 0.2.0, zlib, librdkafka >= 0.9.3
16+
BuildRequires: librdkafka-devel, openssl-devel
17+
Requires: libfds >= 0.2.0, zlib, librdkafka >= 0.9.3, openssl-libs
1818

1919
%description
2020
IPFIXcol is a flexible IPFIX (RFC 7011) flow data collector designed to

src/plugins/input/tcp/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ if (CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_HOST_SYSTEM_NAME STREQUAL
2929
)
3030
endif()
3131

32+
target_link_libraries(tcp-input OpenSSL::Crypto OpenSSL::SSL)
33+
3234
install(
3335
TARGETS tcp-input
3436
LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixcol2/"

0 commit comments

Comments
 (0)