Thu Nov 23 22:06:15 2017 UTC ()
Update chat/prosody to 0.10.0

- Rewritten SQL storage module with archive support
- SCRAM-SHA-1-PLUS
- prosodyctl check
- Statistics
- Improved TLS configuration
- Lua 5.2 support
- mod_blocklist (XEP-0191)
- mod_carbons (XEP-0280)
- Pluggable connection timeout handling
- mod_websocket (RFC 7395)
- mod_mam (XEP-0313)

See release notes on upgrading:

  https://prosody.im/doc/release/0.10.0#upgrade_notes


(fhajny)
diff -r1.27 -r1.28 pkgsrc/chat/prosody/Makefile
diff -r1.8 -r1.9 pkgsrc/chat/prosody/PLIST
diff -r1.14 -r1.15 pkgsrc/chat/prosody/distinfo
diff -r1.6 -r1.7 pkgsrc/chat/prosody/patches/patch-aa
diff -r1.5 -r1.6 pkgsrc/chat/prosody/patches/patch-ab
diff -r1.3 -r1.4 pkgsrc/chat/prosody/patches/patch-ad
diff -r1.2 -r0 pkgsrc/chat/prosody/patches/patch-prosodyctl
diff -r1.1 -r1.2 pkgsrc/chat/prosody/patches/patch-util-src_Makefile
diff -r1.1 -r1.2 pkgsrc/chat/prosody/patches/patch-util-src_hashes.c
cvs diff -r1.27 -r1.28 pkgsrc/chat/prosody/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/prosody/Makefile 2017/03/01 16:38:31 1.27
+++ pkgsrc/chat/prosody/Makefile 2017/11/23 22:06:15 1.28
@@ -1,53 +1,54 @@ @@ -1,53 +1,54 @@
1# $NetBSD: Makefile,v 1.27 2017/03/01 16:38:31 fhajny Exp $ 1# $NetBSD: Makefile,v 1.28 2017/11/23 22:06:15 fhajny Exp $
2# 2#
3 3
4DISTNAME= prosody-0.9.12 4DISTNAME= prosody-0.10.0
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= http://prosody.im/downloads/source/ 6MASTER_SITES= http://prosody.im/downloads/source/
7 7
8MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
9HOMEPAGE= http://prosody.im/ 9HOMEPAGE= http://prosody.im/
10COMMENT= Flexible communications server for Jabber/XMPP written in Lua 10COMMENT= Flexible communications server for Jabber/XMPP written in Lua
11LICENSE= mit 11LICENSE= mit
12 12
13DEPENDS+= ${LUA_PKGPREFIX}-expat>=1.2:../../textproc/lua-expat 13DEPENDS+= ${LUA_PKGPREFIX}-expat>=1.2:../../textproc/lua-expat
14DEPENDS+= ${LUA_PKGPREFIX}-filesystem>=1.0:../../devel/lua-filesystem 14DEPENDS+= ${LUA_PKGPREFIX}-filesystem>=1.0:../../devel/lua-filesystem
15DEPENDS+= ${LUA_PKGPREFIX}-sec>=0.3.3:../../security/lua-sec 15DEPENDS+= ${LUA_PKGPREFIX}-sec>=0.3.3:../../security/lua-sec
16DEPENDS+= ${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket 16DEPENDS+= ${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
17 17
18HAS_CONFIGURE= yes 18HAS_CONFIGURE= yes
 19USE_LANGUAGES+= c c99
19USE_TOOLS+= gmake 20USE_TOOLS+= gmake
20BUILD_DEFS+= VARBASE 21BUILD_DEFS+= VARBASE
21 22
22LUA_VERSIONS_ACCEPTED= 51 23LUA_VERSIONS_ACCEPTED= 52 51
23 24
24.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
25 26
26PROSODY_USER?= prosody 27PROSODY_USER?= prosody
27PROSODY_GROUP?= ${PROSODY_USER} 28PROSODY_GROUP?= ${PROSODY_USER}
28PROSODY_DATA?= ${VARBASE}/db/prosody 29PROSODY_DATA?= ${VARBASE}/db/prosody
29PROSODY_LOG?= ${VARBASE}/log/prosody 30PROSODY_LOG?= ${VARBASE}/log/prosody
30PROSODY_RUN?= ${VARBASE}/run/prosody 31PROSODY_RUN?= ${VARBASE}/run/prosody
31 32
32OWN_DIRS_PERMS+= ${PROSODY_DATA} ${PROSODY_USER} ${PROSODY_GROUP} 0770 33OWN_DIRS_PERMS+= ${PROSODY_DATA} ${PROSODY_USER} ${PROSODY_GROUP} 0770
33OWN_DIRS_PERMS+= ${PROSODY_LOG} ${PROSODY_USER} ${PROSODY_GROUP} 0770 34OWN_DIRS_PERMS+= ${PROSODY_LOG} ${PROSODY_USER} ${PROSODY_GROUP} 0770
34OWN_DIRS_PERMS+= ${PROSODY_RUN} ${PROSODY_USER} ${PROSODY_GROUP} 0770 35OWN_DIRS_PERMS+= ${PROSODY_RUN} ${PROSODY_USER} ${PROSODY_GROUP} 0770
35MAKE_DIRS+= ${PKG_SYSCONFDIR}/certs 36MAKE_DIRS+= ${PKG_SYSCONFDIR}/certs
36 37
37PKG_USERS_VARS= PROSODY_USER 38PKG_USERS_VARS= PROSODY_USER
38PKG_GROUPS_VARS= PROSODY_GROUP 39PKG_GROUPS_VARS= PROSODY_GROUP
39PKG_GROUPS= ${PROSODY_GROUP} 40PKG_GROUPS= ${PROSODY_GROUP}
40PKG_USERS= ${PROSODY_USER}:${PROSODY_GROUP} 41PKG_USERS= ${PROSODY_USER}:${PROSODY_GROUP}
41PKG_GECOS.${PROSODY_USER}= Prosody daemon user 42PKG_GECOS.${PROSODY_USER}= Prosody daemon user
42PKG_HOME.${PROSODY_USER}= ${PROSODY_DATA} 43PKG_HOME.${PROSODY_USER}= ${PROSODY_DATA}
43PKG_SHELL.${PROSODY_USER}= ${NOLOGIN} 44PKG_SHELL.${PROSODY_USER}= ${NOLOGIN}
44 45
45PKG_SYSCONFSUBDIR= ${PKGBASE} 46PKG_SYSCONFSUBDIR= ${PKGBASE}
46EGDIR= ${PREFIX}/share/examples/${PKGBASE} 47EGDIR= ${PREFIX}/share/examples/${PKGBASE}
47CONF_FILES+= ${EGDIR}/prosody.cfg.lua ${PKG_SYSCONFDIR}/prosody.cfg.lua 48CONF_FILES+= ${EGDIR}/prosody.cfg.lua ${PKG_SYSCONFDIR}/prosody.cfg.lua
48CONF_FILES+= ${EGDIR}/certs/localhost.cnf ${PKG_SYSCONFDIR}/certs/localhost.cnf 49CONF_FILES+= ${EGDIR}/certs/localhost.cnf ${PKG_SYSCONFDIR}/certs/localhost.cnf
49 50
50REPLACE_LUA+= prosody prosodyctl 51REPLACE_LUA+= prosody prosodyctl
51 52
52SUBST_CLASSES+= path 53SUBST_CLASSES+= path
53SUBST_MESSAGE.path= Fixing default paths 54SUBST_MESSAGE.path= Fixing default paths
@@ -59,19 +60,21 @@ SUBST_VARS.path= EGDIR PROSODY_DATA PROS @@ -59,19 +60,21 @@ SUBST_VARS.path= EGDIR PROSODY_DATA PROS
59CONFIGURE_ARGS+= --cflags=${CFLAGS:Q} 60CONFIGURE_ARGS+= --cflags=${CFLAGS:Q}
60CONFIGURE_ARGS+= --datadir=${PROSODY_DATA} 61CONFIGURE_ARGS+= --datadir=${PROSODY_DATA}
61CONFIGURE_ARGS+= --ldflags="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared" 62CONFIGURE_ARGS+= --ldflags="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared"
62CONFIGURE_ARGS+= --no-example-certs 63CONFIGURE_ARGS+= --no-example-certs
63CONFIGURE_ARGS+= --prefix=${PREFIX} 64CONFIGURE_ARGS+= --prefix=${PREFIX}
64CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 65CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
65CONFIGURE_ARGS+= --with-lua-include=${PREFIX}/${LUA_INCDIR} 66CONFIGURE_ARGS+= --with-lua-include=${PREFIX}/${LUA_INCDIR}
66 67
67CFLAGS+= -fPIC -Wall -DLUA_COMPAT_MODULE 68CFLAGS+= -fPIC -Wall -DLUA_COMPAT_MODULE
68MAKE_ENV.SunOS+= SOCKET_LIB=-lsocket 69MAKE_ENV.SunOS+= SOCKET_LIB=-lsocket
69 70
70RCD_SCRIPTS= prosody 71RCD_SCRIPTS= prosody
71 72
 73TEST_TARGET= test
 74
72.include "../../lang/lua/application.mk" 75.include "../../lang/lua/application.mk"
73.include "../../lang/lua/tool.mk" 76.include "../../lang/lua/tool.mk"
74.include "../../devel/libidn/buildlink3.mk" 77.include "../../devel/libidn/buildlink3.mk"
75.include "../../lang/lua/buildlink3.mk" 78.include "../../lang/lua/buildlink3.mk"
76.include "../../security/openssl/buildlink3.mk" 79.include "../../security/openssl/buildlink3.mk"
77.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"
cvs diff -r1.8 -r1.9 pkgsrc/chat/prosody/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/prosody/PLIST 2016/02/26 10:52:01 1.8
+++ pkgsrc/chat/prosody/PLIST 2017/11/23 22:06:15 1.9
@@ -1,138 +1,166 @@ @@ -1,138 +1,166 @@
1@comment $NetBSD: PLIST,v 1.8 2016/02/26 10:52:01 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.9 2017/11/23 22:06:15 fhajny Exp $
2bin/prosody 2bin/prosody
3bin/prosodyctl 3bin/prosodyctl
4lib/prosody/core/certmanager.lua 4lib/prosody/core/certmanager.lua
5lib/prosody/core/configmanager.lua 5lib/prosody/core/configmanager.lua
6lib/prosody/core/hostmanager.lua 6lib/prosody/core/hostmanager.lua
7lib/prosody/core/loggingmanager.lua 7lib/prosody/core/loggingmanager.lua
8lib/prosody/core/moduleapi.lua 8lib/prosody/core/moduleapi.lua
9lib/prosody/core/modulemanager.lua 9lib/prosody/core/modulemanager.lua
10lib/prosody/core/portmanager.lua 10lib/prosody/core/portmanager.lua
11lib/prosody/core/rostermanager.lua 11lib/prosody/core/rostermanager.lua
12lib/prosody/core/s2smanager.lua 12lib/prosody/core/s2smanager.lua
13lib/prosody/core/sessionmanager.lua 13lib/prosody/core/sessionmanager.lua
14lib/prosody/core/stanza_router.lua 14lib/prosody/core/stanza_router.lua
 15lib/prosody/core/statsmanager.lua
15lib/prosody/core/storagemanager.lua 16lib/prosody/core/storagemanager.lua
16lib/prosody/core/usermanager.lua 17lib/prosody/core/usermanager.lua
17lib/prosody/modules/adhoc/adhoc.lib.lua 18lib/prosody/modules/adhoc/adhoc.lib.lua
18lib/prosody/modules/adhoc/mod_adhoc.lua 19lib/prosody/modules/adhoc/mod_adhoc.lua
19lib/prosody/modules/mod_admin_adhoc.lua 20lib/prosody/modules/mod_admin_adhoc.lua
20lib/prosody/modules/mod_admin_telnet.lua 21lib/prosody/modules/mod_admin_telnet.lua
21lib/prosody/modules/mod_announce.lua 22lib/prosody/modules/mod_announce.lua
22lib/prosody/modules/mod_auth_anonymous.lua 23lib/prosody/modules/mod_auth_anonymous.lua
23lib/prosody/modules/mod_auth_cyrus.lua 24lib/prosody/modules/mod_auth_cyrus.lua
24lib/prosody/modules/mod_auth_internal_hashed.lua 25lib/prosody/modules/mod_auth_internal_hashed.lua
25lib/prosody/modules/mod_auth_internal_plain.lua 26lib/prosody/modules/mod_auth_internal_plain.lua
 27lib/prosody/modules/mod_blocklist.lua
26lib/prosody/modules/mod_bosh.lua 28lib/prosody/modules/mod_bosh.lua
27lib/prosody/modules/mod_c2s.lua 29lib/prosody/modules/mod_c2s.lua
 30lib/prosody/modules/mod_carbons.lua
28lib/prosody/modules/mod_component.lua 31lib/prosody/modules/mod_component.lua
29lib/prosody/modules/mod_compression.lua 32lib/prosody/modules/mod_compression.lua
 33lib/prosody/modules/mod_debug_sql.lua
30lib/prosody/modules/mod_dialback.lua 34lib/prosody/modules/mod_dialback.lua
31lib/prosody/modules/mod_disco.lua 35lib/prosody/modules/mod_disco.lua
32lib/prosody/modules/mod_groups.lua 36lib/prosody/modules/mod_groups.lua
33lib/prosody/modules/mod_http.lua 37lib/prosody/modules/mod_http.lua
34lib/prosody/modules/mod_http_errors.lua 38lib/prosody/modules/mod_http_errors.lua
35lib/prosody/modules/mod_http_files.lua 39lib/prosody/modules/mod_http_files.lua
36lib/prosody/modules/mod_iq.lua 40lib/prosody/modules/mod_iq.lua
37lib/prosody/modules/mod_lastactivity.lua 41lib/prosody/modules/mod_lastactivity.lua
38lib/prosody/modules/mod_legacyauth.lua 42lib/prosody/modules/mod_legacyauth.lua
 43lib/prosody/modules/mod_limits.lua
39lib/prosody/modules/mod_message.lua 44lib/prosody/modules/mod_message.lua
40lib/prosody/modules/mod_motd.lua 45lib/prosody/modules/mod_motd.lua
41lib/prosody/modules/mod_net_multiplex.lua 46lib/prosody/modules/mod_net_multiplex.lua
42lib/prosody/modules/mod_offline.lua 47lib/prosody/modules/mod_offline.lua
43lib/prosody/modules/mod_pep.lua 48lib/prosody/modules/mod_pep.lua
44lib/prosody/modules/mod_ping.lua 49lib/prosody/modules/mod_ping.lua
45lib/prosody/modules/mod_posix.lua 50lib/prosody/modules/mod_posix.lua
46lib/prosody/modules/mod_presence.lua 51lib/prosody/modules/mod_presence.lua
47lib/prosody/modules/mod_privacy.lua 52lib/prosody/modules/mod_privacy.lua
48lib/prosody/modules/mod_private.lua 53lib/prosody/modules/mod_private.lua
49lib/prosody/modules/mod_proxy65.lua 54lib/prosody/modules/mod_proxy65.lua
50lib/prosody/modules/mod_pubsub.lua 
51lib/prosody/modules/mod_register.lua 55lib/prosody/modules/mod_register.lua
52lib/prosody/modules/mod_roster.lua 56lib/prosody/modules/mod_roster.lua
53lib/prosody/modules/mod_s2s/mod_s2s.lua 57lib/prosody/modules/mod_s2s/mod_s2s.lua
54lib/prosody/modules/mod_s2s/s2sout.lib.lua 58lib/prosody/modules/mod_s2s/s2sout.lib.lua
 59lib/prosody/modules/mod_s2s_auth_certs.lua
55lib/prosody/modules/mod_saslauth.lua 60lib/prosody/modules/mod_saslauth.lua
 61lib/prosody/modules/mod_server_contact_info.lua
56lib/prosody/modules/mod_storage_internal.lua 62lib/prosody/modules/mod_storage_internal.lua
57lib/prosody/modules/mod_storage_none.lua 63lib/prosody/modules/mod_storage_none.lua
58lib/prosody/modules/mod_storage_sql.lua 64lib/prosody/modules/mod_storage_sql.lua
 65lib/prosody/modules/mod_storage_sql1.lua
 66lib/prosody/modules/mod_storage_xep0227.lua
59lib/prosody/modules/mod_time.lua 67lib/prosody/modules/mod_time.lua
60lib/prosody/modules/mod_tls.lua 68lib/prosody/modules/mod_tls.lua
 69lib/prosody/modules/mod_unknown.lua
61lib/prosody/modules/mod_uptime.lua 70lib/prosody/modules/mod_uptime.lua
62lib/prosody/modules/mod_vcard.lua 71lib/prosody/modules/mod_vcard.lua
63lib/prosody/modules/mod_version.lua 72lib/prosody/modules/mod_version.lua
64lib/prosody/modules/mod_watchregistrations.lua 73lib/prosody/modules/mod_watchregistrations.lua
 74lib/prosody/modules/mod_websocket.lua
65lib/prosody/modules/mod_welcome.lua 75lib/prosody/modules/mod_welcome.lua
 76lib/prosody/modules/mod_windows.lua
66lib/prosody/modules/muc/mod_muc.lua 77lib/prosody/modules/muc/mod_muc.lua
67lib/prosody/modules/muc/muc.lib.lua 78lib/prosody/modules/muc/muc.lib.lua
68lib/prosody/modules/sql.lib.lua 
69lib/prosody/modules/storage/mod_xep0227.lua 
70lib/prosody/modules/storage/sqlbasic.lib.lua 
71lib/prosody/modules/storage/xep227store.lib.lua 
72lib/prosody/net/adns.lua 79lib/prosody/net/adns.lua
73lib/prosody/net/connlisteners.lua 80lib/prosody/net/connlisteners.lua
74lib/prosody/net/dns.lua 81lib/prosody/net/dns.lua
75lib/prosody/net/http.lua 82lib/prosody/net/http.lua
76lib/prosody/net/http/codes.lua 83lib/prosody/net/http/codes.lua
77lib/prosody/net/http/parser.lua 84lib/prosody/net/http/parser.lua
78lib/prosody/net/http/server.lua 85lib/prosody/net/http/server.lua
79lib/prosody/net/httpserver.lua 86lib/prosody/net/httpserver.lua
80lib/prosody/net/server.lua 87lib/prosody/net/server.lua
81lib/prosody/net/server_event.lua 88lib/prosody/net/server_event.lua
82lib/prosody/net/server_select.lua 89lib/prosody/net/server_select.lua
 90lib/prosody/net/websocket.lua
83lib/prosody/prosody.version 91lib/prosody/prosody.version
84lib/prosody/util/adhoc.lua 92lib/prosody/util/adhoc.lua
85lib/prosody/util/array.lua 93lib/prosody/util/array.lua
 94lib/prosody/util/cache.lua
86lib/prosody/util/caps.lua 95lib/prosody/util/caps.lua
87lib/prosody/util/dataforms.lua 96lib/prosody/util/dataforms.lua
88lib/prosody/util/datamanager.lua 97lib/prosody/util/datamanager.lua
89lib/prosody/util/datetime.lua 98lib/prosody/util/datetime.lua
90lib/prosody/util/debug.lua 99lib/prosody/util/debug.lua
91lib/prosody/util/dependencies.lua 100lib/prosody/util/dependencies.lua
92lib/prosody/util/encodings.so 101lib/prosody/util/encodings.so
93lib/prosody/util/envload.lua 102lib/prosody/util/envload.lua
94lib/prosody/util/events.lua 103lib/prosody/util/events.lua
95lib/prosody/util/filters.lua 104lib/prosody/util/filters.lua
 105lib/prosody/util/format.lua
96lib/prosody/util/hashes.so 106lib/prosody/util/hashes.so
97lib/prosody/util/helpers.lua 107lib/prosody/util/helpers.lua
 108lib/prosody/util/hex.lua
98lib/prosody/util/hmac.lua 109lib/prosody/util/hmac.lua
99lib/prosody/util/http.lua 110lib/prosody/util/http.lua
 111lib/prosody/util/id.lua
100lib/prosody/util/import.lua 112lib/prosody/util/import.lua
 113lib/prosody/util/interpolation.lua
101lib/prosody/util/ip.lua 114lib/prosody/util/ip.lua
102lib/prosody/util/iterators.lua 115lib/prosody/util/iterators.lua
103lib/prosody/util/jid.lua 116lib/prosody/util/jid.lua
104lib/prosody/util/json.lua 117lib/prosody/util/json.lua
105lib/prosody/util/logger.lua 118lib/prosody/util/logger.lua
 119lib/prosody/util/mercurial.lua
106lib/prosody/util/multitable.lua 120lib/prosody/util/multitable.lua
107lib/prosody/util/net.so 121lib/prosody/util/net.so
108lib/prosody/util/openssl.lua 122lib/prosody/util/openssl.lua
 123lib/prosody/util/paths.lua
109lib/prosody/util/pluginloader.lua 124lib/prosody/util/pluginloader.lua
110lib/prosody/util/pposix.so 125lib/prosody/util/pposix.so
 126lib/prosody/util/presence.lua
111lib/prosody/util/prosodyctl.lua 127lib/prosody/util/prosodyctl.lua
112lib/prosody/util/pubsub.lua 128lib/prosody/util/pubsub.lua
 129lib/prosody/util/queue.lua
 130lib/prosody/util/random.lua
113lib/prosody/util/rfc6724.lua 131lib/prosody/util/rfc6724.lua
 132lib/prosody/util/ringbuffer.so
 133lib/prosody/util/rsm.lua
114lib/prosody/util/sasl.lua 134lib/prosody/util/sasl.lua
115lib/prosody/util/sasl/anonymous.lua 135lib/prosody/util/sasl/anonymous.lua
116lib/prosody/util/sasl/digest-md5.lua 136lib/prosody/util/sasl/digest-md5.lua
 137lib/prosody/util/sasl/external.lua
117lib/prosody/util/sasl/plain.lua 138lib/prosody/util/sasl/plain.lua
118lib/prosody/util/sasl/scram.lua 139lib/prosody/util/sasl/scram.lua
119lib/prosody/util/sasl_cyrus.lua 140lib/prosody/util/sasl_cyrus.lua
120lib/prosody/util/serialization.lua 141lib/prosody/util/serialization.lua
 142lib/prosody/util/session.lua
121lib/prosody/util/set.lua 143lib/prosody/util/set.lua
122lib/prosody/util/signal.so 144lib/prosody/util/signal.so
123lib/prosody/util/sql.lua 145lib/prosody/util/sql.lua
 146lib/prosody/util/sslconfig.lua
124lib/prosody/util/stanza.lua 147lib/prosody/util/stanza.lua
 148lib/prosody/util/statistics.lua
 149lib/prosody/util/statsd.lua
 150lib/prosody/util/table.so
125lib/prosody/util/template.lua 151lib/prosody/util/template.lua
126lib/prosody/util/termcolours.lua 152lib/prosody/util/termcolours.lua
127lib/prosody/util/throttle.lua 153lib/prosody/util/throttle.lua
 154lib/prosody/util/time.lua
128lib/prosody/util/timer.lua 155lib/prosody/util/timer.lua
129lib/prosody/util/uuid.lua 156lib/prosody/util/uuid.lua
130lib/prosody/util/watchdog.lua 157lib/prosody/util/watchdog.lua
131lib/prosody/util/x509.lua 158lib/prosody/util/x509.lua
132lib/prosody/util/xml.lua 159lib/prosody/util/xml.lua
133lib/prosody/util/xmppstream.lua 160lib/prosody/util/xmppstream.lua
134man/man1/prosodyctl.1 161man/man1/prosodyctl.1
135share/examples/prosody/certs/Makefile 162share/examples/prosody/certs/Makefile
136share/examples/prosody/certs/localhost.cnf 163share/examples/prosody/certs/localhost.cnf
137share/examples/prosody/certs/openssl.cnf 164share/examples/prosody/certs/openssl.cnf
138share/examples/prosody/prosody.cfg.lua 165share/examples/prosody/prosody.cfg.lua
 166@pkgdir lib/prosody/modules/storage
cvs diff -r1.14 -r1.15 pkgsrc/chat/prosody/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/prosody/distinfo 2017/03/01 16:38:31 1.14
+++ pkgsrc/chat/prosody/distinfo 2017/11/23 22:06:15 1.15
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1$NetBSD: distinfo,v 1.14 2017/03/01 16:38:31 fhajny Exp $ 1$NetBSD: distinfo,v 1.15 2017/11/23 22:06:15 fhajny Exp $
2 2
3SHA1 (prosody-0.9.12.tar.gz) = 1ee224263a5b3d67960e12edbbe6b2f16b95d147 3SHA1 (prosody-0.10.0.tar.gz) = 57c1c5a665e6453bdde06727ef398cd69accd9d7
4RMD160 (prosody-0.9.12.tar.gz) = 5d5d16d839936d4577228e7b7de06e9bb95d001a 4RMD160 (prosody-0.10.0.tar.gz) = dad7a9329fb94bffbaf3177a86aa2740360f74c8
5SHA512 (prosody-0.9.12.tar.gz) = e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76 5SHA512 (prosody-0.10.0.tar.gz) = ee66e240afba6a8cb286623da48d9b535798153fb65e32070cec93aafe360e91f7087eeb49dec0f7d145e24f04339ed0878e50835b52f682130b204e22990ce9
6Size (prosody-0.9.12.tar.gz) = 267869 bytes 6Size (prosody-0.10.0.tar.gz) = 330461 bytes
7SHA1 (patch-aa) = a51829983e9b4b28ee769a101df3dec00daf677d 7SHA1 (patch-aa) = 5725cddbb77358d3bf75c55f122fe91051efbae3
8SHA1 (patch-ab) = 755dd6d77689ef56ea4468f943f149933be72378 8SHA1 (patch-ab) = 15acaf1320eec02c6d4a0b005350dc49dbd20af5
9SHA1 (patch-ad) = abcae34982fee846c00252be1c0b033a44ad65d0 9SHA1 (patch-ad) = 3683833ef1c45e521542f04df4e6df698e727671
10SHA1 (patch-prosodyctl) = e3e3a8f03c6d7c74b9026cf7ada765ee86c8397e 10SHA1 (patch-util-src_Makefile) = 0405f68a3b4c7f4f7a98d67230470a2a11078869
11SHA1 (patch-util-src_Makefile) = be6d7dd7224a56687238a85827756c109d068a96 11SHA1 (patch-util-src_hashes.c) = 9c5b02f3ad652a9cb12ee4cbf4a6b7d235668932
12SHA1 (patch-util-src_hashes.c) = ddd8a623209def4e7ff923d71a20e0c143f6ebaf 
cvs diff -r1.6 -r1.7 pkgsrc/chat/prosody/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/prosody/patches/Attic/patch-aa 2016/01/25 13:01:39 1.6
+++ pkgsrc/chat/prosody/patches/Attic/patch-aa 2017/11/23 22:06:15 1.7
@@ -1,55 +1,63 @@ @@ -1,55 +1,63 @@
1$NetBSD: patch-aa,v 1.6 2016/01/25 13:01:39 fhajny Exp $ 1$NetBSD: patch-aa,v 1.7 2017/11/23 22:06:15 fhajny Exp $
2 2
3Fix installation directories and scripts 3Fix installation directories and scripts
4--- Makefile.orig 2016-01-08 13:07:07.000000000 +0000 4
 5--- Makefile.orig 2017-11-17 20:57:32.803849000 +0000
5+++ Makefile 6+++ Makefile
6@@ -3,10 +3,11 @@ include config.unix 7@@ -3,10 +3,11 @@ include config.unix
7  8
8 BIN = $(DESTDIR)$(PREFIX)/bin 9 BIN = $(DESTDIR)$(PREFIX)/bin
9 CONFIG = $(DESTDIR)$(SYSCONFDIR) 10 CONFIG = $(DESTDIR)$(SYSCONFDIR)
10+EGDIR = $(DESTDIR)@EGDIR@ 11+EGDIR = $(DESTDIR)@EGDIR@
11 MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules 12 MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
12 SOURCE = $(DESTDIR)$(LIBDIR)/prosody 13 SOURCE = $(DESTDIR)$(LIBDIR)/prosody
13 DATA = $(DESTDIR)$(DATADIR) 14 DATA = $(DESTDIR)$(DATADIR)
14-MAN = $(DESTDIR)$(PREFIX)/share/man 15-MAN = $(DESTDIR)$(PREFIX)/share/man
15+MAN = $(DESTDIR)$(PREFIX)/$(PKGMANDIR) 16+MAN = $(DESTDIR)$(PREFIX)/$(PKGMANDIR)
16  17
17 INSTALLEDSOURCE = $(LIBDIR)/prosody 18 INSTALLEDSOURCE = $(LIBDIR)/prosody
18 INSTALLEDCONFIG = $(SYSCONFDIR) 19 INSTALLEDCONFIG = $(SYSCONFDIR)
19@@ -22,26 +23,39 @@ ifeq ($(EXCERTS),yes) 20@@ -28,35 +29,39 @@ ifeq ($(EXCERTS),yes)
20 endif 21 endif
21  22
22 install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so 23 install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
23- install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE) 24- $(MKDIR) $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
24- install -m750 -d $(DATA) 25- $(MKDIR_PRIVATE) $(DATA)
25- install -d $(MAN)/man1 26- $(MKDIR) $(MAN)/man1
26- install -d $(CONFIG)/certs 27- $(MKDIR) $(CONFIG)/certs
27- install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util 28- $(MKDIR) $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
28- install -m755 ./prosody.install $(BIN)/prosody 29- $(INSTALL_EXEC) ./prosody.install $(BIN)/prosody
29- install -m755 ./prosodyctl.install $(BIN)/prosodyctl 30- $(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
30- install -m644 core/*.lua $(SOURCE)/core 31- $(INSTALL_DATA) core/*.lua $(SOURCE)/core
31- install -m644 net/*.lua $(SOURCE)/net 32- $(INSTALL_DATA) net/*.lua $(SOURCE)/net
32- install -d $(SOURCE)/net/http 33- $(MKDIR) $(SOURCE)/net/http $(SOURCE)/net/websocket
33- install -m644 net/http/*.lua $(SOURCE)/net/http 34- $(INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
34- install -m644 util/*.lua $(SOURCE)/util 35- $(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
35- install -m644 util/*.so $(SOURCE)/util 36- $(INSTALL_DATA) util/*.lua $(SOURCE)/util
36- install -d $(SOURCE)/util/sasl 37- $(INSTALL_DATA) util/*.so $(SOURCE)/util
37- install -m644 util/sasl/* $(SOURCE)/util/sasl 38- $(MKDIR) $(SOURCE)/util/sasl
38- umask 0022 && cp -r plugins/* $(MODULES) 39- $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
39- install -m644 certs/* $(CONFIG)/certs 40- $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
40- install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1 41- $(INSTALL_DATA) plugins/*.lua $(MODULES)
41- test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua 42- $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
42- test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true 43- $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
 44- $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
 45- $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
 46- $(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
 47- $(INSTALL_DATA) certs/* $(CONFIG)/certs
 48- $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
 49- test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
 50- -test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
43+ $(BSD_INSTALL_SCRIPT_DIR) $(BIN) 51+ $(BSD_INSTALL_SCRIPT_DIR) $(BIN)
44+ $(BSD_INSTALL_DATA_DIR) $(EGDIR) 52+ $(BSD_INSTALL_DATA_DIR) $(EGDIR)
45+ $(BSD_INSTALL_DATA_DIR) $(MODULES) 53+ $(BSD_INSTALL_DATA_DIR) $(MODULES)
46+ $(BSD_INSTALL_DATA_DIR) $(SOURCE) 54+ $(BSD_INSTALL_DATA_DIR) $(SOURCE)
47+ $(BSD_INSTALL_DATA_DIR) -m 750 $(DATA) 55+ $(BSD_INSTALL_DATA_DIR) -m 750 $(DATA)
48+ $(BSD_INSTALL_MAN_DIR) $(MAN)/man1 56+ $(BSD_INSTALL_MAN_DIR) $(MAN)/man1
49+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/core 57+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/core
50+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net 58+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net
51+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util 59+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util
52+ $(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody 60+ $(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody
53+ $(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl 61+ $(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl
54+ $(BSD_INSTALL_DATA) core/*.lua $(SOURCE)/core 62+ $(BSD_INSTALL_DATA) core/*.lua $(SOURCE)/core
55+ $(BSD_INSTALL_DATA) net/*.lua $(SOURCE)/net 63+ $(BSD_INSTALL_DATA) net/*.lua $(SOURCE)/net
@@ -59,20 +67,21 @@ Fix installation directories and scripts @@ -59,20 +67,21 @@ Fix installation directories and scripts
59+ $(BSD_INSTALL_LIB) util/*.so $(SOURCE)/util 67+ $(BSD_INSTALL_LIB) util/*.so $(SOURCE)/util
60+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl 68+ $(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl
61+ $(BSD_INSTALL_DATA) util/sasl/* $(SOURCE)/util/sasl 69+ $(BSD_INSTALL_DATA) util/sasl/* $(SOURCE)/util/sasl
62+ $(BSD_INSTALL_DATA) plugins/*.lua $(MODULES) 70+ $(BSD_INSTALL_DATA) plugins/*.lua $(MODULES)
63+ $(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs 71+ $(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
64+ $(BSD_INSTALL_DATA) certs/* $(EGDIR)/certs 72+ $(BSD_INSTALL_DATA) certs/* $(EGDIR)/certs
65+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc 73+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc
66+ $(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc 74+ $(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
67+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_s2s 75+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_s2s
68+ $(BSD_INSTALL_DATA) plugins/mod_s2s/* $(MODULES)/mod_s2s 76+ $(BSD_INSTALL_DATA) plugins/mod_s2s/* $(MODULES)/mod_s2s
69+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/muc 77+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
70+ $(BSD_INSTALL_DATA) plugins/muc/* $(MODULES)/muc 78+ $(BSD_INSTALL_DATA) plugins/muc/* $(MODULES)/muc
71+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/storage 79+ $(BSD_INSTALL_LIB_DIR) $(MODULES)/storage
72+ $(BSD_INSTALL_DATA) plugins/storage/* $(MODULES)/storage 
73+ $(BSD_INSTALL_MAN) man/prosodyctl.man $(MAN)/man1/prosodyctl.1 80+ $(BSD_INSTALL_MAN) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
74+ $(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua 81+ $(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua
75+ $(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version 82+ $(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
76 $(MAKE) install -C util-src 83 $(MAKE) install -C util-src
77  84-
78 clean: 85 clean:
 86 rm -f prosody.install
 87 rm -f prosodyctl.install
cvs diff -r1.5 -r1.6 pkgsrc/chat/prosody/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/chat/prosody/patches/Attic/patch-ab 2014/03/10 13:01:17 1.5
+++ pkgsrc/chat/prosody/patches/Attic/patch-ab 2017/11/23 22:06:15 1.6
@@ -1,35 +1,33 @@ @@ -1,35 +1,33 @@
1$NetBSD: patch-ab,v 1.5 2014/03/10 13:01:17 fhajny Exp $ 1$NetBSD: patch-ab,v 1.6 2017/11/23 22:06:15 fhajny Exp $
2 2
3enable POSIX functionality by default 
4set the logging paths 3set the logging paths
5set up the pid files 4set up the pid files
6 5
7--- prosody.cfg.lua.dist.orig 2014-01-12 11:41:40.000000000 +0000 6--- prosody.cfg.lua.dist.orig 2017-11-17 20:50:11.470659000 +0000
8+++ prosody.cfg.lua.dist 7+++ prosody.cfg.lua.dist
9@@ -63,7 +63,7 @@ modules_enabled = { 8@@ -161,12 +161,13 @@ archive_expires_after = "1w" -- Remove a
10 --"http_files"; -- Serve static files from a directory over HTTP 
11  
12 -- Other specific functionality 
13- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. 
14+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. 
15 --"groups"; -- Shared roster support 
16 --"announce"; -- Send announcement to all online users 
17 --"welcome"; -- Welcome users who register accounts 
18@@ -139,12 +139,15 @@ authentication = "internal_plain" 
19 -- Logging configuration 9 -- Logging configuration
20 -- For advanced logging see http://prosody.im/doc/logging 10 -- For advanced logging see https://prosody.im/doc/logging
21 log = { 11 log = {
22- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging 12- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
23- error = "prosody.err"; 13- error = "prosody.err";
24+ info = "@PROSODY_LOG@/prosody.log"; -- Change 'info' to 'debug' for verbose logging 14+ info = "@PROSODY_LOG@/prosody.log"; -- Change 'info' to 'debug' for verbose logging
25+ error = "@PROSODY_LOG@/prosody.err"; 15+ error = "@PROSODY_LOG@/prosody.err";
26 -- "*syslog"; -- Uncomment this for logging to syslog 16 -- "*syslog"; -- Uncomment this for logging to syslog
27 -- "*console"; -- Log to the console, useful for debugging with daemonize=false 17 -- "*console"; -- Log to the console, useful for debugging with daemonize=false
28 } 18 }
29  19
 20+
 21 -- Uncomment to enable statistics
 22 -- For more info see https://prosody.im/doc/statistics
 23 -- statistics = "internal"
 24@@ -181,6 +182,9 @@ log = {
 25 -- Location of directory to find certificates in (relative to main config file):
 26 certificates = "certs"
 27
30+-- Enable PID file by default 28+-- Enable PID file by default
31+pidfile = "@PROSODY_RUN@/prosody.pid"; 29+pidfile = "@PROSODY_RUN@/prosody.pid";
32+ 30+
33 ----------- Virtual hosts ----------- 31 ----------- Virtual hosts -----------
34 -- You need to add a VirtualHost entry for each domain you wish Prosody to serve. 32 -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
35 -- Settings under each VirtualHost entry apply *only* to that host. 33 -- Settings under each VirtualHost entry apply *only* to that host.
cvs diff -r1.3 -r1.4 pkgsrc/chat/prosody/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/chat/prosody/patches/Attic/patch-ad 2014/03/10 13:01:17 1.3
+++ pkgsrc/chat/prosody/patches/Attic/patch-ad 2017/11/23 22:06:15 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ad,v 1.3 2014/03/10 13:01:17 fhajny Exp $ 1$NetBSD: patch-ad,v 1.4 2017/11/23 22:06:15 fhajny Exp $
2 2
3Include <sys/param.h> when on UNIX 3Include <sys/param.h> when on UNIX
4 4
5--- util-src/signal.c.orig 2014-01-12 11:41:40.000000000 +0000 5--- util-src/signal.c.orig 2017-11-17 20:50:20.874396000 +0000
6+++ util-src/signal.c 6+++ util-src/signal.c
7@@ -29,6 +29,10 @@ 7@@ -31,6 +31,10 @@
8 #include <signal.h> 8 #include <signal.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10  10
11+#ifdef __unix__ 11+#ifdef __unix__
12+#include <sys/param.h> 12+#include <sys/param.h>
13+#endif 13+#endif
14+ 14+
15 #include "lua.h" 15 #include "lua.h"
16 #include "lauxlib.h" 16 #include "lauxlib.h"
17  17
File Deleted: pkgsrc/chat/prosody/patches/Attic/patch-prosodyctl
cvs diff -r1.1 -r1.2 pkgsrc/chat/prosody/patches/Attic/patch-util-src_Makefile (expand / switch to unified diff)

--- pkgsrc/chat/prosody/patches/Attic/patch-util-src_Makefile 2014/11/27 10:18:20 1.1
+++ pkgsrc/chat/prosody/patches/Attic/patch-util-src_Makefile 2017/11/23 22:06:15 1.2
@@ -1,24 +1,15 @@ @@ -1,24 +1,15 @@
1$NetBSD: patch-util-src_Makefile,v 1.1 2014/11/27 10:18:20 fhajny Exp $ 1$NetBSD: patch-util-src_Makefile,v 1.2 2017/11/23 22:06:15 fhajny Exp $
2 2
3We need libsocket on SunOS at least, for getifaddrs. 3We need libsocket on SunOS at least, for getifaddrs.
4--- util-src/Makefile.orig 2014-10-24 22:30:55.000000000 +0000 4
 5--- util-src/Makefile.orig 2017-09-28 13:07:47.000000000 +0000
5+++ util-src/Makefile 6+++ util-src/Makefile
6@@ -6,6 +6,7 @@ LUA_INCDIR?=/usr/include/lua$(LUA_SUFFIX 7@@ -27,6 +27,8 @@ encodings.so: LDLIBS+=$(IDNA_LIBS)
7 LUA_LIB?=lua$(LUA_SUFFIX) 8
8 IDN_LIB?=idn 9 hashes.so: LDLIBS+=$(OPENSSL_LIBS)
9 OPENSSL_LIB?=crypto 
10+SOCKET_LIB?= 
11 CC?=gcc 
12 CXX?=g++ 
13 LD?=gcc 
14@@ -32,6 +33,10 @@ hashes.so: hashes.o 
15 MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; 
16 $(CC) -o $@ $< $(LDFLAGS) -l$(OPENSSL_LIB) 
17  10
18+net.so: net.o 11+net.so: LDLIBS+=$(SOCKET_LIB)
19+ MACOSX_DEPLOYMENT_TARGET="10.3"; export MACOSX_DEPLOYMENT_TARGET; 
20+ $(CC) -o $@ $< $(LDFLAGS) $(SOCKET_LIB) 
21+ 12+
22 .c.o: 13 crand.o: CFLAGS+=-DWITH_$(RANDOM)
23 $(CC) $(CFLAGS) -I$(LUA_INCDIR) -c -o $@ $< 14 crand.so: LDLIBS+=$(RANDOM_LIBS)
24  15
cvs diff -r1.1 -r1.2 pkgsrc/chat/prosody/patches/Attic/patch-util-src_hashes.c (expand / switch to unified diff)

--- pkgsrc/chat/prosody/patches/Attic/patch-util-src_hashes.c 2016/12/15 23:45:42 1.1
+++ pkgsrc/chat/prosody/patches/Attic/patch-util-src_hashes.c 2017/11/23 22:06:15 1.2
@@ -1,40 +1,41 @@ @@ -1,40 +1,41 @@
1$NetBSD: patch-util-src_hashes.c,v 1.1 2016/12/15 23:45:42 joerg Exp $ 1$NetBSD: patch-util-src_hashes.c,v 1.2 2017/11/23 22:06:15 fhajny Exp $
2 2
3Avoid conflict with NetBSD's hmac. 3Avoid conflict with NetBSD's hmac.
4 4
5--- util-src/hashes.c.orig 2016-12-15 15:20:05.616992510 +0000 5--- util-src/hashes.c.orig 2017-09-28 13:07:47.000000000 +0000
6+++ util-src/hashes.c 6+++ util-src/hashes.c
7@@ -70,7 +70,7 @@ struct hash_desc { 7@@ -74,7 +74,7 @@ struct hash_desc {
8 void *ctx, *ctxo; 8 void *ctx, *ctxo;
9 }; 9 };
10  10
11-static void hmac(struct hash_desc *desc, const char *key, size_t key_len, 11-static void hmac(struct hash_desc *desc, const char *key, size_t key_len,
12+static void myhmac(struct hash_desc *desc, const char *key, size_t key_len, 12+static void myhmac(struct hash_desc *desc, const char *key, size_t key_len,
13 const char *msg, size_t msg_len, unsigned char *result) 13 const char *msg, size_t msg_len, unsigned char *result) {
14 { 
15 union xory { 14 union xory {
16@@ -124,7 +124,7 @@ static int myFunc(lua_State *L) { \ 15 unsigned char bytes[64];
 16@@ -127,7 +127,7 @@ static int myFunc(lua_State *L) { \
17 desc.digestLength = size; \ 17 desc.digestLength = size; \
18 desc.ctx = &ctx; \ 18 desc.ctx = &ctx; \
19 desc.ctxo = &ctxo; \ 19 desc.ctxo = &ctxo; \
20- hmac(&desc, key, key_len, msg, msg_len, hash); \ 20- hmac(&desc, key, key_len, msg, msg_len, hash); \
21+ myhmac(&desc, key, key_len, msg, msg_len, hash); \ 21+ myhmac(&desc, key, key_len, msg, msg_len, hash); \
22 if (hex_out) { \ 22 if (hex_out) { \
23 toHex(hash, size, result); \ 23 toHex(hash, size, result); \
24 lua_pushlstring(L, (char*)result, size*2); \ 24 lua_pushlstring(L, (char*)result, size*2); \
25@@ -168,13 +168,13 @@ static int LscramHi(lua_State *L) { 25@@ -174,14 +174,14 @@ static int LscramHi(lua_State *L) {
26 luaL_error(L, "Out of memory in scramHi"); 26
27 memcpy(salt2, salt, salt_len); 27 memcpy(salt2, salt, salt_len);
28 memcpy(salt2 + salt_len, "\0\0\0\1", 4); 28 memcpy(salt2 + salt_len, "\0\0\0\1", 4);
29- hmac(&desc, str, str_len, salt2, salt_len + 4, Ust); 29- hmac(&desc, str, str_len, salt2, salt_len + 4, Ust);
30+ myhmac(&desc, str, str_len, salt2, salt_len + 4, Ust); 30+ myhmac(&desc, str, str_len, salt2, salt_len + 4, Ust);
31 free(salt2); 31 free(salt2);
32  32
33 memcpy(res.bytes, Ust, sizeof(res)); 33 memcpy(res.bytes, Ust, sizeof(res));
34 for (i = 1; i < iter; i++) { 34
 35 for(i = 1; i < iter; i++) {
35 int j; 36 int j;
36- hmac(&desc, str, str_len, (char*)Ust, sizeof(Ust), Und.bytes); 37- hmac(&desc, str, str_len, (char *)Ust, sizeof(Ust), Und.bytes);
37+ myhmac(&desc, str, str_len, (char*)Ust, sizeof(Ust), Und.bytes); 38+ myhmac(&desc, str, str_len, (char *)Ust, sizeof(Ust), Und.bytes);
38 for (j = 0; j < SHA_DIGEST_LENGTH/4; j++) 39
 40 for(j = 0; j < SHA_DIGEST_LENGTH / 4; j++) {
39 res.quadbytes[j] ^= Und.quadbytes[j]; 41 res.quadbytes[j] ^= Und.quadbytes[j];
40 memcpy(Ust, Und.bytes, sizeof(Ust));