* [gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
@ 2015-09-07 20:19 Bjarke Istrup Pedersen
0 siblings, 0 replies; 5+ messages in thread
From: Bjarke Istrup Pedersen @ 2015-09-07 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 514f72a3500d571c4333ebf7424d6e0c68603b25
Author: Bjarke Istrup Pedersen <gurligebis <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 20:19:08 2015 +0000
Commit: Bjarke Istrup Pedersen <gurligebis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 20:19:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514f72a3
net-irc/anope: make init script use ircd
Package-Manager: portage-2.2.20.1
net-irc/anope/{anope-1.8.7-r1.ebuild => anope-1.8.7-r2.ebuild} | 2 +-
net-irc/anope/files/anope-init.d | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/net-irc/anope/anope-1.8.7-r1.ebuild b/net-irc/anope/anope-1.8.7-r2.ebuild
similarity index 98%
rename from net-irc/anope/anope-1.8.7-r1.ebuild
rename to net-irc/anope/anope-1.8.7-r2.ebuild
index 95b969e..9f0afbc 100644
--- a/net-irc/anope/anope-1.8.7-r1.ebuild
+++ b/net-irc/anope/anope-1.8.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-irc/anope/files/anope-init.d b/net-irc/anope/files/anope-init.d
index 6523007..f8d73c6 100644
--- a/net-irc/anope/files/anope-init.d
+++ b/net-irc/anope/files/anope-init.d
@@ -7,6 +7,10 @@ PIDFILE=/run/anope/services.pid
extra_started_commands="reload"
+depend() {
+ use ircd
+}
+
start_pre() {
checkpath -o ${ANOPE_USER} -d "$(dirname $PIDFILE)"
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
@ 2019-02-06 21:02 Brian Evans
0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2019-02-06 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 1eb2b264d55d3f76f745ff36ef065c08458933fd
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 6 20:51:08 2019 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 6 20:51:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb2b264
net-irc/anope: Version bump
Non-maintainer commit
Based heavily off of Palme's ebuild in the bug
Closes: https://bugs.gentoo.org/420613
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
net-irc/anope/Manifest | 1 +
net-irc/anope/anope-2.0.6.ebuild | 157 ++++++++++++++++++++++++++++++++++++
net-irc/anope/files/anope-conf.d-v2 | 9 +++
net-irc/anope/metadata.xml | 15 ++++
4 files changed, 182 insertions(+)
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index c166c738a00..3a36b042078 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1 +1,2 @@
DIST anope-1.8.7.tar.gz 1586164 BLAKE2B 1efc6c9e719bca6698760d4181e2b96fa9aef5999a27af1c9452aea8ae39a5be7009efc14e5e7ad22426b95eb35952724b737d9de911830f3f69f822ebcc914f SHA512 3fb67f73b8f4dbdfbb9b4ac41a20e3b5c46d54cf5abb303f4a25d3a5863ef860ba5bdffc67439e5f1435675f80f86b2c283932c1a05edde2ae49612947fbd074
+DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild
new file mode 100644
index 00000000000..aad039abb9b
--- /dev/null
+++ b/net-irc/anope/anope-2.0.6.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils user
+
+DESCRIPTION="Anope IRC Services"
+HOMEPAGE="https://anope.org"
+SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql sqlite pcre posix gnutls ssl tre ldap anope_modules_sql_auth
+ anope_modules_sql_log anope_modules_sql_oper anope_modules_ldap_auth
+ anope_modules_ldap_oper anope_modules_irc2sql anope_modules_chanstats
+ anope_modules_cs_fantasy_stats anope_modules_cs_fantasy_top"
+
+REQUIRED_USE="
+ anope_modules_sql_auth? ( || ( mysql sqlite ) )
+ anope_modules_sql_oper? ( mysql )
+ anope_modules_sql_log? ( mysql )
+ anope_modules_cs_fantasy_stats? ( anope_modules_chanstats mysql )
+ anope_modules_cs_fantasy_top? ( anope_modules_chanstats mysql )
+ anope_modules_chanstats? ( mysql )
+ anope_modules_irc2sql? ( mysql )
+ anope_modules_ldap_auth? ( ldap )
+ anope_modules_ldap_oper? ( ldap )"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="${BDEPEND}
+ mysql? ( dev-db/mysql-connector-c:0= )
+ ssl? ( dev-libs/openssl:0= )
+ gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= )
+ ldap? ( net-nds/openldap )
+ pcre? ( dev-libs/libpcre )
+ sqlite? ( dev-db/sqlite:3 )
+ tre? ( dev-libs/tre )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}-source"
+
+pkg_pretend() {
+ local replaced_version
+ for replaced_version in ${REPLACING_VERSIONS} ; do
+ if ver_test ${replaced_version} -lt 1.8.7 && [[ -f ${ROOT}/opt/anope/data/nick.db ]]; then
+ eerror "It looks like you have an older version of Anope installed."
+ eerror "To upgrade, shut down Anope and copy your databases to"
+ eerror "${ROOT}/var/lib/anope and your configuration to ${ROOT}/etc/anope"
+ eerror "You can do this by:"
+ eerror "# mkdir -p ${ROOT}/var/lib/anope ${ROOT}/etc/anope"
+ eerror "# chown anope:anope ${ROOT}/var/lib/anope"
+ eerror "# mv ${ROOT}/opt/anope/data/*.db ${ROOT}var/lib/anope"
+ eerror "# mv ${ROOT}/opt/anope/data/services.conf ${ROOT}etc/anope"
+ die "Please move your anope database files from /opt/anope/data"
+ fi
+ done
+}
+
+pkg_setup() {
+ enewgroup anope
+ enewuser anope -1 -1 -1 anope
+}
+
+src_prepare() {
+ anope_use_extra() {
+ local useflag=$1
+ local modulefile=$2
+ if use $useflag; then
+ ln -s "extra/${modulefile}" "modules/" || \
+ die "Failed to use ${modulefile}"
+ fi
+ }
+
+ anope_use_extra mysql "m_mysql.cpp"
+ anope_use_extra sqlite "m_sqlite.cpp"
+ anope_use_extra ssl "m_ssl_openssl.cpp"
+ anope_use_extra gnutls "m_ssl_gnutls.cpp"
+ anope_use_extra posix "m_regex_posix.cpp"
+ anope_use_extra pcre "m_regex_pcre.cpp"
+ anope_use_extra tre "m_regex_tre.cpp"
+ anope_use_extra ldap "m_ldap.cpp"
+ anope_use_extra anope_modules_sql_auth "m_sql_authentication.cpp"
+ anope_use_extra anope_modules_sql_log "m_sql_log.cpp"
+ anope_use_extra anope_modules_sql_oper "m_sql_oper.cpp"
+ anope_use_extra anope_modules_ldap_auth "m_ldap_authentication.cpp"
+ anope_use_extra anope_modules_ldap_oper "m_ldap_oper.cpp"
+ anope_use_extra anope_modules_chanstats "stats/m_chanstats.cpp"
+ anope_use_extra anope_modules_cs_fantasy_top "stats/cs_fantasy_top.cpp"
+ anope_use_extra anope_modules_cs_fantasy_stats "stats/cs_fantasy_stats.cpp"
+ anope_use_extra anope_modules_irc2sql "stats/irc2sql/irc2sql.cpp"
+ anope_use_extra anope_modules_irc2sql "stats/irc2sql/irc2sql.h"
+ anope_use_extra anope_modules_irc2sql "stats/irc2sql/tables.cpp"
+ anope_use_extra anope_modules_irc2sql "stats/irc2sql/utils.cpp"
+
+ # Avoid a silly sandbox error - tries to delete /usr/lib/modules
+ sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBIN_DIR="libexec/anope"
+ -DDB_DIR="../var/lib/anope"
+ -DDOC_DIR="share/doc/${PF}"
+ -DLIB_DIR="$(get_libdir)/anope"
+ -DLOCALE_DIR="share/locale"
+ -DCONF_DIR="/etc/anope"
+ -DLOGS_DIR="../var/log/anope/"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ newinitd "${FILESDIR}/anope-init.d" "${PN}"
+ cp "${FILESDIR}/anope-conf.d-v2" "${T}" || die
+ sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \
+ "${T}/anope-conf.d-v2" || die
+ newconfd "${T}/anope-conf.d-v2" "${PN}"
+ dosym ../libexec/anope/services /usr/bin/services
+ dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp
+ keepdir /var/log/anope /var/lib/anope/backups
+ fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
+ dodoc -r docs/* data/example.conf
+ insinto /etc/anope
+ newins data/example.conf services.conf
+ fowners -R anope:anope /etc/anope
+ fperms -R 0700 /etc/anope
+ fperms 0755 /var/log/anope
+ fperms -R 0750 /var/lib/anope
+}
+
+pkg_preinst() {
+ if [[ -n ${REPLACING_VERSIONS} ]] ; then
+ local directory
+ directory="${ROOT}"/var/lib/anope/pre-update
+ elog "Making a backup of your databases to ${directory}"
+ if [ ! -d "${directory}" ]; then
+ mkdir -p "${directory}" || die "failed to create backup directory"
+ chown anope:anope "${directory}"/../ || die "failed to chown data directory"
+ fi
+ # don't die otherwise merge will fail if there are no existing databases
+ cp "${ROOT}"/var/lib/anope/*.db "${directory}"
+ fi
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog
+ ewarn "Anope won't run out of the box, you still have to configure it to match your IRCD's configuration."
+ ewarn "Edit /etc/anope/services.conf to configure Anope."
+ elog
+ fi
+}
diff --git a/net-irc/anope/files/anope-conf.d-v2 b/net-irc/anope/files/anope-conf.d-v2
new file mode 100644
index 00000000000..fbe7c3c5017
--- /dev/null
+++ b/net-irc/anope/files/anope-conf.d-v2
@@ -0,0 +1,9 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# user to run ultimate-ircd as
+ANOPE_USER="anope"
+
+# Additional commandline parameters
+ANOPE_OPTS="--confdir=/etc/anope --logdir=/var/log/anope --dbdir=/var/lib/anope"
+ANOPE_OPTS="${ANOPE_OPTS} --localedir=/usr/share/locale --modulesdir=%LIBDIR%"
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index 52f9787ecc7..7a4bd9256ef 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/metadata.xml
@@ -4,5 +4,20 @@
<longdescription>Anope IRC Services</longdescription>
<upstream>
<remote-id type="sourceforge">anope</remote-id>
+ <remote-id type="github">anope/anope</remote-id>
</upstream>
+ <use>
+ <flag name="anope_modules_sql_auth">Authorize through SQL</flag>
+ <flag name="anope_modules_sql_log">Additional log target in SQL</flag>
+ <flag name="anope_modules_sql_oper">Allows granting users services operator privileges from SQL</flag>
+ <flag name="anope_modules_ldap_auth">Authorize through LDAP</flag>
+ <flag name="anope_modules_ldap_oper">Dynamically ties users to Anope opertypes via LDAP</flag>
+ <flag name="anope_modules_irc2sql">Stores channel statistics in a mysql database</flag>
+ <flag name="anope_modules_chanstats">Channel Statistics</flag>
+ <flag name="anope_modules_cs_fantasy_stats">Enables the STATS and GSTATS commands</flag>
+ <flag name="anope_modules_cs_fantasy_top">Enables the (G)TOP and (G)TOP10 commands</flag>
+ <flag name="posix">Add support for POSIX Compatible Regular Expressions</flag>
+ <flag name="ssl">Provide SSL services using OpenSSL</flag>
+ <flag name="tre">Use <pkg>dev-libs/tre</pkg> for regular expressions</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
@ 2019-02-06 21:02 Brian Evans
0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2019-02-06 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 16444ce57e9332a7643c68fb9040e512cd1e7330
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 6 21:02:32 2019 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 6 21:02:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16444ce5
net-irc/anope: Add default pid path patch
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
net-irc/anope/anope-2.0.6.ebuild | 2 ++
net-irc/anope/files/pid-patch.patch | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild
index aad039abb9b..dfdba26b54f 100644
--- a/net-irc/anope/anope-2.0.6.ebuild
+++ b/net-irc/anope/anope-2.0.6.ebuild
@@ -39,6 +39,8 @@ DEPEND="${BDEPEND}
tre? ( dev-libs/tre )"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/pid-patch.patch" )
+
S="${WORKDIR}/${P}-source"
pkg_pretend() {
diff --git a/net-irc/anope/files/pid-patch.patch b/net-irc/anope/files/pid-patch.patch
new file mode 100644
index 00000000000..ddf661ba980
--- /dev/null
+++ b/net-irc/anope/files/pid-patch.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"
+ }
+
+ /*
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
@ 2019-02-06 21:02 Brian Evans
0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2019-02-06 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 4d7ed8caabbaac6f9f05805fe381b31d2cba095b
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 6 20:59:24 2019 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Feb 6 20:59:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7ed8ca
net-irc/anope: Drop old
Non-maintainer commit
Closes: https://bugs.gentoo.org/632430
Closes: https://bugs.gentoo.org/665980
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
net-irc/anope/Manifest | 1 -
net-irc/anope/anope-1.8.7-r2.ebuild | 119 ---------------------
net-irc/anope/files/anope-1.8.7-ldflags-fix.patch | 47 --------
.../anope/files/anope-1.8.7-libdir-gentoo.patch | 91 ----------------
net-irc/anope/files/anope-1.8.7-mariadb.patch | 109 -------------------
net-irc/anope/files/anope-conf.d | 8 --
net-irc/anope/files/pid-patch.diff | 11 --
7 files changed, 386 deletions(-)
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 3a36b042078..fb1c759751e 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,2 +1 @@
-DIST anope-1.8.7.tar.gz 1586164 BLAKE2B 1efc6c9e719bca6698760d4181e2b96fa9aef5999a27af1c9452aea8ae39a5be7009efc14e5e7ad22426b95eb35952724b737d9de911830f3f69f822ebcc914f SHA512 3fb67f73b8f4dbdfbb9b4ac41a20e3b5c46d54cf5abb303f4a25d3a5863ef860ba5bdffc67439e5f1435675f80f86b2c283932c1a05edde2ae49612947fbd074
DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
diff --git a/net-irc/anope/anope-1.8.7-r2.ebuild b/net-irc/anope/anope-1.8.7-r2.ebuild
deleted file mode 100644
index 82224833f9b..00000000000
--- a/net-irc/anope/anope-1.8.7-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils multilib versionator user
-
-DESCRIPTION="Anope IRC Services"
-HOMEPAGE="http://www.anope.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql"
-
-DEPEND="mysql? ( virtual/mysql )"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
- local replaced_version
- for replaced_version in ${REPLACING_VERSIONS} ; do
- if ! version_is_at_least 1.8.7 ${replaced_version} && [[ -f ${ROOT}opt/anope/data/nick.db ]]; then
- eerror "It looks like you have an older version of Anope installed."
- eerror "To upgrade, shut down Anope and copy your databases to"
- eerror "${ROOT}var/lib/anope and your configuration to ${ROOT}etc/anope"
- eerror "You can do this by:"
- eerror "# mkdir -p ${ROOT}var/lib/anope ${ROOT}etc/anope"
- eerror "# chown anope:anope ${ROOT}var/lib/anope"
- eerror "# mv ${ROOT}opt/anope/data/*.db ${ROOT}var/lib/anope"
- eerror "# mv ${ROOT}opt/anope/data/services.conf ${ROOT}etc/anope"
- die "Please move your anope database files from /opt/anope/data"
- fi
- done
-}
-
-pkg_setup() {
- enewgroup anope
- enewuser anope -1 -1 -1 anope
-}
-
-src_prepare() {
- epatch "${FILESDIR}/pid-patch.diff"
- epatch "${FILESDIR}/${P}-ldflags-fix.patch"
- epatch "${FILESDIR}/${P}-libdir-gentoo.patch"
- epatch "${FILESDIR}"/${P}-mariadb.patch # bug 381119
- eautoconf
-}
-
-src_configure() {
- local myconf
- if ! use mysql; then
- myconf="${myconf} --without-mysql"
- fi
-
- econf \
- ${myconf} \
- --with-bindir=/usr/bin/ \
- --with-datadir=/var/lib/anope \
- --with-libdir=/usr/$(get_libdir)/anope/ \
- --with-rungroup=anope \
- --with-permissions=077
-
- sed -i -e "/^build:/s:$: language:g" "${S}"/Makefile || die "sed failed"
-}
-
-src_install() {
- keepdir /var/log/anope /var/lib/anope/backups
- fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
-
- local baselibdir
- baselibdir="${D}/usr/$(get_libdir)/anope"
-
- dodir /usr/$(get_libdir)/anope/{lang,modules}
- emake DATDEST="${baselibdir}" \
- BINDEST="${D}/usr/bin" \
- MODULE_PATH="${baselibdir}/modules" \
- install
-
- newinitd "${FILESDIR}/anope-init.d" anope
- newconfd "${FILESDIR}/anope-conf.d" anope
-
- dodoc Changes Changes.conf Changes.lang Changes.mysql docs/* data/example.conf
- use mysql && dodoc data/tables.sql
-
- insinto /etc/anope
- newins data/example.conf services.conf
-}
-
-pkg_preinst() {
- if has_version net-irc/anope ; then
- local directory
- directory="${ROOT}"var/lib/anope/pre-update
- elog "Making a backup of your databases to ${directory}"
- if [ ! -d "${directory}" ]; then
- mkdir -p "${directory}" || die "failed to create backup directory"
- chown anope:anope "${directory}"/../ || die "failed to chown data directory"
- fi
- # don't die otherwise merge will fail if there are no existing databases
- cp "${ROOT}"/var/lib/anope/*.db "${directory}"
- fi
-}
-
-pkg_postinst() {
- echo
- ewarn "Anope won't run out of the box, you still have to configure it to match your IRCD's configuration."
- ewarn "Edit /etc/anope/services.conf to configure Anope."
-
- if use mysql; then
- echo
- ewarn "!!! ATTENTION !!!"
- ewarn "Be sure to read Changes.mysql to update your MySQL"
- ewarn "tables or anope will break after restart"
- ewarn "!!! ATTENTION !!!"
- echo
- einfo "The mysql script for updating the tables is located in the"
- einfo "/usr/share/doc/${PF} directory"
- fi
-}
diff --git a/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch b/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch
deleted file mode 100644
index 98500509693..00000000000
--- a/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -aurp a/src/core/Makefile b/src/core/Makefile
---- a/src/core/Makefile 2010-10-10 19:55:31.396999906 +0000
-+++ b/src/core/Makefile 2010-10-10 19:53:54.877001245 +0000
-@@ -24,7 +24,7 @@ distclean: spotless
- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-
- .o.s:
-- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
-+ $(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
- @$(TOUCH) $*.s
-
- subs:
-diff -aurp a/src/modules/Makefile b/src/modules/Makefile
---- a/src/modules/Makefile 2010-10-10 19:55:32.486000023 +0000
-+++ b/src/modules/Makefile 2010-10-10 19:54:07.240000026 +0000
-@@ -27,7 +27,7 @@ distclean: spotless
- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-
- .o.s:
-- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
-+ $(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
- @$(TOUCH) $*.s
-
- subs:
-diff -aurp a/src/protocol/Makefile b/src/protocol/Makefile
---- a/src/protocol/Makefile 2010-10-10 19:55:33.605002302 +0000
-+++ b/src/protocol/Makefile 2010-10-10 19:54:19.271997806 +0000
-@@ -24,7 +24,7 @@ distclean: clean spotless
- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-
- .o.s:
-- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
-+ $(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
- @$(TOUCH) $*.s
-
- subs:
---- a/src/tools/Makefile 2011-12-28 20:00:00.646427623 +0000
-+++ b/src/tools/Makefile 2011-12-28 20:00:41.030430806 +0000
-@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}'
- 'RUNGROUP=${RUNGROUP}'
-
- .c.o:
-- $(CC) $(CFLAGS) -I../include/ $< -o $*
-+ $(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $*
-
- all: ${OBJS}
-
diff --git a/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch b/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch
deleted file mode 100644
index 7a86d0f517b..00000000000
--- a/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -286,6 +286,15 @@
- ])
-
- AC_SUBST(DATDEST)
-+
-+AC_ARG_WITH(libdir, [ --with-libdir=libdir Specify the location of the services lib folder], [
-+ AC_DEFINE_UNQUOTED(LIB_DIR,"$withval","services lib dir")
-+ AC_DEFINE_UNQUOTED(MODULE_PATH,"${withval}/modules/","Module dir")
-+ DATDEST=$withval
-+ MODULE_PATH=${withval}/modules/
-+])
-+
-+AC_SUBST(LIB_PATH)
- AC_SUBST(MODULE_PATH)
-
- AC_CONFIG_FILES( \
---- src/Makefile
-+++ src/Makefile
-@@ -115,10 +115,6 @@
- ln $(BINDEST)/services $(BINDEST)/listnicks
- ln $(BINDEST)/services $(BINDEST)/listchans
- (cd ../lang ; $(MAKE) install)
-- $(CP) ../data/* $(DATDEST)
-- $(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
-- test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
-- test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
- @if [ "$(MODULE_PATH)" ] ; then \
- test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \
- test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \
---- include/sysconf.h.in
-+++ include/sysconf.h.in
-@@ -96,6 +96,9 @@
- /* "Module dir" */
- #undef MODULE_PATH
-
-+/* "Lib dir" */
-+#undef LIB_DIR
-+
- /* "Has mysql/mysql.h" */
- #undef MYSQL_HEADER_PREFIX
-
---- include/config.h
-+++ include/config.h
-@@ -22,10 +22,10 @@
- /******* General configuration *******/
-
- /* Name of configuration file (in Services directory) */
--#define SERVICES_CONF "services.conf"
-+#define SERVICES_CONF "/etc/anope/services.conf"
-
- /* Name of log file (in Services directory) */
--#define LOG_FILENAME "services.log"
-+#define LOG_FILENAME "/var/log/anope/services.log"
-
- /* Maximum amount of data from/to the network to buffer (bytes). */
- #define NET_BUFSIZE 65536
---- src/log.c
-+++ src/log.c
-@@ -33,7 +33,7 @@
-
- /* fix bug 577 */
- strftime(timestamp, sizeof(timestamp), "%Y%m%d", tm);
-- snprintf(name, count, "logs/%s.%s", log_filename, timestamp);
-+ snprintf(name, count, "%s.%s", log_filename, timestamp);
- curday = tm->tm_yday;
-
- return 1;
---- src/modules.c
-+++ src/modules.c
-@@ -2846,7 +2846,7 @@
-
-
- #ifndef _WIN32
-- snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", services_dir);
-+ snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", LIB_DIR);
- #else
- snprintf(dirbuf, BUFSIZE, "\\%s", "modules/runtime");
- #endif
---- src/language.c
-+++ src/language.c
-@@ -71,7 +71,7 @@
- alog("debug: Loading language %d from file `languages/%s'",
- index, filename);
- }
-- snprintf(buf, sizeof(buf), "languages/%s", filename);
-+ snprintf(buf, sizeof(buf), "%s/languages/%s", LIB_DIR, filename);
- #ifndef _WIN32
- if (!(f = fopen(buf, "r"))) {
- #else
diff --git a/net-irc/anope/files/anope-1.8.7-mariadb.patch b/net-irc/anope/files/anope-1.8.7-mariadb.patch
deleted file mode 100644
index 98a1b3634b6..00000000000
--- a/net-irc/anope/files/anope-1.8.7-mariadb.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Author: Adam
-Date: 2012-01-11
-Subject: Fix https://bugs.gentoo.org/381119 , where -I ordering causes
- mariadb's services.h to be #include-ed improperly.
-
-diff --git a/src/Makefile b/src/Makefile
-index 739c918..a9a2ee2 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -25,7 +25,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
- 'RDB=${RDB}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
-
- .c.o:
-- $(CC) $(CFLAGS) -I../include/ -c $<
-+ $(CC) -I../include/ $(CFLAGS) -c $<
-
- all: services
-
-diff --git a/src/core/Makefile b/src/core/Makefile
-index 4ec2754..32c049f 100644
---- a/src/core/Makefile
-+++ b/src/core/Makefile
-@@ -21,7 +21,7 @@ install:
- distclean: spotless
-
- .c.o:
-- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-+ $(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
-
- .o.s:
- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
-diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub
-index 9fbadf3..d93e6d5 100644
---- a/src/core/Makefile.sub
-+++ b/src/core/Makefile.sub
-@@ -16,7 +16,7 @@ module: $(OBJECTS) so
- distclean: spotless
-
- .c.o:
-- $(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-+ $(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
-
- so:
- $(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
-diff --git a/src/modules/Makefile b/src/modules/Makefile
-index cafbe45..bde65b3 100644
---- a/src/modules/Makefile
-+++ b/src/modules/Makefile
-@@ -24,7 +24,7 @@ install:
- distclean: spotless
-
- .c.o:
-- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-+ $(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
-
- .o.s:
- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
-diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
-index 7697249..b7c244f 100644
---- a/src/modules/Makefile.sub
-+++ b/src/modules/Makefile.sub
-@@ -16,7 +16,7 @@ module: $(OBJECTS) so
- distclean: spotless
-
- .c.o:
-- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-+ $(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
-
- so:
- $(CC) ${SHARED} ../../mod_version.o $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
-diff --git a/src/protocol/Makefile b/src/protocol/Makefile
-index ab837e4..d962d8b 100644
---- a/src/protocol/Makefile
-+++ b/src/protocol/Makefile
-@@ -21,7 +21,7 @@ install:
- distclean: clean spotless
-
- .c.o:
-- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-+ $(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
-
- .o.s:
- $(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
-diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub
-index a2d6a41..d93e6d5 100644
---- a/src/protocol/Makefile.sub
-+++ b/src/protocol/Makefile.sub
-@@ -16,7 +16,7 @@ module: $(OBJECTS) so
- distclean: spotless
-
- .c.o:
-- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-+ $(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
-
- so:
- $(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
-diff --git a/src/tools/Makefile b/src/tools/Makefile
-index 4dffbf0..87bd0ae 100644
---- a/src/tools/Makefile
-+++ b/src/tools/Makefile
-@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
- 'RUNGROUP=${RUNGROUP}'
-
- .c.o:
-- $(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $*
-+ $(CC) -I../include/ $(LDFLAGS) $(CFLAGS) $< -o $*
-
- all: ${OBJS}
-
diff --git a/net-irc/anope/files/anope-conf.d b/net-irc/anope/files/anope-conf.d
deleted file mode 100644
index ddcae9856e0..00000000000
--- a/net-irc/anope/files/anope-conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# user to run ultimate-ircd as
-ANOPE_USER="anope"
-
-# Additional commandline parameters
-ANOPE_OPTS=""
diff --git a/net-irc/anope/files/pid-patch.diff b/net-irc/anope/files/pid-patch.diff
deleted file mode 100644
index c92e1216be9..00000000000
--- a/net-irc/anope/files/pid-patch.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/example.conf.orig 2008-12-14 20:37:22.000000000 +0000
-+++ data/example.conf 2008-12-14 20:37:43.000000000 +0000
-@@ -285,7 +285,7 @@ HostServName "HostServ" "vHost Server"
- # PIDFile <filename> [REQUIRED]
- # Specifies the name of the file containing Services' process ID.
-
--PIDFile services.pid
-+PIDFile /var/run/anope/services.pid
-
- # MOTDFile <filename> [REQUIRED]
- # Specifies the name of the Message of the Day file.
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
@ 2020-05-05 13:30 Thomas Deutschmann
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Deutschmann @ 2020-05-05 13:30 UTC (permalink / raw
To: gentoo-commits
commit: fad3398f2af43b94a28e677a7d318526e194bffb
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Tue May 5 13:13:08 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue May 5 13:30:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad3398f
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) <sam <AT> cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/15654
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
net-irc/anope/anope-2.0.6.ebuild | 2 +-
net-irc/anope/anope-2.0.7.ebuild | 6 +++---
.../{pid-patch.patch => anope-2.0.6-example.conf-pid-path.patch} | 0
...{example.conf-user.patch => anope-2.0.7-example.conf-user.patch} | 0
.../files/{musl-libintl.patch => anope-2.0.7-musl-libintl.patch} | 0
5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild
index 8bb47e7d54b..1d78f2271b9 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 e24c908ab98..1d5f4d67658 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/pid-patch.patch b/net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch
similarity index 100%
rename from net-irc/anope/files/pid-patch.patch
rename to net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch
diff --git a/net-irc/anope/files/example.conf-user.patch b/net-irc/anope/files/anope-2.0.7-example.conf-user.patch
similarity index 100%
rename from net-irc/anope/files/example.conf-user.patch
rename to net-irc/anope/files/anope-2.0.7-example.conf-user.patch
diff --git a/net-irc/anope/files/musl-libintl.patch b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch
similarity index 100%
rename from net-irc/anope/files/musl-libintl.patch
rename to net-irc/anope/files/anope-2.0.7-musl-libintl.patch
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-05-05 13:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-06 21:02 [gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2020-05-05 13:30 Thomas Deutschmann
2019-02-06 21:02 Brian Evans
2019-02-06 21:02 Brian Evans
2015-09-07 20:19 Bjarke Istrup Pedersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox