commit: 417e58c420eccb652dd16b23f7d3155e07b20938
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 05:47:53 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 05:47:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417e58c4
net-irc/ngircd: cleanup old
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-irc/ngircd/Manifest | 1 -
net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch | 77 ----------------
net-irc/ngircd/files/ngircd-25-make-env.patch | 75 ----------------
net-irc/ngircd/ngircd-25.ebuild | 111 ------------------------
4 files changed, 264 deletions(-)
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest
index 788ac8cbe86..6dba9318b06 100644
--- a/net-irc/ngircd/Manifest
+++ b/net-irc/ngircd/Manifest
@@ -1,2 +1 @@
-DIST ngircd-25.tar.gz 527886 BLAKE2B
ab75c9a904fae8da4c89e07bd66bb000bc9b614e27269be3ac6f55254c77abeb2d6f7d0afc6d05630f7c548ea13d842d4c0376123035f9417eda55565a69dcec
SHA512
0c96e97da312fe86c50007a72db03f85b9f79df053806f50badd07c7ca8e8bddd99adb478eab8be9630330707d7aa578b5d0bd3017b59bf4515319a64c29ea6c
DIST ngircd-26.tar.gz 565579 BLAKE2B
edd005179a79bbb51a1401f7d580ebf66cb5bf65d1427453c471a4e7e667d7fd6b320c292e9a7993c5fef6beeae88126fefb73284063451b080ecc0d3e6ca0f1
SHA512
2502baf83e3bfca3e6b83c22fe660fee24732ee875b32a7071a489a8babcc08124738142215b55d4f9bd4e94bec3f2a41889ab18324f772b1674b02883cbfb91
diff --git a/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch
b/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch
deleted file mode 100644
index 33e0d444bd5..00000000000
--- a/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From f27827d7937375b5348107ca7427abf74c9eff3d Mon Sep 17 00:00:00 2001
-From: michi <michi+ngi...@dataswamp.org>
-Date: Tue, 14 Apr 2020 16:53:02 +0200
-Subject: [PATCH] Unbreak GCC 10 (-fno-common) build
-
----
- src/ngircd/conn.c | 1 +
- src/ngircd/conn.h | 14 +++++++++++---
- src/ngircd/ngircd.c | 1 +
- src/portab/portab.h | 4 ++++
- 4 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
-index f62e9675..e14e6c08 100644
---- a/src/ngircd/conn.c
-+++ b/src/ngircd/conn.c
-@@ -10,6 +10,7 @@
- */
-
- #define CONN_MODULE
-+#define CONN_MODULE_GLOBAL_INIT
-
- #include "portab.h"
-
-diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
-index c642541f..869477f0 100644
---- a/src/ngircd/conn.h
-+++ b/src/ngircd/conn.h
-@@ -105,9 +105,17 @@ typedef struct _Connection
- #endif
- } CONNECTION;
-
--GLOBAL CONNECTION *My_Connections;
--GLOBAL CONN_ID Pool_Size;
--GLOBAL long WCounter;
-+
-+#ifdef CONN_MODULE_GLOBAL_INIT
-+CONNECTION *My_Connections;
-+CONN_ID Pool_Size;
-+long WCounter;
-+#else
-+extern CONNECTION *My_Connections;
-+extern CONN_ID Pool_Size;
-+extern long WCounter;
-+#endif
-+
-
- #define CONNECTION2ID(x) (long)(x - My_Connections)
-
-diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
-index 7166640b..41255ca0 100644
---- a/src/ngircd/ngircd.c
-+++ b/src/ngircd/ngircd.c
-@@ -9,6 +9,7 @@
- * Please read the file COPYING, README and AUTHORS for more information.
- */
-
-+#define GLOBAL_INIT
- #include "portab.h"
-
- /**
-diff --git a/src/portab/portab.h b/src/portab/portab.h
-index 70d5ed3e..43f2f907 100644
---- a/src/portab/portab.h
-+++ b/src/portab/portab.h
-@@ -102,7 +102,11 @@ typedef unsigned char bool;
- #endif
-
- #undef GLOBAL
-+#ifdef GLOBAL_INIT
- #define GLOBAL
-+#else
-+#define GLOBAL extern
-+#endif
-
- /* SPLint */
-
diff --git a/net-irc/ngircd/files/ngircd-25-make-env.patch
b/net-irc/ngircd/files/ngircd-25-make-env.patch
deleted file mode 100644
index e6494c72007..00000000000
--- a/net-irc/ngircd/files/ngircd-25-make-env.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/Makefile.am 2016-09-18 18:01:30.000000000 -0000
-+++ b/Makefile.am 2020-04-20 14:01:43.166312404 -0000
-@@ -25,13 +25,13 @@
- rm -f config.log debian
-
- testsuite:
-- cd src/testsuite && make check
-+ cd src/testsuite && ${MAKE} check
-
- lint:
-- cd src/ngircd && make lint
-+ cd src/ngircd && ${MAKE} lint
-
- srcdoc:
-- cd doc && make srcdoc
-+ cd doc && ${MAKE} srcdoc
-
- have-xcodebuild:
- @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \
-@@ -66,7 +66,7 @@
- --out ../../$(distdir).mpkg
- rm -f $(distdir).mpkg.zip
- zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg
-- make osxpkg-clean
-+ ${MAKE} osxpkg-clean
-
- osxpkg-clean:
- [ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest
-@@ -74,12 +74,12 @@
-
- osxpkg-dest: have-xcodebuild osxpkg-clean clean
- ./configure --prefix=/opt/ngircd
-- make xcode
-- make -C contrib/MacOSX de.barton.ngircd.plist
-+ ${MAKE} xcode
-+ ${MAKE} -C contrib/MacOSX de.barton.ngircd.plist
- mkdir -p ngircd.dest/opt/ngircd/sbin
-- DESTDIR="$$PWD/ngircd.dest" make -C doc install
-- DESTDIR="$$PWD/ngircd.dest" make -C contrib install
-- DESTDIR="$$PWD/ngircd.dest" make -C man install
-+ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C doc install
-+ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C contrib install
-+ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C man install
- cp contrib/MacOSX/build/Default/ngIRCd \
- ngircd.dest/opt/ngircd/sbin/ngircd
- rm ngircd.dest/opt/ngircd/etc/ngircd.conf
---- a/doc/Makefile.am 2016-01-16 13:23:40.000000000 -0000
-+++ b/doc/Makefile.am 2020-04-20 14:05:45.316912143 -0000
-@@ -55,7 +55,7 @@
- install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
- $(MKDIR_P) -m 755 $(DESTDIR)$(sysconfdir)
- @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
-- make install-config; \
-+ ${MAKE} install-config; \
- fi
- $(MKDIR_P) -m 755 $(DESTDIR)$(docdir)
- for f in $(static_docs) $(toplevel_docs); do \
-@@ -75,7 +75,7 @@
- uninstall-hook:
- rm -rf $(DESTDIR)$(docdir)
- @if cmp --silent sample-ngircd.conf
$(DESTDIR)$(sysconfdir)/ngircd.conf; then \
-- make uninstall-config; \
-+ ${MAKE} uninstall-config; \
- else \
- echo; \
- echo " ** NOTE: Not uninstalling changed configuration file:"; \
-@@ -87,7 +87,7 @@
- rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf
-
- srcdoc:
-- make -C src srcdoc
-+ ${MAKE} -C src srcdoc
-
- .PHONY: install-config uninstall-config srcdoc
-
diff --git a/net-irc/ngircd/ngircd-25.ebuild b/net-irc/ngircd/ngircd-25.ebuild
deleted file mode 100644
index d6a322c5b18..00000000000
--- a/net-irc/ngircd/ngircd-25.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Bug: https://github.com/ngircd/ngircd/issues/261
-WANT_AUTOMAKE=1.11.6
-inherit autotools
-
-DESCRIPTION="An IRC server written from scratch"
-HOMEPAGE="https://ngircd.barton.de/";
-SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos"
-IUSE="debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test
zlib"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-user/ngircd
- acct-group/ngircd
- irc-plus? ( virtual/libiconv )
- ident? ( net-libs/libident )
- pam? ( sys-libs/pam )
- ssl? (
- gnutls? ( net-libs/gnutls:= )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )
- tcpd? ( sys-apps/tcp-wrappers )
- zlib? ( sys-libs/zlib )
-"
-
-BDEPEND="sys-devel/automake:1.11"
-
-DEPEND="
- ${RDEPEND}
- test? (
- dev-tcltk/expect
- net-misc/netkit-telnetd
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-25-fix-gcc-10.patch"
- "${FILESDIR}/${PN}-25-make-env.patch"
-)
-
-# Flaky test needs investigation (bug 719256)
-RESTRICT="test"
-
-src_prepare() {
- default
-
- if ! use prefix; then
- sed -i \
- -e "s:;ServerUID = 65534:ServerUID = ngircd:" \
- -e "s:;ServerGID = 65534:ServerGID = ngircd:" \
- doc/sample-ngircd.conf.tmpl || die
- fi
-
- # Once https://github.com/ngircd/ngircd/pull/270 is in a release
(ngircd 26), we can remove
- # the eautomake/autotools machinery.
- eautomake
-}
-
-src_configure() {
- local myconf=(
- --sysconfdir="${EPREFIX}"/etc/"${PN}"
- $(use_enable debug sniffer)
- $(use_enable debug)
- $(use_enable irc-plus ircplus)
- $(use_enable ipv6)
- $(use_enable strict-rfc)
- $(use_with irc-plus iconv)
- $(use_with ident)
- $(use_with pam)
- $(use_with tcpd tcp-wrappers)
- $(use_with zlib)
- )
-
- if use ssl; then
- if use gnutls; then
- myconf+=(
- $( use_with gnutls )
- )
- else
- myconf+=(
- $( use_with !gnutls openssl )
- )
- fi
- fi
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]] && use pam; then
- elog "ngircd will use PAMOnly by default, please change this
option."
- elog "You may not be able to login until you change this."
- fi
-}
