Download raw body.
update: umurmur
Update umurmur 0.2.20 -> v0.3.1
Tested running a server and connected to it with mumble client.
OK?
Andrew
diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index d8b1e5759..e2e9a94bb 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -2,8 +2,7 @@ COMMENT = minimalistic Mumble server
GH_ACCOUNT = umurmur
GH_PROJECT = umurmur
-GH_TAGNAME = 0.2.20
-REVISION = 1
+GH_TAGNAME = v0.3.1
CATEGORIES = audio
@@ -19,7 +18,6 @@ MODULES = devel/cmake
LIB_DEPENDS = devel/libconfig \
devel/protobuf-c>=1.0.1
-CONFIGURE_ARGS = -DSSL=openssl
MODCMAKE_POLICY_VERSION_OVERRIDE = Yes
NO_TEST = Yes
diff --git a/audio/umurmur/distinfo b/audio/umurmur/distinfo
index e47fe344f..ead2483e3 100644
--- a/audio/umurmur/distinfo
+++ b/audio/umurmur/distinfo
@@ -1,2 +1,2 @@
-SHA256 (umurmur-0.2.20.tar.gz) = t7KXjDGXrvCmUx8c8O4a67MqVa2L2kMGTOOpRO28rIM=
-SIZE (umurmur-0.2.20.tar.gz) = 93152
+SHA256 (umurmur-0.3.1.tar.gz) = gyfdCyxb0YejjQmCleiWprhdaYySaCBbyyf2JE92CnM=
+SIZE (umurmur-0.3.1.tar.gz) = 94742
diff --git a/audio/umurmur/patches/patch-CMakeLists_txt b/audio/umurmur/patches/patch-CMakeLists_txt
index 280e1f0b9..df1a0b7b6 100644
--- a/audio/umurmur/patches/patch-CMakeLists_txt
+++ b/audio/umurmur/patches/patch-CMakeLists_txt
@@ -10,11 +10,11 @@ Index: CMakeLists.txt
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${UMURMUR_BINARY_DIR}")
if(NOT CMAKE_BUILD_TYPE)
-@@ -27,7 +27,7 @@ add_subdirectory(src)
+@@ -31,7 +31,7 @@ add_subdirectory(src)
install(
FILES "umurmur.conf.example"
-- DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/"
+- DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/umurmur"
+ DESTINATION "share/examples/umurmur"
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
RENAME "umurmur.conf"
diff --git a/audio/umurmur/patches/patch-cmake_Modules_FindLibconfig_cmake b/audio/umurmur/patches/patch-cmake_Modules_FindLibconfig_cmake
deleted file mode 100644
index a251ad7c6..000000000
--- a/audio/umurmur/patches/patch-cmake_Modules_FindLibconfig_cmake
+++ /dev/null
@@ -1,16 +0,0 @@
---- cmake/Modules/FindLibconfig.cmake.orig Fri Aug 8 08:37:03 2014
-+++ cmake/Modules/FindLibconfig.cmake Thu Sep 4 13:27:02 2014
-@@ -1,10 +1,6 @@
- include(FindPackageHandleStandardArgs)
-
--find_path(LIBCONFIG_INCLUDE_DIR NAMES "libconfig.h" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "include")
--find_path(LIBCONFIG_LIB_DIR NAMES "libconfig.so" "libconfig.dylib" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib" "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-+find_path(LIBCONFIG_INCLUDE_DIR NAMES "libconfig.h")
-+find_library(LIBCONFIG_LIBRARIES NAMES "config")
-
--if(LIBCONFIG_INCLUDE_DIR AND LIBCONFIG_LIB_DIR)
-- set(LIBCONFIG_LIBRARIES config)
--endif(LIBCONFIG_INCLUDE_DIR AND LIBCONFIG_LIB_DIR)
--
--find_package_handle_standard_args(Libconfig DEFAULT LIBCONFIG_INCLUDE_DIR LIBCONFIG_LIBRARIES LIBCONFIG_LIB_DIR)
-+find_package_handle_standard_args(Libconfig REQUIRED_VARS LIBCONFIG_INCLUDE_DIR LIBCONFIG_LIBRARIES)
diff --git a/audio/umurmur/patches/patch-cmake_Modules_FindProtobufC_cmake b/audio/umurmur/patches/patch-cmake_Modules_FindProtobufC_cmake
deleted file mode 100644
index af7ffb138..000000000
--- a/audio/umurmur/patches/patch-cmake_Modules_FindProtobufC_cmake
+++ /dev/null
@@ -1,16 +0,0 @@
---- cmake/Modules/FindProtobufC.cmake.orig Fri Aug 8 08:37:03 2014
-+++ cmake/Modules/FindProtobufC.cmake Thu Sep 4 13:27:27 2014
-@@ -1,10 +1,6 @@
- include(FindPackageHandleStandardArgs)
-
--find_path(PROTOBUFC_INCLUDE_DIR NAMES "protobuf-c.h" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "include/google/protobuf-c")
--find_path(PROTOBUFC_LIB_DIR NAMES "libprotobuf-c.so" "libprotobuf-c.dylib" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib" "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
-+find_path(PROTOBUFC_INCLUDE_DIR NAMES "protobuf-c.h" PATH_SUFFIXES "protobuf-c")
-+find_library(PROTOBUFC_LIBRARIES NAMES "protobuf-c")
-
--if(PROTOBUFC_INCLUDE_DIR AND PROTOBUFC_LIB_DIR)
-- set(PROTOBUFC_LIBRARIES protobuf-c)
--endif(PROTOBUFC_INCLUDE_DIR AND PROTOBUFC_LIB_DIR)
--
--find_package_handle_standard_args(ProtobufC REQUIRED_VARS PROTOBUFC_INCLUDE_DIR PROTOBUFC_LIBRARIES PROTOBUFC_LIB_DIR)
-+find_package_handle_standard_args(ProtobufC REQUIRED_VARS PROTOBUFC_INCLUDE_DIR PROTOBUFC_LIBRARIES)
diff --git a/audio/umurmur/patches/patch-src_CMakeLists_txt b/audio/umurmur/patches/patch-src_CMakeLists_txt
deleted file mode 100644
index 90c7f4391..000000000
--- a/audio/umurmur/patches/patch-src_CMakeLists_txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: src/CMakeLists.txt
---- src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
-@@ -48,4 +48,4 @@ target_link_libraries(${PROJECT_NAME}
- ${LIBRT}
- ${CRYPTO_LIBRARIES})
-
--install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "bin")
-+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "sbin")
diff --git a/audio/umurmur/patches/patch-src_config_h_in b/audio/umurmur/patches/patch-src_config_h_in
index ed5ecaea2..ee8a9acd8 100644
--- a/audio/umurmur/patches/patch-src_config_h_in
+++ b/audio/umurmur/patches/patch-src_config_h_in
@@ -5,7 +5,7 @@ Index: src/config.h.in
#cmakedefine USE_SHAREDMEMORY_API
--#define DEFAULT_CONFIG "${CMAKE_INSTALL_FULL_SYSCONFDIR}/umurmur.conf"
+-#define DEFAULT_CONFIG "${CMAKE_INSTALL_FULL_SYSCONFDIR}/umurmur/umurmur.conf"
+#define DEFAULT_CONFIG "${SYSCONFDIR}/umurmur/umurmur.conf"
#endif // CONFIG_H
diff --git a/audio/umurmur/patches/patch-src_main_c b/audio/umurmur/patches/patch-src_main_c
deleted file mode 100644
index c39bc3261..000000000
--- a/audio/umurmur/patches/patch-src_main_c
+++ /dev/null
@@ -1,28 +0,0 @@
-initgroups(3) invalidates the data returned by getgrnam(3) producing
-bogus logs.
-
-Backport of <https://github.com/umurmur/umurmur/pull/183>
-
-Index: src/main.c
---- src/main.c.orig
-+++ src/main.c
-@@ -149,6 +149,9 @@ static void switch_user(void)
- Log_fatal("Unknown group '%s'", groupname);
-
- gid = grp->gr_gid;
-+
-+ /* initgroups() will invalidate this data */
-+ grp = NULL;
- }
-
- if (initgroups(pwd->pw_name, gid))
-@@ -160,8 +163,7 @@ static void switch_user(void)
- if (setuid(pwd->pw_uid))
- Log_fatal("setuid() failed: %s", strerror(errno));
-
-- if (!grp)
-- grp = getgrgid(gid);
-+ grp = getgrgid(gid);
- if (!grp)
- Log_fatal("getgrgid() failed: %s", strerror(errno));
-
diff --git a/audio/umurmur/patches/patch-umurmur_conf_example b/audio/umurmur/patches/patch-umurmur_conf_example
index 7fcbcd0c4..e54b959e6 100644
--- a/audio/umurmur/patches/patch-umurmur_conf_example
+++ b/audio/umurmur/patches/patch-umurmur_conf_example
@@ -14,7 +14,7 @@ Index: umurmur.conf.example
@@ -18,9 +18,9 @@ max_users = 10;
# username and groupname for privilege dropping.
- # Will attempt to switch user if set.
+ # Will attempt to switch user if set.
-# username = "";
+username = "_umurmur";
# If groupname not set the user's default login group will be used
update: umurmur