rpms
/
libprelude
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add patch to remove unneeded libraries from libprelude-config --libs 

Thanks to Orion Poplawski
bz#1830473
This commit is contained in:
Thomas Andrejak 2020-09-20 10:36:23 +02:00
parent bd30c80994
commit 87731763ea
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libprelude-5.2.0-clean_libprelude-config.patch Normal file
View File

@ -0,0 +1,28 @@
Description: Remove unneeded libraries from libprelude-config --libs
Author: Orion Poplawski <orion@nwra.com>
Last-Update: 2020-18-09
diff -up libprelude-5.2.0/libprelude-config.in.config libprelude-5.2.0/libprelude-config.in
--- libprelude-5.2.0/libprelude-config.in.config 2020-09-09 08:30:32.658000000 -0600
+++ libprelude-5.2.0/libprelude-config.in 2020-09-18 19:10:11.786743848 -0600
@@ -104,7 +104,10 @@ fi
if test $want_libs = yes; then
- libdirs=-L@libdir@
+ libdirs=
+ if test @libdir@ != /usr/lib -a @libdir@ != /usr/lib64 ; then
+ libdirs=-L@libdir@
+ fi
cpplibs=""
if test $cpp_set = yes; then
cpplibs="$libdirs -lpreludecpp"
@@ -116,7 +119,7 @@ if test $want_libs = yes; then
thrlibs="@LTLIBTHREAD@"
fi
- echo $cpplibs $libdirs -lprelude @LIBPRELUDE_LIBS@ @LIBLTDL_DECL@ @LIBADD_DL@ $thrlibs @GETADDRINFO_LIB@ @GETHOSTNAME_LIB@ @HOSTENT_LIB@ @INET_NTOP_LIB@ @INET_PTON_LIB@ @LIBSOCKET@ @LIB_POLL@ @LIB_SELECT@ @LTLIBINTL@ @SERVENT_LIB@
+ echo $cpplibs $libdirs -lprelude $thrlibs @GETADDRINFO_LIB@ @GETHOSTNAME_LIB@ @HOSTENT_LIB@ @INET_NTOP_LIB@ @INET_PTON_LIB@ @LIBSOCKET@ @LIB_POLL@ @LIB_SELECT@ @LTLIBINTL@ @SERVENT_LIB@
fi
exit 0

13
libprelude.spec
View File

@ -7,7 +7,7 @@
Name: libprelude
Version: 5.2.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Secure Connections between all Sensors and the Prelude Manager
License: LGPL-2.1+
URL: https://www.prelude-siem.org/
@ -26,13 +26,15 @@ Patch4: libprelude-5.2.0-fix_pthread_atfork.patch
Patch5: libprelude-5.2.0-fix_prelude_tests_timer.patch
Patch6: libprelude-5.2.0-fix_gtkdoc_1.32.patch
Patch7: libprelude-5.2.0-linking.patch
Patch8: libprelude-5.2.0-fix_libprelude-error_on_gnu.patch
Patch9: libprelude-5.2.0-disable_test-poll_on_kfreebsd.patch
Patch8: libprelude-5.2.0-fix_libprelude-error_on_gnu.patch
Patch9: libprelude-5.2.0-disable_test-poll_on_kfreebsd.patch
Patch10: libprelude-5.2.0-fix-test_rwlock1.patch
# https://github.com/swig/swig/issues/1689
# https://github.com/swig/swig/pull/1692
# For now, add a minimum patch to support ruby2.7
Patch11: libprelude-5.2.0-ruby27.patch
# Remove unneded libraries from libprelude-config --libs (bz#1830473)
Patch12: libprelude-5.2.0-clean_libprelude-config.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: bison
@ -229,7 +231,10 @@ find %{buildroot} -name '.packlist' -delete
%doc AUTHORS ChangeLog README NEWS
%changelog
* Thu Sep 18 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-1
* Fri Sep 18 2020 Orion Poplawski <orion@nwra.com> - 5.2.0-2
- Add patch to remove unneeded libraries from libprelude-config --libs (bz#1830473)
* Thu Sep 17 2020 Thomas Andrejak <thomas.andrejak@gmail.com> - 5.2.0-1
- Bump version 5.2.0
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-7