public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Randy Barlow <randy@electronsweatshop.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ejabberd] f45: Update patch 0007 for ejabberd 15.11.
Date: Wed, 23 Sep 2026 19:07:22 GMT [thread overview]
Message-ID: <179019044252.1.14252376309299782640.rpms-ejabberd-016418b889d3@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ejabberd
Branch : f45
Commit : 016418b889d3de8177ab79974b50ace3316af3f2
Author : Randy Barlow <randy@electronsweatshop.com>
Date : 2016-02-14T11:47:49-05:00
Stats : +20/-24 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ejabberd/c/016418b889d3de8177ab79974b50ace3316af3f2?branch=f45
Log:
Update patch 0007 for ejabberd 15.11.
---
diff --git a/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch b/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch
index 7a0e178..f977b1d 100644
--- a/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch
+++ b/ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch
@@ -1,32 +1,28 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 17 Jul 2013 14:53:49 +0400
-Subject: [PATCH] Install into BINDIR instead of SBINDIR
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/Makefile.in b/Makefile.in
-index de47be2..037d2ff 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11,8 +11,8 @@ DESTDIR =
- # /etc/ejabberd/
- ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
+--- b/Makefile.in 2015-12-25 23:25:50.462000000 -0500
++++ a/Makefile.in 2015-12-26 00:03:06.226000000 -0500
+@@ -14,9 +14,6 @@
+ # /bin/
+ BINDIR = $(DESTDIR)@bindir@
-# /sbin/
-SBINDIR = $(DESTDIR)@sbindir@
-+# /bin/
-+BINDIR = $(DESTDIR)@bindir@
+-
+ # /lib/
+ LIBDIR = $(DESTDIR)@libdir@
- # /lib/ejabberd/
- EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
-@@ -126,11 +126,11 @@ install: all
+@@ -159,8 +156,8 @@
$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
#
# Administration script
- [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
-- $(INSTALL) -m 755 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
+- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
+ [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
-+ $(INSTALL) -m 755 $(G_USER) ejabberdctl.example $(BINDIR)/ejabberdctl
++ $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(BINDIR)/ejabberdctl
+ # 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
+@@ -168,7 +165,7 @@
+ [ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
#
# Init script
- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \
@@ -34,12 +30,12 @@ index de47be2..037d2ff 100644
-e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \
> ejabberd.init
chmod 755 ejabberd.init
-@@ -191,7 +191,7 @@ install: all
+@@ -211,7 +208,7 @@
uninstall: uninstall-binary
uninstall-binary:
- rm -f $(SBINDIR)/ejabberdctl
+ rm -f $(BINDIR)/ejabberdctl
- rm -fr $(DOCDIR)
- rm -f $(BEAMDIR)/*.beam
- rm -f $(BEAMDIR)/*.app
+ rm -f $(BINDIR)/iex
+ rm -f $(BINDIR)/elixir
+ rm -f $(BINDIR)/mix
reply other threads:[~2026-09-23 19:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=179019044252.1.14252376309299782640.rpms-ejabberd-016418b889d3@fedoraproject.org \
--to=randy@electronsweatshop.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox