mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
net-irc/unrealircd: Bump to 4.0.12.
Requires upstream-accepted patch to fix QA warning about extraneous -Wl,-rpath. Package-Manager: Portage-2.3.6, Repoman-2.3.1
This commit is contained in:
Nathan Phillip Brink
@@ -1,2 +1,3 @@
|
||||
DIST Unreal3.2.10.7.tar.gz 3539026 SHA256 472e12cd42d2e725a1795e2bead4786062775782bd015a07697c2edf400d4047 SHA512 7d5fd4729fdde56c6b3e38a93bc365857b5b4faf58cb39e844b43e87872623abc7527025247eeda8c8535576e2b1b8ef14d482c964ce940cafb5de77cc9e1667 WHIRLPOOL 48c578ba12a36ab8078b5569d5de05134699218a6265591aa9ce80614015d96c76624eda17c42b7301379ebbd48e1ea1a62360b624e1d482cbdae562905a95a2
|
||||
DIST unrealircd-4.0.12.tar.gz 5521686 SHA256 db82848fef9ccc2e97ee4decf0167118554d7d5ce396c8e2c902229e6b19ffe8 SHA512 3df18e07226673d76977771f91f0f6c2129955523f1330519e5cada7989c8987382d78770c95837d520737796cf4fa84f1de3eb0f08ef017c5c56f775cf45420 WHIRLPOOL 75a8a6a93dd82fdf3da5ff35b6c8554f1ec47b445714197b96ba49d3a3b09f2f995acb2c380e51434d84c681f92699d8227ebacfe6f6cdf72dc667c2ae612324
|
||||
DIST unrealircd-4.0.6.tar.gz 4877399 SHA256 0193754212e01eba96aed7c2fb2f1d022408f424d251e8b0db870e714c752f09 SHA512 3cf70334966b87902e4a94e391545549df96885ebec26f7d2ec3f2620e18c829c3f7f566b4c1a22c8bcf16d19fdcb35ed10e37d4ce981fe2decd3b90ff204486 WHIRLPOOL f415f846da32de33cc19e16c66af465e058b29184dfdb4624bc78b06e901bc4d5a98a15761fd2dc773715e39c272435de4bc24007db1c06291b15f0edff2d7ba
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
From 2b94733cbe0161b58084a2e7a26985e6d321e1c8 Mon Sep 17 00:00:00 2001
|
||||
From: Nathan Phillip Brink <binki@gentoo.org>
|
||||
Date: Thu, 6 Jul 2017 06:04:18 +0000
|
||||
Subject: [PATCH] Support --without-privatelibdir for packagers.
|
||||
|
||||
---
|
||||
configure.ac | 22 +++++++++++++---------
|
||||
1 file changed, 13 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 78360df..aa49df5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -586,15 +586,19 @@ AC_ARG_WITH(pidfile, [AS_HELP_STRING([--with-pidfile=path],[Specify the path of
|
||||
[AC_DEFINE_UNQUOTED([PIDFILE], ["$HOME/unrealircd/data/unrealircd.pid"], [Define the path of the pid file])
|
||||
PIDFILE="$HOME/unrealircd/data/unrealircd.pid"])
|
||||
|
||||
-LDFLAGS_PRIVATELIBS=""
|
||||
-AC_ARG_WITH(privatelibdir, [AS_HELP_STRING([--with-privatelibdir=path],[Specify the directory where private libraries are stored])],
|
||||
- [AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$withval"], [Define the location of private libraries])
|
||||
- PRIVATELIBDIR="$withval"
|
||||
- LDFLAGS_PRIVATELIBS="-Wl,-rpath=$PRIVATELIBDIR"
|
||||
- LDFLAGS="$LDFLAGS $LDFLAGS_PRIVATELIBS"
|
||||
- export LDFLAGS],
|
||||
- [AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$HOME/unrealircd/lib"], [Define the location of private libraries])
|
||||
- PRIVATELIBDIR="$HOME/unrealircd/lib"
|
||||
+dnl Ensure that this “feature” can be disabled as it makes it harder to package unrealircd.
|
||||
+dnl Users have always been able to specify “./configure LDFLAGS=-Wl,-rpath,/path/to/blah”—binki
|
||||
+AC_ARG_WITH(privatelibdir, [AS_HELP_STRING([--with-privatelibdir=path],[Specify the directory where private libraries are stored. Disable when building a package for a distro])],
|
||||
+ [],
|
||||
+ [with_privatelibdir="yes"])
|
||||
+AS_IF([test "x$with_privatelibdir" = "xno"],
|
||||
+ [PRIVATELIBDIR=],
|
||||
+ [test "x$with_privatelibdir" = "xyes"],
|
||||
+ [PRIVATELIBDIR="$HOME/unrealircd/lib"],
|
||||
+ [PRIVATELIBDIR="$with_privatelibdir"])
|
||||
+AS_IF([test "x$PRIVATELIBDIR" = "x"],
|
||||
+ [LDFLAGS_PRIVATELIBS=""],
|
||||
+ [AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$PRIVATELIBDIR"], [Define the location of private libraries])
|
||||
LDFLAGS_PRIVATELIBS="-Wl,-rpath=$PRIVATELIBDIR"
|
||||
LDFLAGS="$LDFLAGS $LDFLAGS_PRIVATELIBS"
|
||||
export LDFLAGS])
|
||||
--
|
||||
2.4.6
|
||||
|
||||
From 6591e6bcee0858b7cddf6fcfee7dbe04ae511169 Mon Sep 17 00:00:00 2001
|
||||
From: Nathan Phillip Brink <binki@gentoo.org>
|
||||
Date: Thu, 6 Jul 2017 06:43:20 +0000
|
||||
Subject: [PATCH] Do not try to delete libcares when not using PRIVATELIBDIR.
|
||||
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index aa49df5..874d58f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -786,7 +786,7 @@ dnl Use system c-ares when available, unless --without-system-cares.
|
||||
has_system_cares="no"
|
||||
AS_IF([test "x$with_system_cares" = "xyes"],[
|
||||
PKG_CHECK_MODULES([CARES], libcares >= 1.6.0,[has_system_cares=yes
|
||||
-rm -f "$PRIVATELIBDIR/"libcares*],[has_system_cares=no])])
|
||||
+AS_IF([test "x$PRIVATELIBDIR" != "x"], [rm -f "$PRIVATELIBDIR/"libcares*])],[has_system_cares=no])])
|
||||
|
||||
AS_IF([test "$has_system_cares" = "no"], [
|
||||
dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!
|
||||
--
|
||||
2.4.6
|
||||
|
||||
249
net-irc/unrealircd/unrealircd-4.0.12.ebuild
Normal file
249
net-irc/unrealircd/unrealircd-4.0.12.ebuild
Normal file
@@ -0,0 +1,249 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
SSL_CERT_MANDATORY=1
|
||||
inherit autotools eutils ssl-cert versionator multilib user
|
||||
|
||||
DESCRIPTION="An advanced Internet Relay Chat daemon"
|
||||
HOMEPAGE="https://www.unrealircd.org/"
|
||||
SRC_URI="https://www.unrealircd.org/${PN}$(get_version_component_range 1)/${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux"
|
||||
IUSE="class-nofakelag curl +extban-stacking +operoverride operoverride-verify +prefixaq
|
||||
showlistmodes shunnotices topicisnuhost +usermod"
|
||||
|
||||
RDEPEND="dev-libs/openssl:=
|
||||
curl? ( net-misc/curl[adns] )
|
||||
dev-libs/libpcre2
|
||||
dev-libs/tre
|
||||
>=net-dns/c-ares-1.7"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
pkg_pretend() {
|
||||
local v
|
||||
for v in ${REPLACING_VERSIONS}; do
|
||||
version_is_at_least 4 "${v}" && continue
|
||||
ewarn "The configuration file format has changed since ${v}."
|
||||
ewarn "Please be prepared to manually update them and visit:"
|
||||
ewarn "https://www.unrealircd.org/docs/Upgrading_from_3.2.x"
|
||||
break
|
||||
done
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
enewuser unrealircd
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# QA check against bundled pkgs
|
||||
rm -r extras || die
|
||||
|
||||
if use class-nofakelag; then
|
||||
sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
|
||||
fi
|
||||
|
||||
# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
|
||||
# that to look for ca-certificates-provided file instead. %s is
|
||||
# CONFDIR. #618066
|
||||
sed -i -e 's:%s/ssl/curl-ca-bundle.crt:%s/../ssl/certs/ca-certificates.crt:' src/s_conf.c || die
|
||||
|
||||
epatch "${FILESDIR}"/${P}-without-privatelibdir.patch
|
||||
eautoreconf -I autoconf/m4
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Default value for privatelibdir adds a build path to -Wl,-rpath.
|
||||
econf \
|
||||
--with-bindir="${EPREFIX}"/usr/bin \
|
||||
--with-cachedir="${EPREFIX}"/var/lib/${PN} \
|
||||
--with-confdir="${EPREFIX}"/etc/${PN} \
|
||||
--with-datadir="${EPREFIX}"/var/lib/${PN} \
|
||||
--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
|
||||
--with-logdir="${EPREFIX}"/var/log/${PN} \
|
||||
--with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
|
||||
--without-privatelibdir \
|
||||
--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
|
||||
--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
|
||||
--with-nick-history=2000 \
|
||||
--with-sendq=3000000 \
|
||||
--with-permissions=0640 \
|
||||
--with-fd-setsize=1024 \
|
||||
--with-system-cares \
|
||||
--with-system-pcre2 \
|
||||
--with-system-tre \
|
||||
--enable-dynamic-linking \
|
||||
--enable-ssl="${EPREFIX}"/usr \
|
||||
$(use_enable curl libcurl "${EPREFIX}"/usr) \
|
||||
$(use_enable prefixaq) \
|
||||
$(use_with showlistmodes) \
|
||||
$(use_with topicisnuhost) \
|
||||
$(use_with shunnotices) \
|
||||
$(use_with !operoverride no-operoverride) \
|
||||
$(use_with operoverride-verify) \
|
||||
$(use_with !usermod disableusermod) \
|
||||
$(use_with !extban-stacking disable-extendedban-stacking)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
keepdir /var/log/${PN}
|
||||
keepdir /var/lib/${PN}/tmp
|
||||
|
||||
newbin src/ircd ${PN}
|
||||
|
||||
(
|
||||
cd src/modules || die
|
||||
for subdir in $(find . -type d -print); do
|
||||
if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
|
||||
exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
|
||||
doexe "${subdir}"/*.so
|
||||
fi
|
||||
done
|
||||
)
|
||||
|
||||
insinto /etc/${PN}
|
||||
# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
|
||||
# is redundant with app-misc/ca-certificates and examples will all
|
||||
# be in docs anyway.
|
||||
doins -r doc/conf/{aliases,help}
|
||||
doins doc/conf/*.conf
|
||||
newins doc/conf/examples/example.conf ${PN}.conf
|
||||
keepdir /etc/${PN}/ssl
|
||||
|
||||
dodoc \
|
||||
doc/{Changes.old,Changes.older,RELEASE-NOTES} \
|
||||
doc/{Donation,translations.txt}
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd-r2 ${PN}
|
||||
|
||||
# config should be read-only
|
||||
fperms -R 0640 /etc/${PN}
|
||||
fperms 0750 /etc/${PN}{,/aliases,/help}
|
||||
fperms 0750 /etc/${PN}/ssl
|
||||
# state is editable but not owned by unrealircd directly
|
||||
fperms 0770 /var/log/${PN}
|
||||
fperms 0770 /var/lib/${PN}{,/tmp}
|
||||
fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Must pre-create directories; otherwise their permissions are lost
|
||||
# on installation.
|
||||
|
||||
# Usage: _unrealircd_dir_permissions <user> <group> <mode> <dir>[, <dir>…]
|
||||
#
|
||||
# Ensure that directories are created with the correct permissions
|
||||
# before portage tries to merge them to the filesystem because,
|
||||
# otherwise, those directories are installed world-readable.
|
||||
#
|
||||
# If this is a first-time install, create those directories with
|
||||
# correct permissions before installing. Otherwise, update
|
||||
# permissions—but only if we are replacing an unrealircd ebuild at
|
||||
# least as old as net-irc/unrealircd-3.2.10. Portage handles normal
|
||||
# file permissions correctly, so no need for recursive
|
||||
# chmoding/chowning.
|
||||
_unrealircd_dir_permissions() {
|
||||
local user=${1} group=${2} mode=${3} dir v
|
||||
shift 3
|
||||
while dir=${1} && shift; do
|
||||
if [[ ! -d "${EROOT}${dir}" ]]; then
|
||||
ebegin "Creating ""${EROOT}${dir}"" with correct permissions"
|
||||
install -d -m "${mode}" -o "${user}" -g "${group}" "${EROOT}${dir}" || die
|
||||
eend ${?}
|
||||
elif ! [[ ${REPLACING_VERSIONS} ]] || for v in ${REPLACING_VERSIONS}; do
|
||||
# If 3.2.10 ≤ ${REPLACING_VERSIONS}, then we update
|
||||
# existing permissions.
|
||||
version_is_at_least "${v}" 3.2.10 && break
|
||||
done; then
|
||||
ebegin "Correcting permissions of ""${EROOT}${dir}"" left by ${CATEGORY}/${PN}-${v}"
|
||||
chmod "${mode}" "${EROOT}${dir}" \
|
||||
&& chown ${user}:${group} "${EROOT}${dir}" \
|
||||
|| die "Unable to correct permissions of ${EROOT}${dir}"
|
||||
eend ${?}
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# unrealircd only needs to be able to read files in /etc/unrealircd.
|
||||
_unrealircd_dir_permissions root unrealircd 0750 etc/${PN}{,/aliases}
|
||||
|
||||
# unrealircd needs to be able to create files in /var/lib/unrealircd
|
||||
# and /var/log/unrealircd.
|
||||
_unrealircd_dir_permissions root unrealircd 0770 var/{lib,log}/${PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Move docert call from src_install() to install_cert in pkg_postinst for
|
||||
# bug #201682
|
||||
if [[ ! -f "${EROOT}"etc/${PN}/ssl/server.cert.key ]]; then
|
||||
if [[ -f "${EROOT}"etc/${PN}/server.cert.key ]]; then
|
||||
ewarn "The location ${PN} looks for SSL certificates has changed"
|
||||
ewarn "from ${EROOT}etc/${PN} to ${EROOT}etc/${PN}/ssl."
|
||||
ewarn "Please move your existing certificates."
|
||||
else
|
||||
(
|
||||
umask 0037
|
||||
install_cert /etc/${PN}/ssl/server.cert
|
||||
chown unrealircd "${EROOT}"etc/${PN}/ssl/server.cert.*
|
||||
ln -snf server.cert.key "${EROOT}"etc/${PN}/ssl/server.key.pem
|
||||
)
|
||||
fi
|
||||
fi
|
||||
|
||||
local unrealircd_conf="${EROOT}"etc/${PN}/${PN}.conf
|
||||
# Fix up the default cloak keys.
|
||||
if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
|
||||
ebegin "Generating cloak-keys"
|
||||
local keys=(
|
||||
$(${PN} -k 2>&1 | tail -n 3)
|
||||
)
|
||||
[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
|
||||
eend $?
|
||||
|
||||
ebegin "Substituting cloak-keys into ${unrealircd_conf}"
|
||||
sed -i \
|
||||
-e '/cloak-keys/ {
|
||||
n
|
||||
s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
|
||||
n
|
||||
s/"and another one";/"'"${keys[1]}"'";/
|
||||
n
|
||||
s/"and another one";/"'"${keys[2]}"'";/
|
||||
}' \
|
||||
"${unrealircd_conf}"
|
||||
eend $?
|
||||
fi
|
||||
|
||||
# Precreate ircd.tune and ircd.log with the correct ownership to
|
||||
# protect people from themselves when they run unrealircd as root
|
||||
# before trying the initscripts. #560790
|
||||
local f
|
||||
for f in "${EROOT}"var/{lib/${PN}/ircd.tune,log/${PN}/ircd.log}; do
|
||||
[[ -e ${f} ]] && continue
|
||||
ebegin "Precreating ${f} to set ownership"
|
||||
(
|
||||
umask 0037
|
||||
# ircd.tune must be seeded with content instead of being empty.
|
||||
if [[ ${f} == *ircd.tune ]]; then
|
||||
echo 0 > "${f}"
|
||||
echo 0 >> "${f}"
|
||||
fi
|
||||
touch "${f}"
|
||||
)
|
||||
chown unrealircd "${f}"
|
||||
eend $?
|
||||
done
|
||||
|
||||
elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
|
||||
elog
|
||||
elog "You can also configure ${PN} start at boot with rc-update(1)."
|
||||
elog "It is recommended to run unrealircd as an unprivileged user."
|
||||
elog "The provided init.d script does this for you."
|
||||
}
|
||||
Reference in New Issue
Block a user