prosody: remove from wip

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: prosody: remove from wip
From: Pierre Pronchery <khorben%defora.org@localhost>
Date: Sun, 08 May 2022 21:44:30 +0000
Module Name:	pkgsrc-wip
Committed By:	Pierre Pronchery <khorben%defora.org@localhost>
Pushed By:	khorben
Date:		Sun May 8 23:44:30 2022 +0200
Changeset:	2a2ea1e67db013b1d01a1984de36a82c1dbab39d

Modified Files:
	Makefile
Removed Files:
	prosody/DESCR
	prosody/Makefile
	prosody/PLIST
	prosody/distinfo
	prosody/files/prosody.sh
	prosody/files/smf/manifest.xml
	prosody/patches/patch-makefile
	prosody/patches/patch-prosody.cfg.lua.dist
	prosody/patches/patch-util-src_pposix.c

Log Message:
prosody: remove from wip

This version is now packaged in pkgsrc-current.

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

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

diffstat:
 Makefile                                   |   1 -
 prosody/DESCR                              |   6 -
 prosody/Makefile                           |  81 ---------
 prosody/PLIST                              | 262 -----------------------------
 prosody/distinfo                           |   8 -
 prosody/files/prosody.sh                   |  26 ---
 prosody/files/smf/manifest.xml             |  29 ----
 prosody/patches/patch-makefile             |  35 ----
 prosody/patches/patch-prosody.cfg.lua.dist |  28 ---
 prosody/patches/patch-util-src_pposix.c    |  12 --
 10 files changed, 488 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 05eef6cd9a..2dd3de371f 100644
--- a/Makefile
+++ b/Makefile
@@ -3326,7 +3326,6 @@ SUBDIR+=	progreiserfs
 SUBDIR+=	proj
 SUBDIR+=	proplib
 SUBDIR+=	proselint
-SUBDIR+=	prosody
 SUBDIR+=	prover9
 SUBDIR+=	proxychains
 SUBDIR+=	proxychains-ng
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 f484ef9ab1..0000000000
--- a/prosody/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-# $NetBSD: Makefile,v 1.36 2022/05/06 04:02:11 khorben Exp $
-
-DISTNAME=		prosody-0.12.0
-CATEGORIES=		chat
-MASTER_SITES=		https://prosody.im/downloads/source/
-
-MAINTAINER=		pkgsrc-users%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
-DEPENDS+=		${LUA_PKGPREFIX}-unbound-[0-9]*:../../net/lua-unbound
-
-HAS_CONFIGURE=		yes
-USE_LANGUAGES=		c99
-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=	makefile prosody.cfg.lua.dist
-SUBST_SED.path=		-e 's,$$(CONFIG),$$(DESTDIR)$(EGDIR),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=		makefile
-
-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 "../../textproc/icu/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/prosody/PLIST b/prosody/PLIST
deleted file mode 100644
index 676924915c..0000000000
--- a/prosody/PLIST
+++ /dev/null
@@ -1,262 +0,0 @@
-@comment $NetBSD$
-bin/prosody
-bin/prosodyctl
-lib/prosody/core/certmanager.lua
-lib/prosody/core/configmanager.lua
-lib/prosody/core/features.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_shell.lua
-lib/prosody/modules/mod_admin_socket.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_insecure.lua
-lib/prosody/modules/mod_auth_internal_hashed.lua
-lib/prosody/modules/mod_auth_internal_plain.lua
-lib/prosody/modules/mod_auth_ldap.lua
-lib/prosody/modules/mod_authz_internal.lua
-lib/prosody/modules/mod_blocklist.lua
-lib/prosody/modules/mod_bookmarks.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_cron.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_external_services.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_file_share.lua
-lib/prosody/modules/mod_http_files.lua
-lib/prosody/modules/mod_http_openmetrics.lua
-lib/prosody/modules/mod_invites.lua
-lib/prosody/modules/mod_invites_adhoc.lua
-lib/prosody/modules/mod_invites_register.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_mam/mamprefs.lib.lua
-lib/prosody/modules/mod_mam/mamprefsxml.lib.lua
-lib/prosody/modules/mod_mam/mod_mam.lua
-lib/prosody/modules/mod_message.lua
-lib/prosody/modules/mod_mimicking.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_pubsub/mod_pubsub.lua
-lib/prosody/modules/mod_pubsub/pubsub.lib.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.lua
-lib/prosody/modules/mod_s2s_auth_certs.lua
-lib/prosody/modules/mod_s2s_bidi.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_smacks.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_tokenauth.lua
-lib/prosody/modules/mod_tombstones.lua
-lib/prosody/modules/mod_turn_external.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/hats.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/occupant_id.lib.lua
-lib/prosody/modules/muc/password.lib.lua
-lib/prosody/modules/muc/persistent.lib.lua
-lib/prosody/modules/muc/presence_broadcast.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/cqueues.lua
-lib/prosody/net/dns.lua
-lib/prosody/net/http.lua
-lib/prosody/net/http/codes.lua
-lib/prosody/net/http/errors.lua
-lib/prosody/net/http/files.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/chain.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/stun.lua
-lib/prosody/net/unbound.lua
-lib/prosody/net/websocket.lua
-lib/prosody/net/websocket/frames.lua
-lib/prosody/prosody.version
-lib/prosody/util/adhoc.lua
-lib/prosody/util/adminstream.lua
-lib/prosody/util/argparse.lua
-lib/prosody/util/array.lua
-lib/prosody/util/async.lua
-lib/prosody/util/bit53.lua
-lib/prosody/util/bitcompat.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/datamapper.lua
-lib/prosody/util/datetime.lua
-lib/prosody/util/dbuffer.lua
-lib/prosody/util/debug.lua
-lib/prosody/util/dependencies.lua
-lib/prosody/util/dns.lua
-lib/prosody/util/dnsregistry.lua
-lib/prosody/util/encodings.so
-lib/prosody/util/envload.lua
-lib/prosody/util/error.lua
-lib/prosody/util/events.lua
-lib/prosody/util/filters.lua
-lib/prosody/util/format.lua
-lib/prosody/util/gc.lua
-lib/prosody/util/hashes.so
-lib/prosody/util/hashring.lua
-lib/prosody/util/helpers.lua
-lib/prosody/util/hex.lua
-lib/prosody/util/hmac.lua
-lib/prosody/util/http.lua
-lib/prosody/util/human/io.lua
-lib/prosody/util/human/units.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/jsonpointer.lua
-lib/prosody/util/jsonschema.lua
-lib/prosody/util/jwt.lua
-lib/prosody/util/logger.lua
-lib/prosody/util/mercurial.lua
-lib/prosody/util/multitable.lua
-lib/prosody/util/net.so
-lib/prosody/util/openmetrics.lua
-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/prosodyctl/cert.lua
-lib/prosody/util/prosodyctl/check.lua
-lib/prosody/util/prosodyctl/shell.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/external.lua
-lib/prosody/util/sasl/plain.lua
-lib/prosody/util/sasl/scram.lua
-lib/prosody/util/serialization.lua
-lib/prosody/util/session.lua
-lib/prosody/util/set.lua
-lib/prosody/util/signal.so
-lib/prosody/util/smqueue.lua
-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/strbitop.so
-lib/prosody/util/struct.so
-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
-lib/prosody/util/xtemplate.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 var/db/prosody
diff --git a/prosody/distinfo b/prosody/distinfo
deleted file mode 100644
index 708d9027d1..0000000000
--- a/prosody/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.22 2022/05/06 04:02:11 khorben Exp $
-
-BLAKE2s (prosody-0.12.0.tar.gz) = 5060b27c828174f3b9a1cca350b584a5767b93d48f8373d61cf1d63e37b7000c
-SHA512 (prosody-0.12.0.tar.gz) = b7144a413a5bc72b1e677504d5ced6583c7399c8334b39b4c9157da60f951300832b34a1d47703a0b217caa4f1d3a0f52ab59cef08b27c6b43e876e1dffca3ce
-Size (prosody-0.12.0.tar.gz) = 610330 bytes
-SHA1 (patch-makefile) = 8971d0a898ca7bf38f0d79322e2d0c381334c37c
-SHA1 (patch-prosody.cfg.lua.dist) = a1e4636abe4f2caa82d13ed8564b5b785dc8595a
-SHA1 (patch-util-src_pposix.c) = 519fd2da1931c1b35a0b028ea9303b3c0f5b6a6a
diff --git a/prosody/files/prosody.sh b/prosody/files/prosody.sh
deleted file mode 100644
index f8fd2c411c..0000000000
--- a/prosody/files/prosody.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: prosody.sh,v 1.2 2021/08/29 18:32:29 khorben Exp $
-#
-# PROVIDE: prosody
-# REQUIRE: DAEMON
-
-if [ -f @SYSCONFBASE@/rc.subr ]; then
-  . @SYSCONFBASE@/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-makefile b/prosody/patches/patch-makefile
deleted file mode 100644
index 382e705b40..0000000000
--- a/prosody/patches/patch-makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-makefile,v 1.1 2020/03/09 19:37:20 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)/man
- 
- 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
diff --git a/prosody/patches/patch-prosody.cfg.lua.dist b/prosody/patches/patch-prosody.cfg.lua.dist
deleted file mode 100644
index ad485e5ea7..0000000000
--- a/prosody/patches/patch-prosody.cfg.lua.dist
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-prosody.cfg.lua.dist,v 1.1 2020/01/23 18:26:15 gdt Exp $
-
-set the logging paths
-set up the pid files
-
---- prosody.cfg.lua.dist.orig	2022-03-08 12:34:39.594708341 +0000
-+++ prosody.cfg.lua.dist
-@@ -183,8 +183,8 @@ 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 when running in the foreground
- }
-@@ -205,6 +205,9 @@ log = {
- -- Location of directory to find certificates in (relative to main config file):
- certificates = "certs"
- 
-+-- 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_pposix.c b/prosody/patches/patch-util-src_pposix.c
deleted file mode 100644
index 08bc7c7b09..0000000000
--- a/prosody/patches/patch-util-src_pposix.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- util-src/pposix.c.orig	2022-03-08 12:34:39.594708341 +0000
-+++ util-src/pposix.c
-@@ -38,6 +38,7 @@
- #endif
- #endif
- 
-+#include <unistd.h>
- #include <stdlib.h>
- #include <math.h>
- #include <unistd.h>
Prev by Date: prosody: register a dependency
Next by Date: lua-lualdap: remove from wip
Previous by Thread: prosody: register a dependency
Next by Thread: lua-lualdap: remove from wip
Indexes:
Home | Main Index | Thread Index | Old Index