Date: Sat, 14 Sep 2013 01:59:27 GMT From: Paul Procacci <pprocacci@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/182075: [patch] Update net-im/prosody to 0.9.1. Message-ID: <201309140159.r8E1xRHv071742@oldred.freebsd.org> Resent-Message-ID: <201309140200.r8E2000X043208@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182075 >Category: ports >Synopsis: [patch] Update net-im/prosody to 0.9.1. >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: Sat Sep 14 02:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Paul Procacci >Release: 9.1-RELEASE >Organization: N/A >Environment: FreeBSD black-legion.us 9.1-RELEASE-p6 FreeBSD 9.1-RELEASE-p6 #0: Wed Aug 21 20:40:52 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Attached patch updates prosody to 0.9.1. >How-To-Repeat: N/A >Fix: Apply patch. Patch attached with submission follows: diff -ur prosody.orig/Makefile prosody/Makefile --- prosody.orig/Makefile 2013-09-13 21:08:03.000000000 -0400 +++ prosody/Makefile 2013-09-13 21:44:21.000000000 -0400 @@ -6,7 +6,7 @@ # PORTNAME= prosody -PORTVERSION= 0.8.2 +PORTVERSION= 0.9.1 CATEGORIES= net-im MASTER_SITES= http://prosody.im/downloads/source/ \ http://redundancy.redundancy.org/mirror/ @@ -39,7 +39,7 @@ ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL ${REINPLACE_CMD} -e 's|/usr/bin/env lua|${LUA_CMD}|' ${WRKSRC}/prosody ${WRKSRC}/prosodyctl ${RM} ${WRKSRC}/certs/localhost.* - cd ${WRKSRC}/certs && ${GMAKE} localhost.cert + cd ${WRKSRC}/certs && ${GMAKE} localhost.crt post-install: ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff -ur prosody.orig/distinfo prosody/distinfo --- prosody.orig/distinfo 2013-09-13 21:08:03.000000000 -0400 +++ prosody/distinfo 2013-09-13 21:10:16.000000000 -0400 @@ -1,2 +1,2 @@ -SHA256 (prosody-0.8.2.tar.gz) = d0315150f8487fc960adf56ce057985428679975f9c6f3fcf424832d24eaae60 -SIZE (prosody-0.8.2.tar.gz) = 212170 +SHA256 (prosody-0.9.1.tar.gz) = 6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5 +SIZE (prosody-0.9.1.tar.gz) = 265755 diff -ur prosody.orig/files/patch-Makefile prosody/files/patch-Makefile --- prosody.orig/files/patch-Makefile 2013-09-13 21:08:03.000000000 -0400 +++ prosody/files/patch-Makefile 2013-09-13 21:44:09.000000000 -0400 @@ -1,26 +1,16 @@ ---- ./Makefile.orig 2011-04-05 15:47:05.000000000 +0200 -+++ ./Makefile 2011-04-10 18:09:24.000000000 +0200 -@@ -6,7 +6,7 @@ - MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules - SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody - DATA = $(DESTDIR)$(DATADIR) --MAN = $(DESTDIR)$(PREFIX)/share/man -+MAN = $(DESTDIR)$(PREFIX)/man - - INSTALLEDSOURCE = $(PREFIX)/lib/prosody - INSTALLEDCONFIG = $(SYSCONFDIR) -@@ -33,11 +33,12 @@ - install -m644 plugins/*.lua $(MODULES) - install -d $(MODULES)/muc - install -m644 plugins/muc/* $(MODULES)/muc -- install -m644 certs/* $(CONFIG)/certs -+ install -m644 certs/localhost.cert $(CONFIG)/certs/localhost.cert.sample +--- Makefile.orig 2013-09-13 21:12:43.000000000 -0400 ++++ Makefile 2013-09-13 21:14:07.000000000 -0400 +@@ -34,10 +34,11 @@ + install -m644 util/*.so $(SOURCE)/util + install -d $(SOURCE)/util/sasl + install -m644 util/sasl/* $(SOURCE)/util/sasl ++ install -m644 certs/localhost.crt $(CONFIG)/certs/localhost.crt.sample + install -m644 certs/localhost.key $(CONFIG)/certs/localhost.key.sample - install -d $(MODULES)/adhoc - install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc + umask 0022 && cp -r plugins/* $(MODULES) +- install -m644 certs/* $(CONFIG)/certs install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1 - test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua + install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample - test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true + test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true $(MAKE) install -C util-src diff -ur prosody.orig/files/patch-certs-Makefile prosody/files/patch-certs-Makefile --- prosody.orig/files/patch-certs-Makefile 2013-09-13 21:08:03.000000000 -0400 +++ prosody/files/patch-certs-Makefile 2013-09-13 21:22:09.000000000 -0400 @@ -1,5 +1,5 @@ ---- certs/Makefile.orig 2011-06-27 15:22:39.024815105 -0700 -+++ certs/Makefile 2011-06-27 15:24:55.275832762 -0700 +--- certs/Makefile.orig 2013-09-13 21:17:31.000000000 -0400 ++++ certs/Makefile 2013-09-13 21:18:55.000000000 -0400 @@ -2,13 +2,13 @@ keysize=2048 @@ -12,14 +12,9 @@ +# Then `gmake yourhost.key` to create your private key, you can # include keysize=number to change the size of the key. -# Then you can either `make yourhost.csr` to generate a certificate --# signing request that you can submit to a CA, or `make yourhost.cert` +-# signing request that you can submit to a CA, or `make yourhost.crt` +# Then you can either `gmake yourhost.csr` to generate a certificate -+# signing request that you can submit to a CA, or `gmake yourhost.cert` ++# signing request that you can submit to a CA, or `gmake yourhost.crt` # to generate a self signed certificate. .PRECIOUS: %.cnf %.key -@@ -28,3 +28,4 @@ - %.key: - openssl genrsa $(keysize) > $@ - @chmod 400 $@ -+ @chown prosody:prosody $@ diff -ur prosody.orig/files/patch-prosody.cfg.lua.dist prosody/files/patch-prosody.cfg.lua.dist --- prosody.orig/files/patch-prosody.cfg.lua.dist 2013-09-13 21:08:03.000000000 -0400 +++ prosody/files/patch-prosody.cfg.lua.dist 2013-09-13 21:24:13.000000000 -0400 @@ -1,11 +1,11 @@ ---- prosody.cfg.lua.dist.orig 2011-04-11 13:21:41.498385123 -0700 -+++ prosody.cfg.lua.dist 2011-04-11 13:21:51.387828331 -0700 -@@ -59,7 +59,7 @@ - --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 +--- prosody.cfg.lua.dist.orig 2013-09-13 21:22:50.000000000 -0400 ++++ prosody.cfg.lua.dist 2013-09-13 21:23:50.000000000 -0400 +@@ -63,7 +63,7 @@ + --"http_files"; -- Serve static files from a directory over HTTP -- Other specific functionality - --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. + "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - --"httpserver"; -- Serve static files from a directory over HTTP --"groups"; -- Shared roster support + --"announce"; -- Send announcement to all online users + --"welcome"; -- Welcome users who register accounts Only in prosody.orig: work >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309140159.r8E1xRHv071742>