prosody: update to version 0.11.3

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: prosody: update to version 0.11.3
From: Tiago Seco <tiago%seco.ws@localhost>
Date: Sat, 11 Jan 2020 21:11:02 +0000
Module Name:	pkgsrc-wip
Committed By:	Tiago Seco <tiago%seco.ws@localhost>
Pushed By:	tse
Date:		Sat Jan 11 21:11:02 2020 +0000
Changeset:	91f232388f9a39c02019300daad147379951f3d0

Modified Files:
	Makefile
Added Files:
	prosody/DESCR
	prosody/Makefile
	prosody/PLIST
	prosody/distinfo
	prosody/files/prosody.sh
	prosody/files/smf/manifest.xml
	prosody/patches/patch-GNUmakefile
	prosody/patches/patch-prosody.cfg.lua.dist
	prosody/patches/patch-util-src_GNUmakefile
	prosody/patches/patch-util-src_hashes.c
	prosody/patches/patch-util-src_signal.c

Log Message:
prosody: update to version 0.11.3

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=91f232388f9a39c02019300daad147379951f3d0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                   |   1 +
 prosody/DESCR                              |   4 +
 prosody/Makefile                           |  82 +++++++++++
 prosody/PLIST                              | 211 +++++++++++++++++++++++++++++
 prosody/distinfo                           |  11 ++
 prosody/files/prosody.sh                   |  24 ++++
 prosody/files/smf/manifest.xml             |  29 ++++
 prosody/patches/patch-GNUmakefile          |  88 ++++++++++++
 prosody/patches/patch-prosody.cfg.lua.dist |  30 ++++
 prosody/patches/patch-util-src_GNUmakefile |  13 ++
 prosody/patches/patch-util-src_hashes.c    |  30 ++++
 prosody/patches/patch-util-src_signal.c    |  15 ++
 12 files changed, 538 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index b0e5cd189f..3537cfe3a2 100644
--- a/Makefile
+++ b/Makefile
@@ -5142,6 +5142,7 @@ SUBDIR+=	zodiac
 SUBDIR+=	zola
 SUBDIR+=	zoneminder
 SUBDIR+=	zvbi
+SUBDIR+=	prosody
 
 ${.CURDIR}/PKGDB:
 	${RM} -f ${.CURDIR}/PKGDB
diff --git a/prosody/DESCR b/prosody/DESCR
new file mode 100644
index 0000000000..66ae434a17
--- /dev/null
+++ b/prosody/DESCR
@@ -0,0 +1,4 @@
+Prosody is a flexible communications server for Jabber/XMPP written in Lua.
+It aims to be easy to use, and light on resources. For developers it aims
+to be easy to extend and give a flexible system on which to rapidly develop
+added functionality, or prototype new protocols.
diff --git a/prosody/Makefile b/prosody/Makefile
new file mode 100644
index 0000000000..277150de84
--- /dev/null
+++ b/prosody/Makefile
@@ -0,0 +1,82 @@
+# $NetBSD$
+#
+
+DISTNAME=		prosody-0.11.3
+CATEGORIES=		chat
+MASTER_SITES=		http://prosody.im/downloads/source/
+
+MAINTAINER=		fhajny%NetBSD.org@localhost
+HOMEPAGE=		http://prosody.im/
+COMMENT=		Flexible communications server for Jabber/XMPP written in Lua
+LICENSE=		mit
+
+DEPENDS+=		${LUA_PKGPREFIX}-expat>=1.2:../../textproc/lua-expat
+DEPENDS+=		${LUA_PKGPREFIX}-filesystem>=1.6.2:../../devel/lua-filesystem
+DEPENDS+=		${LUA_PKGPREFIX}-sec>=0.3.3:../../security/lua-sec
+DEPENDS+=		${LUA_PKGPREFIX}-socket>=2.0:../../net/lua-socket
+DEPENDS+=		icu-[0-9]*:../../textproc/icu
+
+HAS_CONFIGURE=		yes
+USE_LANGUAGES+=		c c99
+USE_TOOLS+=		gmake
+BUILD_DEFS+=		VARBASE
+
+LUA_VERSIONS_ACCEPTED=	52 51
+
+.include "../../mk/bsd.prefs.mk"
+
+PROSODY_USER?=		prosody
+PROSODY_GROUP?=		${PROSODY_USER}
+PROSODY_DATA?=		${VARBASE}/db/prosody
+PROSODY_LOG?=		${VARBASE}/log/prosody
+PROSODY_RUN?=		${VARBASE}/run/prosody
+
+OWN_DIRS_PERMS+=	${PROSODY_DATA} ${PROSODY_USER} ${PROSODY_GROUP} 0770
+OWN_DIRS_PERMS+=	${PROSODY_LOG} ${PROSODY_USER} ${PROSODY_GROUP} 0770
+OWN_DIRS_PERMS+=	${PROSODY_RUN} ${PROSODY_USER} ${PROSODY_GROUP} 0770
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/certs
+
+PKG_USERS_VARS=			PROSODY_USER
+PKG_GROUPS_VARS=		PROSODY_GROUP
+PKG_GROUPS=			${PROSODY_GROUP}
+PKG_USERS=			${PROSODY_USER}:${PROSODY_GROUP}
+PKG_GECOS.${PROSODY_USER}=	Prosody daemon user
+PKG_HOME.${PROSODY_USER}=	${PROSODY_DATA}
+PKG_SHELL.${PROSODY_USER}=	${NOLOGIN}
+
+PKG_SYSCONFSUBDIR=	${PKGBASE}
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES+=		${EGDIR}/prosody.cfg.lua ${PKG_SYSCONFDIR}/prosody.cfg.lua
+CONF_FILES+=		${EGDIR}/certs/localhost.cnf ${PKG_SYSCONFDIR}/certs/localhost.cnf
+
+REPLACE_LUA+=		prosody prosodyctl
+
+SUBST_CLASSES+=		path
+SUBST_MESSAGE.path=	Fixing default paths
+SUBST_STAGE.path=	pre-configure
+SUBST_FILES.path=	GNUmakefile man/prosodyctl.man prosody.cfg.lua.dist
+SUBST_SED.path=		-e 's,/etc/prosody,${PKG_SYSCONFDIR},g'
+SUBST_VARS.path=	EGDIR PROSODY_DATA PROSODY_LOG PROSODY_RUN
+
+CONFIGURE_ARGS+=	--cflags=${CFLAGS:Q}
+CONFIGURE_ARGS+=	--datadir=${PROSODY_DATA}
+CONFIGURE_ARGS+=	--ldflags="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -shared"
+CONFIGURE_ARGS+=	--no-example-certs
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-lua-include=${PREFIX}/${LUA_INCDIR}
+
+CFLAGS+=		-fPIC -Wall -DLUA_COMPAT_MODULE
+MAKE_ENV.SunOS+=	SOCKET_LIB=-lsocket
+MAKE_FILE=		GNUmakefile
+
+RCD_SCRIPTS=		prosody
+
+TEST_TARGET=		test
+
+.include "../../lang/lua/application.mk"
+.include "../../lang/lua/tool.mk"
+.include "../../devel/libidn/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/prosody/PLIST b/prosody/PLIST
new file mode 100644
index 0000000000..80eb340bb5
--- /dev/null
+++ b/prosody/PLIST
@@ -0,0 +1,211 @@
+@comment $NetBSD$
+bin/prosody
+bin/prosodyctl
+lib/prosody/core/certmanager.lua
+lib/prosody/core/configmanager.lua
+lib/prosody/core/hostmanager.lua
+lib/prosody/core/loggingmanager.lua
+lib/prosody/core/moduleapi.lua
+lib/prosody/core/modulemanager.lua
+lib/prosody/core/portmanager.lua
+lib/prosody/core/rostermanager.lua
+lib/prosody/core/s2smanager.lua
+lib/prosody/core/sessionmanager.lua
+lib/prosody/core/stanza_router.lua
+lib/prosody/core/statsmanager.lua
+lib/prosody/core/storagemanager.lua
+lib/prosody/core/usermanager.lua
+lib/prosody/modules/adhoc/adhoc.lib.lua
+lib/prosody/modules/adhoc/mod_adhoc.lua
+lib/prosody/modules/mod_admin_adhoc.lua
+lib/prosody/modules/mod_admin_telnet.lua
+lib/prosody/modules/mod_announce.lua
+lib/prosody/modules/mod_auth_anonymous.lua
+lib/prosody/modules/mod_auth_cyrus.lua
+lib/prosody/modules/mod_auth_insecure.lua
+lib/prosody/modules/mod_auth_internal_hashed.lua
+lib/prosody/modules/mod_auth_internal_plain.lua
+lib/prosody/modules/mod_blocklist.lua
+lib/prosody/modules/mod_bosh.lua
+lib/prosody/modules/mod_c2s.lua
+lib/prosody/modules/mod_carbons.lua
+lib/prosody/modules/mod_component.lua
+lib/prosody/modules/mod_csi.lua
+lib/prosody/modules/mod_csi_simple.lua
+lib/prosody/modules/mod_debug_sql.lua
+lib/prosody/modules/mod_dialback.lua
+lib/prosody/modules/mod_disco.lua
+lib/prosody/modules/mod_groups.lua
+lib/prosody/modules/mod_http.lua
+lib/prosody/modules/mod_http_errors.lua
+lib/prosody/modules/mod_http_files.lua
+lib/prosody/modules/mod_iq.lua
+lib/prosody/modules/mod_lastactivity.lua
+lib/prosody/modules/mod_legacyauth.lua
+lib/prosody/modules/mod_limits.lua
+lib/prosody/modules/mod_message.lua
+lib/prosody/modules/mod_motd.lua
+lib/prosody/modules/mod_muc_mam.lua
+lib/prosody/modules/mod_muc_unique.lua
+lib/prosody/modules/mod_net_multiplex.lua
+lib/prosody/modules/mod_offline.lua
+lib/prosody/modules/mod_pep.lua
+lib/prosody/modules/mod_pep_plus.lua
+lib/prosody/modules/mod_pep_simple.lua
+lib/prosody/modules/mod_ping.lua
+lib/prosody/modules/mod_posix.lua
+lib/prosody/modules/mod_presence.lua
+lib/prosody/modules/mod_private.lua
+lib/prosody/modules/mod_proxy65.lua
+lib/prosody/modules/mod_register.lua
+lib/prosody/modules/mod_register_ibr.lua
+lib/prosody/modules/mod_register_limits.lua
+lib/prosody/modules/mod_roster.lua
+lib/prosody/modules/mod_s2s/mod_s2s.lua
+lib/prosody/modules/mod_s2s/s2sout.lib.lua
+lib/prosody/modules/mod_s2s_auth_certs.lua
+lib/prosody/modules/mod_saslauth.lua
+lib/prosody/modules/mod_scansion_record.lua
+lib/prosody/modules/mod_server_contact_info.lua
+lib/prosody/modules/mod_stanza_debug.lua
+lib/prosody/modules/mod_storage_internal.lua
+lib/prosody/modules/mod_storage_memory.lua
+lib/prosody/modules/mod_storage_none.lua
+lib/prosody/modules/mod_storage_sql.lua
+lib/prosody/modules/mod_storage_xep0227.lua
+lib/prosody/modules/mod_time.lua
+lib/prosody/modules/mod_tls.lua
+lib/prosody/modules/mod_unknown.lua
+lib/prosody/modules/mod_uptime.lua
+lib/prosody/modules/mod_user_account_management.lua
+lib/prosody/modules/mod_vcard.lua
+lib/prosody/modules/mod_vcard4.lua
+lib/prosody/modules/mod_vcard_legacy.lua
+lib/prosody/modules/mod_version.lua
+lib/prosody/modules/mod_watchregistrations.lua
+lib/prosody/modules/mod_websocket.lua
+lib/prosody/modules/mod_welcome.lua
+lib/prosody/modules/mod_windows.lua
+lib/prosody/modules/muc/config_form_sections.lib.lua
+lib/prosody/modules/muc/description.lib.lua
+lib/prosody/modules/muc/hidden.lib.lua
+lib/prosody/modules/muc/history.lib.lua
+lib/prosody/modules/muc/language.lib.lua
+lib/prosody/modules/muc/lock.lib.lua
+lib/prosody/modules/muc/members_only.lib.lua
+lib/prosody/modules/muc/mod_muc.lua
+lib/prosody/modules/muc/moderated.lib.lua
+lib/prosody/modules/muc/muc.lib.lua
+lib/prosody/modules/muc/name.lib.lua
+lib/prosody/modules/muc/occupant.lib.lua
+lib/prosody/modules/muc/password.lib.lua
+lib/prosody/modules/muc/persistent.lib.lua
+lib/prosody/modules/muc/register.lib.lua
+lib/prosody/modules/muc/request.lib.lua
+lib/prosody/modules/muc/subject.lib.lua
+lib/prosody/modules/muc/util.lib.lua
+lib/prosody/modules/muc/whois.lib.lua
+lib/prosody/net/adns.lua
+lib/prosody/net/connect.lua
+lib/prosody/net/connlisteners.lua
+lib/prosody/net/cqueues.lua
+lib/prosody/net/dns.lua
+lib/prosody/net/http.lua
+lib/prosody/net/http/codes.lua
+lib/prosody/net/http/parser.lua
+lib/prosody/net/http/server.lua
+lib/prosody/net/httpserver.lua
+lib/prosody/net/resolvers/basic.lua
+lib/prosody/net/resolvers/manual.lua
+lib/prosody/net/resolvers/service.lua
+lib/prosody/net/server.lua
+lib/prosody/net/server_epoll.lua
+lib/prosody/net/server_event.lua
+lib/prosody/net/server_select.lua
+lib/prosody/net/websocket.lua
+lib/prosody/net/websocket/frames.lua
+lib/prosody/prosody.version
+lib/prosody/util/adhoc.lua
+lib/prosody/util/array.lua
+lib/prosody/util/async.lua
+lib/prosody/util/cache.lua
+lib/prosody/util/caps.lua
+lib/prosody/util/compat.so
+lib/prosody/util/dataforms.lua
+lib/prosody/util/datamanager.lua
+lib/prosody/util/datetime.lua
+lib/prosody/util/debug.lua
+lib/prosody/util/dependencies.lua
+lib/prosody/util/encodings.so
+lib/prosody/util/envload.lua
+lib/prosody/util/events.lua
+lib/prosody/util/filters.lua
+lib/prosody/util/format.lua
+lib/prosody/util/hashes.so
+lib/prosody/util/helpers.lua
+lib/prosody/util/hex.lua
+lib/prosody/util/hmac.lua
+lib/prosody/util/http.lua
+lib/prosody/util/id.lua
+lib/prosody/util/import.lua
+lib/prosody/util/indexedbheap.lua
+lib/prosody/util/interpolation.lua
+lib/prosody/util/ip.lua
+lib/prosody/util/iterators.lua
+lib/prosody/util/jid.lua
+lib/prosody/util/json.lua
+lib/prosody/util/logger.lua
+lib/prosody/util/mercurial.lua
+lib/prosody/util/multitable.lua
+lib/prosody/util/net.so
+lib/prosody/util/openssl.lua
+lib/prosody/util/paths.lua
+lib/prosody/util/pluginloader.lua
+lib/prosody/util/poll.so
+lib/prosody/util/pposix.so
+lib/prosody/util/presence.lua
+lib/prosody/util/promise.lua
+lib/prosody/util/prosodyctl.lua
+lib/prosody/util/pubsub.lua
+lib/prosody/util/queue.lua
+lib/prosody/util/random.lua
+lib/prosody/util/rfc6724.lua
+lib/prosody/util/ringbuffer.so
+lib/prosody/util/rsm.lua
+lib/prosody/util/sasl.lua
+lib/prosody/util/sasl/anonymous.lua
+lib/prosody/util/sasl/digest-md5.lua
+lib/prosody/util/sasl/external.lua
+lib/prosody/util/sasl/plain.lua
+lib/prosody/util/sasl/scram.lua
+lib/prosody/util/sasl_cyrus.lua
+lib/prosody/util/serialization.lua
+lib/prosody/util/session.lua
+lib/prosody/util/set.lua
+lib/prosody/util/signal.so
+lib/prosody/util/sql.lua
+lib/prosody/util/sslconfig.lua
+lib/prosody/util/stanza.lua
+lib/prosody/util/startup.lua
+lib/prosody/util/statistics.lua
+lib/prosody/util/statsd.lua
+lib/prosody/util/table.so
+lib/prosody/util/template.lua
+lib/prosody/util/termcolours.lua
+lib/prosody/util/throttle.lua
+lib/prosody/util/time.so
+lib/prosody/util/timer.lua
+lib/prosody/util/uuid.lua
+lib/prosody/util/vcard.lua
+lib/prosody/util/watchdog.lua
+lib/prosody/util/x509.lua
+lib/prosody/util/xml.lua
+lib/prosody/util/xmppstream.lua
+lib/prosody/util/xpcall.lua
+man/man1/prosodyctl.1
+share/examples/prosody/certs/GNUmakefile
+share/examples/prosody/certs/localhost.cnf
+share/examples/prosody/certs/makefile
+share/examples/prosody/certs/openssl.cnf
+share/examples/prosody/prosody.cfg.lua
+@pkgdir lib/prosody/modules/storage
diff --git a/prosody/distinfo b/prosody/distinfo
new file mode 100644
index 0000000000..0c0bd1ed34
--- /dev/null
+++ b/prosody/distinfo
@@ -0,0 +1,11 @@
+$NetBSD$
+
+SHA1 (prosody-0.11.3.tar.gz) = 87ec8039bf297ba9bc4da44b2ba42f4b035e73ca
+RMD160 (prosody-0.11.3.tar.gz) = bdfc9e054b68699722d8745e100f17a8a7e12240
+SHA512 (prosody-0.11.3.tar.gz) = 07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb
+Size (prosody-0.11.3.tar.gz) = 424098 bytes
+SHA1 (patch-GNUmakefile) = 0e84f03f2f93180f2f74b316820d42f8ca354d51
+SHA1 (patch-prosody.cfg.lua.dist) = 50ea01f7b9c16e5571df84aa41916fe7a32a041c
+SHA1 (patch-util-src_GNUmakefile) = 217e7556e5bf2dc5e851bb0d5fd6be5fbc8cd37e
+SHA1 (patch-util-src_hashes.c) = 9f0ecb528046d71a242ccae66473a3226a007fde
+SHA1 (patch-util-src_signal.c) = bccc5066a28e9dd3402a9505f3acb6dddcf69ef3
diff --git a/prosody/files/prosody.sh b/prosody/files/prosody.sh
new file mode 100644
index 0000000000..7b22581d71
--- /dev/null
+++ b/prosody/files/prosody.sh
@@ -0,0 +1,24 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: prosody
+# REQUIRE: DAEMON
+
+if [ -f /etc/rc.subr ]; then
+  . /etc/rc.subr
+fi
+
+name="prosody"
+rcvar=${name}
+ctl_command="@PREFIX@/bin/${name}ctl"
+required_files="@PKG_SYSCONFDIR@/${name}.cfg.lua"
+pidfile="@VARBASE@/run/${name}.pid"
+#start_precmd="ulimit -n 2048"
+extra_commands="reload status"
+
+start_cmd="${ctl_command} start"
+stop_cmd="${ctl_command} stop"
+reload_cmd="${ctl_command} reload"
+status_cmd="${ctl_command} status"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/prosody/files/smf/manifest.xml b/prosody/files/smf/manifest.xml
new file mode 100644
index 0000000000..76d8556c1f
--- /dev/null
+++ b/prosody/files/smf/manifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="export">
+  <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
+    <create_default_instance enabled="false" />
+    <single_instance />
+    <dependency name="network" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/milestone/network:default" />
+    </dependency>
+    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/system/filesystem/local" />
+    </dependency>
+    <method_context></method_context>
+    <exec_method type="method" name="start" exec="@PREFIX@/bin/prosodyctl start" timeout_seconds="600" />
+    <exec_method type="method" name="stop" exec="@PREFIX@/bin/prosodyctl stop" timeout_seconds="600" />
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="contract" />
+      <propval name="ignore_error" type="astring" value="core,signal" />
+    </property_group>
+    <property_group name="application" type="application">
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/prosody.cfg.lua" />
+    </property_group>
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Prosody XMPP server</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>
diff --git a/prosody/patches/patch-GNUmakefile b/prosody/patches/patch-GNUmakefile
new file mode 100644
index 0000000000..5e4d6ff72e
--- /dev/null
+++ b/prosody/patches/patch-GNUmakefile
@@ -0,0 +1,88 @@
+$NetBSD$
+
+--- GNUmakefile.orig	2019-08-31 14:08:45.000000000 +0000
++++ GNUmakefile
+@@ -3,10 +3,11 @@ include config.unix
+ 
+ BIN = $(DESTDIR)$(PREFIX)/bin
+ CONFIG = $(DESTDIR)$(SYSCONFDIR)
++EGDIR = $(DESTDIR)/usr/pkg/share/examples/prosody
+ MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
+ SOURCE = $(DESTDIR)$(LIBDIR)/prosody
+ DATA = $(DESTDIR)$(DATADIR)
+-MAN = $(DESTDIR)$(PREFIX)/share/man
++MAN = $(DESTDIR)$(PREFIX)/$(PKGMANDIR)
+ 
+ INSTALLEDSOURCE = $(LIBDIR)/prosody
+ INSTALLEDCONFIG = $(SYSCONFDIR)
+@@ -31,34 +32,42 @@ ifeq ($(EXCERTS),yes)
+ endif
+ 
+ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodings.so util/encodings.so util/pposix.so util/signal.so
+-	$(MKDIR) $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
+-	$(MKDIR_PRIVATE) $(DATA)
+-	$(MKDIR) $(MAN)/man1
+-	$(MKDIR) $(CONFIG)/certs
+-	$(MKDIR) $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
+-	$(INSTALL_EXEC) ./prosody.install $(BIN)/prosody
+-	$(INSTALL_EXEC) ./prosodyctl.install $(BIN)/prosodyctl
+-	$(INSTALL_DATA) core/*.lua $(SOURCE)/core
+-	$(INSTALL_DATA) net/*.lua $(SOURCE)/net
+-	$(MKDIR) $(SOURCE)/net/http $(SOURCE)/net/resolvers $(SOURCE)/net/websocket
+-	$(INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
+-	$(INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers
+-	$(INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
+-	$(INSTALL_DATA) util/*.lua $(SOURCE)/util
+-	$(INSTALL_DATA) util/*.so $(SOURCE)/util
+-	$(MKDIR) $(SOURCE)/util/sasl
+-	$(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
+-	$(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
+-	$(INSTALL_DATA) plugins/*.lua $(MODULES)
+-	$(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
+-	$(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
+-	$(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
+-	$(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
+-	$(INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam
+-	$(INSTALL_DATA) certs/* $(CONFIG)/certs
+-	$(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
+-	test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
+-	-test -f prosody.version && $(INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
++	$(BSD_INSTALL_SCRIPT_DIR) $(BIN)
++	$(BSD_INSTALL_DATA_DIR) $(EGDIR)
++	$(BSD_INSTALL_DATA_DIR) $(MODULES)
++	$(BSD_INSTALL_DATA_DIR) $(SOURCE)
++	$(BSD_INSTALL_DATA_DIR) -m 750 $(DATA)
++	$(BSD_INSTALL_MAN_DIR) $(MAN)/man1
++	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/core
++	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net
++	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/util
++	$(BSD_INSTALL_SCRIPT) ./prosody.install $(BIN)/prosody
++	$(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl
++	$(BSD_INSTALL_DATA) core/*.lua $(SOURCE)/core
++	$(BSD_INSTALL_DATA) net/*.lua $(SOURCE)/net
++	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/http
++	$(BSD_INSTALL_DATA) net/http/*.lua $(SOURCE)/net/http
++	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/resolvers
++	$(BSD_INSTALL_DATA) net/resolvers/*.lua $(SOURCE)/net/resolvers
++	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/net/websocket
++	$(BSD_INSTALL_DATA) net/websocket/*.lua $(SOURCE)/net/websocket
++	$(BSD_INSTALL_DATA) util/*.lua $(SOURCE)/util
++	$(BSD_INSTALL_LIB) util/*.so $(SOURCE)/util
++	$(BSD_INSTALL_LIB_DIR) $(SOURCE)/util/sasl
++	$(BSD_INSTALL_DATA) util/sasl/* $(SOURCE)/util/sasl
++	$(BSD_INSTALL_DATA) plugins/*.lua $(MODULES)
++	$(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs
++	$(BSD_INSTALL_DATA) certs/* $(EGDIR)/certs
++	$(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc
++	$(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
++	$(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_s2s
++	$(BSD_INSTALL_DATA) plugins/mod_s2s/* $(MODULES)/mod_s2s
++	$(BSD_INSTALL_LIB_DIR) $(MODULES)/muc
++	$(BSD_INSTALL_DATA) plugins/muc/* $(MODULES)/muc
++	$(BSD_INSTALL_LIB_DIR) $(MODULES)/storage
++	$(BSD_INSTALL_MAN) man/prosodyctl.man $(MAN)/man1/prosodyctl.1
++	$(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua
++	$(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version
+ 	$(MAKE) install -C util-src
+ 
+ clean:
diff --git a/prosody/patches/patch-prosody.cfg.lua.dist b/prosody/patches/patch-prosody.cfg.lua.dist
new file mode 100644
index 0000000000..e68cda4604
--- /dev/null
+++ b/prosody/patches/patch-prosody.cfg.lua.dist
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- prosody.cfg.lua.dist.orig	2019-08-31 14:08:45.000000000 +0000
++++ prosody.cfg.lua.dist
+@@ -153,12 +153,13 @@ archive_expires_after = "1w" -- Remove a
+ -- Logging configuration
+ -- For advanced logging see https://prosody.im/doc/logging
+ log = {
+-	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
+-	error = "prosody.err";
++	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
++	error = "/var/log/prosody/prosody.err";
+ 	-- "*syslog"; -- Uncomment this for logging to syslog
+ 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }
+ 
++
+ -- Uncomment to enable statistics
+ -- For more info see https://prosody.im/doc/statistics
+ -- statistics = "internal"
+@@ -176,6 +177,9 @@ certificates = "certs"
+ -- HTTPS currently only supports a single certificate, specify it here:
+ --https_certificate = "certs/localhost.crt"
+ 
++-- Enable PID file by default
++pidfile = "/var/run/prosody/prosody.pid";
++
+ ----------- Virtual hosts -----------
+ -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
+ -- Settings under each VirtualHost entry apply *only* to that host.
diff --git a/prosody/patches/patch-util-src_GNUmakefile b/prosody/patches/patch-util-src_GNUmakefile
new file mode 100644
index 0000000000..4829ed4f94
--- /dev/null
+++ b/prosody/patches/patch-util-src_GNUmakefile
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- util-src/GNUmakefile.orig	2019-08-31 14:08:45.000000000 +0000
++++ util-src/GNUmakefile
+@@ -28,6 +28,8 @@ encodings.so: LDLIBS+=$(IDNA_LIBS)
+ 
+ hashes.so: LDLIBS+=$(OPENSSL_LIBS)
+ 
++net.so: LDLIBS+=$(SOCKET_LIB)
++
+ crand.o: CFLAGS+=-DWITH_$(RANDOM)
+ crand.so: LDLIBS+=$(RANDOM_LIBS)
+ 
diff --git a/prosody/patches/patch-util-src_hashes.c b/prosody/patches/patch-util-src_hashes.c
new file mode 100644
index 0000000000..51a0db3222
--- /dev/null
+++ b/prosody/patches/patch-util-src_hashes.c
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- util-src/hashes.c.orig	2019-08-31 14:08:45.000000000 +0000
++++ util-src/hashes.c
+@@ -75,7 +75,7 @@ struct hash_desc {
+ 	void *ctx, *ctxo;
+ };
+ 
+-static void hmac(struct hash_desc *desc, const char *key, size_t key_len,
++static void myhmac(struct hash_desc *desc, const char *key, size_t key_len,
+                  const char *msg, size_t msg_len, unsigned char *result) {
+ 	union xory {
+ 		unsigned char bytes[64];
+@@ -168,14 +168,14 @@ static int LscramHi(lua_State *L) {
+ 
+ 	memcpy(salt2, salt, salt_len);
+ 	memcpy(salt2 + salt_len, "\0\0\0\1", 4);
+-	hmac(&desc, str, str_len, salt2, salt_len + 4, Ust);
++	myhmac(&desc, str, str_len, salt2, salt_len + 4, Ust);
+ 	free(salt2);
+ 
+ 	memcpy(res.bytes, Ust, sizeof(res));
+ 
+ 	for(i = 1; i < iter; i++) {
+ 		int j;
+-		hmac(&desc, str, str_len, (char *)Ust, sizeof(Ust), Und.bytes);
++		myhmac(&desc, str, str_len, (char *)Ust, sizeof(Ust), Und.bytes);
+ 
+ 		for(j = 0; j < SHA_DIGEST_LENGTH / 4; j++) {
+ 			res.quadbytes[j] ^= Und.quadbytes[j];
diff --git a/prosody/patches/patch-util-src_signal.c b/prosody/patches/patch-util-src_signal.c
new file mode 100644
index 0000000000..24681df6d7
--- /dev/null
+++ b/prosody/patches/patch-util-src_signal.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- util-src/signal.c.orig	2019-08-31 14:08:45.000000000 +0000
++++ util-src/signal.c
+@@ -33,6 +33,10 @@
+ #include <signal.h>
+ #include <stdlib.h>
+ 
++#ifdef __unix__
++#include <sys/param.h>
++#endif
++
+ #include "lua.h"
+ #include "lauxlib.h"
+
Prev by Date: Also remove the package for DeforaOS Mailer
Next by Date: fix sorting
Previous by Thread: Also remove the package for DeforaOS Mailer
Next by Thread: fix sorting
Indexes:
Home | Main Index | Thread Index | Old Index