From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A945E158094 for ; Tue, 26 Jul 2022 04:27:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F102E0B64; Tue, 26 Jul 2022 04:27:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1785E0AE0 for ; Tue, 26 Jul 2022 04:26:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C959D340FFB for ; Tue, 26 Jul 2022 04:26:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34E0155F for ; Tue, 26 Jul 2022 04:26:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1658809525.12a6db563aba6b635b47912785e8a3cc59796dea.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/unrealircd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/unrealircd/Manifest net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild net-irc/unrealircd/unrealircd-6.0.3.ebuild X-VCS-Directories: net-irc/unrealircd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 12a6db563aba6b635b47912785e8a3cc59796dea X-VCS-Branch: master Date: Tue, 26 Jul 2022 04:26:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2cb0eab6-9589-4a16-bc09-bdbbdc35abf7 X-Archives-Hash: 40b99fb2a6d70cae7146146b9fc09abb commit: 12a6db563aba6b635b47912785e8a3cc59796dea Author: Sam James gentoo org> AuthorDate: Tue Jul 26 04:20:14 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 26 04:25:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a6db56 net-irc/unrealircd: drop 6.0.2-r1, 6.0.3 Signed-off-by: Sam James gentoo.org> net-irc/unrealircd/Manifest | 3 - net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild | 184 ------------------------- net-irc/unrealircd/unrealircd-6.0.3.ebuild | 187 -------------------------- 3 files changed, 374 deletions(-) diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest index 0abb07a545bd..637c06fc3cf1 100644 --- a/net-irc/unrealircd/Manifest +++ b/net-irc/unrealircd/Manifest @@ -1,7 +1,4 @@ DIST unrealircd-5.2.4.tar.gz 7201203 BLAKE2B 06afc8b5e28bbd56971b2ce21da3e000e39366444472786891bfe000754f5fed37b59850f9539b4f01914d6b33c1f9f17a15fe69569620ba5213f39fce1cfcad SHA512 b6784d011bc56b0b8253d61fb1edddb2133e791e9ce4ae978f90059563d11f3f7b3ebca1cf13765b4077ebc39f0699e101bdfc71cbb0c5cf51d508c5a5fdacb3 DIST unrealircd-5.2.4.tar.gz.asc 866 BLAKE2B 9fc520e93f80a548650b016690036c4e9957e81095f75c34489eb0b83d28548a891196469199cf354207c44b22aaeecfc696995842e9b278ab10fdf5bdb8d7f6 SHA512 0d85a668e2cc3f3d736f3a321e282ecb1fd94d5f605e0e40e8c84a17a6486f8e0d299ec673fe7688fca3ead847f432144ff077547cc90321534406fbe084804b -DIST unrealircd-6.0.2.tar.gz 8672255 BLAKE2B d52f2984f32331c489528b429f4671189713e4e308a7a7fd2f70933bfd606a938a9b6a6e581170b41fa9a948d1cc04c0cd8bb90c595c01c39b473cf341494a27 SHA512 041f97ad82d89222ad49bdc7db83869fc5133a049dd5354c34759c33c16307b9d60c25d3ef4e19a549059e3a0030699d061bd03fa8118428ded1f1e79d483398 -DIST unrealircd-6.0.3.tar.gz 8673998 BLAKE2B 64a5f8bfa6e19abb5cf5434134b2729d460cd4564ad2ca395241f27aab26113f85249d43b8e9a14245354868f767d07e399ff1f28c606bb7b75c4955048e03ae SHA512 be3b823eee42e5ecf7ffbdcac0d56cf4ff4cde8aa082affa8c2f78518a3c54a2d8bb3956cf2b95060958d7c3382ca8da00e6f7b816670cf3ba48e3b8588adba3 -DIST unrealircd-6.0.3.tar.gz.asc 866 BLAKE2B 4605034a7f4bdd240f20d96c0c7933e03b842d6aca2b481639b9e6aca7d32531f9a76cd07a7bb736c41586ec9ce3fe1f53864b8c06601d61df22d635c9a5f522 SHA512 a55cb7647f8efbddc65b6779baa816040f26ba32c6d86efe52ea10a96f51ca9f52d56e311bbac1f984a37b59b2771b8f346716c269df5a79867c0ab9c08c36b9 DIST unrealircd-6.0.4.tar.gz 8696690 BLAKE2B 25960ce78d56f7e5c2ad62751f3359ffc8df1885351f5a8bc36461f2a0a45aed1e99adb207e56988f9bf637d51f8cc17ca3d82f232f09e659a26c0afc3655a93 SHA512 fddce374dc7480e0f02d91965926028993e965450cfe871985ffbfadf38c86198d55be024eddc3dac65e44ff859a6e5e7e8176110d87042b489ce4b14deeeca2 DIST unrealircd-6.0.4.tar.gz.asc 866 BLAKE2B 79bc065c7b24398bee53660c9dc4a7cfca857c7368b3667d2fdd30c87a160126dff0b255b3a20cc436026b923eb6dd744ca21a010f3a0b5df13af185bec211db SHA512 467b3cc1d291da76fea6b4e8fbeb02ffd24a3bd94b6eddf1e94ceabe9fc97e573fd6a3860b49370088a9c60ba0e0485af0f9f5a48e854e1b30f4d45be873ac20 diff --git a/net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild b/net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild deleted file mode 100644 index f4720c15ff43..000000000000 --- a/net-irc/unrealircd/unrealircd-6.0.2-r1.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -SSL_CERT_MANDATORY=1 -inherit autotools ssl-cert systemd tmpfiles - -DESCRIPTION="An advanced Internet Relay Chat daemon" -HOMEPAGE="https://www.unrealircd.org/" -SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" -IUSE="class-nofakelag curl geoip +operoverride operoverride-verify" - -RDEPEND="acct-group/unrealircd - acct-user/unrealircd - >=app-crypt/argon2-20171227-r1:= - dev-libs/libpcre2 - dev-libs/libsodium:= - dev-libs/openssl:= - dev-libs/jansson:= - >=net-dns/c-ares-1.7:= - virtual/libcrypt:= - curl? ( net-misc/curl[adns] ) - geoip? ( dev-libs/libmaxminddb )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} ) - -src_prepare() { - # QA check against bundled pkgs - rm -r extras || die - - # building third-party modules (which we don't do) cause a sandbox violation - # bug 704444 - echo "" > src/buildmod || die - - sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die - - if use class-nofakelag; then - sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die - fi - - # File is missing from the 5.0.9.1 tarball - sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die - - default - eautoreconf -} - -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-maxconnections=1024 \ - --with-nick-history=2000 \ - --with-permissions=0640 \ - --with-system-argon2 \ - --with-system-cares \ - --with-system-pcre2 \ - --with-system-sodium \ - --with-system-jansson \ - --enable-dynamic-linking \ - --with-controlfile="${EPREFIX}"/run/${PN}/unrealircd.ctl \ - --enable-ssl="${EPREFIX}"/usr \ - $(use_enable curl libcurl "${EPREFIX}"/usr) \ - $(use_with !operoverride no-operoverride) \ - $(use_with operoverride-verify) \ - $(use_enable geoip libmaxminddb) -} - -src_install() { - keepdir /var/log/${PN} - keepdir /var/lib/${PN}/tmp - - newbin src/ircd ${PN} - dobin src/unrealircdctl - - newtmpfiles "${FILESDIR}"/unrealircd.tmpfiles unrealircd.conf - - ( - 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}/tls - - einstalldocs - - newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN} - newconfd "${FILESDIR}"/${PN}.confd-r4 ${PN} - - # config should be read-only - fperms -R 0640 /etc/${PN} - fperms 0750 /etc/${PN}{,/aliases,/help} - fperms 0750 /etc/${PN}/tls - # 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} - - # 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 - dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt - - systemd_dounit "${FILESDIR}"/${PN}.service -} - -pkg_postinst() { - tmpfiles_process unrealircd.conf - - # Move docert call from src_install() to install_cert in pkg_postinst for - # bug #201682 - if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then - if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then - ewarn "The location ${PN} looks for SSL certificates has changed" - ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls." - ewarn "Please move your existing certificates." - else - ( - umask 0037 - install_cert /etc/${PN}/tls/server.cert - chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.* - ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/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 '"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";$' "${unrealircd_conf}"; then - ebegin "Generating cloak-keys" - local keys=( - $(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 6 | head -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/"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";/'${keys[0]}'/ -n -s/"and another one";/'${keys[1]}'/ -n -s/"and another one";/'${keys[2]}'/ -}' \ - "${unrealircd_conf}" - eend $? - fi - - elog "UnrealIRCd will not run until you've set up ${EROOT}/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." -} diff --git a/net-irc/unrealircd/unrealircd-6.0.3.ebuild b/net-irc/unrealircd/unrealircd-6.0.3.ebuild deleted file mode 100644 index 7cc9feca1c71..000000000000 --- a/net-irc/unrealircd/unrealircd-6.0.3.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -SSL_CERT_MANDATORY=1 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/unrealircd.asc -inherit autotools ssl-cert systemd tmpfiles verify-sig - -DESCRIPTION="An advanced Internet Relay Chat daemon" -HOMEPAGE="https://www.unrealircd.org/" -SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz" -SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" -IUSE="class-nofakelag curl geoip +operoverride operoverride-verify" - -RDEPEND="acct-group/unrealircd - acct-user/unrealircd - >=app-crypt/argon2-20171227-r1:= - dev-libs/libpcre2 - dev-libs/libsodium:= - dev-libs/openssl:= - dev-libs/jansson:= - >=net-dns/c-ares-1.7:= - virtual/libcrypt:= - curl? ( net-misc/curl[adns] ) - geoip? ( dev-libs/libmaxminddb )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-unrealircd )" - -DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} ) - -src_prepare() { - # QA check against bundled pkgs - rm -r extras || die - - # building third-party modules (which we don't do) cause a sandbox violation - # bug 704444 - echo "" > src/buildmod || die - - sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die - - if use class-nofakelag; then - sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die - fi - - # File is missing from the 5.0.9.1 tarball - sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die - - default - eautoreconf -} - -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-maxconnections=1024 \ - --with-nick-history=2000 \ - --with-permissions=0640 \ - --with-system-argon2 \ - --with-system-cares \ - --with-system-pcre2 \ - --with-system-sodium \ - --with-system-jansson \ - --enable-dynamic-linking \ - --with-controlfile="${EPREFIX}"/run/${PN}/unrealircd.ctl \ - --enable-ssl="${EPREFIX}"/usr \ - $(use_enable curl libcurl "${EPREFIX}"/usr) \ - $(use_with !operoverride no-operoverride) \ - $(use_with operoverride-verify) \ - $(use_enable geoip libmaxminddb) -} - -src_install() { - keepdir /var/log/${PN} - keepdir /var/lib/${PN}/tmp - - newbin src/ircd ${PN} - dobin src/unrealircdctl - - newtmpfiles "${FILESDIR}"/unrealircd.tmpfiles unrealircd.conf - - ( - 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}/tls - - einstalldocs - - newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN} - newconfd "${FILESDIR}"/${PN}.confd-r4 ${PN} - - # config should be read-only - fperms -R 0640 /etc/${PN} - fperms 0750 /etc/${PN}{,/aliases,/help} - fperms 0750 /etc/${PN}/tls - # 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} - - # 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 - dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt - - systemd_dounit "${FILESDIR}"/${PN}.service -} - -pkg_postinst() { - tmpfiles_process unrealircd.conf - - # Move docert call from src_install() to install_cert in pkg_postinst for - # bug #201682 - if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then - if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then - ewarn "The location ${PN} looks for SSL certificates has changed" - ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls." - ewarn "Please move your existing certificates." - else - ( - umask 0037 - install_cert /etc/${PN}/tls/server.cert - chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.* - ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/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 '"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";$' "${unrealircd_conf}"; then - ebegin "Generating cloak-keys" - local keys=( - $(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 6 | head -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/"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";/'${keys[0]}'/ -n -s/"and another one";/'${keys[1]}'/ -n -s/"and another one";/'${keys[2]}'/ -}' \ - "${unrealircd_conf}" - eend $? - fi - - elog "UnrealIRCd will not run until you've set up ${EROOT}/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." -}