From e0dcf1cab23c3e4508674cc4f38f05ec7e4aee06 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Fri, 8 Jul 2011 09:09:43 +0000 Subject: [PATCH] Update to umurmur-0.2.7. Tested on amd64 and sparc64 by maintainer and myself OK ajacoutot@ --- audio/umurmur/Makefile | 31 +++++++++---------- audio/umurmur/distinfo | 10 +++--- audio/umurmur/patches/patch-configure_ac | 12 +++++++ audio/umurmur/patches/patch-src_conf_c | 17 +++------- audio/umurmur/patches/patch-src_conf_h | 12 +++++++ .../patches/patch-umurmur_conf_example | 14 +++++---- audio/umurmur/pkg/PLIST | 4 +-- audio/umurmur/pkg/umurmurd.rc | 4 +-- 8 files changed, 60 insertions(+), 44 deletions(-) create mode 100644 audio/umurmur/patches/patch-configure_ac create mode 100644 audio/umurmur/patches/patch-src_conf_h diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile index 3deb2934535..58f780e4cf4 100644 --- a/audio/umurmur/Makefile +++ b/audio/umurmur/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.2 2011/07/08 09:09:43 dcoppa Exp $ COMMENT = minimalistic Mumble server -DISTNAME = umurmur-0.2.6 +DISTNAME = umurmur-0.2.7 CATEGORIES = audio @@ -12,33 +12,32 @@ MASTER_SITES = ${HOMEPAGE}/files/ MAINTAINER = Jonathon Sisson -# BSD and Apache 2.0 (see src/google/protobuf-c/*) +# BSD PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -LIB_DEPENDS = devel/libconfig +WANTLIB = c config crypto protobuf-c ssl -MAKE_FLAGS = EXTRA_CFLAGS="-I${LOCALBASE}/include" \ - EXTRA_LDFLAGS="-L${LOCALBASE}/lib \ - -lcrypto -lssl" +LIB_DEPENDS = devel/libconfig \ + devel/protobuf-c -USE_GMAKE = Yes +CONFIGURE_STYLE = autoconf +AUTOCONF_VERSION = 2.63 +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS = --with-ssl=openssl -WANTLIB = c config crypto ssl - -WRKSRC = ${WRKDIST}/src +NO_REGRESS = Yes post-configure: - ${SUBST_CMD} ${WRKSRC}/conf.c + ${SUBST_CMD} ${WRKSRC}/src/conf.c ${WRKSRC}/src/conf.h -do-install: - ${INSTALL_PROGRAM} ${WRKBUILD}/umurmurd \ - ${PREFIX}/sbin/umurmurd +post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/umurmur ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} \ - -c ${WRKBUILD}/../umurmur.conf.example \ + -c ${WRKBUILD}/umurmur.conf.example \ ${PREFIX}/share/examples/umurmur/umurmur.conf ${INSTALL_MAN} ${FILESDIR}/umurmurd.1 \ ${PREFIX}/man/man1/ diff --git a/audio/umurmur/distinfo b/audio/umurmur/distinfo index abf020fb755..a28ac51a4a5 100644 --- a/audio/umurmur/distinfo +++ b/audio/umurmur/distinfo @@ -1,5 +1,5 @@ -MD5 (umurmur-0.2.6.tar.gz) = BtwiS+UWDhcldMkkhoIUCw== -RMD160 (umurmur-0.2.6.tar.gz) = TffSdGerAMrrRq6MTGNxApv9vvU= -SHA1 (umurmur-0.2.6.tar.gz) = qlOpOTDG8mog/cLAhBnhiu7UCCk= -SHA256 (umurmur-0.2.6.tar.gz) = sfI3GR6h23iQvoa8Pr5WJXCQHYvVi8U9ns7go/S+OMs= -SIZE (umurmur-0.2.6.tar.gz) = 86014 +MD5 (umurmur-0.2.7.tar.gz) = lH0mVz3Pom0nTLL3xWtqFw== +RMD160 (umurmur-0.2.7.tar.gz) = wGxsb/lMvKXB299+qzAYPkduPXQ= +SHA1 (umurmur-0.2.7.tar.gz) = 9gL1JXpSyppoEqvF7guqR9XKTDc= +SHA256 (umurmur-0.2.7.tar.gz) = TQ7gjZHSePnuGtknXG3WvrOqQZTwd/X/oQU9/9TMJ10= +SIZE (umurmur-0.2.7.tar.gz) = 157348 diff --git a/audio/umurmur/patches/patch-configure_ac b/audio/umurmur/patches/patch-configure_ac new file mode 100644 index 00000000000..3f3d6aa979f --- /dev/null +++ b/audio/umurmur/patches/patch-configure_ac @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure_ac,v 1.1 2011/07/08 09:09:43 dcoppa Exp $ +--- configure.ac.orig Thu Jul 7 13:34:33 2011 ++++ configure.ac Thu Jul 7 13:35:14 2011 +@@ -58,7 +58,7 @@ AS_IF([test "x$with_ssl" == xopenssl], [ + + # Checks for header files. + AC_FUNC_ALLOCA +-AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h], [], [AC_MSG_ERROR([missing a required header])]) ++AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h syslog.h unistd.h], [], [AC_MSG_ERROR([missing a required header])]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STDBOOL diff --git a/audio/umurmur/patches/patch-src_conf_c b/audio/umurmur/patches/patch-src_conf_c index aa5221e2314..6ca84cfaf1b 100644 --- a/audio/umurmur/patches/patch-src_conf_c +++ b/audio/umurmur/patches/patch-src_conf_c @@ -1,16 +1,7 @@ -$OpenBSD: patch-src_conf_c,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $ ---- src/conf.c.orig Thu Mar 31 11:09:52 2011 -+++ src/conf.c Thu Mar 31 11:12:41 2011 -@@ -40,7 +40,7 @@ - - static config_t configuration; - --#define DEFAULT_CONFIG "/etc/umurmur.conf" -+#define DEFAULT_CONFIG "${SYSCONFDIR}/umurmur/umurmur.conf" - #define DEFAULT_WELCOME "Welcome to uMurmur!" - #define DEFAULT_MAX_CLIENTS 10 - #define DEFAULT_MAX_BANDWIDTH 48000 -@@ -73,23 +73,23 @@ const char *getStrConf(param_t param) +$OpenBSD: patch-src_conf_c,v 1.2 2011/07/08 09:09:43 dcoppa Exp $ +--- src/conf.c.orig Mon Apr 18 20:19:33 2011 ++++ src/conf.c Thu Jul 7 13:24:25 2011 +@@ -72,23 +72,23 @@ const char *getStrConf(param_t param) case CERTIFICATE: setting = config_lookup(&configuration, "certificate"); if (!setting) diff --git a/audio/umurmur/patches/patch-src_conf_h b/audio/umurmur/patches/patch-src_conf_h new file mode 100644 index 00000000000..d4bb89bb248 --- /dev/null +++ b/audio/umurmur/patches/patch-src_conf_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_conf_h,v 1.1 2011/07/08 09:09:43 dcoppa Exp $ +--- src/conf.h.orig Thu Jul 7 13:50:29 2011 ++++ src/conf.h Thu Jul 7 13:52:49 2011 +@@ -33,7 +33,7 @@ + + #include "messages.h" + +-#define DEFAULT_CONFIG "/etc/umurmur.conf" ++#define DEFAULT_CONFIG "${SYSCONFDIR}/umurmur/umurmur.conf" + + typedef enum param { + CERTIFICATE, diff --git a/audio/umurmur/patches/patch-umurmur_conf_example b/audio/umurmur/patches/patch-umurmur_conf_example index bb5b5a77555..f43d5a35328 100644 --- a/audio/umurmur/patches/patch-umurmur_conf_example +++ b/audio/umurmur/patches/patch-umurmur_conf_example @@ -1,7 +1,7 @@ -$OpenBSD: patch-umurmur_conf_example,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $ ---- umurmur.conf.example.orig Tue Feb 8 23:06:05 2011 -+++ umurmur.conf.example Thu Mar 31 15:25:23 2011 -@@ -1,15 +1,15 @@ +$OpenBSD: patch-umurmur_conf_example,v 1.2 2011/07/08 09:09:43 dcoppa Exp $ +--- umurmur.conf.example.orig Mon Apr 18 20:19:33 2011 ++++ umurmur.conf.example Thu Jul 7 14:30:37 2011 +@@ -1,7 +1,7 @@ max_bandwidth = 48000; welcometext = "Welcome to uMurmur!"; -certificate = "/etc/umurmur/cert.crt"; @@ -11,6 +11,8 @@ $OpenBSD: patch-umurmur_conf_example,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $ password = ""; max_users = 10; +@@ -10,9 +10,9 @@ max_users = 10; + # username and groupname for privilege dropping. # Will attempt to switch user if set. -# username = ""; @@ -19,5 +21,5 @@ $OpenBSD: patch-umurmur_conf_example,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $ -# groupname = ""; +groupname = "_umurmur"; - # bindport = 64738; - # bindaddr = "192.168.1.1"; + # Log to file option. Default is logging to syslog. + # umurmurd will close and reopen the logfile if SIGHUP is received. diff --git a/audio/umurmur/pkg/PLIST b/audio/umurmur/pkg/PLIST index f0e7393cfdb..ae5d2536485 100644 --- a/audio/umurmur/pkg/PLIST +++ b/audio/umurmur/pkg/PLIST @@ -1,9 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $ +@comment $OpenBSD: PLIST,v 1.2 2011/07/08 09:09:43 dcoppa Exp $ @newgroup _umurmur:671 @newuser _umurmur:671:_umurmur:daemon:uMurmur Account:/nonexistent:/sbin/nologin +@bin bin/umurmurd @man man/man1/umurmurd.1 @man man/man1/umurmur.conf.1 -@bin sbin/umurmurd share/examples/umurmur/ share/examples/umurmur/umurmur.conf @owner _umurmur diff --git a/audio/umurmur/pkg/umurmurd.rc b/audio/umurmur/pkg/umurmurd.rc index fa11f371980..32c1ed23956 100644 --- a/audio/umurmur/pkg/umurmurd.rc +++ b/audio/umurmur/pkg/umurmurd.rc @@ -1,8 +1,8 @@ #!/bin/sh # -# $OpenBSD: umurmurd.rc,v 1.1.1.1 2011/04/03 12:04:47 dcoppa Exp $ +# $OpenBSD: umurmurd.rc,v 1.2 2011/07/08 09:09:43 dcoppa Exp $ -daemon="${TRUEPREFIX}/sbin/umurmurd" +daemon="${TRUEPREFIX}/bin/umurmurd" . /etc/rc.d/rc.subr