Hi ports@ Attached is an update of umurmur 0.3.1 -> 0.5.0 It contains a fix for a remote use-after-free crash. In my opinion, this should be backported to -stable. Many patches are removed, having been upstreamed. Changelog: https://github.com/umurmur/umurmur/releases/tag/v0.4.0 https://github.com/umurmur/umurmur/releases/tag/v0.4.1 https://github.com/umurmur/umurmur/releases/tag/v0.5.0 OK? Andrew diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile index b6cb72999..6339b0fe4 100644 --- a/audio/umurmur/Makefile +++ b/audio/umurmur/Makefile @@ -2,15 +2,18 @@ COMMENT = minimalistic Mumble server GH_ACCOUNT = umurmur GH_PROJECT = umurmur -GH_TAGNAME = v0.3.1 +GH_TAGNAME = v0.5.0 CATEGORIES = audio HOMEPAGE = https://umurmur.net/ +MAINTAINER = Andrew Kloet <andrew@kloet.net> + # BSD PERMIT_PACKAGE = Yes +# uses pledge() and unveil() WANTLIB = c config crypto protobuf-c>=1.0 ssl MODULES = devel/cmake @@ -18,6 +21,8 @@ MODULES = devel/cmake LIB_DEPENDS = devel/libconfig \ devel/protobuf-c>=1.0.1 +SEPARATE_BUILD = Yes + pre-configure: ${SUBST_CMD} ${WRKSRC}/src/conf.c ${WRKSRC}/src/config.h.in \ ${WRKSRC}/umurmur.conf.example diff --git a/audio/umurmur/distinfo b/audio/umurmur/distinfo index ead2483e3..1908ed366 100644 --- a/audio/umurmur/distinfo +++ b/audio/umurmur/distinfo @@ -1,2 +1,2 @@ -SHA256 (umurmur-0.3.1.tar.gz) = gyfdCyxb0YejjQmCleiWprhdaYySaCBbyyf2JE92CnM= -SIZE (umurmur-0.3.1.tar.gz) = 94742 +SHA256 (umurmur-0.5.0.tar.gz) = Ao5szJLgRyLrDwLUGPQYRdOweEmYQFuPpI804zsFwL4= +SIZE (umurmur-0.5.0.tar.gz) = 87698 diff --git a/audio/umurmur/patches/patch-CMakeLists_txt b/audio/umurmur/patches/patch-CMakeLists_txt index df1a0b7b6..fe7f18291 100644 --- a/audio/umurmur/patches/patch-CMakeLists_txt +++ b/audio/umurmur/patches/patch-CMakeLists_txt @@ -1,16 +1,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -3,7 +3,7 @@ project(umurmurd C) - - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) --set(UMURMUR_BINARY_DIR "${CMAKE_BINARY_DIR}/bin") -+set(UMURMUR_BINARY_DIR "${CMAKE_BINARY_DIR}/sbin") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${UMURMUR_BINARY_DIR}") - - if(NOT CMAKE_BUILD_TYPE) -@@ -31,7 +31,7 @@ add_subdirectory(src) +@@ -44,7 +44,7 @@ add_subdirectory(src) install( FILES "umurmur.conf.example" diff --git a/audio/umurmur/patches/patch-src_byteorder_h b/audio/umurmur/patches/patch-src_byteorder_h deleted file mode 100644 index 60a122a4d..000000000 --- a/audio/umurmur/patches/patch-src_byteorder_h +++ /dev/null @@ -1,28 +0,0 @@ -Include correct userspace header for endian information -Skip linuxism to fix build on LP64 archs that aren't amd64 - -Index: src/byteorder.h ---- src/byteorder.h.orig -+++ src/byteorder.h -@@ -36,7 +36,7 @@ - #include <stdint.h> - - #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) --#include <machine/endian.h> -+#include <endian.h> - #if BYTE_ORDER == BIG_ENDIAN - #define BYTE_ORDER_BIG_ENDIAN -
No comments:
Post a Comment