Attachment #136775 for bug #182075

Lines 6-12 Link Here

(-)prosody/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= prosody	8	PORTNAME= prosody
9	PORTVERSION= 0.8.2	9	PORTVERSION= 0.9.1
10	CATEGORIES= net-im	10	CATEGORIES= net-im
11	MASTER_SITES= http://prosody.im/downloads/source/ \	11	MASTER_SITES= http://prosody.im/downloads/source/ \
12	http://redundancy.redundancy.org/mirror/	12	http://redundancy.redundancy.org/mirror/
Lines 39-45 Link Here
39	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	39	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
40	${REINPLACE_CMD} -e 's\|/usr/bin/env lua\|${LUA_CMD}\|' ${WRKSRC}/prosody ${WRKSRC}/prosodyctl	40	${REINPLACE_CMD} -e 's\|/usr/bin/env lua\|${LUA_CMD}\|' ${WRKSRC}/prosody ${WRKSRC}/prosodyctl
41	${RM} ${WRKSRC}/certs/localhost.*	41	${RM} ${WRKSRC}/certs/localhost.*
42	cd ${WRKSRC}/certs && ${GMAKE} localhost.cert	42	cd ${WRKSRC}/certs && ${GMAKE} localhost.crt
43		43
44	post-install:	44	post-install:
45	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL	45	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

Lines 1-2 Link Here

(-)prosody/distinfo (-2 / +2 lines)
1	SHA256 (prosody-0.8.2.tar.gz) = d0315150f8487fc960adf56ce057985428679975f9c6f3fcf424832d24eaae60	1	SHA256 (prosody-0.9.1.tar.gz) = 6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5
2	SIZE (prosody-0.8.2.tar.gz) = 212170	2	SIZE (prosody-0.9.1.tar.gz) = 265755




--- 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
+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
+	install -m644 certs/localhost.key $(CONFIG)/certs/localhost.key.sample
 	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 -m644 prosody.version $(SOURCE)/prosody.version || true
 	$(MAKE) install -C util-src
 




--- 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
 

+# 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.crt`
+# Then you can either `gmake yourhost.csr` to generate a certificate
+# 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 $@




--- 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

Return to bug 182075

Lines 1-26 Link Here

(-)prosody/files/patch-Makefile (-20 / +10 lines)
1	--- ./Makefile.orig 2011-04-05 15:47:05.000000000 +0200	1	--- Makefile.orig 2013-09-13 21:12:43.000000000 -0400
2	+++ ./Makefile 2011-04-10 18:09:24.000000000 +0200	2	+++ Makefile 2013-09-13 21:14:07.000000000 -0400
3	@@ -6,7 +6,7 @@	3	@@ -34,10 +34,11 @@
4	MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules	4	install -m644 util/*.so $(SOURCE)/util
5	SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody	5	install -d $(SOURCE)/util/sasl
6	DATA = $(DESTDIR)$(DATADIR)	6	install -m644 util/sasl/* $(SOURCE)/util/sasl
7	-MAN = $(DESTDIR)$(PREFIX)/share/man	7	+ install -m644 certs/localhost.crt $(CONFIG)/certs/localhost.crt.sample
8	+MAN = $(DESTDIR)$(PREFIX)/man
9
10	INSTALLEDSOURCE = $(PREFIX)/lib/prosody
11	INSTALLEDCONFIG = $(SYSCONFDIR)
12	@@ -33,11 +33,12 @@
13	install -m644 plugins/*.lua $(MODULES)
14	install -d $(MODULES)/muc
15	install -m644 plugins/muc/* $(MODULES)/muc
16	- install -m644 certs/* $(CONFIG)/certs
17	+ install -m644 certs/localhost.cert $(CONFIG)/certs/localhost.cert.sample
18	+ install -m644 certs/localhost.key $(CONFIG)/certs/localhost.key.sample	8	+ install -m644 certs/localhost.key $(CONFIG)/certs/localhost.key.sample
19	install -d $(MODULES)/adhoc	9	umask 0022 && cp -r plugins/* $(MODULES)
20	install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc	10	- install -m644 certs/* $(CONFIG)/certs
21	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1	11	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
22	- test -e $(CONFIG)/prosody.cfg.lua \|\| install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua	12	- test -e $(CONFIG)/prosody.cfg.lua \|\| install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
23	+ install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample	13	+ install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
24	test -e prosody.version && install prosody.version $(SOURCE)/prosody.version \|\| true	14	test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version \|\| true
25	$(MAKE) install -C util-src	15	$(MAKE) install -C util-src
26		16

Lines 1-5 Link Here

(-)prosody/files/patch-certs-Makefile (-9 / +4 lines)
1	--- certs/Makefile.orig 2011-06-27 15:22:39.024815105 -0700	1	--- certs/Makefile.orig 2013-09-13 21:17:31.000000000 -0400
2	+++ certs/Makefile 2011-06-27 15:24:55.275832762 -0700	2	+++ certs/Makefile 2013-09-13 21:18:55.000000000 -0400
3	@@ -2,13 +2,13 @@	3	@@ -2,13 +2,13 @@
4	keysize=2048	4	keysize=2048
5		5
Lines 12-25 Link Here
12	+# Then `gmake yourhost.key` to create your private key, you can	12	+# Then `gmake yourhost.key` to create your private key, you can
13	# include keysize=number to change the size of the key.	13	# include keysize=number to change the size of the key.
14	-# Then you can either `make yourhost.csr` to generate a certificate	14	-# Then you can either `make yourhost.csr` to generate a certificate
15	-# signing request that you can submit to a CA, or `make yourhost.cert`	15	-# signing request that you can submit to a CA, or `make yourhost.crt`
16	+# Then you can either `gmake yourhost.csr` to generate a certificate	16	+# Then you can either `gmake yourhost.csr` to generate a certificate
17	+# signing request that you can submit to a CA, or `gmake yourhost.cert`	17	+# signing request that you can submit to a CA, or `gmake yourhost.crt`
18	# to generate a self signed certificate.	18	# to generate a self signed certificate.
19		19
20	.PRECIOUS: %.cnf %.key	20	.PRECIOUS: %.cnf %.key
21	@@ -28,3 +28,4 @@
22	%.key:
23	openssl genrsa $(keysize) > $@
24	@chmod 400 $@
25	+ @chown prosody:prosody $@

Lines 1-11 Link Here

(-)prosody/files/patch-prosody.cfg.lua.dist (-6 / +6 lines)
1	--- prosody.cfg.lua.dist.orig 2011-04-11 13:21:41.498385123 -0700	1	--- prosody.cfg.lua.dist.orig 2013-09-13 21:22:50.000000000 -0400
2	+++ prosody.cfg.lua.dist 2011-04-11 13:21:51.387828331 -0700	2	+++ prosody.cfg.lua.dist 2013-09-13 21:23:50.000000000 -0400
3	@@ -59,7 +59,7 @@	3	@@ -63,7 +63,7 @@
4	--"admin_telnet"; -- Opens telnet console interface on localhost port 5582	4	--"http_files"; -- Serve static files from a directory over HTTP
5		5
6	-- Other specific functionality	6	-- Other specific functionality
7	- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.	7	- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
8	+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.	8	+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
9	--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
10	--"httpserver"; -- Serve static files from a directory over HTTP
11	--"groups"; -- Shared roster support	9	--"groups"; -- Shared roster support
		10	--"announce"; -- Send announcement to all online users
		11	--"welcome"; -- Welcome users who register accounts