505a9dca83
Admin - Avoid logging IP addresses in mod_register when it's not desired - Command 'reload-config' allows to reload certificates - Get rid of 'fs' package dependency - Improve log message when module startup has failed - mod_muc_admin: New command get_room_affiliation - prosody2ejabberd: Report meaningful error when luerl is not available Configure - Accept atoms in api_permission command lists and commands with numbers in them - Validate additional listen opts: inet, inet6, backlog - Remove 'iqdisc' option - New option –enable-group=xxx - New option 'negotiation_timeout' - New option 'new_sql_schema' - New option 'validate_stream' - ejabberd_service: New option 'global_routes' for - mod_avatar: New 'rate_limit' option - mod_block_strangers: New 'access' option - mod_block_strangers: New 'captcha' option - mod_pubsub: New option 'force_node_config' Miscelanea - Simplify ejabberd_sup code - New gen_mod mod_options/1 callback to provide known options and defaults - Replace ?MYLANG with connection's language wherever possible - sql/*: Add username to peer indexes - cyrsasl: Simplify code for splitting auth string in cyrsasl - ejabberd_auth: Cache 'isuser' queries to external auth program - ejabberd_web_admin: Hardcode required ACL rules - mod_admin_extra: Command check_password_hash supports all hash methods - mod_admin_extra: Fix srg_get_info command with @all@ and @online@ - mod_avatar: Fulfill all requirements of XEP-0398 v0.2.0 - mod_avatar: Improve validation of 'convert' option - mod_block_strangers: Bounce groupchat to bare JID - mod_block_strangers: Fix a typo in call to create_captcha() - mod_caps: Only store CAPS if contact is subscribed - mod_carboncopy: Copy outgoing MUC PMs - mod_mam: Really run use_cache/1 and cache_nodes/1 callbacks - mod_pubsub: Remove items of unregistered user - mod_push_keepalive: Preserve timeout on resumption - mod_shared_roster: Try to fix ejabberd_c2s:process_info: got unexpected info - mod_shared_roster_ldap: Fix processing of ldap_memberattr_format_re option - mod_stream_mgmt: Abort connection on count error - mod_stream_mgmt: Clean up on timed out resumption
65 lines
1.6 KiB
Text
65 lines
1.6 KiB
Text
$NetBSD: patch-aa,v 1.15 2018/03/28 21:51:09 fhajny Exp $
|
|
|
|
Fix locations; don't mess with ownership.
|
|
|
|
--- Makefile.in.orig 2018-03-23 13:48:17.000000000 +0000
|
|
+++ Makefile.in
|
|
@@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@
|
|
DESTDIR =
|
|
|
|
# /etc/ejabberd/
|
|
-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
|
|
+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
|
|
|
|
# /bin/
|
|
BINDIR = $(DESTDIR)@bindir@
|
|
@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
|
|
LIBDIR = $(DESTDIR)@libdir@
|
|
|
|
# /lib/ejabberd/
|
|
-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
|
|
+EJABBERDDIR = $(LIBDIR)/ejabberd
|
|
|
|
# /share/doc/ejabberd
|
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|
@@ -59,37 +59,24 @@ JSDIR = $(PRIVDIR)/js
|
|
SQLDIR = $(PRIVDIR)/sql
|
|
|
|
# /var/lib/ejabberd/
|
|
-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
|
|
+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
|
|
|
|
# /var/lock/ejabberdctl
|
|
-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
|
|
+CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@
|
|
|
|
# /var/lib/ejabberd/.erlang.cookie
|
|
COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
|
|
|
|
# /var/log/ejabberd/
|
|
-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
|
|
+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@
|
|
|
|
INSTALLUSER=@INSTALLUSER@
|
|
-# if no user was enabled, don't set privileges or ownership
|
|
-ifeq ($(INSTALLUSER),)
|
|
O_USER=
|
|
G_USER=
|
|
CHOWN_COMMAND=echo
|
|
CHOWN_OUTPUT=/dev/null
|
|
INIT_USER=root
|
|
-else
|
|
- O_USER=-o $(INSTALLUSER)
|
|
- G_USER=-g $(INSTALLUSER)
|
|
- CHOWN_COMMAND=chown
|
|
- CHOWN_OUTPUT=&1
|
|
- INIT_USER=$(INSTALLUSER)
|
|
-endif
|
|
-# if no group was enabled, don't set privileges or ownership
|
|
INSTALLGROUP=@INSTALLGROUP@
|
|
-ifneq ($(INSTALLGROUP),)
|
|
- G_USER=-g $(INSTALLGROUP)
|
|
-endif
|
|
|
|
all: deps src
|
|
|