public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/, net-ftp/proftpd/
Date: Wed, 04 Jun 2025 00:34:11 +0000 (UTC)	[thread overview]
Message-ID: <1748997015.336e5ba57b9644f2912af3ed3dcdbc1946abe0b5.sam@gentoo> (raw)

commit:     336e5ba57b9644f2912af3ed3dcdbc1946abe0b5
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Tue Jun  3 23:50:31 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  4 00:30:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=336e5ba5

net-ftp/proftpd: fix the install target

Closes: https://bugs.gentoo.org/953968
Upstream-PR: https://github.com/proftpd/proftpd/pull/1954
Upstream-Commit: https://github.com/proftpd/proftpd/commit/d71ae3f226547b3409dd296e824a57a87354e58d
Signed-off-by: orbea <orbea <AT> riseup.net>
Part-of: https://github.com/gentoo/gentoo/pull/42430
Closes: https://github.com/gentoo/gentoo/pull/42430
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/files/proftpd-1.3.9-slibtool.patch | 34 ++++++++++++++++++++++
 net-ftp/proftpd/proftpd-1.3.9-r1.ebuild            |  2 ++
 2 files changed, 36 insertions(+)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.9-slibtool.patch b/net-ftp/proftpd/files/proftpd-1.3.9-slibtool.patch
new file mode 100644
index 000000000000..4484e36ca0b3
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.9-slibtool.patch
@@ -0,0 +1,34 @@
+https://github.com/proftpd/proftpd/pull/1954
+https://github.com/proftpd/proftpd/commit/d71ae3f226547b3409dd296e824a57a87354e58d
+
+From 75d79d68465ece9c67fc2f2a9788d28c2965d583 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 2 Jun 2025 20:16:17 -0700
+Subject: [PATCH] use $(LIBTOOL) to install proftpd
+
+With slibtool 'make install' will install the slibtool wrapper script
+instead of the actual executable file. This is because with slibtool
+the executable is compiled into the .libs directory while the file in
+the root directory is a wrapper script where with GNU libtool the
+executable will be placed into the root directory. Using $(LIBTOOL) to
+install the executable will ensure that both implementations install the
+correct file.
+
+Gentoo-Issue: https://bugs.gentoo.org/953968
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 32fd5f3c8b..3f574a8262 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -134,7 +134,7 @@ $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $
+ 	fi
+ 
+ install-proftpd: $(DESTDIR)$(includedir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sbindir)
+-	$(INSTALL_SBIN) $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/proftpd
++	$(LIBTOOL) --mode=install --tag=CC $(INSTALL_SBIN) $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/proftpd
+ 	if [ -f $(DESTDIR)$(sbindir)/in.proftpd ] ; then \
+ 		rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
+ 	fi

diff --git a/net-ftp/proftpd/proftpd-1.3.9-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.9-r1.ebuild
index 4f0cca4bc62b..7b0bcda7fd28 100644
--- a/net-ftp/proftpd/proftpd-1.3.9-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.9-r1.ebuild
@@ -81,6 +81,8 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.6-use-trace.patch
+	# https://bugs.gentoo.org/953968
+	"${FILESDIR}"/${PN}-1.3.9-slibtool.patch
 )
 
 QA_CONFIG_IMPL_DECL_SKIP=(


             reply	other threads:[~2025-06-04  0:34 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-04  0:34 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-15 14:46 [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/, net-ftp/proftpd/ Sam James
2025-09-14 17:08 Sam James
2025-04-15 16:25 Mike Gilbert
2023-12-09 18:11 Sam James
2023-05-07  7:21 Sam James
2021-04-28 21:25 Sergei Trofimovich
2021-03-21  9:45 Sergei Trofimovich
2020-05-31 17:18 Sergei Trofimovich
2020-03-02 23:40 Sergei Trofimovich
2019-12-02 22:52 Sergei Trofimovich
2019-10-01 22:16 Sergei Trofimovich
2019-08-19  7:43 Sergei Trofimovich
2017-03-26 21:29 Sergei Trofimovich
2015-12-01 22:23 Sergei Trofimovich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1748997015.336e5ba57b9644f2912af3ed3dcdbc1946abe0b5.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox