Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #788 from guijan/pcapsipdump-libobsd

Browse source 
pcapsipdump: fix linking against libobsd
This commit is contained in:
micmac1 2024-01-31 18:35:06 +01:00 committed by GitHub
commit 352384f37d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
net/pcapsipdump/patches/01-use-libc-strlcpy-if-available-v2.patch
View file

@ -1,49 +1,51 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -2,8 +2,12 @@ LIBS ?= -lpcap -lstdc++ @@ -2,11 +2,14 @@ LIBS ?= -lpcap -lstdc++
RELEASEFLAGS ?= -O3 -Wall RELEASEFLAGS ?= -O3 -Wall
#CXXFLAGS ?= --std=c++0x #CXXFLAGS ?= --std=c++0x
-# auto-detect if bsd/strings.h is available
-ifeq ($(shell $(CXX) $(CXXFLAGS) $(LDFLAGS) $(DEFS) -E -o /dev/null \
- make-checks/libbsd.cpp 2>/dev/null; echo $$?),0)
- BSDSTR_DEFS := -DUSE_BSD_STRING_H
- BSDSTR_LIBS := -lbsd
+# check if libc provides BSD's strlcpy +# check if libc provides BSD's strlcpy
+ifeq ($(shell $(CXX) $(CXXFLAGS) -D_BSD_SOURCE $(LDFLAGS) $(DEFS) -o /dev/null \ +ifeq ($(shell $(CXX) $(CXXFLAGS) -D_BSD_SOURCE $(LDFLAGS) $(DEFS) -o /dev/null \
+ make-checks/strlcpy.cpp 2>/dev/null; echo $$?),0) + make-checks/strlcpy.cpp 2>/dev/null; echo $$?),0)
+ BSDSTR_DEFS := -D_BSD_SOURCE -DUSE_LIBC_STRLCPY + BSDSTR_DEFS := -D_BSD_SOURCE
# auto-detect if bsd/strings.h is available +# use libbsd's strlcpy
-ifeq ($(shell $(CXX) $(CXXFLAGS) $(LDFLAGS) $(DEFS) -E -o /dev/null \ +else
+else ifeq ($(shell $(CXX) $(CXXFLAGS) $(LDFLAGS) $(DEFS) -E -o /dev/null \ + BSDSTR_DEFS != pkg-config --cflags libbsd-overlay
make-checks/libbsd.cpp 2>/dev/null; echo $$?),0) + BSDSTR_LIBS != pkg-config --libs libbsd-overlay
BSDSTR_DEFS := -DUSE_BSD_STRING_H endif
BSDSTR_LIBS := -lbsd
# auto-detect rhel/fedora and debian/ubuntu
--- a/pcapsipdump_lib.h --- a/pcapsipdump_lib.h
+++ b/pcapsipdump_lib.h +++ b/pcapsipdump_lib.h
@@ -3,7 +3,7 @@ @@ -1,13 +1,5 @@
#ifndef BSD #include <sys/stat.h>
#ifdef USE_BSD_STRING_H
#include <bsd/string.h> -#ifndef BSD
- #ifdef USE_BSD_STRING_H
- #include <bsd/string.h>
- #else - #else
+ #elif !defined(USE_LIBC_STRLCPY) - #define strlcpy strncpy
#define strlcpy strncpy - #endif
#endif -#endif
#endif -
// equivalent of "mkdir -p"
int mkdir_p(const char *path, mode_t mode);
--- a/make-checks/all.mk --- a/make-checks/all.mk
+++ b/make-checks/all.mk +++ b/make-checks/all.mk
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
-make-checks/all: make-checks/cxx make-checks/libpcap make-checks/libbsd -make-checks/all: make-checks/cxx make-checks/libpcap make-checks/libbsd
+make-checks/all: make-checks/cxx make-checks/libpcap make-checks/strlcpy make-checks/libbsd +make-checks/all: make-checks/cxx make-checks/libpcap make-checks/strlcpy
@touch make-checks/all @touch make-checks/all
make-checks/clean: make-checks/clean:
- rm -f make-checks/all make-checks/cxx make-checks/libpcap make-checks/libbsd - rm -f make-checks/all make-checks/cxx make-checks/libpcap make-checks/libbsd
+ rm -f make-checks/all make-checks/cxx make-checks/libpcap make-checks/strlcpy make-checks/libbsd + rm -f make-checks/all make-checks/cxx make-checks/libpcap make-checks/strlcpy
--- a/make-checks/libbsd.mk
+++ b/make-checks/libbsd.mk
@@ -2,5 +2,5 @@ CHECK_LIBBSD = $(CXX) $(CXXFLAGS) $(LDFL
make-checks/libbsd:
@$(CHECK_LIBBSD) || (\
- echo "*** notice: recommended library not found: libbsd"; \
+ echo "*** notice: library not found: libbsd"; \
true)
--- /dev/null --- /dev/null
+++ b/make-checks/strlcpy.cpp +++ b/make-checks/strlcpy.cpp
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@