Attachment #145804 for bug #192177

Lines 2-19 Link Here

(-)Makefile (-5 / +16 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= umurmur	4	PORTNAME= umurmur
5	PORTVERSION= 0.2.13	5	PORTVERSION= 0.2.15
6	PORTREVISION= 1
7	CATEGORIES= audio net	6	CATEGORIES= audio net
8	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	7	MASTER_SITES= https://github.com/${GITHUB_USER}/${GITHUB_REPO}/archive/ \
		8	http://github.com/${GITHUB_USER}/${GITHUB_REPO}/archive/
		9	DISTNAME= ${PORTVERSION}
9		10
10	MAINTAINER= ayu@commun.jp	11	MAINTAINER= ayu@commun.jp
11	COMMENT= Minimalistic Murmur (Mumble server)	12	COMMENT= Minimalistic Murmur (Mumble server)
12		13
		14	LICENSE= BSD2CLAUSE
		15
13	LIB_DEPENDS= libconfig.so:${PORTSDIR}/devel/libconfig \	16	LIB_DEPENDS= libconfig.so:${PORTSDIR}/devel/libconfig \
14	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c	17	libprotobuf-c.so:${PORTSDIR}/devel/protobuf-c
15		18
16	USES= gmake	19	GITHUB_USER= fatbob313
		20	GITHUB_REPO= umurmur
		21	DIST_SUBDIR= ${PORTNAME}
		22	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
		23
		24	USES= gmake libtool
		25	USE_AUTOTOOLS= aclocal autoconf autoheader automake
		26	AUTOMAKE_ARGS= --add-missing
17	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
18	USE_OPENSSL= yes	28	USE_OPENSSL= yes
19	CONFIGURE_ARGS= --with-ssl=openssl	29	CONFIGURE_ARGS= --with-ssl=openssl
Lines 24-30 Link Here
24	LDFLAGS+= -L${LOCALBASE}/lib	34	LDFLAGS+= -L${LOCALBASE}/lib
25		35
26	post-patch:	36	post-patch:
27	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/src/conf.h	37	# @${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/src/conf.h
		38	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/configure.ac
28	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/src/conf.c	39	@${REINPLACE_CMD} -e 's\|%%PREFIX%%\|${PREFIX}\|g' ${WRKSRC}/src/conf.c
29	@${REINPLACE_CMD} \	40	@${REINPLACE_CMD} \
30	-e 's\|/etc/\|${PREFIX}/etc/\|g' ${WRKSRC}/umurmur.conf.example	41	-e 's\|/etc/\|${PREFIX}/etc/\|g' ${WRKSRC}/umurmur.conf.example

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (umurmur-0.2.13.tar.gz) = ac1595fa47ce6bd1e0706dd609293f745d73a59af00a7a04ddc0f9ae243997be	1	SHA256 (umurmur/0.2.15.tar.gz) = edadbda3ee17033d0ed9da1b6550634b6d3fca4226d0113a453b359ad9a88767
2	SIZE (umurmur-0.2.13.tar.gz) = 167500	2	SIZE (umurmur/0.2.15.tar.gz) = 86187

Line 0 Link Here

(-)files/patch-configure.ac (+11 lines)
	1	--- configure.ac.orig 2014-08-07 23:37:03.000000000 -0700
	2	+++ configure.ac 2014-08-15 00:54:12.000000000 -0700
	3	@@ -89,7 +89,7 @@
	4	AM_CONDITIONAL(USE_OPENSSL, test x$with_ssl = xopenssl)
	5	AM_CONDITIONAL(USE_GNUTLS, test x$with_ssl = xgnutls)
	6
	7	-AC_DEFINE([DEFAULT_CONFIG], ["/etc/umurmur.conf"], [Default config])
	8	+AC_DEFINE([DEFAULT_CONFIG], ["%%PREFIX%%/etc/umurmur.conf"], [Default config])
	9
	10	# Checks for header files.
	11	AC_FUNC_ALLOCA




--- src/conf.c.orig	2014-08-07 23:37:03.000000000 -0700
+++ src/conf.c	2014-08-14 11:47:27.000000000 -0700
@@ -89,23 +89,23 @@
 		case CERTIFICATE:
 			setting = config_lookup(&configuration, "certificate");
 			if (!setting)
-			return "/etc/umurmur/certificate.crt";
+			return "%%PREFIX%%/etc/umurmur/certificate.crt";
 		else {
 			if ((strsetting = config_setting_get_string(setting)) != NULL)
 				return strsetting;
 			else
-				return "/etc/umurmur/certificate.crt";
+				return "%%PREFIX%%/etc/umurmur/certificate.crt";
 			else {
 				if ((strsetting = config_setting_get_string(setting)) != NULL)
 					return strsetting;
 				else
-					return "/etc/umurmur/certificate.crt";
+					return "%%PREFIX%%/etc/umurmur/certificate.crt";
 			}
 			break;
 		case KEY:
 			setting = config_lookup(&configuration, "private_key");
 			if (!setting)
-				return "/etc/umurmur/private_key.key";
+				return "%%PREFIX%%/etc/umurmur/private_key.key";
 			else {
 				if ((strsetting = config_setting_get_string(setting)) != NULL)
 					return strsetting;
 				else
-					return "/etc/umurmur/private_key.key";
+					return "%%PREFIX%%/etc/umurmur/private_key.key";
 			}
 			break;
 		case CAPATH:

Lines 1-11 Link Here

(-)files/patch-src-conf.h (-11 lines)
1	--- src/conf.h.old 2011-12-04 19:11:49.751119971 +0200
2	+++ src/conf.h 2011-12-04 19:13:32.677786798 +0200
3	@@ -33,7 +33,7 @@
4
5	#include "messages.h"
6
7	-#define DEFAULT_CONFIG "/etc/umurmur.conf"
8	+#define DEFAULT_CONFIG "%%PREFIX%%/etc/umurmur/umurmur.conf"
9
10	typedef enum param {
11	CERTIFICATE,

Lines 2-5 Link Here

(-)pkg-descr (-1 / +1 lines)
2	routers with an open OS like OpenWRT.	2	routers with an open OS like OpenWRT.
3	The server part of Mumble is called Murmur, hence the name uMurmur.	3	The server part of Mumble is called Murmur, hence the name uMurmur.
4		4
5	WWW: http://code.google.com/p/umurmur/	5	WWW: http://code.google.com/p/umurmur/

Return to bug 192177

Lines 1-30 Link Here

(-)files/patch-src-conf.c (-26 / +26 lines)
1	--- src/conf.c.old 2011-12-04 19:11:54.718388035 +0200	1	--- src/conf.c.orig 2014-08-07 23:37:03.000000000 -0700
2	+++ src/conf.c 2011-12-04 19:13:08.845299535 +0200	2	+++ src/conf.c 2014-08-14 11:47:27.000000000 -0700
3	@@ -87,23 +87,23 @@	3	@@ -89,23 +89,23 @@
4	case CERTIFICATE:	4	case CERTIFICATE:
5	setting = config_lookup(&configuration, "certificate");	5	setting = config_lookup(&configuration, "certificate");
6	if (!setting)	6	if (!setting)
7	- return "/etc/umurmur/certificate.crt";
8	+ return "%%PREFIX%%/etc/umurmur/certificate.crt";
9	else {
10	if ((strsetting = config_setting_get_string(setting)) != NULL)
11	return strsetting;
12	else
13	- return "/etc/umurmur/certificate.crt";	7	- return "/etc/umurmur/certificate.crt";
14	+ return "%%PREFIX%%/etc/umurmur/certificate.crt";	8	+ return "%%PREFIX%%/etc/umurmur/certificate.crt";
15	}	9	else {
16	break;	10	if ((strsetting = config_setting_get_string(setting)) != NULL)
17	case KEY:	11	return strsetting;
18	setting = config_lookup(&configuration, "private_key");	12	else
19	if (!setting)	13	- return "/etc/umurmur/certificate.crt";
20	- return "/etc/umurmur/private_key.key";	14	+ return "%%PREFIX%%/etc/umurmur/certificate.crt";
21	+ return "%%PREFIX%%/etc/umurmur/private_key.key";	15	}
22	else {	16	break;
23	if ((strsetting = config_setting_get_string(setting)) != NULL)	17	case KEY:
24	return strsetting;	18	setting = config_lookup(&configuration, "private_key");
25	else	19	if (!setting)
26	- return "/etc/umurmur/private_key.key";	20	- return "/etc/umurmur/private_key.key";
27	+ return "%%PREFIX%%/etc/umurmur/private_key.key";	21	+ return "%%PREFIX%%/etc/umurmur/private_key.key";
28	}	22	else {
29	break;	23	if ((strsetting = config_setting_get_string(setting)) != NULL)
30	case PASSPHRASE:	24	return strsetting;
		25	else
		26	- return "/etc/umurmur/private_key.key";
		27	+ return "%%PREFIX%%/etc/umurmur/private_key.key";
		28	}
		29	break;
		30	case CAPATH: