View | Details | Raw Unified | Return to bug 223637
Collapse All | Expand All

(-)b/net-im/prosody/Makefile (-2 / +1 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	prosody
4
PORTNAME=	prosody
5
PORTVERSION=	0.9.12
5
PORTVERSION=	0.10.0
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 17-23 RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/core.so:net/luasocket-51 \ Link Here
17
		${LUA_MODLIBDIR}/ssl.so:security/luasec-51 \
17
		${LUA_MODLIBDIR}/ssl.so:security/luasec-51 \
18
		${LUA_MODLIBDIR}/lxp.so:textproc/luaexpat-51 \
18
		${LUA_MODLIBDIR}/lxp.so:textproc/luaexpat-51 \
19
		${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem-51
19
		${LUA_MODLIBDIR}/lfs.so:devel/luafilesystem-51
20
21
LIB_DEPENDS=	libidn.so:dns/libidn
20
LIB_DEPENDS=	libidn.so:dns/libidn
22
21
23
USES=		cpe gmake lua:51 shebangfix ssl
22
USES=		cpe gmake lua:51 shebangfix ssl
(-)b/net-im/prosody/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1484211518
1
TIMESTAMP = 1510389229
2
SHA256 (prosody-0.9.12.tar.gz) = 1a59a322b71928a21985522aa00d0eab3552208d7bf9ecb318542a1b2fee3e8d
2
SHA256 (prosody-0.10.0.tar.gz) = 7414e447256c60b2645578c4a5913113cd74b419ca5a032b54db90d98a978498
3
SIZE (prosody-0.9.12.tar.gz) = 267869
3
SIZE (prosody-0.10.0.tar.gz) = 330461
(-)b/net-im/prosody/files/patch-Makefile (-13 / +13 lines)
Lines 1-20 Link Here
1
--- Makefile.orig	2014-01-12 05:41:40.000000000 -0600
1
--- Makefile.orig	2017-09-28 13:07:47 UTC
2
+++ Makefile	2014-03-15 11:58:25.725744098 -0500
2
+++ Makefile
3
@@ -6,7 +6,7 @@
3
@@ -6,7 +6,7 @@ CONFIG = $(DESTDIR)$(SYSCONFDIR)
4
 MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
4
 MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
5
 SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
5
 SOURCE = $(DESTDIR)$(LIBDIR)/prosody
6
 DATA = $(DESTDIR)$(DATADIR)
6
 DATA = $(DESTDIR)$(DATADIR)
7
-MAN = $(DESTDIR)$(PREFIX)/share/man
7
-MAN = $(DESTDIR)$(PREFIX)/share/man
8
+MAN = $(DESTDIR)$(PREFIX)/man
8
+MAN = $(DESTDIR)$(PREFIX)/man
9
 
9
 
10
 INSTALLEDSOURCE = $(PREFIX)/lib/prosody
10
 INSTALLEDSOURCE = $(LIBDIR)/prosody
11
 INSTALLEDCONFIG = $(SYSCONFDIR)
11
 INSTALLEDCONFIG = $(SYSCONFDIR)
12
@@ -40,7 +40,7 @@
12
@@ -53,7 +53,7 @@ install: prosody.install prosodyctl.install prosody.cf
13
 	umask 0022 && cp -r plugins/* $(MODULES)
13
 	$(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
14
 	install -m644 certs/* $(CONFIG)/certs
14
 	$(INSTALL_DATA) certs/* $(CONFIG)/certs
15
 	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
15
 	$(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
16
-	test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
16
-	test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
17
+	install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
17
+	$(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
18
 	test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
18
 	-test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
19
 	$(MAKE) install -C util-src
19
 	$(MAKE) install -C util-src
20
 
20
 
(-)b/net-im/prosody/files/patch-configure (-15 / +14 lines)
Lines 1-17 Link Here
1
--- configure.orig	2013-12-08 19:05:39.000000000 +0100
1
--- configure.orig	2017-09-28 13:07:47 UTC
2
+++ configure	2014-02-06 22:21:15.000000000 +0100
2
+++ configure
3
@@ -13,11 +13,11 @@
3
@@ -16,10 +16,10 @@ LUA_LIBDIR="/usr/lib"
4
 IDN_LIB=idn
4
 IDN_LIB="idn"
5
 ICU_FLAGS="-licui18n -licudata -licuuc"
5
 ICU_FLAGS="-licui18n -licudata -licuuc"
6
 OPENSSL_LIB=crypto
6
 OPENSSL_LIB="crypto"
7
-CC=gcc
7
-CC="gcc"
8
+CC=cc
8
-LD="gcc"
9
 CXX=g++
9
+CC="cc"
10
-LD=gcc
10
+LD="cc"
11
+LD=cc
11
 RUNWITH="lua"
12
 RUNWITH=lua
12
-EXCERTS="yes"
13
-EXCERTS=yes
13
+EXCERTS="no"
14
+EXCERTS=no
14
 PRNG=
15
 PRNGLIBS=
15
 
16
 
16
 CFLAGS="-fPIC -Wall"
17
 LDFLAGS="-shared"
(-)b/net-im/prosody/files/patch-util-src_pposix.c (+10 lines)
Added Link Here
1
--- util-src/pposix.c.orig	2017-11-11 08:52:04 UTC
2
+++ util-src/pposix.c
3
@@ -21,7 +21,6 @@
4
 #else
5
 #define _DEFAULT_SOURCE
6
 #endif
7
-#define _POSIX_C_SOURCE 200809L
8
 
9
 #include <stdlib.h>
10
 #include <math.h>
(-)b/net-im/prosody/pkg-plist (-12 / +46 lines)
Lines 15-20 lib/prosody/core/portmanager.lua Link Here
15
lib/prosody/core/s2smanager.lua
15
lib/prosody/core/s2smanager.lua
16
lib/prosody/core/sessionmanager.lua
16
lib/prosody/core/sessionmanager.lua
17
lib/prosody/core/stanza_router.lua
17
lib/prosody/core/stanza_router.lua
18
lib/prosody/core/statsmanager.lua
18
lib/prosody/core/storagemanager.lua
19
lib/prosody/core/storagemanager.lua
19
lib/prosody/core/usermanager.lua
20
lib/prosody/core/usermanager.lua
20
lib/prosody/modules/mod_admin_adhoc.lua
21
lib/prosody/modules/mod_admin_adhoc.lua
Lines 30-49 lib/prosody/modules/mod_http_files.lua Link Here
30
lib/prosody/modules/mod_motd.lua
31
lib/prosody/modules/mod_motd.lua
31
lib/prosody/modules/mod_net_multiplex.lua
32
lib/prosody/modules/mod_net_multiplex.lua
32
lib/prosody/modules/mod_offline.lua
33
lib/prosody/modules/mod_offline.lua
33
lib/prosody/modules/mod_pubsub.lua
34
lib/prosody/modules/mod_storage_internal.lua
34
lib/prosody/modules/mod_storage_internal.lua
35
lib/prosody/modules/mod_storage_none.lua
35
lib/prosody/modules/mod_storage_none.lua
36
lib/prosody/modules/mod_storage_sql.lua
36
lib/prosody/modules/mod_storage_sql.lua
37
lib/prosody/modules/mod_storage_sql1.lua
38
lib/prosody/modules/mod_storage_xep0227.lua
37
lib/prosody/modules/mod_announce.lua
39
lib/prosody/modules/mod_announce.lua
40
lib/prosody/modules/mod_blocklist.lua
38
lib/prosody/modules/mod_bosh.lua
41
lib/prosody/modules/mod_bosh.lua
42
lib/prosody/modules/mod_carbons.lua
39
lib/prosody/modules/mod_component.lua
43
lib/prosody/modules/mod_component.lua
40
lib/prosody/modules/mod_compression.lua
44
lib/prosody/modules/mod_compression.lua
45
lib/prosody/modules/mod_debug_sql.lua
41
lib/prosody/modules/mod_dialback.lua
46
lib/prosody/modules/mod_dialback.lua
42
lib/prosody/modules/mod_disco.lua
47
lib/prosody/modules/mod_disco.lua
43
lib/prosody/modules/mod_groups.lua
48
lib/prosody/modules/mod_groups.lua
44
lib/prosody/modules/mod_iq.lua
49
lib/prosody/modules/mod_iq.lua
45
lib/prosody/modules/mod_lastactivity.lua
50
lib/prosody/modules/mod_lastactivity.lua
46
lib/prosody/modules/mod_legacyauth.lua
51
lib/prosody/modules/mod_legacyauth.lua
52
lib/prosody/modules/mod_limits.lua
47
lib/prosody/modules/mod_message.lua
53
lib/prosody/modules/mod_message.lua
48
lib/prosody/modules/mod_pep.lua
54
lib/prosody/modules/mod_pep.lua
49
lib/prosody/modules/mod_ping.lua
55
lib/prosody/modules/mod_ping.lua
Lines 54-77 lib/prosody/modules/mod_private.lua Link Here
54
lib/prosody/modules/mod_proxy65.lua
60
lib/prosody/modules/mod_proxy65.lua
55
lib/prosody/modules/mod_register.lua
61
lib/prosody/modules/mod_register.lua
56
lib/prosody/modules/mod_roster.lua
62
lib/prosody/modules/mod_roster.lua
63
lib/prosody/modules/mod_s2s_auth_certs.lua
57
lib/prosody/modules/mod_saslauth.lua
64
lib/prosody/modules/mod_saslauth.lua
65
lib/prosody/modules/mod_server_contact_info.lua
58
lib/prosody/modules/mod_time.lua
66
lib/prosody/modules/mod_time.lua
59
lib/prosody/modules/mod_tls.lua
67
lib/prosody/modules/mod_tls.lua
68
lib/prosody/modules/mod_unknown.lua
60
lib/prosody/modules/mod_uptime.lua
69
lib/prosody/modules/mod_uptime.lua
61
lib/prosody/modules/mod_vcard.lua
70
lib/prosody/modules/mod_vcard.lua
62
lib/prosody/modules/mod_version.lua
71
lib/prosody/modules/mod_version.lua
63
lib/prosody/modules/mod_watchregistrations.lua
72
lib/prosody/modules/mod_watchregistrations.lua
73
lib/prosody/modules/mod_websocket.lua
64
lib/prosody/modules/mod_welcome.lua
74
lib/prosody/modules/mod_welcome.lua
65
lib/prosody/modules/sql.lib.lua
75
lib/prosody/modules/mod_windows.lua
76
lib/prosody/modules/mod_pubsub/mod_pubsub.lua
77
lib/prosody/modules/mod_pubsub/pubsub.lib.lua
78
lib/prosody/modules/mod_mam/fallback_archive.lib.lua
79
lib/prosody/modules/mod_mam/mamprefs.lib.lua
80
lib/prosody/modules/mod_mam/mamprefsxml.lib.lua
81
lib/prosody/modules/mod_mam/mod_mam.lua
66
lib/prosody/modules/adhoc/adhoc.lib.lua
82
lib/prosody/modules/adhoc/adhoc.lib.lua
67
lib/prosody/modules/adhoc/mod_adhoc.lua
83
lib/prosody/modules/adhoc/mod_adhoc.lua
68
lib/prosody/modules/mod_s2s/mod_s2s.lua
84
lib/prosody/modules/mod_s2s/mod_s2s.lua
69
lib/prosody/modules/mod_s2s/s2sout.lib.lua
85
lib/prosody/modules/mod_s2s/s2sout.lib.lua
70
lib/prosody/modules/muc/mod_muc.lua
86
lib/prosody/modules/muc/mod_muc.lua
71
lib/prosody/modules/muc/muc.lib.lua
87
lib/prosody/modules/muc/muc.lib.lua
72
lib/prosody/modules/storage/mod_xep0227.lua
73
lib/prosody/modules/storage/sqlbasic.lib.lua
74
lib/prosody/modules/storage/xep227store.lib.lua
75
lib/prosody/net/adns.lua
88
lib/prosody/net/adns.lua
76
lib/prosody/net/connlisteners.lua
89
lib/prosody/net/connlisteners.lua
77
lib/prosody/net/dns.lua
90
lib/prosody/net/dns.lua
Lines 83-91 lib/prosody/net/server_select.lua Link Here
83
lib/prosody/net/http/codes.lua
96
lib/prosody/net/http/codes.lua
84
lib/prosody/net/http/parser.lua
97
lib/prosody/net/http/parser.lua
85
lib/prosody/net/http/server.lua
98
lib/prosody/net/http/server.lua
99
lib/prosody/net/websocket.lua
100
lib/prosody/net/websocket/frames.lua
86
lib/prosody/prosody.version
101
lib/prosody/prosody.version
87
lib/prosody/util/adhoc.lua
102
lib/prosody/util/adhoc.lua
88
lib/prosody/util/array.lua
103
lib/prosody/util/array.lua
104
lib/prosody/util/cache.lua
89
lib/prosody/util/caps.lua
105
lib/prosody/util/caps.lua
90
lib/prosody/util/dataforms.lua
106
lib/prosody/util/dataforms.lua
91
lib/prosody/util/datamanager.lua
107
lib/prosody/util/datamanager.lua
Lines 96-136 lib/prosody/util/encodings.so Link Here
96
lib/prosody/util/envload.lua
112
lib/prosody/util/envload.lua
97
lib/prosody/util/events.lua
113
lib/prosody/util/events.lua
98
lib/prosody/util/filters.lua
114
lib/prosody/util/filters.lua
115
lib/prosody/util/format.lua
99
lib/prosody/util/hashes.so
116
lib/prosody/util/hashes.so
100
lib/prosody/util/helpers.lua
117
lib/prosody/util/helpers.lua
118
lib/prosody/util/hex.lua
101
lib/prosody/util/hmac.lua
119
lib/prosody/util/hmac.lua
102
lib/prosody/util/http.lua
120
lib/prosody/util/http.lua
121
lib/prosody/util/id.lua
103
lib/prosody/util/import.lua
122
lib/prosody/util/import.lua
123
lib/prosody/util/interpolation.lua
104
lib/prosody/util/ip.lua
124
lib/prosody/util/ip.lua
105
lib/prosody/util/iterators.lua
125
lib/prosody/util/iterators.lua
106
lib/prosody/util/jid.lua
126
lib/prosody/util/jid.lua
107
lib/prosody/util/json.lua
127
lib/prosody/util/json.lua
108
lib/prosody/util/logger.lua
128
lib/prosody/util/logger.lua
129
lib/prosody/util/mercurial.lua
109
lib/prosody/util/multitable.lua
130
lib/prosody/util/multitable.lua
110
lib/prosody/util/net.so
131
lib/prosody/util/net.so
111
lib/prosody/util/openssl.lua
132
lib/prosody/util/openssl.lua
133
lib/prosody/util/paths.lua
112
lib/prosody/util/pluginloader.lua
134
lib/prosody/util/pluginloader.lua
113
lib/prosody/util/pposix.so
135
lib/prosody/util/pposix.so
136
lib/prosody/util/presence.lua
114
lib/prosody/util/prosodyctl.lua
137
lib/prosody/util/prosodyctl.lua
115
lib/prosody/util/pubsub.lua
138
lib/prosody/util/pubsub.lua
139
lib/prosody/util/queue.lua
140
lib/prosody/util/random.lua
116
lib/prosody/util/rfc6724.lua
141
lib/prosody/util/rfc6724.lua
142
lib/prosody/util/ringbuffer.so
143
lib/prosody/util/rsm.lua
117
lib/prosody/util/sasl.lua
144
lib/prosody/util/sasl.lua
118
lib/prosody/util/sql.lua
119
lib/prosody/util/template.lua
120
lib/prosody/util/throttle.lua
121
lib/prosody/util/watchdog.lua
122
lib/prosody/util/x509.lua
123
lib/prosody/util/xml.lua
124
lib/prosody/util/xmppstream.lua
125
lib/prosody/util/serialization.lua
145
lib/prosody/util/serialization.lua
146
lib/prosody/util/session.lua
126
lib/prosody/util/set.lua
147
lib/prosody/util/set.lua
127
lib/prosody/util/signal.so
148
lib/prosody/util/signal.so
149
lib/prosody/util/sql.lua
150
lib/prosody/util/sslconfig.lua
128
lib/prosody/util/stanza.lua
151
lib/prosody/util/stanza.lua
152
lib/prosody/util/statistics.lua
153
lib/prosody/util/statsd.lua
154
lib/prosody/util/table.so
155
lib/prosody/util/template.lua
129
lib/prosody/util/termcolours.lua
156
lib/prosody/util/termcolours.lua
157
lib/prosody/util/throttle.lua
158
lib/prosody/util/time.lua
130
lib/prosody/util/timer.lua
159
lib/prosody/util/timer.lua
131
lib/prosody/util/uuid.lua
160
lib/prosody/util/uuid.lua
161
lib/prosody/util/watchdog.lua
162
lib/prosody/util/x509.lua
163
lib/prosody/util/xml.lua
164
lib/prosody/util/xmppstream.lua
132
lib/prosody/util/sasl/anonymous.lua
165
lib/prosody/util/sasl/anonymous.lua
133
lib/prosody/util/sasl/digest-md5.lua
166
lib/prosody/util/sasl/digest-md5.lua
167
lib/prosody/util/sasl/external.lua
134
lib/prosody/util/sasl/plain.lua
168
lib/prosody/util/sasl/plain.lua
135
lib/prosody/util/sasl/scram.lua
169
lib/prosody/util/sasl/scram.lua
136
lib/prosody/util/sasl_cyrus.lua
170
lib/prosody/util/sasl_cyrus.lua

Return to bug 223637