head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.12 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.10 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.8 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.6 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.4 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.2 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.2.0.20 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.18 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.16 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.14 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.12 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.10 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.8 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.6 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.4 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.2 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.1.0.18 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.16 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.14 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.12 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.10 pkgsrc-2021Q1-base:1.1 pkgsrc-2020Q4:1.1.0.8 pkgsrc-2020Q4-base:1.1 pkgsrc-2020Q3:1.1.0.6 pkgsrc-2020Q3-base:1.1 pkgsrc-2020Q2:1.1.0.4 pkgsrc-2020Q2-base:1.1 pkgsrc-2020Q1:1.1.0.2 pkgsrc-2020Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2024.12.02.07.57.33; author nia; state Exp; branches; next 1.2; commitid NmBMgefpWBjeSTzF; 1.2 date 2022.05.08.21.24.12; author khorben; state Exp; branches; next 1.1; commitid OjEGwFMG1YFgviDD; 1.1 date 2020.03.09.19.37.20; author khorben; state Exp; branches; next ; commitid GOaBBkYI3xHajLZB; desc @@ 1.3 log @prosody: Honour PKGMANDIR @ text @$NetBSD: patch-makefile,v 1.2 2022/05/08 21:24:12 khorben Exp $ Fix installation directories and scripts --- makefile.orig 2022-03-08 12:34:39.594708341 +0000 +++ makefile @@@@ -6,7 +6,7 @@@@ CONFIG = $(DESTDIR)$(SYSCONFDIR) 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) @@@@ -33,7 +33,9 @@@@ all: prosody.install prosodyctl.install install-etc: prosody.cfg.lua.install $(MKDIR) $(CONFIG) $(MKDIR) $(CONFIG)/certs - test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua + $(INSTALL_DATA) certs/GNUmakefile certs/localhost.cnf $(CONFIG)/certs + $(INSTALL_DATA) certs/makefile certs/openssl.cnf $(CONFIG)/certs + $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua .if $(EXCERTS) == "yes" $(INSTALL_DATA) certs/localhost.crt certs/localhost.key $(CONFIG)/certs $(INSTALL_DATA) certs/example.com.crt certs/example.com.key $(CONFIG)/certs @@@@ -63,7 +65,7 @@@@ install-util: util/encodings.so util/enc $(MKDIR) $(SOURCE)/util $(INSTALL_DATA) util/*.lua $(SOURCE)/util $(MAKE) install -C util-src - $(INSTALL_DATA) util/*.so $(SOURCE)/util + $(INSTALL_EXEC) util/*.so $(SOURCE)/util $(MKDIR) $(SOURCE)/util/sasl $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl $(MKDIR) $(SOURCE)/util/human @ 1.2 log @prosody: update to 0.12.0 New in this release: Modules * mod_mimicking: Prevent address spoofing * mod_s2s_bidi: Bi-directional server-to-server connections (XEP-0288) * mod_external_services: Generic XEP-0215 support * mod_turn_external: Easy setup of XEP-0215 for STUN/TURN for audio/video calls * mod_http_file_share: File sharing via HTTP (XEP-0363) * mod_http_openmetrics: Expose metrics to Prometheus and compatible monitoring systems * mod_smacks: Stream management and resumption (XEP-0198) * mod_auth_ldap: LDAP authentication * mod_cron: One module to rule all the periodic tasks * mod_admin_shell: New home of the Console admin interface * mod_admin_socket: Enable secure connections to the Console * mod_tombstones: Prevent re-registration of deleted accounts * mod_invites: Create and manage invites * mod_invites_register: Allow registering accounts using invites * mod_invites_adhoc: Create invites via ad-hoc command * mod_bookmarks: Synchronise open rooms between clients Security and authentication * Unencrypted HTTP port (5280) restricted to loopback by default * require_encryption options default to true if unspecified * Authentication module defaults to internal_hashed if unspecified * SNI support (including automatic certificate selection) * ALPN support in mod_net_multiplex * DANE support in low-level network layer * Direct TLS support (c2s and s2s) * SCRAM-SHA-256 * Direct TLS (including https) certificates are now updated on reload * Pluggable authorization providers (mod_authz_*) * Easy use of Mozilla TLS recommendations presets HTTP * CORS handling now provided by mod_http * Built-in HTTP server now handles HEAD requests * Uploads can be handled incrementally API * Module statuses (API change) * util.error for encapsulating errors * Promise based API for sending queries * API for adding periodic tasks * More APIs supporting ES6 Promises * Async can be used during shutdown Other * Plugin installer * MUC presence broadcast controls * MUC: support for XEP-0421 occupant identifiers * prosodyctl check connectivity via observe.jabber.network * STUN/TURN server tests in prosodyctl check * libunbound for DNS queries * The POSIX poll() API used by server_epoll on *nix other than Linux Changed in this release * Improved rules for mobile optimizations in mod_csi_simple * Improved rules for what messages should be archived in mod_mam * mod_limits: Support for exempt JIDs * mod_server_contact_info now loaded on components if enabled * Statistics now based on OpenMetrics * Statistics scheduling can be done by plugin * Offline messages aren't sent to MAM clients * Archive quotas (maximum limit on items in an archive store) * Rewritten migrator with archive support * Improved automatic certificate locating and selecting * Logging to syslog no longer missing startup messages * Graceful shutdown sequence that closes ports first and waits for connections to close Removed in this release * daemonize option deprecated * SASL DIGEST-MD5 removed * mod_auth_cyrus (older LDAP support) * Network backend server_select deprecated (not actually removed yet) @ text @d1 1 a1 1 $NetBSD: patch-makefile,v 1.1 2020/03/09 19:37:20 khorben Exp $ d12 1 a12 1 +MAN = $(DESTDIR)$(PREFIX)/man @ 1.1 log @prosody: remove requirement for gmake to build While there, install two modules which were missing in the patched Makefile; bumps PKGREVISION. No other changes intended. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- makefile.orig 2020-01-02 09:49:37.000000000 +0000 d7 1 a7 5 @@@@ -3,10 +3,11 @@@@ include config.unix BIN = $(DESTDIR)$(PREFIX)/bin CONFIG = $(DESTDIR)$(SYSCONFDIR) +EGDIR = $(DESTDIR)@@EGDIR@@ d12 1 a12 1 +MAN = $(DESTDIR)$(PREFIX)/$(PKGMANDIR) d16 8 a23 66 @@@@ -28,37 +29,52 @@@@ all: prosody.install prosodyctl.install .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 + $(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_SCRIPT) ./prosody.install $(BIN)/prosody + $(BSD_INSTALL_SCRIPT) ./prosodyctl.install $(BIN)/prosodyctl + $(BSD_INSTALL_LIB_DIR) $(SOURCE)/core + $(BSD_INSTALL_DATA) core/*.lua $(SOURCE)/core + $(BSD_INSTALL_LIB_DIR) $(SOURCE)/net + $(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_LIB_DIR) $(SOURCE)/util + $(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/*.lua $(SOURCE)/util/sasl + $(BSD_INSTALL_LIB_DIR) $(MODULES) + $(BSD_INSTALL_DATA) plugins/*.lua $(MODULES) + $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_s2s + $(BSD_INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s + $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_pubsub + $(BSD_INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub + $(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs + $(BSD_INSTALL_DATA) certs/*.cnf $(EGDIR)/certs + $(BSD_INSTALL_DATA) certs/*makefile $(EGDIR)/certs + $(BSD_INSTALL_LIB_DIR) $(MODULES)/adhoc + $(BSD_INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc + $(BSD_INSTALL_LIB_DIR) $(MODULES)/muc + $(BSD_INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc + $(BSD_INSTALL_LIB_DIR) $(MODULES)/mod_mam + $(BSD_INSTALL_DATA) plugins/mod_mam/*.lua $(MODULES)/mod_mam d25 5 a29 12 - $(INSTALL_DATA) certs/localhost.crt certs/localhost.key $(CONFIG)/certs - $(INSTALL_DATA) certs/example.com.crt certs/example.com.key $(CONFIG)/certs + $(BSD_INSTALL_DATA_DIR) $(EGDIR)/certs + $(BSD_INSTALL_DATA) certs/localhost.crt certs/localhost.key $(EGDIR)/certs + $(BSD_INSTALL_DATA) certs/example.com.crt certs/example.com.key $(EGDIR)/certs .endif - $(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_MAN) man/prosodyctl.man $(MAN)/man1/prosodyctl.1 + test -f $(CONFIG)/prosody.cfg.lua || $(BSD_INSTALL_DATA) prosody.cfg.lua.install $(EGDIR)/prosody.cfg.lua + -test -f prosody.version && $(BSD_INSTALL_DATA) prosody.version $(SOURCE)/prosody.version d31 5 a35 2 clean: @