Date: Sun, 4 Dec 2011 18:56:00 GMT From: toddnni <toddnni@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/163067: [update] Update audio/umurmur 0.2.6 to 0.2.8 Message-ID: <201112041856.pB4Iu0MG009538@red.freebsd.org> Resent-Message-ID: <201112041900.pB4J0PGs049483@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163067
>Category: ports
>Synopsis: [update] Update audio/umurmur 0.2.6 to 0.2.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 04 19:00:24 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: toddnni
>Release: FreeBSD 8.2-RELEASE-p3
>Organization:
>Environment:
>Description:
Here is a patch to update umurmur to 0.2.8. Thanks.
Files changed
Makefile: new version, uses gnu configure, protobuf-c dependency
files/umurmur.in: added description for umurmur_user
pkg-plist: sbin/umurmurd -> bin/umurmurd
Files added or removed
-files/patch-Makefile
-files/patch-conf.c
+files/patch-src-conf.h
+files/patch-src-conf.c
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/audio/umurmur.orig/Makefile /usr/ports/audio/umurmur/Makefile
--- /usr/ports/audio/umurmur.orig/Makefile 2011-12-04 20:37:36.412719821 +0200
+++ /usr/ports/audio/umurmur/Makefile 2011-12-04 19:38:16.108009819 +0200
@@ -6,35 +6,38 @@
#
PORTNAME= umurmur
-PORTVERSION= 0.2.6
+PORTVERSION= 0.2.8
CATEGORIES= audio net
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
MAINTAINER= ayu@commun.jp
COMMENT= Minimalistic Murmur (Mumble server)
-LIB_DEPENDS= config.9:${PORTSDIR}/devel/libconfig
+LIB_DEPENDS= config.9:${PORTSDIR}/devel/libconfig\
+ protobuf-c.0:${PORTSDIR}/devel/protobuf-c
USE_GMAKE= yes
+GNU_CONFIGURE= yes
USE_OPENSSL= yes
+CONFIGURE_ARGS= --with-ssl=openssl
USE_RC_SUBR= umurmur
-MAKE_ENV+= TARGET_ARCH=
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
.include <bsd.port.pre.mk>
-do-build:
- @(cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
-
pre-su-install:
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-pre-install:
- @${SED} -i '' -e 's|"/etc/|"${PREFIX}/etc/|' ${WRKSRC}/umurmur.conf.example
+post-patch:
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/conf.h
+ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/conf.c
+ @${REINPLACE_CMD} \
+ -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/umurmur.conf.example
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/src/umurmurd ${PREFIX}/sbin
+post-install:
@${MKDIR} ${PREFIX}/etc/umurmur
@${INSTALL_DATA} ${WRKSRC}/umurmur.conf.example ${PREFIX}/etc/umurmur/umurmur.conf.sample
@if [ ! -f ${PREFIX}/etc/umurmur/umurmur.conf ]; then \
diff -ruN /usr/ports/audio/umurmur.orig/distinfo /usr/ports/audio/umurmur/distinfo
--- /usr/ports/audio/umurmur.orig/distinfo 2011-06-26 10:17:00.000000000 +0300
+++ /usr/ports/audio/umurmur/distinfo 2011-12-04 18:57:52.698582131 +0200
@@ -1,2 +1,2 @@
-SHA256 (umurmur-0.2.6.tar.gz) = b1f237191ea1db7890be86bc3ebe562570901d8bd58bc53d9ecee0a3f4be38cb
-SIZE (umurmur-0.2.6.tar.gz) = 86014
+SHA256 (umurmur-0.2.8.tar.gz) = 62c43da2f07125977cf8024a0775ed697101816c3fa8f36345780901aaf08736
+SIZE (umurmur-0.2.8.tar.gz) = 155357
diff -ruN /usr/ports/audio/umurmur.orig/files/patch-Makefile /usr/ports/audio/umurmur/files/patch-Makefile
--- /usr/ports/audio/umurmur.orig/files/patch-Makefile 2011-06-26 10:17:01.000000000 +0300
+++ /usr/ports/audio/umurmur/files/patch-Makefile 1970-01-01 02:00:00.000000000 +0200
@@ -1,15 +0,0 @@
---- src/Makefile.orig 2011-02-24 13:06:56.000000000 +0900
-+++ src/Makefile 2011-02-24 13:07:54.000000000 +0900
-@@ -25,9 +25,10 @@
- # OpenSSL - usually installed at a standard place
- # EXTRA_CFLAGS:=
- # EXTRA_LDFLAGS:=-lcrypto -lssl
-+EXTRA_LDFLAGS:=-lcrypto -lssl
-
--CFLAGS:=$(CFLAGS) -I. -Wall $(EXTRA_CFLAGS)
--LDFLAGS:=$(EXTRA_LDFLAGS) $(LDFLAGS) -lconfig
-+CFLAGS:=$(CFLAGS) -I. -I/usr/local/include -Wall $(EXTRA_CFLAGS)
-+LDFLAGS:=$(EXTRA_LDFLAGS) $(LDFLAGS) -L/usr/local/lib -lconfig
-
- umurmurd:google/protobuf-c/libprotobuf_c.a $(OBJS)
- $(CC) $(LDFLAGS) $(OBJS) $(SSL_LIB) google/protobuf-c/libprotobuf_c.a -o umurmurd
diff -ruN /usr/ports/audio/umurmur.orig/files/patch-conf.c /usr/ports/audio/umurmur/files/patch-conf.c
--- /usr/ports/audio/umurmur.orig/files/patch-conf.c 2011-06-26 10:17:01.000000000 +0300
+++ /usr/ports/audio/umurmur/files/patch-conf.c 1970-01-01 02:00:00.000000000 +0200
@@ -1,39 +0,0 @@
---- src/conf.c.orig 2011-02-24 13:16:42.000000000 +0900
-+++ src/conf.c 2011-02-24 13:17:50.000000000 +0900
-@@ -40,7 +40,7 @@
-
- static config_t configuration;
-
--#define DEFAULT_CONFIG "/etc/umurmur.conf"
-+#define DEFAULT_CONFIG "/usr/local/etc/umurmur/umurmur.conf"
- #define DEFAULT_WELCOME "Welcome to uMurmur!"
- #define DEFAULT_MAX_CLIENTS 10
- #define DEFAULT_MAX_BANDWIDTH 48000
-@@ -73,23 +73,23 @@
- case CERTIFICATE:
- setting = config_lookup(&configuration, "certificate");
- if (!setting)
-- return "/etc/umurmur/certificate.crt";
-+ return "/usr/local/etc/umurmur/certificate.crt";
- else {
- if ((strsetting = config_setting_get_string(setting)) != NULL)
- return strsetting;
- else
-- return "/etc/umurmur/certificate.crt";
-+ return "/usr/local/etc/umurmur/certificate.crt";
- }
- break;
- case KEY:
- setting = config_lookup(&configuration, "private_key");
- if (!setting)
-- return "/etc/umurmur/private_key.key";
-+ return "/usr/local/etc/umurmur/private_key.key";
- else {
- if ((strsetting = config_setting_get_string(setting)) != NULL)
- return strsetting;
- else
-- return "/etc/umurmur/private_key.key";
-+ return "/usr/local/etc/umurmur/private_key.key";
- }
- break;
- case PASSPHRASE:
diff -ruN /usr/ports/audio/umurmur.orig/files/patch-src-conf.c /usr/ports/audio/umurmur/files/patch-src-conf.c
--- /usr/ports/audio/umurmur.orig/files/patch-src-conf.c 1970-01-01 02:00:00.000000000 +0200
+++ /usr/ports/audio/umurmur/files/patch-src-conf.c 2011-12-04 19:15:14.589280132 +0200
@@ -0,0 +1,30 @@
+--- src/conf.c.old 2011-12-04 19:11:54.718388035 +0200
++++ src/conf.c 2011-12-04 19:13:08.845299535 +0200
+@@ -87,23 +87,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";
+ }
+ 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 PASSPHRASE:
diff -ruN /usr/ports/audio/umurmur.orig/files/patch-src-conf.h /usr/ports/audio/umurmur/files/patch-src-conf.h
--- /usr/ports/audio/umurmur.orig/files/patch-src-conf.h 1970-01-01 02:00:00.000000000 +0200
+++ /usr/ports/audio/umurmur/files/patch-src-conf.h 2011-12-04 19:15:07.366470166 +0200
@@ -0,0 +1,11 @@
+--- src/conf.h.old 2011-12-04 19:11:49.751119971 +0200
++++ src/conf.h 2011-12-04 19:13:32.677786798 +0200
+@@ -33,7 +33,7 @@
+
+ #include "messages.h"
+
+-#define DEFAULT_CONFIG "/etc/umurmur.conf"
++#define DEFAULT_CONFIG "%%PREFIX%%/etc/umurmur.conf"
+
+ typedef enum param {
+ CERTIFICATE,
diff -ruN /usr/ports/audio/umurmur.orig/files/umurmur.in /usr/ports/audio/umurmur/files/umurmur.in
--- /usr/ports/audio/umurmur.orig/files/umurmur.in 2011-06-26 10:17:01.000000000 +0300
+++ /usr/ports/audio/umurmur/files/umurmur.in 2011-12-04 19:41:51.159952950 +0200
@@ -11,6 +11,8 @@
#
# umurmur_enable (bool): Set to NO by default.
# Set it to YES to enable umurmur.
+# umurmur_user (str): Set to "umurmur" by default.
+# Set to change user account.
# umurmur_flags (str): Set to "" by default.
# Extra flags passed to start command.
#
diff -ruN /usr/ports/audio/umurmur.orig/pkg-plist /usr/ports/audio/umurmur/pkg-plist
--- /usr/ports/audio/umurmur.orig/pkg-plist 2011-06-26 10:17:00.000000000 +0300
+++ /usr/ports/audio/umurmur/pkg-plist 2011-12-04 19:28:54.984932210 +0200
@@ -3,5 +3,5 @@
@unexec if cmp -s %D/etc/umurmur/umurmur.conf.sample %D/etc/umurmur/umurmur.conf; then rm -f %D/etc/umurmur/umurmur.conf; fi
etc/umurmur/umurmur.conf.sample
@exec if [ ! -f %D/etc/umurmur/umurmur.conf ] ; then cp -p %D/%F %B/umurmur/umurmur.conf; fi
-sbin/umurmurd
+bin/umurmurd
@dirrmtry etc/umurmur
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112041856.pB4Iu0MG009538>