package/ejabberd: bump version to 23.04
Rebased patches, added sha256 hash provided by upstream, switched tarball
to tar.gz.
Added make target "all" because the default make target "compile" in
pkg-rebar.mk does not build ejabberdctl.example after upstream commit
93f994d50a
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
f36e336ee5
commit
fd29a61f01
@ -4,6 +4,8 @@ Date: Fri, 13 May 2022 14:22:37 +0200
|
||||
Subject: [PATCH] Makefile.in: do not download or compile dependencies
|
||||
|
||||
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
|
||||
[Bernd: updated for version 23.04]
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
Makefile.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
@ -12,17 +14,17 @@ diff --git a/Makefile.in b/Makefile.in
|
||||
index ab0e9d967..6e54168a7 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -139,7 +139,7 @@ else
|
||||
@@ -155,7 +155,7 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
-all: deps src
|
||||
+all: src
|
||||
-all: scripts deps src
|
||||
+all: scripts src
|
||||
|
||||
deps: $(DEPSDIR)/.got
|
||||
|
||||
@@ -153,7 +153,7 @@ $(DEPSDIR)/.built: $(DEPSDIR)/.got
|
||||
$(CONFIGURE_DEPS)
|
||||
@@ -169,7 +169,7 @@ $(DEPSDIR)/.built: $(DEPSDIR)/.got
|
||||
$(DEPSDIR)/.built: $(DEPSDIR)/.got
|
||||
$(REBAR) compile && :> $(DEPSDIR)/.built
|
||||
|
||||
-src: $(DEPSDIR)/.built
|
||||
|
@ -6,6 +6,8 @@ Subject: [PATCH] fix ejabberdctl
|
||||
Change default values so ejabberdctl run commands as ejabberd user.
|
||||
|
||||
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
|
||||
[Bernd: updated for version 23.04]
|
||||
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
||||
---
|
||||
ejabberdctl.template | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
@ -14,7 +16,7 @@ diff --git a/ejabberdctl.template b/ejabberdctl.template
|
||||
index a940c3df7..5166e5a27 100755
|
||||
--- a/ejabberdctl.template
|
||||
+++ b/ejabberdctl.template
|
||||
@@ -15,7 +15,7 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd)
|
||||
@@ -17,7 +17,7 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd)
|
||||
ERL="{{erl}}"
|
||||
IEX="{{bindir}}/iex"
|
||||
EPMD="{{epmd}}"
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,4 @@
|
||||
# From https://static.process-one.net/ejabberd/downloads/23.04/ejabberd-23.04.tar.gz.sum
|
||||
sha256 6ff1d41a1ff6261a0c846193647d8ec143e82142859bf1cfdc62299022ceb2ad ejabberd-23.04.tar.gz
|
||||
# Locally computed
|
||||
sha256 b6e6739947d3678525b14ee280cedb1a04280c83ea17a4741795aac99fbdad47 ejabberd-21.12.tgz
|
||||
sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING
|
||||
|
@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EJABBERD_VERSION = 21.12
|
||||
EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz
|
||||
EJABBERD_VERSION = 23.04
|
||||
EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tar.gz
|
||||
EJABBERD_SITE = https://static.process-one.net/ejabberd/downloads/$(EJABBERD_VERSION)
|
||||
EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception
|
||||
EJABBERD_LICENSE_FILES = COPYING
|
||||
@ -40,7 +40,7 @@ EJABBERD_CONF_OPTS = \
|
||||
--disable-erlang-version-check
|
||||
|
||||
define EJABBERD_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) install -C $(@D)
|
||||
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) all install -C $(@D)
|
||||
endef
|
||||
|
||||
# Replace HOST_DIR prefix to /usr in environment variables of
|
||||
|
Loading…
Reference in New Issue
Block a user