diff options
Diffstat (limited to 'package/ejabberd/0007-fix-install-permissions.patch')
| -rw-r--r-- | package/ejabberd/0007-fix-install-permissions.patch | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/package/ejabberd/0007-fix-install-permissions.patch b/package/ejabberd/0007-fix-install-permissions.patch index 89e3379b8c..2ad8453238 100644 --- a/package/ejabberd/0007-fix-install-permissions.patch +++ b/package/ejabberd/0007-fix-install-permissions.patch @@ -7,11 +7,11 @@ Author: Johan Oudinet <johan.oudinet@gmail.com> Index: ejabberd/Makefile.in =================================================================== diff --git a/Makefile.in b/Makefile.in -index f7b30d4..84098a6 100644 +index b9d783a..6ec805a 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -114,10 +114,8 @@ DLLs := $(wildcard deps/*/priv/*.so) $(wildcard deps/*/priv/lib/*.so) - install: all +@@ -122,10 +122,8 @@ copy-files: $(call TO_DEST,$(MAIN_FILES)) + install: all copy-files # # Configuration files - $(INSTALL) -d -m 750 $(G_USER) $(ETCDIR) @@ -19,19 +19,20 @@ index f7b30d4..84098a6 100644 - && $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \ - || $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml + $(INSTALL) -d $(ETCDIR) -+ $(INSTALL) -b -m 644 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml ++ $(INSTALL) -b -m 644 ejabberd.yml.example $(ETCDIR)/ejabberd.yml $(SED) -e "s*{{rootdir}}*@prefix@*" \ -e "s*{{installuser}}*@INSTALLUSER@*" \ -e "s*{{bindir}}*@bindir@*" \ -@@ -127,14 +125,11 @@ install: all +@@ -135,14 +133,11 @@ install: all copy-files -e "s*{{docdir}}*@docdir@*" \ -e "s*{{erl}}*@ERL@*" ejabberdctl.template \ > ejabberdctl.example - [ -f $(ETCDIR)/ejabberdctl.cfg ] \ - && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ - || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg -+ $(INSTALL) -b -m 644 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg - $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc +- $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc ++ $(INSTALL) -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg ++ $(INSTALL) -b -m 644 inetrc $(ETCDIR)/inetrc # # Administration script - [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR) @@ -40,20 +41,13 @@ index f7b30d4..84098a6 100644 # Elixir binaries [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR) [ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true -@@ -165,9 +160,9 @@ install: all +@@ -157,34 +152,11 @@ install: all copy-files # # Binary C programs $(INSTALL) -d $(PBINDIR) - $(INSTALL) -m 750 $(O_USER) tools/captcha.sh $(PBINDIR) -- $(INSTALL) -m 750 $(O_USER) tools/joincluster $(PBINDIR) -- $(INSTALL) -m 750 $(O_USER) tools/leavecluster $(PBINDIR) + $(INSTALL) tools/captcha.sh $(PBINDIR) -+ $(INSTALL) tools/joincluster $(PBINDIR) -+ $(INSTALL) tools/leavecluster $(PBINDIR) - [ -f deps/p1_pam/priv/bin/epam ] \ - && $(INSTALL) -m 750 $(O_USER) deps/p1_pam/priv/bin/epam $(PBINDIR) \ - || true -@@ -185,29 +180,6 @@ install: all + # # Copy lite.sql [ -d deps/sqlite3 ] && $(INSTALL) -d $(SQLDIR) || true [ -d deps/sqlite3 ] && $(INSTALL) -m 644 sql/lite.sql $(SQLDIR) || true |
