pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
prosody: updated version in pkgsrc
Module Name: pkgsrc-wip
Committed By: Tiago Seco <tiago%seco.ws@localhost>
Pushed By: tse
Date: Sat Jan 25 15:14:05 2020 +0100
Changeset: b970b903b8677523c69e1f03ef8ebacaca58f523
Removed Files:
prosody/COMMIT_MSG
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: updated version in pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b970b903b8677523c69e1f03ef8ebacaca58f523
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
prosody/COMMIT_MSG | 33 -----
prosody/DESCR | 6 -
prosody/Makefile | 81 -----------
prosody/PLIST | 211 -----------------------------
prosody/distinfo | 11 --
prosody/files/prosody.sh | 24 ----
prosody/files/smf/manifest.xml | 29 ----
prosody/patches/patch-GNUmakefile | 90 ------------
prosody/patches/patch-prosody.cfg.lua.dist | 33 -----
prosody/patches/patch-util-src_GNUmakefile | 15 --
prosody/patches/patch-util-src_hashes.c | 32 -----
prosody/patches/patch-util-src_signal.c | 17 ---
12 files changed, 582 deletions(-)
diffs:
diff --git a/prosody/COMMIT_MSG b/prosody/COMMIT_MSG
deleted file mode 100644
index 9f964a7ef1..0000000000
--- a/prosody/COMMIT_MSG
+++ /dev/null
@@ -1,33 +0,0 @@
-chat/prosody: Update to 0.11.4
-
-Changes in 0.11.4
-=================
-
-Fixes and improvements
-
- core.rostermanager: Improve performance by caching rosters of offline #1233
- mod_pep: Handling subscriptions more efficiently #1372
-
-Minor changes
-
- util.interpolation: Support unescaped variables with more modifiers #1452
- MUC: Mark source of historic messages correctly #1416
- mod_auth_internal_hashed: Pass on errors #1477
- mod_mam, mod_muc_mam: Improve logging of failures #1478, #1480, #1481
- mod_muc, mod_muc_mam: Reschedule message expiry in case of failure
- mod_mam: Add flag to session when it performs a MAM query
- prosodyctl check: Warn about conflict between mod_pep and mod_pep_simple
- prosodyctl check: Warn about conflict between mod_vcard and mod_vcard_legacy #1469
- core.modulemanager: Disable mod_vcard if mod_vcard_legacy is enabled to prevent conflict #1469
- MUC: Strip tags with MUC-related namespaces from private messages #1427
- MUC: Don't advertise registration feature on host #1451
- mod_vcard_legacy: Fix handling of empty photo elements #1432
- mod_vcard_legacy: Advertise lack of avatar correctly #1431
- prosodyctl: Handle if the setting proxy65_address has the wrong type
- prosodyctl: Print a blank line to improve spacing and readability
- MUC: Fix role loss in Nickname change #1466
- util.pposix: Fix reporting of memory usage in 2-4GB range #1445
- util.startup: Fix a regression concerning directory paths #1430
- mod_websocket: Don't mask WebSocket pong answers #1484
- net.resolvers: Apply IDNA conversion to ascii for DNS lookups (affects only HTTP queries) #1426
- net.resolvers.basic: Fix resolution of IPv6 literals (in brackets) #1459
diff --git a/prosody/DESCR b/prosody/DESCR
deleted file mode 100644
index 3d2e77ed6b..0000000000
--- a/prosody/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-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.
-
-List of supported XEPs: https://prosody.im/doc/xeplist
diff --git a/prosody/Makefile b/prosody/Makefile
deleted file mode 100644
index c2aaa4e881..0000000000
--- a/prosody/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# $NetBSD$
-#
-
-DISTNAME= prosody-0.11.4
-CATEGORIES= chat
-MASTER_SITES= https://prosody.im/downloads/source/
-
-MAINTAINER= fhajny%NetBSD.org@localhost
-HOMEPAGE= https://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
-
-HAS_CONFIGURE= yes
-USE_LANGUAGES= 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
deleted file mode 100644
index 80eb340bb5..0000000000
--- a/prosody/PLIST
+++ /dev/null
@@ -1,211 +0,0 @@
-@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
deleted file mode 100644
index 3f484dfabf..0000000000
--- a/prosody/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-SHA1 (prosody-0.11.4.tar.gz) = 59e9e684230c26daf53526e18b0e6e2efb0d63c5
-RMD160 (prosody-0.11.4.tar.gz) = c177c6f58054bd595e11b9d83b2889c8d67ba611
-SHA512 (prosody-0.11.4.tar.gz) = 0c3aa3373c53f803b88a87dad4ca18b215de7a485d29b0bc4b186d97f7c48262840199a74f62aba6b7b4f1766fdfb37327ed4ff24e877c3a6dfca58764a035c3
-Size (prosody-0.11.4.tar.gz) = 423518 bytes
-SHA1 (patch-GNUmakefile) = e0fce25e95a4e765eba588e903de59526433ae54
-SHA1 (patch-prosody.cfg.lua.dist) = e8cc3a467b21bfe606a87beb412cebac71a627a9
-SHA1 (patch-util-src_GNUmakefile) = d64699fb842be5fb963085dcb1edff67cd130161
-SHA1 (patch-util-src_hashes.c) = e955d3ab2d170dce179bee8eed559ba57f825497
-SHA1 (patch-util-src_signal.c) = 2492ccd0a82498a50f76722e0e2036e16eead180
diff --git a/prosody/files/prosody.sh b/prosody/files/prosody.sh
deleted file mode 100644
index 7b22581d71..0000000000
--- a/prosody/files/prosody.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!@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
deleted file mode 100644
index 76d8556c1f..0000000000
--- a/prosody/files/smf/manifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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
deleted file mode 100644
index 5b01e271f8..0000000000
--- a/prosody/patches/patch-GNUmakefile
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD$
-
-Fix installation directories and scripts
-
---- 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
deleted file mode 100644
index af2cec6484..0000000000
--- a/prosody/patches/patch-prosody.cfg.lua.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-set the logging paths
-set up the pid files
-
---- 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 = "@PROSODY_LOG@/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-+ error = "@PROSODY_LOG@/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 = "@PROSODY_RUN@/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
deleted file mode 100644
index 51a9aee822..0000000000
--- a/prosody/patches/patch-util-src_GNUmakefile
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-We need libsocket on SunOS at least, for getifaddrs.
-
---- 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
deleted file mode 100644
index 75a759e322..0000000000
--- a/prosody/patches/patch-util-src_hashes.c
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-Avoid conflict with NetBSD's hmac.
-
---- 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
deleted file mode 100644
index 3d24b21006..0000000000
--- a/prosody/patches/patch-util-src_signal.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-Include <sys/param.h> when on UNIX
-
---- 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"
-
Home |
Main Index |
Thread Index |
Old Index