View | Details | Raw Unified | Return to bug 182075 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +4 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	prosody
4
PORTNAME=	prosody
5
PORTVERSION=	0.8.2
5
PORTVERSION=	0.9.2
6
CATEGORIES=	net-im
6
CATEGORIES=	net-im
7
MASTER_SITES=	http://prosody.im/downloads/source/ \
7
MASTER_SITES=	http://prosody.im/downloads/source/ \
8
				http://redundancy.redundancy.org/mirror/
8
				http://redundancy.redundancy.org/mirror/
Lines 10-15 Link Here
10
MAINTAINER=	lx@FreeBSD.org
10
MAINTAINER=	lx@FreeBSD.org
11
COMMENT=	A simple extensible XMPP server written in Lua
11
COMMENT=	A simple extensible XMPP server written in Lua
12
12
13
LICENSE=	MIT
14
13
RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket \
15
RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket \
14
		${LUA_MODLIBDIR}/ssl.so:${PORTSDIR}/security/luasec \
16
		${LUA_MODLIBDIR}/ssl.so:${PORTSDIR}/security/luasec \
15
		${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat \
17
		${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat \
Lines 34-42 Link Here
34
NO_STAGE=	yes
36
NO_STAGE=	yes
35
pre-install:
37
pre-install:
36
	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
38
	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
37
	${REINPLACE_CMD} -e 's|/usr/bin/env lua|${LUA_CMD}|' ${WRKSRC}/prosody ${WRKSRC}/prosodyctl
39
	${REINPLACE_CMD} -e 's|/usr/bin/env lua|${LUA_CMD}|' ${WRKSRC}/prosody.install ${WRKSRC}/prosodyctl.install
38
	${RM} ${WRKSRC}/certs/localhost.*
39
	cd ${WRKSRC}/certs && ${GMAKE} localhost.cert
40
40
41
post-install:
41
post-install:
42
	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
42
	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (prosody-0.8.2.tar.gz) = d0315150f8487fc960adf56ce057985428679975f9c6f3fcf424832d24eaae60
1
SHA256 (prosody-0.9.2.tar.gz) = a2df64d23b7853a9f03126750d33b98193c93b8331b2622d9ebf1fe54f8feb2d
2
SIZE (prosody-0.8.2.tar.gz) = 212170
2
SIZE (prosody-0.9.2.tar.gz) = 264196
(-)files/patch-Makefile (-14 / +7 lines)
Lines 1-5 Link Here
1
--- ./Makefile.orig	2011-04-05 15:47:05.000000000 +0200
1
--- Makefile.orig	2013-12-08 19:05:39.000000000 +0100
2
+++ ./Makefile	2011-04-10 18:09:24.000000000 +0200
2
+++ Makefile	2014-02-06 23:24:12.000000000 +0100
3
@@ -6,7 +6,7 @@
3
@@ -6,7 +6,7 @@
4
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
4
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
5
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
5
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
Lines 9-26 Link Here
9
 
9
 
10
 INSTALLEDSOURCE = $(PREFIX)/lib/prosody
10
 INSTALLEDSOURCE = $(PREFIX)/lib/prosody
11
 INSTALLEDCONFIG = $(SYSCONFDIR)
11
 INSTALLEDCONFIG = $(SYSCONFDIR)
12
@@ -33,11 +33,12 @@
12
@@ -40,6 +40,7 @@
13
 	install -m644 plugins/*.lua $(MODULES)
13
 	umask 0022 && cp -r plugins/* $(MODULES)
14
 	install -d $(MODULES)/muc
14
 	install -m644 certs/* $(CONFIG)/certs
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
19
 	install -d $(MODULES)/adhoc
20
 	install -m644 plugins/adhoc/*.lua $(MODULES)/adhoc
21
 	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
15
 	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
23
+	install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
16
+	install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
24
 	test -e prosody.version && install prosody.version $(SOURCE)/prosody.version || true
17
 	test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
18
 	test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
25
 	$(MAKE) install -C util-src
19
 	$(MAKE) install -C util-src
26
 
(-)files/patch-certs-Makefile (-25 lines)
Lines 1-25 Link Here
1
--- certs/Makefile.orig	2011-06-27 15:22:39.024815105 -0700
2
+++ certs/Makefile	2011-06-27 15:24:55.275832762 -0700
3
@@ -2,13 +2,13 @@
4
 keysize=2048
5
 
6
 # How to:
7
-# First, `make yourhost.cnf` which creates a openssl config file.
8
+# First, `gmake yourhost.cnf` which creates a openssl config file.
9
 # Then edit this file and fill in the details you want it to have,
10
 # and add or change hosts and components it should cover.
11
-# Then `make 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.
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`
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`
18
 # to generate a self signed certificate.
19
 
20
 .PRECIOUS: %.cnf %.key
21
@@ -28,3 +28,4 @@
22
 %.key:
23
 	openssl genrsa $(keysize) > $@
24
 	@chmod 400 $@
25
+	@chown prosody:prosody $@
(-)files/patch-configure (-9 / +16 lines)
Lines 1-10 Link Here
1
--- ./configure.orig	2011-04-05 15:47:05.000000000 +0200
1
--- configure.orig	2013-12-08 19:05:39.000000000 +0100
2
+++ ./configure	2011-04-10 18:09:24.000000000 +0200
2
+++ configure	2014-02-06 22:21:15.000000000 +0100
3
@@ -2,7 +2,6 @@
3
@@ -13,11 +13,11 @@
4
 IDN_LIB=idn
5
 ICU_FLAGS="-licui18n -licudata -licuuc"
6
 OPENSSL_LIB=crypto
7
-CC=gcc
8
+CC=cc
9
 CXX=g++
10
-LD=gcc
11
+LD=cc
12
 RUNWITH=lua
13
-EXCERTS=yes
14
+EXCERTS=no
4
 
15
 
5
 # Defaults
16
 CFLAGS="-fPIC -Wall"
6
 
17
 LDFLAGS="-shared"
7
-PREFIX=/usr/local
8
 SYSCONFDIR="$PREFIX/etc/prosody"
9
 DATADIR="$PREFIX/var/lib/prosody"
10
 LUA_SUFFIX=""
(-)files/patch-prosody.cfg.lua.dist (-11 lines)
Lines 1-11 Link Here
1
--- prosody.cfg.lua.dist.orig	2011-04-11 13:21:41.498385123 -0700
2
+++ prosody.cfg.lua.dist	2011-04-11 13:21:51.387828331 -0700
3
@@ -59,7 +59,7 @@
4
 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
5
 
6
 	-- Other specific functionality
7
-		--"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
(-)pkg-plist (-27 / +46 lines)
Lines 3-14 Link Here
3
@unexec if cmp -s %D/etc/prosody/prosody.cfg.lua.sample %D/etc/prosody/prosody.cfg.lua; then rm -f %D/etc/prosody/prosody.cfg.lua; fi
3
@unexec if cmp -s %D/etc/prosody/prosody.cfg.lua.sample %D/etc/prosody/prosody.cfg.lua; then rm -f %D/etc/prosody/prosody.cfg.lua; fi
4
etc/prosody/prosody.cfg.lua.sample
4
etc/prosody/prosody.cfg.lua.sample
5
@exec if [ ! -f %D/etc/prosody/prosody.cfg.lua ]; then cp -p %D/etc/prosody/prosody.cfg.lua.sample %D/etc/prosody/prosody.cfg.lua; fi
5
@exec if [ ! -f %D/etc/prosody/prosody.cfg.lua ]; then cp -p %D/etc/prosody/prosody.cfg.lua.sample %D/etc/prosody/prosody.cfg.lua; fi
6
@unexec if cmp -s %D/etc/prosody/certs/localhost.cert.sample %D/etc/prosody/certs/localhost.cert; then rm -f %D/etc/prosody/certs/localhost.cert; fi
7
etc/prosody/certs/localhost.cert.sample
8
@exec if [ ! -f %D/etc/prosody/certs/localhost.cert ]; then cp -p %D/etc/prosody/certs/localhost.cert.sample %D/etc/prosody/certs/localhost.cert; fi
9
@unexec if cmp -s %D/etc/prosody/certs/localhost.key.sample %D/etc/prosody/certs/localhost.key; then rm -f %D/etc/prosody/certs/localhost.key; fi
10
etc/prosody/certs/localhost.key.sample
11
@exec if [ ! -f %D/etc/prosody/certs/localhost.key ]; then cp -p %D/etc/prosody/certs/localhost.key.sample %D/etc/prosody/certs/localhost.key; fi
12
@dirrmtry etc/prosody/certs
6
@dirrmtry etc/prosody/certs
13
@dirrmtry etc/prosody
7
@dirrmtry etc/prosody
14
lib/prosody/core/certmanager.lua
8
lib/prosody/core/certmanager.lua
Lines 15-22 Link Here
15
lib/prosody/core/configmanager.lua
9
lib/prosody/core/configmanager.lua
16
lib/prosody/core/hostmanager.lua
10
lib/prosody/core/hostmanager.lua
17
lib/prosody/core/loggingmanager.lua
11
lib/prosody/core/loggingmanager.lua
12
lib/prosody/core/moduleapi.lua
18
lib/prosody/core/modulemanager.lua
13
lib/prosody/core/modulemanager.lua
19
lib/prosody/core/rostermanager.lua
14
lib/prosody/core/rostermanager.lua
15
lib/prosody/core/portmanager.lua
20
lib/prosody/core/s2smanager.lua
16
lib/prosody/core/s2smanager.lua
21
lib/prosody/core/sessionmanager.lua
17
lib/prosody/core/sessionmanager.lua
22
lib/prosody/core/stanza_router.lua
18
lib/prosody/core/stanza_router.lua
Lines 28-36 Link Here
28
lib/prosody/modules/mod_auth_cyrus.lua
24
lib/prosody/modules/mod_auth_cyrus.lua
29
lib/prosody/modules/mod_auth_internal_hashed.lua
25
lib/prosody/modules/mod_auth_internal_hashed.lua
30
lib/prosody/modules/mod_auth_internal_plain.lua
26
lib/prosody/modules/mod_auth_internal_plain.lua
27
lib/prosody/modules/mod_c2s.lua
28
lib/prosody/modules/mod_http.lua
29
lib/prosody/modules/mod_http_errors.lua
30
lib/prosody/modules/mod_http_files.lua
31
lib/prosody/modules/mod_motd.lua
31
lib/prosody/modules/mod_motd.lua
32
lib/prosody/modules/mod_net_multiplex.lua
32
lib/prosody/modules/mod_offline.lua
33
lib/prosody/modules/mod_offline.lua
34
lib/prosody/modules/mod_pubsub.lua
33
lib/prosody/modules/mod_storage_internal.lua
35
lib/prosody/modules/mod_storage_internal.lua
36
lib/prosody/modules/mod_storage_none.lua
34
lib/prosody/modules/mod_storage_sql.lua
37
lib/prosody/modules/mod_storage_sql.lua
35
lib/prosody/modules/mod_announce.lua
38
lib/prosody/modules/mod_announce.lua
36
lib/prosody/modules/mod_bosh.lua
39
lib/prosody/modules/mod_bosh.lua
Lines 39-45 Link Here
39
lib/prosody/modules/mod_dialback.lua
42
lib/prosody/modules/mod_dialback.lua
40
lib/prosody/modules/mod_disco.lua
43
lib/prosody/modules/mod_disco.lua
41
lib/prosody/modules/mod_groups.lua
44
lib/prosody/modules/mod_groups.lua
42
lib/prosody/modules/mod_httpserver.lua
43
lib/prosody/modules/mod_iq.lua
45
lib/prosody/modules/mod_iq.lua
44
lib/prosody/modules/mod_lastactivity.lua
46
lib/prosody/modules/mod_lastactivity.lua
45
lib/prosody/modules/mod_legacyauth.lua
47
lib/prosody/modules/mod_legacyauth.lua
Lines 61-116 Link Here
61
lib/prosody/modules/mod_version.lua
63
lib/prosody/modules/mod_version.lua
62
lib/prosody/modules/mod_watchregistrations.lua
64
lib/prosody/modules/mod_watchregistrations.lua
63
lib/prosody/modules/mod_welcome.lua
65
lib/prosody/modules/mod_welcome.lua
66
lib/prosody/modules/sql.lib.lua
67
lib/prosody/modules/adhoc/adhoc.lib.lua
68
lib/prosody/modules/adhoc/mod_adhoc.lua
69
lib/prosody/modules/mod_s2s/mod_s2s.lua
70
lib/prosody/modules/mod_s2s/s2sout.lib.lua
64
lib/prosody/modules/muc/mod_muc.lua
71
lib/prosody/modules/muc/mod_muc.lua
65
lib/prosody/modules/muc/muc.lib.lua
72
lib/prosody/modules/muc/muc.lib.lua
66
lib/prosody/modules/adhoc/adhoc.lib.lua
73
lib/prosody/modules/storage/mod_xep0227.lua
67
lib/prosody/modules/adhoc/mod_adhoc.lua
74
lib/prosody/modules/storage/sqlbasic.lib.lua
75
lib/prosody/modules/storage/xep227store.lib.lua
68
lib/prosody/net/adns.lua
76
lib/prosody/net/adns.lua
69
lib/prosody/net/connlisteners.lua
77
lib/prosody/net/connlisteners.lua
70
lib/prosody/net/dns.lua
78
lib/prosody/net/dns.lua
71
lib/prosody/net/http.lua
79
lib/prosody/net/http.lua
72
lib/prosody/net/httpclient_listener.lua
73
lib/prosody/net/httpserver.lua
80
lib/prosody/net/httpserver.lua
74
lib/prosody/net/httpserver_listener.lua
75
lib/prosody/net/multiplex_listener.lua
76
lib/prosody/net/server.lua
81
lib/prosody/net/server.lua
77
lib/prosody/net/server_event.lua
82
lib/prosody/net/server_event.lua
78
lib/prosody/net/server_select.lua
83
lib/prosody/net/server_select.lua
79
lib/prosody/net/xmppclient_listener.lua
84
lib/prosody/net/http/codes.lua
80
lib/prosody/net/xmppcomponent_listener.lua
85
lib/prosody/net/http/parser.lua
81
lib/prosody/net/xmppserver_listener.lua
86
lib/prosody/net/http/server.lua
82
lib/prosody/prosody.version
87
lib/prosody/prosody.version
88
lib/prosody/util/adhoc.lua
83
lib/prosody/util/array.lua
89
lib/prosody/util/array.lua
84
lib/prosody/util/broadcast.lua
90
lib/prosody/util/caps.lua
85
lib/prosody/util/dataforms.lua
91
lib/prosody/util/dataforms.lua
86
lib/prosody/util/datamanager.lua
92
lib/prosody/util/datamanager.lua
87
lib/prosody/util/datetime.lua
93
lib/prosody/util/datetime.lua
94
lib/prosody/util/debug.lua
88
lib/prosody/util/dependencies.lua
95
lib/prosody/util/dependencies.lua
89
lib/prosody/util/encodings.so
96
lib/prosody/util/encodings.so
97
lib/prosody/util/envload.lua
90
lib/prosody/util/events.lua
98
lib/prosody/util/events.lua
99
lib/prosody/util/filters.lua
91
lib/prosody/util/hashes.so
100
lib/prosody/util/hashes.so
92
lib/prosody/util/helpers.lua
101
lib/prosody/util/helpers.lua
93
lib/prosody/util/hmac.lua
102
lib/prosody/util/hmac.lua
103
lib/prosody/util/http.lua
94
lib/prosody/util/import.lua
104
lib/prosody/util/import.lua
105
lib/prosody/util/ip.lua
95
lib/prosody/util/iterators.lua
106
lib/prosody/util/iterators.lua
96
lib/prosody/util/jid.lua
107
lib/prosody/util/jid.lua
108
lib/prosody/util/json.lua
97
lib/prosody/util/logger.lua
109
lib/prosody/util/logger.lua
98
lib/prosody/util/multitable.lua
110
lib/prosody/util/multitable.lua
111
lib/prosody/util/net.so
112
lib/prosody/util/openssl.lua
99
lib/prosody/util/pluginloader.lua
113
lib/prosody/util/pluginloader.lua
100
lib/prosody/util/pposix.so
114
lib/prosody/util/pposix.so
101
lib/prosody/util/prosodyctl.lua
115
lib/prosody/util/prosodyctl.lua
102
lib/prosody/util/caps.lua
116
lib/prosody/util/pubsub.lua
103
lib/prosody/util/filters.lua
117
lib/prosody/util/rfc6724.lua
104
lib/prosody/util/httpstream.lua
118
lib/prosody/util/sasl.lua
105
lib/prosody/util/json.lua
119
lib/prosody/util/sql.lua
106
lib/prosody/util/template.lua
120
lib/prosody/util/template.lua
121
lib/prosody/util/throttle.lua
122
lib/prosody/util/watchdog.lua
123
lib/prosody/util/x509.lua
124
lib/prosody/util/xml.lua
107
lib/prosody/util/xmppstream.lua
125
lib/prosody/util/xmppstream.lua
108
lib/prosody/util/sasl.lua
109
lib/prosody/util/sasl/anonymous.lua
110
lib/prosody/util/sasl/digest-md5.lua
111
lib/prosody/util/sasl/plain.lua
112
lib/prosody/util/sasl/scram.lua
113
lib/prosody/util/sasl_cyrus.lua
114
lib/prosody/util/serialization.lua
126
lib/prosody/util/serialization.lua
115
lib/prosody/util/set.lua
127
lib/prosody/util/set.lua
116
lib/prosody/util/signal.so
128
lib/prosody/util/signal.so
Lines 118-129 Link Here
118
lib/prosody/util/termcolours.lua
130
lib/prosody/util/termcolours.lua
119
lib/prosody/util/timer.lua
131
lib/prosody/util/timer.lua
120
lib/prosody/util/uuid.lua
132
lib/prosody/util/uuid.lua
121
lib/prosody/util/xmlrpc.lua
133
lib/prosody/util/sasl/anonymous.lua
134
lib/prosody/util/sasl/digest-md5.lua
135
lib/prosody/util/sasl/plain.lua
136
lib/prosody/util/sasl/scram.lua
137
lib/prosody/util/sasl_cyrus.lua
122
@dirrm lib/prosody/util/sasl
138
@dirrm lib/prosody/util/sasl
123
@dirrm lib/prosody/util
139
@dirrm lib/prosody/util
140
@dirrm lib/prosody/net/http
124
@dirrm lib/prosody/net
141
@dirrm lib/prosody/net
125
@dirrm lib/prosody/modules/adhoc
142
@dirrm lib/prosody/modules/adhoc
143
@dirrm lib/prosody/modules/mod_s2s
126
@dirrm lib/prosody/modules/muc
144
@dirrm lib/prosody/modules/muc
145
@dirrm lib/prosody/modules/storage
127
@dirrm lib/prosody/modules
146
@dirrm lib/prosody/modules
128
@dirrm lib/prosody/core
147
@dirrm lib/prosody/core
129
@dirrm lib/prosody
148
@dirrm lib/prosody

Return to bug 182075