From 1ccef27203b03f1fa900c9b44dc425df27e49452 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Sep 2022 04:34:29 +0100 Subject: gentoo auto-resync : 07:09:2022 - 04:34:29 --- net-irc/Manifest.gz | Bin 8048 -> 8051 bytes net-irc/eggdrop/Manifest | 2 -- .../eggdrop-1.8.4-fix-array-bounds-warning.patch | 24 ------------- .../files/eggdrop-1.8.4-respect-ldflags.patch | 39 --------------------- 4 files changed, 65 deletions(-) delete mode 100644 net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch delete mode 100644 net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch (limited to 'net-irc') diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz index 9e0bb9dca186..12ea158d3f2e 100644 Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest index 05db9a41e7d9..34557b8eec60 100644 --- a/net-irc/eggdrop/Manifest +++ b/net-irc/eggdrop/Manifest @@ -1,5 +1,3 @@ -AUX eggdrop-1.8.4-fix-array-bounds-warning.patch 864 BLAKE2B d35686e21c7a531b25ba6b06420dfd45914d4aff5321ccd9129239e7f66182d91800371f14c81ee4ac6eb39ad96063d7750a40a25e1eccb9dcebbe50502f0bc9 SHA512 de10ae6d6328da636afd8ec0de187b3f29677c3854e111a64df9b15c9d41ef8ec92f2efd65bc361b2fb6b879016b44e2ce9639da937370d71781aca569991d75 -AUX eggdrop-1.8.4-respect-ldflags.patch 1316 BLAKE2B 43c0ca341a328f08fe8beb735c678bcf0c8fd547acbc7c1614995d5fc75261924cb435b0c0fc4d9f94c2fee3781aba407f3cb09e26958d1e09e1338e7e1781fb SHA512 f0d7c699d648f4a89d622f3f2238b967cae7ff139f25390853b195efd3a76c74af80389c20fcd2c1203fc33d006e7e27d9bdfcab4772c7a688fce7d0649d28be AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715 DIST eggdrop-1.9.1.tar.gz 2271120 BLAKE2B 73fadeddcebeba5de42328f6f02c05e850e47c19812bc1a868da09f55fd1d297e3596c5a4b167806237554966e7dfbebadcee6215932c56a76b3e67a77d5ee47 SHA512 d8907d265f7e22f3bcd3e28b256c5788d5959ad11cc1425d59eb4411ebbc172fe8d90c31fd9f033369ab80cd29a36a5856f6bd32bc6c9cdfedea1d6509ea7f3b DIST eggdrop-1.9.2.tar.gz 2296300 BLAKE2B ed409896718e45daab2b21c25e7f1a5a2664ef8afec7127943abb3018ce963413e714618ee730ef2c49e4542c6e87377cff405ee36ce91448335adf6c7ab5a8a SHA512 67c8053a79ab5c4c418164e4e12f89a6e111b06b4e6dfdc69c52913b2f3b9a58b065a7601165112071c9ca2a778269aeb95c749a9da787c1932e6471a23146ce 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 deleted file mode 100644 index 7c6c2d6dae69..000000000000 --- a/net-irc/eggdrop/files/eggdrop-1.8.4-fix-array-bounds-warning.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/flags.c b/src/flags.c -index 8cecd2898..3f0a7ea32 100644 ---- a/src/flags.c -+++ b/src/flags.c -@@ -403,7 +403,10 @@ void break_down_flags(const char *string, struct flag_record *plus, - which = plus; - mode++; - if ((mode == 2) && !(flags & (FR_CHAN | FR_BOT))) -- string = ""; -+ goto breakout; /* string = ""; does not work here because we need to -+ break out of while() / nested switch(), see -+ "string++;" below and string = "\0"; is worse than -+ goto */ - else if (mode == 3) - mode = 1; - break; -@@ -447,6 +450,7 @@ void break_down_flags(const char *string, struct flag_record *plus, - } - string++; - } -+breakout: - for (which = plus; which; which = (which == plus ? minus : 0)) { - which->global &=USER_VALID; - 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 deleted file mode 100644 index e41dbd664c51..000000000000 --- a/net-irc/eggdrop/files/eggdrop-1.8.4-respect-ldflags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 36f2df10c6c39290f6896f9ad5eb9d1419a1abe3 Mon Sep 17 00:00:00 2001 -From: Michael Ortmann <41313082+michaelortmann@users.noreply.github.com> -Date: Tue, 26 May 2020 01:08:03 +0200 -Subject: [PATCH] Respect LDFLAGS - ---- - src/Makefile.in | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 6757bbc8c..c9605a049 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -16,6 +16,7 @@ LD = @CC@ - STRIP = @STRIP@ - CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @SSL_INCLUDES@ @DEFS@ $(CFLGS) - CPPFLAGS = @CPPFLAGS@ -+LDFLAGS = @LDFLAGS@ - - eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \ - dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \ -@@ -41,7 +42,7 @@ linkstart: - touch mod/mod.xlibs - - link: -- $(LD) $(CFLAGS) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` -+ $(LD) $(CFLAGS) $(LDFLAGS) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` - - linkfinish: - @$(STRIP) ../$(EGGEXEC) && \ -@@ -63,7 +64,7 @@ clean: - main.o: - $(CC) $(CFLAGS) $(CPPFLAGS) \ - '-DCCFLAGS="$(CC) $(CFLAGS) $(CPPFLAGS)"' \ -- '-DLDFLAGS="$(LD)"' \ -+ '-DLDFLAGS="$(LD) $(LDFLAGS)"' \ - '-DSTRIPFLAGS="$(STRIP)"' -c $(srcdir)/main.c - - compatibility: -- cgit v1.2.3