From fad3398f2af43b94a28e677a7d318526e194bffb Mon Sep 17 00:00:00 2001 From: "Sam James (sam_c)" Date: Tue, 5 May 2020 13:13:08 +0000 Subject: net-irc/anope: Fix patch filenames Adhere to the standards for patch file naming. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) Closes: https://github.com/gentoo/gentoo/pull/15654 Signed-off-by: Thomas Deutschmann --- net-irc/anope/anope-2.0.6.ebuild | 2 +- net-irc/anope/anope-2.0.7.ebuild | 6 +++--- .../files/anope-2.0.6-example.conf-pid-path.patch | 18 ++++++++++++++++++ .../files/anope-2.0.7-example.conf-user.patch | 13 +++++++++++++ net-irc/anope/files/anope-2.0.7-musl-libintl.patch | 22 ++++++++++++++++++++++ net-irc/anope/files/example.conf-user.patch | 13 ------------- net-irc/anope/files/musl-libintl.patch | 22 ---------------------- net-irc/anope/files/pid-patch.patch | 18 ------------------ 8 files changed, 57 insertions(+), 57 deletions(-) create mode 100644 net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch create mode 100644 net-irc/anope/files/anope-2.0.7-example.conf-user.patch create mode 100644 net-irc/anope/files/anope-2.0.7-musl-libintl.patch delete mode 100644 net-irc/anope/files/example.conf-user.patch delete mode 100644 net-irc/anope/files/musl-libintl.patch delete mode 100644 net-irc/anope/files/pid-patch.patch (limited to 'net-irc/anope') diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild index 8bb47e7d54bc..1d78f2271b9f 100644 --- a/net-irc/anope/anope-2.0.6.ebuild +++ b/net-irc/anope/anope-2.0.6.ebuild @@ -38,7 +38,7 @@ DEPEND="${BDEPEND} tre? ( dev-libs/tre )" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/pid-patch.patch" ) +PATCHES=( "${FILESDIR}/anope-2.0.6-example.conf-pid-path.patch" ) S="${WORKDIR}/${P}-source" diff --git a/net-irc/anope/anope-2.0.7.ebuild b/net-irc/anope/anope-2.0.7.ebuild index e24c908ab985..1d5f4d676581 100644 --- a/net-irc/anope/anope-2.0.7.ebuild +++ b/net-irc/anope/anope-2.0.7.ebuild @@ -33,9 +33,9 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/pid-patch.patch" - "${FILESDIR}/example.conf-user.patch" - "${FILESDIR}/musl-libintl.patch" + "${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch" + "${FILESDIR}/${PN}-2.0.7-example.conf-user.patch" + "${FILESDIR}/${PN}-2.0.7-musl-libintl.patch" ) S="${WORKDIR}/${P}-source" diff --git a/net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch b/net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch new file mode 100644 index 000000000000..ddf661ba9803 --- /dev/null +++ b/net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch @@ -0,0 +1,18 @@ +--- a/data/example.conf 2017-03-30 17:00:24.000000000 -0400 ++++ a/data/example.conf 2019-02-06 15:16:20.088469043 -0500 +@@ -231,13 +231,13 @@ + * The filename containing the Services process ID. The path is relative to the + * services root directory. + */ +- pid = "data/services.pid" ++ pid = "/run/anope/services.pid" + + /* + * The filename containing the Message of the Day. The path is relative to the + * services root directory. + */ +- motd = "conf/services.motd" ++ motd = "/etc/anope/services.motd" + } + + /* diff --git a/net-irc/anope/files/anope-2.0.7-example.conf-user.patch b/net-irc/anope/files/anope-2.0.7-example.conf-user.patch new file mode 100644 index 000000000000..7f7a3826cb10 --- /dev/null +++ b/net-irc/anope/files/anope-2.0.7-example.conf-user.patch @@ -0,0 +1,13 @@ +--- a/data/example.conf ++++ b/data/example.conf +@@ -375,8 +375,8 @@ + * On Linux/UNIX systems Anope can setuid and setgid to this user and group + * after starting up. This is useful if Anope has to bind to privileged ports + */ +- #user = "anope" +- #group = "anope" ++ user = "anope" ++ group = "anope" + + /* + * The case mapping used by services. This must be set to a valid locale name diff --git a/net-irc/anope/files/anope-2.0.7-musl-libintl.patch b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch new file mode 100644 index 000000000000..f14e494e0c18 --- /dev/null +++ b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch @@ -0,0 +1,22 @@ +diff --git a/src/language.cpp b/src/language.cpp +index 1915378..c1eeea5 100644 +--- a/src/language.cpp ++++ b/src/language.cpp +@@ -75,7 +75,7 @@ const char *Language::Translate(const NickCore *nc, const char *string) + + #if GETTEXT_FOUND + +-#ifdef __USE_GNU_GETTEXT ++#if defined(__GLIBC__) + extern "C" int _nl_msg_cat_cntr; + #endif + +@@ -87,7 +87,7 @@ const char *Language::Translate(const char *lang, const char *string) + if (!lang || !*lang) + lang = Config->DefLanguage.c_str(); + +-#ifdef __USE_GNU_GETTEXT ++#if defined(__GLIBC__) + ++_nl_msg_cat_cntr; + #endif + diff --git a/net-irc/anope/files/example.conf-user.patch b/net-irc/anope/files/example.conf-user.patch deleted file mode 100644 index 7f7a3826cb10..000000000000 --- a/net-irc/anope/files/example.conf-user.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/data/example.conf -+++ b/data/example.conf -@@ -375,8 +375,8 @@ - * On Linux/UNIX systems Anope can setuid and setgid to this user and group - * after starting up. This is useful if Anope has to bind to privileged ports - */ -- #user = "anope" -- #group = "anope" -+ user = "anope" -+ group = "anope" - - /* - * The case mapping used by services. This must be set to a valid locale name diff --git a/net-irc/anope/files/musl-libintl.patch b/net-irc/anope/files/musl-libintl.patch deleted file mode 100644 index f14e494e0c18..000000000000 --- a/net-irc/anope/files/musl-libintl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/language.cpp b/src/language.cpp -index 1915378..c1eeea5 100644 ---- a/src/language.cpp -+++ b/src/language.cpp -@@ -75,7 +75,7 @@ const char *Language::Translate(const NickCore *nc, const char *string) - - #if GETTEXT_FOUND - --#ifdef __USE_GNU_GETTEXT -+#if defined(__GLIBC__) - extern "C" int _nl_msg_cat_cntr; - #endif - -@@ -87,7 +87,7 @@ const char *Language::Translate(const char *lang, const char *string) - if (!lang || !*lang) - lang = Config->DefLanguage.c_str(); - --#ifdef __USE_GNU_GETTEXT -+#if defined(__GLIBC__) - ++_nl_msg_cat_cntr; - #endif - diff --git a/net-irc/anope/files/pid-patch.patch b/net-irc/anope/files/pid-patch.patch deleted file mode 100644 index ddf661ba9803..000000000000 --- a/net-irc/anope/files/pid-patch.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/data/example.conf 2017-03-30 17:00:24.000000000 -0400 -+++ a/data/example.conf 2019-02-06 15:16:20.088469043 -0500 -@@ -231,13 +231,13 @@ - * The filename containing the Services process ID. The path is relative to the - * services root directory. - */ -- pid = "data/services.pid" -+ pid = "/run/anope/services.pid" - - /* - * The filename containing the Message of the Day. The path is relative to the - * services root directory. - */ -- motd = "conf/services.motd" -+ motd = "/etc/anope/services.motd" - } - - /* -- cgit v1.2.3-18-g5258