summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-08-14 10:40:48 -0400
committerMike Gilbert <floppym@gentoo.org>2021-08-14 12:51:21 -0400
commitb1c1d98efcdae8929d86053db15b688dac4d5dde (patch)
treeb8d60d1348cf08b3396411fa2859036bf375f6e9 /net-ftp
parentapp-text/sigil: take direct maintenance (diff)
downloadgentoo-b1c1d98efcdae8929d86053db15b688dac4d5dde.tar.gz
gentoo-b1c1d98efcdae8929d86053db15b688dac4d5dde.tar.bz2
gentoo-b1c1d98efcdae8929d86053db15b688dac4d5dde.zip
net-ftp/vsftpd: drop vsftpd-3.0.5-fix-link-command.patch
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch25
-rw-r--r--net-ftp/vsftpd/vsftpd-3.0.5.ebuild2
2 files changed, 1 insertions, 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 a4560a8ef6b9..000000000000
--- 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 <floppym@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 e4ecfb256b89..b452dee49a00 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[@]}"
}