1 |
commit: 417e58c420eccb652dd16b23f7d3155e07b20938 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 30 05:47:53 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 05:47:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=417e58c4 |
7 |
|
8 |
net-irc/ngircd: cleanup old |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
net-irc/ngircd/Manifest | 1 - |
14 |
net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch | 77 ---------------- |
15 |
net-irc/ngircd/files/ngircd-25-make-env.patch | 75 ---------------- |
16 |
net-irc/ngircd/ngircd-25.ebuild | 111 ------------------------ |
17 |
4 files changed, 264 deletions(-) |
18 |
|
19 |
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest |
20 |
index 788ac8cbe86..6dba9318b06 100644 |
21 |
--- a/net-irc/ngircd/Manifest |
22 |
+++ b/net-irc/ngircd/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST ngircd-25.tar.gz 527886 BLAKE2B ab75c9a904fae8da4c89e07bd66bb000bc9b614e27269be3ac6f55254c77abeb2d6f7d0afc6d05630f7c548ea13d842d4c0376123035f9417eda55565a69dcec SHA512 0c96e97da312fe86c50007a72db03f85b9f79df053806f50badd07c7ca8e8bddd99adb478eab8be9630330707d7aa578b5d0bd3017b59bf4515319a64c29ea6c |
25 |
DIST ngircd-26.tar.gz 565579 BLAKE2B edd005179a79bbb51a1401f7d580ebf66cb5bf65d1427453c471a4e7e667d7fd6b320c292e9a7993c5fef6beeae88126fefb73284063451b080ecc0d3e6ca0f1 SHA512 2502baf83e3bfca3e6b83c22fe660fee24732ee875b32a7071a489a8babcc08124738142215b55d4f9bd4e94bec3f2a41889ab18324f772b1674b02883cbfb91 |
26 |
|
27 |
diff --git a/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch b/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch |
28 |
deleted file mode 100644 |
29 |
index 33e0d444bd5..00000000000 |
30 |
--- a/net-irc/ngircd/files/ngircd-25-fix-gcc-10.patch |
31 |
+++ /dev/null |
32 |
@@ -1,77 +0,0 @@ |
33 |
-From f27827d7937375b5348107ca7427abf74c9eff3d Mon Sep 17 00:00:00 2001 |
34 |
-From: michi <michi+ngircd@×××××××××.org> |
35 |
-Date: Tue, 14 Apr 2020 16:53:02 +0200 |
36 |
-Subject: [PATCH] Unbreak GCC 10 (-fno-common) build |
37 |
- |
38 |
---- |
39 |
- src/ngircd/conn.c | 1 + |
40 |
- src/ngircd/conn.h | 14 +++++++++++--- |
41 |
- src/ngircd/ngircd.c | 1 + |
42 |
- src/portab/portab.h | 4 ++++ |
43 |
- 4 files changed, 17 insertions(+), 3 deletions(-) |
44 |
- |
45 |
-diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c |
46 |
-index f62e9675..e14e6c08 100644 |
47 |
---- a/src/ngircd/conn.c |
48 |
-+++ b/src/ngircd/conn.c |
49 |
-@@ -10,6 +10,7 @@ |
50 |
- */ |
51 |
- |
52 |
- #define CONN_MODULE |
53 |
-+#define CONN_MODULE_GLOBAL_INIT |
54 |
- |
55 |
- #include "portab.h" |
56 |
- |
57 |
-diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h |
58 |
-index c642541f..869477f0 100644 |
59 |
---- a/src/ngircd/conn.h |
60 |
-+++ b/src/ngircd/conn.h |
61 |
-@@ -105,9 +105,17 @@ typedef struct _Connection |
62 |
- #endif |
63 |
- } CONNECTION; |
64 |
- |
65 |
--GLOBAL CONNECTION *My_Connections; |
66 |
--GLOBAL CONN_ID Pool_Size; |
67 |
--GLOBAL long WCounter; |
68 |
-+ |
69 |
-+#ifdef CONN_MODULE_GLOBAL_INIT |
70 |
-+CONNECTION *My_Connections; |
71 |
-+CONN_ID Pool_Size; |
72 |
-+long WCounter; |
73 |
-+#else |
74 |
-+extern CONNECTION *My_Connections; |
75 |
-+extern CONN_ID Pool_Size; |
76 |
-+extern long WCounter; |
77 |
-+#endif |
78 |
-+ |
79 |
- |
80 |
- #define CONNECTION2ID(x) (long)(x - My_Connections) |
81 |
- |
82 |
-diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c |
83 |
-index 7166640b..41255ca0 100644 |
84 |
---- a/src/ngircd/ngircd.c |
85 |
-+++ b/src/ngircd/ngircd.c |
86 |
-@@ -9,6 +9,7 @@ |
87 |
- * Please read the file COPYING, README and AUTHORS for more information. |
88 |
- */ |
89 |
- |
90 |
-+#define GLOBAL_INIT |
91 |
- #include "portab.h" |
92 |
- |
93 |
- /** |
94 |
-diff --git a/src/portab/portab.h b/src/portab/portab.h |
95 |
-index 70d5ed3e..43f2f907 100644 |
96 |
---- a/src/portab/portab.h |
97 |
-+++ b/src/portab/portab.h |
98 |
-@@ -102,7 +102,11 @@ typedef unsigned char bool; |
99 |
- #endif |
100 |
- |
101 |
- #undef GLOBAL |
102 |
-+#ifdef GLOBAL_INIT |
103 |
- #define GLOBAL |
104 |
-+#else |
105 |
-+#define GLOBAL extern |
106 |
-+#endif |
107 |
- |
108 |
- /* SPLint */ |
109 |
- |
110 |
|
111 |
diff --git a/net-irc/ngircd/files/ngircd-25-make-env.patch b/net-irc/ngircd/files/ngircd-25-make-env.patch |
112 |
deleted file mode 100644 |
113 |
index e6494c72007..00000000000 |
114 |
--- a/net-irc/ngircd/files/ngircd-25-make-env.patch |
115 |
+++ /dev/null |
116 |
@@ -1,75 +0,0 @@ |
117 |
---- a/Makefile.am 2016-09-18 18:01:30.000000000 -0000 |
118 |
-+++ b/Makefile.am 2020-04-20 14:01:43.166312404 -0000 |
119 |
-@@ -25,13 +25,13 @@ |
120 |
- rm -f config.log debian |
121 |
- |
122 |
- testsuite: |
123 |
-- cd src/testsuite && make check |
124 |
-+ cd src/testsuite && ${MAKE} check |
125 |
- |
126 |
- lint: |
127 |
-- cd src/ngircd && make lint |
128 |
-+ cd src/ngircd && ${MAKE} lint |
129 |
- |
130 |
- srcdoc: |
131 |
-- cd doc && make srcdoc |
132 |
-+ cd doc && ${MAKE} srcdoc |
133 |
- |
134 |
- have-xcodebuild: |
135 |
- @xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \ |
136 |
-@@ -66,7 +66,7 @@ |
137 |
- --out ../../$(distdir).mpkg |
138 |
- rm -f $(distdir).mpkg.zip |
139 |
- zip -ro9 $(distdir).mpkg.zip $(distdir).mpkg |
140 |
-- make osxpkg-clean |
141 |
-+ ${MAKE} osxpkg-clean |
142 |
- |
143 |
- osxpkg-clean: |
144 |
- [ ! -r ngircd.dest ] || sudo -n rm -rf ngircd.dest |
145 |
-@@ -74,12 +74,12 @@ |
146 |
- |
147 |
- osxpkg-dest: have-xcodebuild osxpkg-clean clean |
148 |
- ./configure --prefix=/opt/ngircd |
149 |
-- make xcode |
150 |
-- make -C contrib/MacOSX de.barton.ngircd.plist |
151 |
-+ ${MAKE} xcode |
152 |
-+ ${MAKE} -C contrib/MacOSX de.barton.ngircd.plist |
153 |
- mkdir -p ngircd.dest/opt/ngircd/sbin |
154 |
-- DESTDIR="$$PWD/ngircd.dest" make -C doc install |
155 |
-- DESTDIR="$$PWD/ngircd.dest" make -C contrib install |
156 |
-- DESTDIR="$$PWD/ngircd.dest" make -C man install |
157 |
-+ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C doc install |
158 |
-+ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C contrib install |
159 |
-+ DESTDIR="$$PWD/ngircd.dest" ${MAKE} -C man install |
160 |
- cp contrib/MacOSX/build/Default/ngIRCd \ |
161 |
- ngircd.dest/opt/ngircd/sbin/ngircd |
162 |
- rm ngircd.dest/opt/ngircd/etc/ngircd.conf |
163 |
---- a/doc/Makefile.am 2016-01-16 13:23:40.000000000 -0000 |
164 |
-+++ b/doc/Makefile.am 2020-04-20 14:05:45.316912143 -0000 |
165 |
-@@ -55,7 +55,7 @@ |
166 |
- install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) |
167 |
- $(MKDIR_P) -m 755 $(DESTDIR)$(sysconfdir) |
168 |
- @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ |
169 |
-- make install-config; \ |
170 |
-+ ${MAKE} install-config; \ |
171 |
- fi |
172 |
- $(MKDIR_P) -m 755 $(DESTDIR)$(docdir) |
173 |
- for f in $(static_docs) $(toplevel_docs); do \ |
174 |
-@@ -75,7 +75,7 @@ |
175 |
- uninstall-hook: |
176 |
- rm -rf $(DESTDIR)$(docdir) |
177 |
- @if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \ |
178 |
-- make uninstall-config; \ |
179 |
-+ ${MAKE} uninstall-config; \ |
180 |
- else \ |
181 |
- echo; \ |
182 |
- echo " ** NOTE: Not uninstalling changed configuration file:"; \ |
183 |
-@@ -87,7 +87,7 @@ |
184 |
- rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf |
185 |
- |
186 |
- srcdoc: |
187 |
-- make -C src srcdoc |
188 |
-+ ${MAKE} -C src srcdoc |
189 |
- |
190 |
- .PHONY: install-config uninstall-config srcdoc |
191 |
- |
192 |
|
193 |
diff --git a/net-irc/ngircd/ngircd-25.ebuild b/net-irc/ngircd/ngircd-25.ebuild |
194 |
deleted file mode 100644 |
195 |
index d6a322c5b18..00000000000 |
196 |
--- a/net-irc/ngircd/ngircd-25.ebuild |
197 |
+++ /dev/null |
198 |
@@ -1,111 +0,0 @@ |
199 |
-# Copyright 1999-2020 Gentoo Authors |
200 |
-# Distributed under the terms of the GNU General Public License v2 |
201 |
- |
202 |
-EAPI=7 |
203 |
- |
204 |
-# Bug: https://github.com/ngircd/ngircd/issues/261 |
205 |
-WANT_AUTOMAKE=1.11.6 |
206 |
-inherit autotools |
207 |
- |
208 |
-DESCRIPTION="An IRC server written from scratch" |
209 |
-HOMEPAGE="https://ngircd.barton.de/" |
210 |
-SRC_URI="https://arthur.barton.de/pub/${PN}/${P}.tar.gz" |
211 |
- |
212 |
-LICENSE="GPL-2" |
213 |
-SLOT="0" |
214 |
-KEYWORDS="amd64 ~arm arm64 x86 ~x64-macos" |
215 |
-IUSE="debug gnutls ident irc-plus +ipv6 libressl pam +ssl strict-rfc tcpd test zlib" |
216 |
- |
217 |
-RESTRICT="!test? ( test )" |
218 |
- |
219 |
-RDEPEND=" |
220 |
- acct-user/ngircd |
221 |
- acct-group/ngircd |
222 |
- irc-plus? ( virtual/libiconv ) |
223 |
- ident? ( net-libs/libident ) |
224 |
- pam? ( sys-libs/pam ) |
225 |
- ssl? ( |
226 |
- gnutls? ( net-libs/gnutls:= ) |
227 |
- !gnutls? ( |
228 |
- !libressl? ( dev-libs/openssl:0= ) |
229 |
- libressl? ( dev-libs/libressl:0= ) |
230 |
- ) |
231 |
- ) |
232 |
- tcpd? ( sys-apps/tcp-wrappers ) |
233 |
- zlib? ( sys-libs/zlib ) |
234 |
-" |
235 |
- |
236 |
-BDEPEND="sys-devel/automake:1.11" |
237 |
- |
238 |
-DEPEND=" |
239 |
- ${RDEPEND} |
240 |
- test? ( |
241 |
- dev-tcltk/expect |
242 |
- net-misc/netkit-telnetd |
243 |
- ) |
244 |
-" |
245 |
- |
246 |
-PATCHES=( |
247 |
- "${FILESDIR}/${PN}-25-fix-gcc-10.patch" |
248 |
- "${FILESDIR}/${PN}-25-make-env.patch" |
249 |
-) |
250 |
- |
251 |
-# Flaky test needs investigation (bug 719256) |
252 |
-RESTRICT="test" |
253 |
- |
254 |
-src_prepare() { |
255 |
- default |
256 |
- |
257 |
- if ! use prefix; then |
258 |
- sed -i \ |
259 |
- -e "s:;ServerUID = 65534:ServerUID = ngircd:" \ |
260 |
- -e "s:;ServerGID = 65534:ServerGID = ngircd:" \ |
261 |
- doc/sample-ngircd.conf.tmpl || die |
262 |
- fi |
263 |
- |
264 |
- # Once https://github.com/ngircd/ngircd/pull/270 is in a release (ngircd 26), we can remove |
265 |
- # the eautomake/autotools machinery. |
266 |
- eautomake |
267 |
-} |
268 |
- |
269 |
-src_configure() { |
270 |
- local myconf=( |
271 |
- --sysconfdir="${EPREFIX}"/etc/"${PN}" |
272 |
- $(use_enable debug sniffer) |
273 |
- $(use_enable debug) |
274 |
- $(use_enable irc-plus ircplus) |
275 |
- $(use_enable ipv6) |
276 |
- $(use_enable strict-rfc) |
277 |
- $(use_with irc-plus iconv) |
278 |
- $(use_with ident) |
279 |
- $(use_with pam) |
280 |
- $(use_with tcpd tcp-wrappers) |
281 |
- $(use_with zlib) |
282 |
- ) |
283 |
- |
284 |
- if use ssl; then |
285 |
- if use gnutls; then |
286 |
- myconf+=( |
287 |
- $( use_with gnutls ) |
288 |
- ) |
289 |
- else |
290 |
- myconf+=( |
291 |
- $( use_with !gnutls openssl ) |
292 |
- ) |
293 |
- fi |
294 |
- fi |
295 |
- |
296 |
- econf "${myconf[@]}" |
297 |
-} |
298 |
- |
299 |
-src_install() { |
300 |
- default |
301 |
- newinitd "${FILESDIR}"/ngircd.init-r1.d ngircd |
302 |
-} |
303 |
- |
304 |
-pkg_postinst() { |
305 |
- if [[ -z ${REPLACING_VERSIONS} ]] && use pam; then |
306 |
- elog "ngircd will use PAMOnly by default, please change this option." |
307 |
- elog "You may not be able to login until you change this." |
308 |
- fi |
309 |
-} |