3aa4c42483
Security fixes: - Fix path traversal vulnerability in mod_http_files (CVE-2016-1231) - Fix use of weak PRNG in generation of dialback secrets (CVE-2016-1232) Bugs: - Improve handling of CNAME records in DNS - Fix traceback when deleting a user in some configurations - MUC: restrict_room_creation could prevent users from joining rooms - MUC: fix occasional dropping of iq stanzas sent privately between occupants - Fix a potential memory leak in mod_pep Additions: - Add http:list() command to telnet to view active HTTP services - Simplify IPv4/v6 address selection code for outgoing s2s - Add support for importing SCRAM hashes from ejabberd
78 lines
3.2 KiB
Text
78 lines
3.2 KiB
Text
$NetBSD: patch-aa,v 1.6 2016/01/25 13:01:39 fhajny Exp $
|
|
|
|
Fix installation directories and scripts
|
|
--- Makefile.orig 2016-01-08 13:07:07.000000000 +0000
|
|
+++ Makefile
|
|
@@ -3,10 +3,11 @@ include config.unix
|
|
|
|
BIN = $(DESTDIR)$(PREFIX)/bin
|
|
CONFIG = $(DESTDIR)$(SYSCONFDIR)
|
|
+EGDIR = $(DESTDIR)@EGDIR@
|
|
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)
|
|
@@ -22,26 +23,39 @@ 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
|
|
- install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
|
|
- install -m750 -d $(DATA)
|
|
- install -d $(MAN)/man1
|
|
- install -d $(CONFIG)/certs
|
|
- install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
|
|
- install -m755 ./prosody.install $(BIN)/prosody
|
|
- install -m755 ./prosodyctl.install $(BIN)/prosodyctl
|
|
- install -m644 core/*.lua $(SOURCE)/core
|
|
- install -m644 net/*.lua $(SOURCE)/net
|
|
- install -d $(SOURCE)/net/http
|
|
- install -m644 net/http/*.lua $(SOURCE)/net/http
|
|
- install -m644 util/*.lua $(SOURCE)/util
|
|
- install -m644 util/*.so $(SOURCE)/util
|
|
- install -d $(SOURCE)/util/sasl
|
|
- install -m644 util/sasl/* $(SOURCE)/util/sasl
|
|
- umask 0022 && cp -r plugins/* $(MODULES)
|
|
- install -m644 certs/* $(CONFIG)/certs
|
|
- install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
|
|
- test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
|
|
- test -e prosody.version && install -m644 prosody.version $(SOURCE)/prosody.version || true
|
|
+ $(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_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_DATA) plugins/storage/* $(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:
|