diff --git a/libs/re/Makefile b/libs/re/Makefile index ff5c7c1..b64d5eb 100644 --- a/libs/re/Makefile +++ b/libs/re/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=re -PKG_VERSION:=0.6.1 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.creytiv.com/pub -PKG_HASH:=cd5bfc79640411803b200c7531e4ba8a230da3806746d3bd2de970da2060fe43 +PKG_SOURCE_URL:=https://codeload.github.com/baresip/re/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=bf0abfc511b7278462e7d54aaae39e7231b9f35423d5026c8210a322c7c8ef2f PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=docs/COPYING @@ -31,7 +31,7 @@ define Package/libre CATEGORY:=Libraries DEPENDS:=+libopenssl +zlib TITLE:=Generic library for real-time communications with async IO support - URL:=http://www.creytiv.com + URL:=https://github.com/baresip/re endef # re.mk is used for this and all related packages (rem, restund and baresip). diff --git a/libs/re/patches/005-fix-builds-for-mipsel-targets.patch b/libs/re/patches/005-fix-builds-for-mipsel-targets.patch index 29a03ee..d59f85e 100644 --- a/libs/re/patches/005-fix-builds-for-mipsel-targets.patch +++ b/libs/re/patches/005-fix-builds-for-mipsel-targets.patch @@ -1,6 +1,6 @@ --- a/mk/re.mk +++ b/mk/re.mk -@@ -438,11 +438,6 @@ endif +@@ -439,11 +439,6 @@ endif CFLAGS += -DARCH=\"$(ARCH)\" diff --git a/libs/re/patches/010-openssl-deprecated.patch b/libs/re/patches/010-openssl-deprecated.patch deleted file mode 100644 index bff18b9..0000000 --- a/libs/re/patches/010-openssl-deprecated.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/src/main/openssl.c -+++ b/src/main/openssl.c -@@ -103,6 +103,7 @@ static void dynlock_destroy_handler(struct CRYPTO_dynlock_value *l, - #endif - - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - #ifdef SIGPIPE - static void sigpipe_handler(int x) - { -@@ -110,10 +111,11 @@ static void sigpipe_handler(int x) - (void)signal(SIGPIPE, sigpipe_handler); - } - #endif -- -+#endif - - int openssl_init(void) - { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - #if defined (HAVE_PTHREAD) && (OPENSSL_VERSION_NUMBER < 0x10100000L) - int err, i; - -@@ -151,6 +153,7 @@ int openssl_init(void) - - SSL_library_init(); - SSL_load_error_strings(); -+#endif - - return 0; - } -@@ -158,7 +161,9 @@ int openssl_init(void) - - void openssl_close(void) - { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - ERR_free_strings(); -+#endif - #if defined (HAVE_PTHREAD) && (OPENSSL_VERSION_NUMBER < 0x10100000L) - lockv = mem_deref(lockv); - #endif ---- a/src/tls/openssl/tls.c -+++ b/src/tls/openssl/tls.c -@@ -291,8 +291,8 @@ int tls_set_selfsigned(struct tls *tls, const char *cn) - !X509_set_subject_name(cert, subj)) - goto out; - -- if (!X509_gmtime_adj(X509_get_notBefore(cert), -3600*24*365) || -- !X509_gmtime_adj(X509_get_notAfter(cert), 3600*24*365*10)) -+ if (!X509_gmtime_adj(X509_getm_notBefore(cert), -3600*24*365) || -+ !X509_gmtime_adj(X509_getm_notAfter(cert), 3600*24*365*10)) - goto out; - - if (!X509_set_pubkey(cert, key))