[gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/

[Mike Gilbert]

commit:     b1c1d98efcdae8929d86053db15b688dac4d5dde
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 14:40:48 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 16:51:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c1d98e

net-ftp/vsftpd: drop vsftpd-3.0.5-fix-link-command.patch

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../files/vsftpd-3.0.5-fix-link-command.patch      | 25 ----------------------
 net-ftp/vsftpd/vsftpd-3.0.5.ebuild                 |  2 +-
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch 
b/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch
deleted file mode 100644
index a4560a8ef6b..00000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5c00346f72de5b966ebb0841c87a22c6b11c1b38 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <flop...@gentoo.org>
-Date: Thu, 12 Aug 2021 16:51:55 -0400
-Subject: [PATCH] Fix link command
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index c63ed1b..c3454c3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -26,7 +26,7 @@ OBJS =       main.o utility.o prelogin.o ftpcmdio.o 
postlogin.o privsock.o \
-       $(CC) -c $*.c $(CFLAGS) $(IFLAGS)
- 
- vsftpd: $(OBJS) 
--      $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
-+      $(CC) -o vsftpd $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
- 
- install:
-       if [ -x /usr/local/sbin ]; then \
--- 
-2.32.0
-

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild 
b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
index e4ecfb256b8..b452dee49a0 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
@@ -31,7 +31,6 @@ src_prepare() {
                "${FILESDIR}"/vsftpd-2.3.2-kerberos.patch
                "${FILESDIR}"/vsftpd-3.0.2-alpha.patch
                "${FILESDIR}"/vsftpd-3.0.3-sparc.patch
-               "${FILESDIR}"/vsftpd-3.0.5-fix-link-command.patch
        )
        default
 }
@@ -71,6 +70,7 @@ src_compile() {
                CFLAGS="${CFLAGS}"
                LDFLAGS="${LDFLAGS}"
                LIBS="${libs[*]}"
+               LINK=
        )
        emake "${args[@]}"
 }