Skip to content

Commit 0f53c9a

Browse files
committed
Proper OpenSSL dependencies.
1 parent 9f6b9c8 commit 0f53c9a

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

.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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.8)
1+
cmake_minimum_required(VERSION 3.11.0)
22
project(ipfixcol2)
33

44
# Description of the project
@@ -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/rpm/ipfixcol2.spec.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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
1616
BuildRequires: librdkafka-devel
17-
Requires: libfds >= 0.2.0, zlib, librdkafka >= 0.9.3
17+
Requires: libfds >= 0.2.0, zlib, librdkafka >= 0.9.3, libcrypto >= 3.2.4, libssl >= 3.2.4
1818

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

src/plugins/input/tcp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if (CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_HOST_SYSTEM_NAME STREQUAL
3232
)
3333
endif()
3434

35-
target_link_libraries(tcp-input crypto ssl)
35+
target_link_libraries(tcp-input OpenSSL::Crypto OpenSSL::SSL)
3636

3737
install(
3838
TARGETS tcp-input

src/tools/ipfixsend/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ add_executable(ipfixsend2
88
siso.h
99
)
1010

11-
target_link_libraries(ipfixsend2 crypto ssl)
11+
target_link_libraries(ipfixsend2 OpenSSL::Crypto OpenSSL::SSL)
1212

1313
# Installation targets
1414
install(

0 commit comments

Comments
 (0)