From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3045139368 for ; Sat, 14 Aug 2021 16:51:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5ACB4E0C08; Sat, 14 Aug 2021 16:51:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35737E0C08 for ; Sat, 14 Aug 2021 16:51:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C955F342AD5 for ; Sat, 14 Aug 2021 16:51:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D94F7A2 for ; Sat, 14 Aug 2021 16:51:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1628959881.b1c1d98efcdae8929d86053db15b688dac4d5dde.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch net-ftp/vsftpd/vsftpd-3.0.5.ebuild X-VCS-Directories: net-ftp/vsftpd/ net-ftp/vsftpd/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: b1c1d98efcdae8929d86053db15b688dac4d5dde X-VCS-Branch: master Date: Sat, 14 Aug 2021 16:51:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 771c3ad0-ccc8-45d8-8ff4-fc60dffe60b5 X-Archives-Hash: 523df83f6ece43c7790d806570da4f9e commit: b1c1d98efcdae8929d86053db15b688dac4d5dde Author: Mike Gilbert gentoo org> AuthorDate: Sat Aug 14 14:40:48 2021 +0000 Commit: Mike Gilbert gentoo 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 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 -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[@]}" }