cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

telephony/baresip/re: update to 2.4.0.

Browse Source 
see https://github.com/baresip/re/blob/main/CHANGELOG.md#v240---2022-06-01
This commit is contained in:
landry 2022-06-28 14:07:49 +00:00
parent 7cf5a50a41
commit 5d9727cf65
6 changed files with 26 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/baresip/re/Makefile
View File

@ -2,15 +2,14 @@ COMMENT = portable library for real-time communications
GH_ACCOUNT = baresip
GH_PROJECT = re
GH_TAGNAME = v2.0.1
REVISION = 0
GH_TAGNAME = v2.4.0
SHARED_LIBS = re 6.0
SHARED_LIBS = re 7.0
CATEGORIES += devel
WANTLIB = crypto pthread ssl z
MAKE_ENV += LIB_SUFFIX=.so.${LIBre_VERSION}
MAKE_ENV += LIB_SUFFIX=.so.${LIBre_VERSION} V=1
MAKE_ENV += LIBS="-lssl -lcrypto -lz -lpthread"
ALL_TARGET = libre.a libre.so.${LIBre_VERSION}

4
telephony/baresip/re/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (re-2.0.1.tar.gz) = Q6pDm5av91/ldoufnUneqXBC5C52R99Hs0VGV2Pi9+0=
SIZE (re-2.0.1.tar.gz) = 342897
SHA256 (re-2.4.0.tar.gz) = 8rgH9tTND/c+gjPUT4FyfAExYMCzm1KLBWwtL5Oo+ic=
SIZE (re-2.4.0.tar.gz) = 376983

56
telephony/baresip/re/patches/patch-Makefile
View File

@ -1,9 +1,9 @@
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -20,10 +20,6 @@ ABI_MAJOR := $(shell expr $(ABI_CUR) - $(ABI_AGE))
PROJECT := re
VERSION := $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
@@ -30,10 +30,6 @@ else
VERSION := $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-$(VER_PRE)
endif
-MK := mk/re.mk
-
@ -12,7 +12,7 @@ Index: Makefile
# List of modules
MODULES += sip sipevent sipreg sipsess
MODULES += uri http httpauth msg websock
@@ -54,6 +50,10 @@ endif
@@ -69,6 +65,10 @@ endif
INCDIR := $(PREFIX)/include/re
MKDIR := $(PREFIX)/share/re
CFLAGS += -Iinclude
@ -23,60 +23,26 @@ Index: Makefile
MODMKS := $(patsubst %,src/%/mod.mk,$(MODULES))
SHARED := libre$(LIB_SUFFIX)
@@ -78,13 +78,11 @@ all: $(SHARED) $(STATIC)
$(SHARED): $(OBJS)
- @echo " LD $@"
- @$(LD) $(LFLAGS) $(SH_LFLAGS) $^ $(LIBS) -o $@
+ $(LD) $(LFLAGS) $(SH_LFLAGS) $^ $(LIBS) -o $@
$(STATIC): $(OBJS)
- @echo " AR $@"
- @$(AR) $(AFLAGS) $@ $^
+ $(AR) $(AFLAGS) $@ $^
ifneq ($(RANLIB),)
@$(RANLIB) $@
endif
@@ -103,12 +101,11 @@ libre.pc:
@@ -119,12 +119,12 @@ libre.pc: Makefile
@echo 'Libs.private: -L$${libdir} -lre ${LIBS}' >> libre.pc
@echo 'Cflags: -I$${includedir}' >> libre.pc
-$(BUILD)/%.o: src/%.c $(BUILD) Makefile $(MK) $(MODMKS)
- @echo " CC $@"
- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
+$(BUILD)/%.o: src/%.c $(BUILD) Makefile $(MODMKS)
+ $(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
@echo " CC $@"
$(HIDE)$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
-$(BUILD): Makefile $(MK) $(MODMKS)
+$(BUILD): Makefile $(MODMKS)
@mkdir -p $(patsubst %,$(BUILD)/%,$(sort $(dir $(SRCS))))
@touch $@
$(HIDE)mkdir -p $(patsubst %,$(BUILD)/%,$(sort $(dir $(SRCS))))
$(HIDE)touch $@
@@ -132,7 +129,6 @@ else
@@ -150,7 +150,6 @@ else
endif
$(INSTALL) -m 0755 $(STATIC) $(DESTDIR)$(LIBDIR)
$(INSTALL) -m 0644 libre.pc $(DESTDIR)$(LIBDIR)/pkgconfig
- $(INSTALL) -m 0644 $(MK) $(DESTDIR)$(MKDIR)
uninstall:
@rm -rf $(DESTDIR)$(INCDIR)
@@ -144,13 +140,11 @@ uninstall:
-include test.d
-test.o: test.c Makefile $(MK)
- @echo " CC $@"
- @$(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
+test.o: test.c Makefile
+ $(CC) $(CFLAGS) -c $< -o $@ $(DFLAGS)
test$(BIN_SUFFIX): test.o $(SHARED) $(STATIC)
- @echo " LD $@"
- @$(LD) $(LFLAGS) $< -L. -lre $(LIBS) -o $@
+ $(LD) $(LFLAGS) $< -L. -lre $(LIBS) -o $@
sym: $(SHARED)
@nm $(SHARED) | grep " U " | perl -pe 's/\s*U\s+(.*)/$${1}/' \
$(HIDE)rm -rf $(DESTDIR)$(INCDIR)

25
telephony/baresip/re/patches/patch-src_hmac_openssl_hmac_c
View File

@ -1,25 +0,0 @@
Fix build with opaque HMAC_CTX in LibreSSL 3.5.
Index: src/hmac/openssl/hmac.c
--- src/hmac/openssl/hmac.c.orig
+++ src/hmac/openssl/hmac.c
@@ -20,8 +20,7 @@ static void destructor(void *arg)
{
struct hmac *hmac = arg;
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
- !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
if (hmac->ctx)
HMAC_CTX_free(hmac->ctx);
@@ -61,8 +60,7 @@ int hmac_create(struct hmac **hmacp, enum hmac_hash ha
if (!hmac)
return ENOMEM;
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
- !defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
hmac->ctx = HMAC_CTX_new();
if (!hmac->ctx) {

16
telephony/baresip/re/patches/patch-src_tls_openssl_tls_h
View File

@ -1,16 +0,0 @@
Fix build with opaque BIO_METHOD in LibreSSL 3.5.
Index: src/tls/openssl/tls.h
--- src/tls/openssl/tls.h.orig
+++ src/tls/openssl/tls.h
@@ -17,10 +17,6 @@
#define TLS_BIO_OPAQUE 1
#endif
-#if defined (LIBRESSL_VERSION_NUMBER)
-#undef TLS_BIO_OPAQUE
-#endif
-
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
!defined(LIBRESSL_VERSION_NUMBER)

11
telephony/baresip/re/pkg/PLIST
View File

@ -1,14 +1,20 @@
include/re/
include/re/re.h
include/re/re_aes.h
include/re/re_atomic.h
include/re/re_av1.h
include/re/re_base64.h
include/re/re_bfcp.h
include/re/re_bitv.h
include/re/re_btrace.h
include/re/re_conf.h
include/re/re_convert.h
include/re/re_crc32.h
include/re/re_dbg.h
include/re/re_dns.h
include/re/re_fmt.h
include/re/re_h264.h
include/re/re_h265.h
include/re/re_hash.h
include/re/re_hmac.h
include/re/re_http.h
@ -25,14 +31,15 @@ include/re/re_mem.h
include/re/re_mod.h
include/re/re_mqueue.h
include/re/re_msg.h
include/re/re_natbd.h
include/re/re_net.h
include/re/re_odict.h
include/re/re_pcp.h
include/re/re_rtmp.h
include/re/re_rtp.h
include/re/re_sa.h
include/re/re_sdp.h
include/re/re_sha.h
include/re/re_shim.h
include/re/re_sip.h
include/re/re_sipevent.h
include/re/re_sipreg.h
@ -42,9 +49,11 @@ include/re/re_stun.h
include/re/re_sys.h
include/re/re_tcp.h
include/re/re_telev.h
include/re/re_thread.h
include/re/re_tls.h
include/re/re_tmr.h
include/re/re_trace.h
include/re/re_trice.h
include/re/re_turn.h
include/re/re_types.h
include/re/re_udp.h