Browse code

Merge 4f42b71b64f10cc80ea391c073dddab809c2edc2 into b3d3cb366b67941ecebd297038522580114e3a0b

space88man authored on 11/06/2021 14:26:57 • GitHub committed on 11/06/2021 14:26:57
Showing 1 changed files
... ...
@@ -230,6 +230,11 @@
230 230
 %define _rundir %{_localstatedir}/run
231 231
 %endif
232 232
 
233
+# build with openssl 1.1.1 on RHEL 7 based dists
234
+%if 0%{?rhel} == 7
235
+%bcond_with openssl11
236
+%endif
237
+
233 238
 # redefine buggy openSUSE Leap _sharedstatedir macro. More info at https://bugzilla.redhat.com/show_bug.cgi?id=183370
234 239
 %if 0%{?suse_version} == 1315
235 240
 %define _sharedstatedir /var/lib
... ...
@@ -337,8 +342,13 @@ Account transaction information in a JSON dictionary.
337 342
 %package    auth-ephemeral
338 343
 Summary:    Functions for authentication using ephemeral credentials
339 344
 Group:      %{PKGGROUP}
345
+%if 0%{?centos_ver} == 7 && %{with openssl11}
346
+Requires:   openssl11, kamailio = %ver
347
+BuildRequires:  openssl11-devel
348
+%else
340 349
 Requires:   openssl, kamailio = %ver
341 350
 BuildRequires:  openssl-devel
351
+%endif
342 352
 
343 353
 %description    auth-ephemeral
344 354
 Functions for authentication using ephemeral credentials.
... ...
@@ -423,9 +433,14 @@ Requires:   openssl
423 433
 BuildRequires:  openssl-devel
424 434
 %endif
425 435
 %if 0%{?rhel} == 7
436
+%if %{with openssl11}
437
+Requires:   openssl11-libs
438
+BuildRequires:  openssl11-devel
439
+%else
426 440
 Requires:   openssl-libs
427 441
 BuildRequires:  openssl-devel
428 442
 %endif
443
+%endif
429 444
 %if 0%{?fedora}
430 445
 Requires:   openssl-libs
431 446
 BuildRequires:  openssl-devel
... ...
@@ -729,8 +744,13 @@ MySQL database connectivity for Kamailio.
729 744
 %package    outbound
730 745
 Summary:    Outbound (RFC 5626) support for Kamailio
731 746
 Group:      %{PKGGROUP}
747
+%if 0%{?centos_ver} == 7 && %{with openssl11}
748
+Requires:   openssl11, kamailio = %ver
749
+BuildRequires:  openssl11-devel
750
+%else
732 751
 Requires:   openssl, kamailio = %ver
733 752
 BuildRequires:  openssl-devel
753
+%endif
734 754
 
735 755
 %description    outbound
736 756
 RFC 5626, "Managing Client-Initiated Connections in the Session Initiation
... ...
@@ -1008,8 +1028,13 @@ SQLite database connectivity for Kamailio.
1008 1028
 %package    tls
1009 1029
 Summary:    TLS transport for Kamailio
1010 1030
 Group:      %{PKGGROUP}
1031
+%if 0%{?centos_ver} == 7 && %{with openssl11}
1032
+Requires:   openssl11, kamailio = %ver
1033
+BuildRequires:  openssl11-devel
1034
+%else
1011 1035
 Requires:   openssl, kamailio = %ver
1012 1036
 BuildRequires:  openssl-devel
1037
+%endif
1013 1038
 
1014 1039
 %description    tls
1015 1040
 TLS transport for Kamailio.
... ...
@@ -1064,8 +1089,13 @@ Non-SIP utitility functions for Kamailio.
1064 1089
 %package    websocket
1065 1090
 Summary:    WebSocket transport for Kamailio
1066 1091
 Group:      %{PKGGROUP}
1092
+%if 0%{?centos_ver} == 7 && %{with openssl11}
1093
+Requires:   libunistring, openssl11, kamailio = %ver
1094
+BuildRequires:  libunistring-devel, openssl11-devel
1095
+%else
1067 1096
 Requires:   libunistring, openssl, kamailio = %ver
1068 1097
 BuildRequires:  libunistring-devel, openssl-devel
1098
+%endif
1069 1099
 
1070 1100
 %description    websocket
1071 1101
 WebSocket transport for Kamailio.
... ...
@@ -1162,6 +1192,9 @@ make cfg prefix=/usr \
1162 1192
 make
1163 1193
 make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \
1164 1194
     jabber ndb_cassandra osp" \
1195
+%if %{with openssl11}
1196
+    SSL_BUILDER="pkg-config libssl11" \
1197
+%endif
1165 1198
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8
1166 1199
     FREERADIUS=1 \
1167 1200
 %endif
... ...
@@ -1255,6 +1288,9 @@ rm -rf %{buildroot}
1255 1288
 make install
1256 1289
 make install-modules-all skip_modules="app_mono db_cassandra db_oracle \
1257 1290
     iptrtpproxy jabber osp" \
1291
+%if %{with openssl11}
1292
+    SSL_BUILDER="pkg-config libssl11" \
1293
+%endif
1258 1294
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} == 8
1259 1295
     FREERADIUS=1 \
1260 1296
 %endif