[packages/ejabberd] Up to 22.05.

arekm arekm at pld-linux.org
Thu May 19 21:19:47 CEST 2022 

commit db5a58602196368d255618f0ec03c51b556be7bb
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu May 19 21:19:04 2022 +0200

    Up to 22.05.

 ejabberd-bug-3819.patch | 219 ++++++++++++++++++++++++++++++++++++++++++++++++
 ejabberd-paths.patch    |  37 ++++----
 ejabberd.spec           | 116 ++++++++++++-------------
 3 files changed, 288 insertions(+), 84 deletions(-)
---
diff --git a/ejabberd.spec b/ejabberd.spec
index c0849d9..cc5e42f 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -9,76 +9,72 @@
 Summary:	Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):	Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:		ejabberd
-Version:	21.12
+Version:	22.05
 Release:	1
 License:	GPL
 Group:		Applications/Communications
-# Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz
-Source0:	https://www.process-one.net/downloads/downloads-action.php?file=/%{version}/%{name}-%{version}.tgz
-# Source0-md5:	0382a30b10aa2bf15ee656814c90af49
+# Source0:	https://www.process-one.net/downloads/downloads-action.php?file=/%{version}/%{name}-%{version}.tar.gz
+Source0:	https://github.com/processone/ejabberd/archive/refs/tags/%{version}.tar.gz
+# Source0-md5:	4ebfd038cda9cb5ab34c95b49cff1bc8
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.service
 Source4:	%{name}.logrotate
 
-
-Source10:	%{name}-base64url-20190617.tar.gz
+Source10:	ejabberd-base64url-20190617.tar.gz
 # Source10-md5:	5a12fd2fb1f992c850aba5115aab3dd4
-Source11:	%{name}-cache_tab-20210721.tar.gz
-# Source11-md5:	7cc70bf8d4b6df65a34fe43fd1983abb
-Source12:	%{name}-eimp-20210721.tar.gz
-# Source12-md5:	8f7b7788e612ca6c03db09866b891940
-Source13:	%{name}-elixir-20170515.tar.gz
+Source11:	ejabberd-cache_tab-20220502.tar.gz
+# Source11-md5:	822bec23631e956ce927ecc5ae31e24d
+Source12:	ejabberd-eimp-20220502.tar.gz
+# Source12-md5:	39b7de8ad391da8fb12ff9b76301ced5
+Source13:	ejabberd-elixir-20170515.tar.gz
 # Source13-md5:	73be42f7d0cda7aeee5c0e6dadc0c451
-Source14:	%{name}-ezlib-20210721.tar.gz
-# Source14-md5:	8d0382c3ff95f82072b6aa4a3b147b51
-Source15:	%{name}-fast_tls-20210721.tar.gz
-# Source15-md5:	af03ff816797aa276a4ceff975faaaf8
-Source16:	%{name}-fast_xml-20211129.tar.gz
-# Source16-md5:	65ecc85b1d0f8d80dcb034ec3d4bf33f
-Source17:	%{name}-fast_yaml-20210721.tar.gz
-# Source17-md5:	074d2700df42b61bbe7ec7f8c9d47012
-Source18:	%{name}-goldrush-20160531.tar.gz
-# Source18-md5:	acac73f0fc85d23671f0c49c68f8df8a
-Source19:	%{name}-idna-20180830.tar.gz
-# Source19-md5:	e34174d5c5e2e91611d3249c690f6d2d
-Source20:	%{name}-jiffy-20200630.tar.gz
-# Source20-md5:	e99a512a9c4395bda77f07990aa9aa97
-Source21:	%{name}-jose-20201223.tar.gz
-# Source21-md5:	6e5c9910dc1e1894e31882d49f78967d
-Source22:	%{name}-lager-20210302.tar.gz
-# Source22-md5:	771b8fd52dac39ebf8df03d7b3f7ce3c
-Source23:	%{name}-mqtree-20210721.tar.gz
-# Source23-md5:	d19e24ec9e57509cc49ef52adb004950
-Source24:	%{name}-p1_acme-20211129.tar.gz
-# Source24-md5:	4682d74e8cd6c13384d661dc2bdb79d2
-Source25:	%{name}-p1_mysql-20210721.tar.gz
-# Source25-md5:	346f98e9eb7e098d91aef99af47ad3e3
-Source26:	%{name}-p1_oauth2-20210721.tar.gz
-# Source26-md5:	02f200cda69fbba041d73239c6720e3a
-Source27:	%{name}-p1_pgsql-20211129.tar.gz
-# Source27-md5:	3d406d48d19310fc56f743cdfacad2d9
-Source28:	%{name}-p1_utils-20210721.tar.gz
-# Source28-md5:	75349258408c43c4a5c87e05129d277c
-Source29:	%{name}-pkix-20210721.tar.gz
-# Source29-md5:	253920e7a3307b3941f2ff21cec8768c
-Source30:	%{name}-rebar_elixir_plugin-20160105.tar.gz
-# Source30-md5:	6a069a566d71c3daa45fc4736364adf0
-Source31:	%{name}-sqlite3-20210721.tar.gz
-# Source31-md5:	a81afbe7543f58fbb2cef732d73b3d3c
-Source32:	%{name}-stringprep-20210721.tar.gz
-# Source32-md5:	88e1f8eff6f0e7a8b7707ef263cfa623
-Source33:	%{name}-stun-20211204.tar.gz
-# Source33-md5:	43efde2a2bcebac99687afb17f2238b1
-Source34:	%{name}-unicode_util_compat-20170729.tar.gz
-# Source34-md5:	1b348fdf38dba88ebed2f65125ad8590
-Source35:	%{name}-xmpp-20211129.tar.gz
-# Source35-md5:	74ae1ea0ef542142479fdd5de0dad3dc
-Source36:	%{name}-yconf-20210721.tar.gz
-# Source36-md5:	befea2c20d4cc672c78b2b5caa8cf75d
+Source14:	ejabberd-ezlib-20220502.tar.gz
+# Source14-md5:	32dadbeff189a0fa18c21aa42258fa1a
+Source15:	ejabberd-fast_tls-20220502.tar.gz
+# Source15-md5:	1f341267a7d0bd953e961ccbe098e438
+Source16:	ejabberd-fast_xml-20220502.tar.gz
+# Source16-md5:	1288d6e5ea055784634367a0991adc3b
+Source17:	ejabberd-fast_yaml-20220502.tar.gz
+# Source17-md5:	1a513d2a074fc67678eecfbfc36c58b2
+Source18:	ejabberd-idna-20180830.tar.gz
+# Source18-md5:	e34174d5c5e2e91611d3249c690f6d2d
+Source19:	ejabberd-jiffy-20220223.tar.gz
+# Source19-md5:	b98489245dadf5a36ac3408be21d835a
+Source20:	ejabberd-jose-20201223.tar.gz
+# Source20-md5:	6e5c9910dc1e1894e31882d49f78967d
+Source21:	ejabberd-mqtree-20220502.tar.gz
+# Source21-md5:	1f1b175534eb917780e89e4c7d49c710
+Source22:	ejabberd-p1_acme-20220502.tar.gz
+# Source22-md5:	ada7344c8192e1999a73110ead29a704
+Source23:	ejabberd-p1_mysql-20210721.tar.gz
+# Source23-md5:	346f98e9eb7e098d91aef99af47ad3e3
+Source24:	ejabberd-p1_oauth2-20220502.tar.gz
+# Source24-md5:	bade7f8e1d18c9f6149b70268c73087b
+Source25:	ejabberd-p1_pgsql-20220502.tar.gz
+# Source25-md5:	052db14b243601591477abde6be1c74e
+Source26:	ejabberd-p1_utils-20220502.tar.gz
+# Source26-md5:	0eab972a4a247519e5a898d8da6054c1
+Source27:	ejabberd-pkix-20220502.tar.gz
+# Source27-md5:	88fd008dca6cf2208678fbf50b47a21a
+Source28:	ejabberd-rebar_elixir_plugin-20160105.tar.gz
+# Source28-md5:	6a069a566d71c3daa45fc4736364adf0
+Source29:	ejabberd-sqlite3-20210721.tar.gz
+# Source29-md5:	a81afbe7543f58fbb2cef732d73b3d3c
+Source30:	ejabberd-stringprep-20220502.tar.gz
+# Source30-md5:	721468fde880de8821c916c2534c9525
+Source31:	ejabberd-stun-20220502.tar.gz
+# Source31-md5:	27a002c7a5b3a6af6deb2a1eff281cfd
+Source32:	ejabberd-unicode_util_compat-20170729.tar.gz
+# Source32-md5:	1b348fdf38dba88ebed2f65125ad8590
+Source33:	ejabberd-xmpp-20220502.tar.gz
+# Source33-md5:	02378d906436ed5d5ece87419ff007ce
+Source34:	ejabberd-yconf-20220502.tar.gz
+# Source34-md5:	878e4993a860cc6384313e301b63a09b
 
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-config.patch
+Patch2:		ejabberd-bug-3819.patch
 # https://paleg.github.io/mod_logdb/
 # https://github.com/paleg/ejabberd/compare/paleg:19.08...paleg:19.08-mod_logdb.patch
 Patch3:		%{name}-mod_logdb.patch
@@ -128,10 +124,10 @@ Requires:	%{name} = %{version}-%{release}
 Server-side logging module.
 
 %prep
-%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34 -a 35 -a 36
+%setup -q -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 -a 25 -a 26 -a 27 -a 28 -a 29 -a 30 -a 31 -a 32 -a 33 -a 34
+%patch2 -p1
 %patch0 -p1
 %patch1 -p1
-#%%patch2 -p1
 %if %{with logdb}
 %patch3 -p1
 %endif
@@ -358,11 +354,9 @@ fi
 %{_libdir}/fast_tls-*
 %{_libdir}/fast_xml-*
 %{_libdir}/fast_yaml-*
-%{_libdir}/goldrush-*
 %{_libdir}/idna-*
 %{_libdir}/jiffy-*
 %{_libdir}/jose-*
-%{_libdir}/lager-*
 %dir %{_libdir}/mqtree-*
 %{_libdir}/mqtree-*/ebin
 %dir %{_libdir}/mqtree-*/priv
diff --git a/ejabberd-bug-3819.patch b/ejabberd-bug-3819.patch
new file mode 100644
index 0000000..bd0ed72
--- /dev/null
+++ b/ejabberd-bug-3819.patch
@@ -0,0 +1,219 @@
+From 75a771bfec3626145d404349fdaec4f0eef83bbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pawel at process-one.net>
+Date: Thu, 19 May 2022 12:20:42 +0200
+Subject: [PATCH] Don't leak DESTDIR in files copied by 'make install'
+
+This fixes issue #3819
+---
+ Makefile.in | 132 ++++++++++++++++++++++++++--------------------------
+ 1 file changed, 66 insertions(+), 66 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 16e713ebe7..7358982f6a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,27 +10,27 @@ exec_prefix = @exec_prefix@
+ DESTDIR =
+ 
+ # /etc/ejabberd/
+-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
++ETCDIR = @sysconfdir@/ejabberd
+ 
+ # /bin/
+-BINDIR = $(DESTDIR)@bindir@
++BINDIR = @bindir@
+ 
+ # /sbin/
+-SBINDIR = $(DESTDIR)@sbindir@
++SBINDIR = @sbindir@
+ 
+ # /lib/
+-LIBDIR =  $(DESTDIR)@libdir@
++LIBDIR =  @libdir@
+ 
+ # /lib/ejabberd/
+-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
++EJABBERDDIR = @libdir@/ejabberd
+ 
+ # /share/doc/ejabberd
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ datarootdir = @datarootdir@
+-DOCDIR = $(DESTDIR)@docdir@
++DOCDIR = @docdir@
+ 
+ # /share/doc/man/man5
+-MANDIR = $(DESTDIR)@mandir@/man5
++MANDIR = @mandir@/man5
+ 
+ # /usr/lib/ejabberd/ebin/
+ BEAMDIR = $(EJABBERDDIR)/ebin
+@@ -66,10 +66,10 @@ SQLDIR = $(PRIVDIR)/sql
+ LUADIR = $(PRIVDIR)/lua
+ 
+ # /var/lib/ejabberd/
+-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
++SPOOLDIR = @localstatedir@/lib/ejabberd
+ 
+ # /var/log/ejabberd/
+-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
++LOGDIR = @localstatedir@/log/ejabberd
+ 
+ INSTALLUSER=@INSTALLUSER@
+ # if no user was enabled, don't set privileges or ownership
+@@ -201,7 +201,7 @@ ELIXIR_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 5,1000,
+ DEPS_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,$(word 2,$(1))) $(wordlist 3,1000,$(1))
+ MAIN_TO_DEST=$(LIBDIR) $(call VERSIONED_DEP,ejabberd) $(1)
+ TO_DEST_SINGLE=$(if $(subst X$(DEPSBASE)X,,X$(word 1,$(1))X),$(call MAIN_TO_DEST,$(1)),$(if $(subst XlibX,,X$(word $(LIBIX),$(1))X),$(call DEPS_TO_DEST,$(wordlist $(DEPIX),1000,$(1))),$(call ELIXIR_TO_DEST,$(wordlist $(DEPIX),1000,$(1)))))
+-TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
++TO_DEST=$(foreach path,$(1),$(call JOIN_PATHS,$(DESTDIR)$(call TO_DEST_SINGLE,$(subst /, ,$(path)))))
+ 
+ FILTER_DIRS=$(foreach path,$(1),$(if $(wildcard $(path)/*),,$(path)))
+ FILES_WILDCARD=$(call FILTER_DIRS,$(foreach w,$(1),$(wildcard $(w))))
+@@ -242,7 +242,7 @@ $(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template,
+ $(foreach file,$(BINARIES),$(eval $(call COPY_BINARY_template,$(file))))
+ 
+ $(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))):
+-	$(INSTALL) -d $@
++		$(INSTALL) -d $@
+ 
+ $(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql)
+ 	$(INSTALL) -m 644 $< $@
+@@ -311,23 +311,23 @@ ejabberdctl.example: vars.config
+ install: copy-files ejabberdctl.example
+ 	#
+ 	# Configuration files
+-	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
+-	[ -f $(ETCDIR)/ejabberd.yml ] \
+-		&& $(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
+-	[ -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) inetrc $(ETCDIR)/inetrc
++	$(INSTALL) -d -m 750 $(G_USER) $(DESTDIR)$(ETCDIR)
++	[ -f $(DESTDIR)$(ETCDIR)/ejabberd.yml ] \
++		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(DESTDIR)$(ETCDIR)/ejabberd.yml-new \
++		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(DESTDIR)$(ETCDIR)/ejabberd.yml
++	[ -f $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg ] \
++		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg-new \
++		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg
++	$(INSTALL) -b -m 644 $(G_USER) inetrc $(DESTDIR)$(ETCDIR)/inetrc
+ 	#
+ 	# Administration script
+-	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
+-	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
++	[ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR)
++	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(DESTDIR)$(SBINDIR)/ejabberdctl
+ 	# Elixir binaries
+-	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
+-	[ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(BINDIR)/iex || true
+-	[ -f $(DEPSDIR)/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/elixir $(BINDIR)/elixir || true
+-	[ -f $(DEPSDIR)/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/mix $(BINDIR)/mix || true
++	[ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
++	[ -f $(DEPSDIR)/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/iex $(DESTDIR)$(BINDIR)/iex || true
++	[ -f $(DEPSDIR)/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/elixir $(DESTDIR)$(BINDIR)/elixir || true
++	[ -f $(DEPSDIR)/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) $(DEPSDIR)/elixir/bin/mix $(DESTDIR)$(BINDIR)/mix || true
+ 	#
+ 	# Init script
+ 	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
+@@ -342,59 +342,59 @@ install: copy-files ejabberdctl.example
+ 	chmod 644 ejabberd.service
+ 	#
+ 	# Spool directory
+-	$(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR)
+-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT)
+-	chmod -R 750 $(SPOOLDIR)
++	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(SPOOLDIR)
++	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(DESTDIR)$(SPOOLDIR) >$(CHOWN_OUTPUT)
++	chmod -R 750 $(DESTDIR)$(SPOOLDIR)
+ 	#
+ 	# Log directory
+-	$(INSTALL) -d -m 750 $(O_USER) $(LOGDIR)
+-	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT)
+-	chmod -R 750 $(LOGDIR)
++	$(INSTALL) -d -m 750 $(O_USER) $(DESTDIR)$(LOGDIR)
++	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(DESTDIR)$(LOGDIR) >$(CHOWN_OUTPUT)
++	chmod -R 750 $(DESTDIR)$(LOGDIR)
+ 	#
+ 	# Documentation
+-	$(INSTALL) -d $(MANDIR)
+-	$(INSTALL) -d $(DOCDIR)
++	$(INSTALL) -d $(DESTDIR)$(MANDIR)
++	$(INSTALL) -d $(DESTDIR)$(DOCDIR)
+ 	[ -f man/ejabberd.yml.5 ] \
+-		&& $(INSTALL) -m 644 man/ejabberd.yml.5 $(MANDIR) \
++		&& $(INSTALL) -m 644 man/ejabberd.yml.5 $(DESTDIR)$(MANDIR) \
+ 		|| echo "Man page not included in sources"
+-	$(INSTALL) -m 644 COPYING $(DOCDIR)
++	$(INSTALL) -m 644 COPYING $(DESTDIR)$(DOCDIR)
+ 
+ uninstall: uninstall-binary
+ 
+ uninstall-binary:
+-	rm -f  $(SBINDIR)/ejabberdctl
+-	rm -f  $(BINDIR)/iex
+-	rm -f  $(BINDIR)/elixir
+-	rm -f  $(BINDIR)/mix
+-	rm -fr $(DOCDIR)
+-	rm -f  $(BEAMDIR)/*.beam
+-	rm -f  $(BEAMDIR)/*.app
+-	rm -fr $(BEAMDIR)
+-	rm -f  $(INCLUDEDIR)/*.hrl
+-	rm -fr $(INCLUDEDIR)
+-	rm -fr $(PBINDIR)
+-	rm -f  $(SODIR)/*.so
+-	rm -fr $(SODIR)
+-	rm -f  $(MSGSDIR)/*.msg
+-	rm -fr $(MSGSDIR)
+-	rm -f  $(CSSDIR)/*.css
+-	rm -fr $(CSSDIR)
+-	rm -f  $(IMGDIR)/*.png
+-	rm -fr $(IMGDIR)
+-	rm -f  $(JSDIR)/*.js
+-	rm -fr $(JSDIR)
+-	rm -f  $(SQLDIR)/*.sql
+-	rm -fr $(SQLDIR)
+-	rm -fr $(LUADIR)/*.lua
+-	rm -fr $(LUADIR)
+-	rm -fr $(PRIVDIR)
+-	rm -fr $(EJABBERDDIR)
++	rm -f  $(DESTDIR)$(SBINDIR)/ejabberdctl
++	rm -f  $(DESTDIR)$(BINDIR)/iex
++	rm -f  $(DESTDIR)$(BINDIR)/elixir
++	rm -f  $(DESTDIR)$(BINDIR)/mix
++	rm -fr $(DESTDIR)$(DOCDIR)
++	rm -f  $(DESTDIR)$(BEAMDIR)/*.beam
++	rm -f  $(DESTDIR)$(BEAMDIR)/*.app
++	rm -fr $(DESTDIR)$(BEAMDIR)
++	rm -f  $(DESTDIR)$(INCLUDEDIR)/*.hrl
++	rm -fr $(DESTDIR)$(INCLUDEDIR)
++	rm -fr $(DESTDIR)$(PBINDIR)
++	rm -f  $(DESTDIR)$(SODIR)/*.so
++	rm -fr $(DESTDIR)$(SODIR)
++	rm -f  $(DESTDIR)$(MSGSDIR)/*.msg
++	rm -fr $(DESTDIR)$(MSGSDIR)
++	rm -f  $(DESTDIR)$(CSSDIR)/*.css
++	rm -fr $(DESTDIR)$(CSSDIR)
++	rm -f  $(DESTDIR)$(IMGDIR)/*.png
++	rm -fr $(DESTDIR)$(IMGDIR)
++	rm -f  $(DESTDIR)$(JSDIR)/*.js
++	rm -fr $(DESTDIR)$(JSDIR)
++	rm -f  $(DESTDIR)$(SQLDIR)/*.sql
++	rm -fr $(DESTDIR)$(SQLDIR)
++	rm -fr $(DESTDIR)$(LUADIR)/*.lua
++	rm -fr $(DESTDIR)$(LUADIR)
++	rm -fr $(DESTDIR)$(PRIVDIR)
++	rm -fr $(DESTDIR)$(EJABBERDDIR)
+ 
+ uninstall-all: uninstall-binary
+-	rm -rf $(ETCDIR)
+-	rm -rf $(EJABBERDDIR)
+-	rm -rf $(SPOOLDIR)
+-	rm -rf $(LOGDIR)
++	rm -rf $(DESTDIR)$(ETCDIR)
++	rm -rf $(DESTDIR)$(EJABBERDDIR)
++	rm -rf $(DESTDIR)$(SPOOLDIR)
++	rm -rf $(DESTDIR)$(LOGDIR)
+ 
+ clean:
+ 	rm -rf $(DEPSDIR)/.got
diff --git a/ejabberd-paths.patch b/ejabberd-paths.patch
index 2638dfd..1904f16 100644
--- a/ejabberd-paths.patch
+++ b/ejabberd-paths.patch
@@ -5,20 +5,20 @@ diff -urNp -x '*.orig' ejabberd-21.01.org/Makefile.in ejabberd-21.01/Makefile.in
  DESTDIR =
  
  # /etc/ejabberd/
--ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
-+ETCDIR = $(DESTDIR)@sysconfdir@/jabber
+-ETCDIR = @sysconfdir@/ejabberd
++ETCDIR = @sysconfdir@/jabber
  
  # /bin/
- BINDIR = $(DESTDIR)@bindir@
-@@ -249,7 +249,7 @@ install: copy-files
- 	[ -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) inetrc $(ETCDIR)/inetrc
-+	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/ejabberd-inetrc
+ BINDIR = @bindir@
+@@ -318,7 +318,7 @@ install: copy-files ejabberdctl.example
+ 	[ -f $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg ] \
+ 		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg-new \
+ 		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(DESTDIR)$(ETCDIR)/ejabberdctl.cfg
+-	$(INSTALL) -b -m 644 $(G_USER) inetrc $(DESTDIR)$(ETCDIR)/inetrc
++	$(INSTALL) -b -m 644 $(G_USER) inetrc $(DESTDIR)$(ETCDIR)/ejabberd-inetrc
  	#
  	# Administration script
- 	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
+ 	[ -d $(DESTDIR)$(SBINDIR) ] || $(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR)
 diff -urNp -x '*.orig' ejabberd-21.01.org/ejabberdctl.template ejabberd-21.01/ejabberdctl.template
 --- ejabberd-21.01.org/ejabberdctl.template	2021-01-29 10:01:29.000000000 +0100
 +++ ejabberd-21.01/ejabberdctl.template	2021-03-03 14:25:43.973420891 +0100
@@ -30,21 +30,12 @@ diff -urNp -x '*.orig' ejabberd-21.01.org/ejabberdctl.template ejabberd-21.01/ej
  
  # define default environment variables
  [ -z "$SCRIPT" ] && SCRIPT=$0
-@@ -55,7 +56,7 @@ while [ $# -gt 0 ]; do
- done
- 
- # define ejabberd variables if not already defined from the command line
--: "${ETC_DIR:="{{sysconfdir}}/ejabberd"}"
-+: "${ETC_DIR:="{{sysconfdir}}/jabber"}"
- : "${LOGS_DIR:="{{localstatedir}}/log/ejabberd"}"
- : "${SPOOL_DIR:="{{localstatedir}}/lib/ejabberd"}"
- : "${EJABBERD_CONFIG_PATH:="$ETC_DIR/ejabberd.yml"}"
-@@ -83,7 +84,7 @@ fi
+@@ -86,7 +86,7 @@ fi
  [ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS"
- ERL_LIBS={{libdir}}
+ ERL_LIBS='{{libdir}}'
  ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
--ERL_INETRC="$ETC_DIR"/inetrc
-+ERL_INETRC="$ETC_DIR"/ejabberd-inetrc
+-ERL_INETRC="$CONFIG_DIR"/inetrc
++ERL_INETRC="$CONFIG_DIR"/ejabberd-inetrc
  
  # define ejabberd parameters
  EJABBERD_OPTS="$EJABBERD_OPTS\
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ejabberd.git/commitdiff/db5a58602196368d255618f0ec03c51b556be7bb

More information about the pld-cvs-commit mailing list