Gentoo Archives: gentoo-commits

From: Louis Sautier <sbraz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/eggdrop/files/
Date: Tue, 06 Sep 2022 22:28:24
Message-Id: 1662503259.f3143451d895d1e7fef66328e2915932b681c45e.sbraz@gentoo
1 commit: f3143451d895d1e7fef66328e2915932b681c45e
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Sep 6 16:32:02 2022 +0000
4 Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 6 22:27:39 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3143451
7
8 net-irc/eggdrop: remove unused patches
9
10 Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14
11
12 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
13 Closes: https://github.com/gentoo/gentoo/pull/27164
14 Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
15
16 .../eggdrop-1.8.4-fix-array-bounds-warning.patch | 24 -------------
17 .../files/eggdrop-1.8.4-respect-ldflags.patch | 39 ----------------------
18 2 files changed, 63 deletions(-)
19
20 diff --git a/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch b/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch
21 deleted file mode 100644
22 index 7c6c2d6dae69..000000000000
23 --- a/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch
24 +++ /dev/null
25 @@ -1,24 +0,0 @@
26 -diff --git a/src/flags.c b/src/flags.c
27 -index 8cecd2898..3f0a7ea32 100644
28 ---- a/src/flags.c
29 -+++ b/src/flags.c
30 -@@ -403,7 +403,10 @@ void break_down_flags(const char *string, struct flag_record *plus,
31 - which = plus;
32 - mode++;
33 - if ((mode == 2) && !(flags & (FR_CHAN | FR_BOT)))
34 -- string = "";
35 -+ goto breakout; /* string = ""; does not work here because we need to
36 -+ break out of while() / nested switch(), see
37 -+ "string++;" below and string = "\0"; is worse than
38 -+ goto */
39 - else if (mode == 3)
40 - mode = 1;
41 - break;
42 -@@ -447,6 +450,7 @@ void break_down_flags(const char *string, struct flag_record *plus,
43 - }
44 - string++;
45 - }
46 -+breakout:
47 - for (which = plus; which; which = (which == plus ? minus : 0)) {
48 - which->global &=USER_VALID;
49 -
50
51 diff --git a/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch b/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch
52 deleted file mode 100644
53 index e41dbd664c51..000000000000
54 --- a/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch
55 +++ /dev/null
56 @@ -1,39 +0,0 @@
57 -From 36f2df10c6c39290f6896f9ad5eb9d1419a1abe3 Mon Sep 17 00:00:00 2001
58 -From: Michael Ortmann <41313082+michaelortmann@××××××××××××××××××××.com>
59 -Date: Tue, 26 May 2020 01:08:03 +0200
60 -Subject: [PATCH] Respect LDFLAGS
61 -
62 ----
63 - src/Makefile.in | 5 +++--
64 - 1 file changed, 3 insertions(+), 2 deletions(-)
65 -
66 -diff --git a/src/Makefile.in b/src/Makefile.in
67 -index 6757bbc8c..c9605a049 100644
68 ---- a/src/Makefile.in
69 -+++ b/src/Makefile.in
70 -@@ -16,6 +16,7 @@ LD = @CC@
71 - STRIP = @STRIP@
72 - CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @SSL_INCLUDES@ @DEFS@ $(CFLGS)
73 - CPPFLAGS = @CPPFLAGS@
74 -+LDFLAGS = @LDFLAGS@
75 -
76 - eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \
77 - dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \
78 -@@ -41,7 +42,7 @@ linkstart:
79 - touch mod/mod.xlibs
80 -
81 - link:
82 -- $(LD) $(CFLAGS) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
83 -+ $(LD) $(CFLAGS) $(LDFLAGS) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs`
84 -
85 - linkfinish:
86 - @$(STRIP) ../$(EGGEXEC) && \
87 -@@ -63,7 +64,7 @@ clean:
88 - main.o:
89 - $(CC) $(CFLAGS) $(CPPFLAGS) \
90 - '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \
91 -- '-DLDFLAGS="$(LD)"' \
92 -+ '-DLDFLAGS="$(LD) $(LDFLAGS)"' \
93 - '-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/main.c
94 -
95 - compatibility: