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: Remove some unused commented patches.
Date: Wed, 23 Sep 2026 19:07:27 GMT [thread overview]
Message-ID: <179019044739.1.17494304341894430772.rpms-ejabberd-8b34042c5e9f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ejabberd
Branch : f45
Commit : 8b34042c5e9fcb6e2853b9c5fae5f78cc356ed4c
Author : Randy Barlow <randy@electronsweatshop.com>
Date : 2016-04-15T13:14:52-04:00
Stats : +2/-73 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/ejabberd/c/8b34042c5e9fcb6e2853b9c5fae5f78cc356ed4c?branch=f45
Log:
Remove some unused commented patches.
---
diff --git a/ejabberd-0004-Install-.so-objects-with-0755-permissions.patch b/ejabberd-0004-Install-.so-objects-with-0755-permissions.patch
deleted file mode 100644
index dbf4fbf..0000000
--- a/ejabberd-0004-Install-.so-objects-with-0755-permissions.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Sat, 12 Jun 2010 14:14:52 +0400
-Subject: [PATCH] Install *.so objects with 0755 permissions
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/Makefile.in b/Makefile.in
-index 018ccd7..58d3486 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -156,7 +156,7 @@ install: all
- #
- # Binary system libraries
- $(INSTALL) -d $(SODIR)
-- $(INSTALL) -m 644 $(DLLs) $(SODIR)
-+ $(INSTALL) -m 755 $(DLLs) $(SODIR)
- #
- # Translated strings
- $(INSTALL) -d $(MSGSDIR)
diff --git a/ejabberd-0008-Disable-Erlang-version-check.patch b/ejabberd-0008-Disable-Erlang-version-check.patch
deleted file mode 100644
index 3c6d723..0000000
--- a/ejabberd-0008-Disable-Erlang-version-check.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Sat, 30 Aug 2014 12:21:45 +0400
-Subject: [PATCH] Disable Erlang version check
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/configure.ac b/configure.ac
-index e7bb43b..d24c543 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,8 +3,6 @@
-
- AC_PREREQ(2.53)
- AC_INIT(ejabberd, m4_esyscmd([echo `git describe --tags 2>/dev/null || echo community` | sed 's/-g.*//' | tr -d '\012']), [ejabberd@process-one.net], [ejabberd])
--REQUIRE_ERLANG_MIN="5.9.1 (Erlang/OTP R15B01)"
--REQUIRE_ERLANG_MAX="9.0.0 (No Max)"
-
- # Checks for programs.
- AC_PROG_MAKE_SET
-@@ -32,18 +30,6 @@ AC_PATH_TOOL(ERLC, erlc, , [${extra_erl_path}$PATH])
- AC_ERLANG_NEED_ERL
- AC_ERLANG_NEED_ERLC
-
--AC_ARG_ENABLE(erlang-version-check,
--[AC_HELP_STRING([--enable-erlang-version-check],
-- [Check Erlang/OTP version @<:@default=yes@:>@])])
--case "$enable_erlang_version_check" in
-- yes|'')
-- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX])
-- ;;
-- no)
-- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn])
-- ;;
--esac
--
- # Checks and sets ERLANG_ROOT_DIR and ERLANG_LIB_DIR variable
- AC_ERLANG_SUBST_ROOT_DIR
- # AC_ERLANG_SUBST_LIB_DIR
diff --git a/ejabberd.spec b/ejabberd.spec
index a6856f6..e272895 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -35,9 +35,6 @@ Patch1: ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
# rbarlow: i'm not sure what this patch is for, but it does not apply cleanly
#Patch3: ejabberd-0003-Fedora-specific-changes-to-ejabberdctl.patch
# Fedora-specific
-# rbarlow: this patch fails to apply
-#Patch4: ejabberd-0004-Install-.so-objects-with-0755-permissions.patch
-# Fedora-specific
# rbarlow: This patch fails to apply cleanly
# Patch5: ejabberd-0005-Clean-up-false-security-measure.patch
# polkit support
@@ -45,9 +42,6 @@ Patch6: ejabberd-0006-Enable-polkit-support.patch
# Fedora-specific
Patch7: ejabberd-0007-Install-into-BINDIR-instead-of-SBINDIR.patch
# Fedora-specific
-# rbarlow: this patch failed to apply
-# Patch8: ejabberd-0008-Disable-Erlang-version-check.patch
-# Fedora-specific
# rbarlow: This patch failed to apply
# Patch9: ejabberd-0009-Fix-permissions-for-captcha-script.patch
# Fedora-specific
@@ -156,17 +150,8 @@ Windows NT/2000/XP).
%setup -q
%patch1 -p1 -b .pam_name
-# %patch3 -p1 -b .fedora_specific
-# %patch4 -p1 -b .so_lib_755
-# %patch5 -p1 -b .false_security
%patch6 -p1 -b .use_polkit
%patch7 -p1 -b .use_bindir
-# %patch8 -p1 -b .no_ver_check
-# %patch9 -p1 -b .captcha_perms
-#%patch10 -p1 -b .systemd_notify
-
-#%patch11 -p1
-#%patch13 -p1
%build
@@ -331,9 +316,10 @@ fi)
%changelog
-* Fri Apr 15 2016 Randy Barlow <rbarlow@redhat.com> - 16.02-1
+* Fri Apr 15 2016 Randy Barlow <rbarlow@redhat.com> - 16.02-2
- Remove the filter_provides statement. It is no longer needed, and it is suspected to cause
problems with ARM dependencies.
+- Remove some unused commented patches.
* Sun Mar 06 2016 Randy Barlow <rbarlow@redhat.com> - 16.02-1
- Update to 16.02
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=179019044739.1.17494304341894430772.rpms-ejabberd-8b34042c5e9f@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