* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/
@ 2017-10-17 17:52 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2017-10-17 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 85aa4bd643ce3503aa3d2501337e4acf0ed3ca34
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Sep 28 18:34:52 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 17:52:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85aa4bd6
net-ftp/proftpd: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/5817
.../files/proftpd-1.3.6_rc4-open-tests.patch | 24 ----------------------
1 file changed, 24 deletions(-)
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-open-tests.patch b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-open-tests.patch
deleted file mode 100644
index f65a2cc3fbb..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-open-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-gcc-6.3 + glibc-2.25 now can detect 2-argument open that is supposed to created new files.
-diff --git a/tests/api/fsio.c b/tests/api/fsio.c
-index 2041f43..18d173b 100644
---- a/tests/api/fsio.c
-+++ b/tests/api/fsio.c
-@@ -1058,3 +1058,3 @@ START_TEST (fsio_sys_access_file_test) {
- /* Make the file to check; we want it to have perms 664.*/
-- fd = open(fsio_test_path, O_CREAT|O_EXCL|O_WRONLY);
-+ fd = open(fsio_test_path, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR);
- fail_if(fd < 0, "Unable to create file '%s': %s", fsio_test_path,
-diff --git a/tests/api/scoreboard.c b/tests/api/scoreboard.c
-index f0ffdbc..f26d833 100644
---- a/tests/api/scoreboard.c
-+++ b/tests/api/scoreboard.c
-@@ -267,3 +267,3 @@ START_TEST (scoreboard_lock_test) {
-
-- fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR);
-+ fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR, S_IRUSR | S_IWUSR);
- fail_unless(fd >= 0, "Failed to open '%s': %s", test_file2, strerror(errno));
-@@ -911,3 +911,3 @@ START_TEST (scoreboard_entry_lock_test) {
-
-- fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR);
-+ fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR, S_IRUSR | S_IWUSR);
- fail_unless(fd >= 0, "Failed to open '%s': %s", test_file2, strerror(errno));
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/
@ 2020-04-18 21:31 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-04-18 21:31 UTC (permalink / raw
To: gentoo-commits
commit: fb7a94f47941261c9b69aca5759478060cf704b8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 18 16:56:52 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr 18 21:31:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7a94f4
net-ftp/proftpd: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/proftpd-1.3.6-EINTR-like-EAGAIN.patch | 54 ------------
net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch | 96 ----------------------
net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch | 24 ------
.../proftpd/files/proftpd-1.3.6-sighup-crash.patch | 81 ------------------
.../files/proftpd-1.3.6b-tls-crl-crash.patch | 40 ---------
5 files changed, 295 deletions(-)
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch b/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch
deleted file mode 100644
index 43608d96492..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/695972
-https://github.com/proftpd/proftpd/commit/f09f0c661621eb22cb1ce579194478007ba62866
-
-From f09f0c661621eb22cb1ce579194478007ba62866 Mon Sep 17 00:00:00 2001
-From: Justin Maggard <jmaggard@netgear.com>
-Date: Tue, 10 Oct 2017 18:20:06 -0700
-Subject: [PATCH] Bug #4319: Treat EINTR like EAGAIN
-
-This bug described a situation where an ongoing transfer would be
-prematurely aborted when one of our timers fired. The timer could have
-fired for an unrelated reason, but if we were in the process of reading
-or writing with pr_netio_read() or pr_netio_write(), those calls would
-be interrupted with errno set to EINTR, and an error would be returned.
-Then pr_data_xfer() would abort the transfer.
-
-EAGAIN was already being handled properly, and we can just use the same
-treatment for EINTR so that we only respond to the timers we should
-actually care about.
----
- src/data.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/src/data.c
-+++ b/src/data.c
-@@ -1143,7 +1143,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
- while (len < 0) {
- int xerrno = errno;
-
-- if (xerrno == EAGAIN) {
-+ if (xerrno == EAGAIN || xerrno == EINTR) {
- /* Since our socket is in non-blocking mode, read(2) can return
- * EAGAIN if there is no data yet for us. Handle this by
- * delaying temporarily, then trying again.
-@@ -1265,7 +1265,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
- while (len < 0) {
- int xerrno = errno;
-
-- if (xerrno == EAGAIN) {
-+ if (xerrno == EAGAIN || xerrno == EINTR) {
- /* Since our socket is in non-blocking mode, read(2) can return
- * EAGAIN if there is no data yet for us. Handle this by
- * delaying temporarily, then trying again.
-@@ -1362,7 +1362,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
- while (bwrote < 0) {
- int xerrno = errno;
-
-- if (xerrno == EAGAIN) {
-+ if (xerrno == EAGAIN || xerrno == EINTR) {
- /* Since our socket is in non-blocking mode, write(2) can return
- * EAGAIN if there is not enough from for our data yet. Handle
- * this by delaying temporarily, then trying again.
---
-2.23.0
-
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch b/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch
deleted file mode 100644
index 40d912eb2b5..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-https://bugs.gentoo.org/690528
-CVE-2019-12815
-
-From a73dbfe3b61459e7c2806d5162b12f0957990cb3 Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Wed, 17 Jul 2019 09:48:39 -0700
-Subject: [PATCH] Backport of fix for Bug#4372 to the 1.3.6 branch.
-
----
- NEWS | 1 +
- contrib/mod_copy.c | 36 +++++++++++++++++++++++++++++++++---
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
---- a/contrib/mod_copy.c
-+++ b/contrib/mod_copy.c
-@@ -1,7 +1,7 @@
- /*
- * ProFTPD: mod_copy -- a module supporting copying of files on the server
- * without transferring the data to the client and back
-- * Copyright (c) 2009-2016 TJ Saunders
-+ * Copyright (c) 2009-2019 TJ Saunders
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
-@@ -657,7 +657,7 @@ MODRET copy_copy(cmd_rec *cmd) {
- MODRET copy_cpfr(cmd_rec *cmd) {
- register unsigned int i;
- int res;
-- char *path = "";
-+ char *cmd_name, *path = "";
- unsigned char *authenticated = NULL;
-
- if (copy_engine == FALSE) {
-@@ -705,6 +705,21 @@ MODRET copy_cpfr(cmd_rec *cmd) {
- path = pstrcat(cmd->tmp_pool, path, *path ? " " : "", decoded_path, NULL);
- }
-
-+ cmd_name = cmd->argv[0];
-+ pr_cmd_set_name(cmd, "SITE_CPFR");
-+ if (!dir_check(cmd->tmp_pool, cmd, G_READ, path, NULL)) {
-+ int xerrno = EPERM;
-+
-+ pr_cmd_set_name(cmd, cmd_name);
-+ pr_response_add_err(R_550, "%s: %s", (char *) cmd->argv[3],
-+ strerror(xerrno));
-+
-+ pr_cmd_set_errno(cmd, xerrno);
-+ errno = xerrno;
-+ return PR_ERROR(cmd);
-+ }
-+ pr_cmd_set_name(cmd, cmd_name);
-+
- res = pr_filter_allow_path(CURRENT_CONF, path);
- switch (res) {
- case 0:
-@@ -758,6 +773,7 @@ MODRET copy_cpfr(cmd_rec *cmd) {
- MODRET copy_cpto(cmd_rec *cmd) {
- register unsigned int i;
- const char *from, *to = "";
-+ char *cmd_name;
- unsigned char *authenticated = NULL;
-
- if (copy_engine == FALSE) {
-@@ -816,6 +832,20 @@ MODRET copy_cpto(cmd_rec *cmd) {
-
- to = dir_canonical_vpath(cmd->tmp_pool, to);
-
-+ cmd_name = cmd->argv[0];
-+ pr_cmd_set_name(cmd, "SITE_CPTO");
-+ if (!dir_check(cmd->tmp_pool, cmd, G_WRITE, to, NULL)) {
-+ int xerrno = EPERM;
-+
-+ pr_cmd_set_name(cmd, cmd_name);
-+ pr_response_add_err(R_550, "%s: %s", to, strerror(xerrno));
-+
-+ pr_cmd_set_errno(cmd, xerrno);
-+ errno = xerrno;
-+ return PR_ERROR(cmd);
-+ }
-+ pr_cmd_set_name(cmd, cmd_name);
-+
- if (copy_paths(cmd->tmp_pool, from, to) < 0) {
- int xerrno = errno;
- const char *err_code = R_550;
-@@ -940,7 +970,7 @@ static conftable copy_conftab[] = {
-
- static cmdtable copy_cmdtab[] = {
- { CMD, C_SITE, G_WRITE, copy_copy, FALSE, FALSE, CL_MISC },
-- { CMD, C_SITE, G_DIRS, copy_cpfr, FALSE, FALSE, CL_MISC },
-+ { CMD, C_SITE, G_READ, copy_cpfr, FALSE, FALSE, CL_MISC },
- { CMD, C_SITE, G_WRITE, copy_cpto, FALSE, FALSE, CL_MISC },
- { POST_CMD, C_PASS, G_NONE, copy_post_pass, FALSE, FALSE },
- { LOG_CMD, C_SITE, G_NONE, copy_log_site, FALSE, FALSE },
---
-2.22.0
-
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch b/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch
deleted file mode 100644
index 4149a654059..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/692434
-https://github.com/proftpd/proftpd/issues/824
---- a/contrib/mod_sql_mysql.c
-+++ b/contrib/mod_sql_mysql.c
-@@ -132,6 +132,7 @@
- #include "../contrib/mod_sql.h"
-
- #include <mysql.h>
-+#include <stdbool.h>
-
- /* The my_make_scrambled_password{,_323} functions are not part of the public
- * MySQL API and are not declared in any of the MySQL header files. But the
-@@ -495,7 +495,11 @@ MODRET cmd_open(cmd_rec *cmd) {
- * http://dev.mysql.com/doc/refman/5.0/en/auto-reconnect.html
- */
- if (!(pr_sql_opts & SQL_OPT_NO_RECONNECT)) {
-+#if MYSQL_VERSION_ID >= 80000
-+ bool reconnect = true;
-+#else
- my_bool reconnect = TRUE;
-+#endif
- mysql_options(conn->mysql, MYSQL_OPT_RECONNECT, &reconnect);
- }
- #endif
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch b/net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch
deleted file mode 100644
index cca550405e1..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://bugs.gentoo.org/678490
-
-From 345aa19ee2a98a3612d9b64a49107461455031a0 Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Tue, 18 Jul 2017 23:00:22 -0700
-Subject: [PATCH] Bug#4310: Use of mod_facl as static module causes ProFTPD to
- die on SIGHUP/restart.
-
----
- modules/mod_facl.c | 35 +++++++++++++++++++++++++++++++----
- 1 file changed, 31 insertions(+), 4 deletions(-)
-
-diff --git a/modules/mod_facl.c b/modules/mod_facl.c
-index b3ac42b7b..258708cf5 100644
---- a/modules/mod_facl.c
-+++ b/modules/mod_facl.c
-@@ -1260,16 +1260,34 @@ MODRET set_faclengine(cmd_rec *cmd) {
- return PR_HANDLED(cmd);
- }
-
-+/* Event listeners
-+ */
-+
-+static void unmount_facl(void) {
-+ pr_fs_t *fs;
-+
-+ fs = pr_unmount_fs("/", "facl");
-+ if (fs != NULL) {
-+ destroy_pool(fs->fs_pool);
-+ fs->fs_pool = NULL;
-+ return;
-+ }
-+
-+ if (errno != ENOENT) {
-+ pr_log_debug(DEBUG0, MOD_FACL_VERSION
-+ ": error unmounting 'facl' FS: %s", strerror(errno));
-+ }
-+}
-+
- #if defined(PR_SHARED_MODULE) && \
- defined(PR_USE_FACL) && \
- defined(HAVE_POSIX_ACL)
- static void facl_mod_unload_ev(const void *event_data, void *user_data) {
- if (strcmp("mod_facl.c", (const char *) event_data) == 0) {
-+ pr_fs_t *fs;
-+
- pr_event_unregister(&facl_module, NULL, NULL);
-- if (pr_unregister_fs("/") < 0) {
-- pr_log_debug(DEBUG0, MOD_FACL_VERSION
-- ": error unregistering 'facl' FS: %s", strerror(errno));
-- }
-+ unmount_facl();
- }
- }
- #endif /* !PR_SHARED_MODULE */
-@@ -1303,6 +1321,14 @@ static void facl_postparse_ev(const void *event_data, void *user_data) {
- #endif /* PR_USE_FACL and HAVE_POSIX_ACL */
- }
-
-+static void facl_restart_ev(const void *event_data, void *user_data) {
-+ if (facl_engine == FALSE) {
-+ return;
-+ }
-+
-+ unmount_facl();
-+}
-+
- /* Initialization routines
- */
-
-@@ -1315,6 +1341,7 @@ static int facl_init(void) {
- # endif /* !PR_SHARED_MODULE */
- #endif /* PR_USE_FACL and HAVE_POSIX_ACL */
- pr_event_register(&facl_module, "core.postparse", facl_postparse_ev, NULL);
-+ pr_event_register(&facl_module, "core.restart", facl_restart_ev, NULL);
-
- return 0;
- }
---
-2.20.1
-
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6b-tls-crl-crash.patch b/net-ftp/proftpd/files/proftpd-1.3.6b-tls-crl-crash.patch
deleted file mode 100644
index 3cfd8186721..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6b-tls-crl-crash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://bugs.gentoo.org/701814
-https://github.com/proftpd/proftpd/commit/be8e1687819cb665359bd62b4c896ff4b1a09c3f
-
-From be8e1687819cb665359bd62b4c896ff4b1a09c3f Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Sun, 24 Nov 2019 14:03:54 -0800
-Subject: [PATCH] Issue #859, #861: Fix handling of CRL lookups by properly
- using issuer for lookups, and guarding against null pointers.
-
----
- contrib/mod_tls.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/contrib/mod_tls.c
-+++ b/contrib/mod_tls.c
-@@ -9066,10 +9066,10 @@ static int tls_verify_crl(int ok, X509_STORE_CTX *ctx) {
-
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
- !defined(HAVE_LIBRESSL)
-- crls = X509_STORE_CTX_get1_crls(store_ctx, subject);
-+ crls = X509_STORE_CTX_get1_crls(store_ctx, issuer);
- #elif OPENSSL_VERSION_NUMBER >= 0x10000000L && \
- !defined(HAVE_LIBRESSL)
-- crls = X509_STORE_get1_crls(store_ctx, subject);
-+ crls = X509_STORE_get1_crls(store_ctx, issuer);
- #else
- /* Your OpenSSL is before 1.0.0. You really need to upgrade. */
- crls = NULL;
-@@ -9088,6 +9088,9 @@ static int tls_verify_crl(int ok, X509_STORE_CTX *ctx) {
- ASN1_INTEGER *sn;
-
- revoked = sk_X509_REVOKED_value(X509_CRL_get_REVOKED(crl), j);
-+ if (revoked == NULL) {
-+ continue;
-+ }
- #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
- !defined(HAVE_LIBRESSL)
- sn = X509_REVOKED_get0_serialNumber(revoked);
---
-2.24.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/
@ 2020-06-17 17:49 Aaron Bauman
0 siblings, 0 replies; 6+ messages in thread
From: Aaron Bauman @ 2020-06-17 17:49 UTC (permalink / raw
To: gentoo-commits
commit: fd862667ade70bddaf4dff9cd313a990f47d4bba
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 17 14:16:49 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 17:49:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd862667
net-ftp/proftpd: remove unused patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16296
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../files/proftpd-1.3.6a-fix-libcheck.patch | 28 ----------------------
1 file changed, 28 deletions(-)
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch b/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch
deleted file mode 100644
index 93752c43e92..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix test suite detection.
-
-https://github.com/proftpd/proftpd/pull/839
-
-Reported-by: Toralf Förster
-Bug: https://bugs.gentoo.org/697782
---- a/configure.in
-+++ b/configure.in
-@@ -991,7 +991,7 @@ AC_ARG_ENABLE(tests,
- [enable unit tests (default=no)])
- ],
- [
-- if test "$enableval" != xno ; then
-+ if test x"$enableval" != xno ; then
- AC_CHECK_HEADERS(check.h)
-
- AC_CHECK_LIB(check, tcase_create,
---- a/configure
-+++ b/configure
-@@ -20639,7 +20639,7 @@ ENABLE_TESTS="\"\""
- # Check whether --enable-tests was given.
- if test "${enable_tests+set}" = set; then
- enableval=$enable_tests;
-- if test "$enableval" != xno ; then
-+ if test x"$enableval" != xno ; then
-
- for ac_header in check.h
- do
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/
@ 2020-07-27 18:17 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-07-27 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 34117b5bad608bd2630011008d281b9a5f4ae3f9
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Jul 27 12:07:17 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 18:17:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34117b5b
net-ftp/proftpd: remove unused patch
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16854
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch
deleted file mode 100644
index c3ee704c085..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/contrib/mod_quotatab.c
-+++ b/contrib/mod_quotatab.c
-@@ -50,6 +50,7 @@ typedef struct regtab_obj {
- module quotatab_module;
-
- /* Quota objects for the current session */
-+quota_deltas_t quotatab_deltas;
- static quota_table_t *limit_tab = NULL;
- static quota_limit_t sess_limit;
-
---- a/contrib/mod_quotatab.h
-+++ b/contrib/mod_quotatab.h
-@@ -188,7 +188,7 @@ typedef struct table_obj {
- #define QUOTATAB_TALLY_SRC 0x0002
-
- /* Quota objects for the current session. */
--quota_deltas_t quotatab_deltas;
-+extern quota_deltas_t quotatab_deltas;
-
- /* Function prototypes necessary for quotatab sub-modules */
- int quotatab_log(const char *, ...)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/
@ 2020-09-17 6:58 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2020-09-17 6:58 UTC (permalink / raw
To: gentoo-commits
commit: 9fc8c26fc287389eebef240d4c3418ea67821dc8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Sep 16 17:19:48 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 06:58:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc8c26f
net-ftp/proftpd: remove unused patches
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17568
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch | 38 -------------------
.../files/proftpd-1.3.7_rc4-str-sentinel.patch | 43 ----------------------
2 files changed, 81 deletions(-)
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch
deleted file mode 100644
index 2f50a28b87f..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/proftpd/proftpd/issues/1027
-https://bugs.gentoo.org/726460
-
-From 6ac1c727ddfd70080b38097e5484390ec84ef9be Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 31 May 2020 17:55:08 +0100
-Subject: [PATCH 1/2] contrib/mod_ldap.c: fix SIGSEGV in mod_ldap:ldap_mod_init
- ()
-
-The crash happens due to missing sentinel value in `pstrcat()`
-
-```c
- feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "",
- api_info.ldapai_extensions[i]);
-```
-
-The change is to add sentinel to `pstrcat()` call.
-
-Bug: https://github.com/proftpd/proftpd/issues/1027
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- contrib/mod_ldap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/contrib/mod_ldap.c
-+++ b/contrib/mod_ldap.c
-@@ -3218,7 +3218,7 @@ static int ldap_mod_init(void) {
-
- for (i = 0; api_info.ldapai_extensions[i]; i++) {
- feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "",
-- api_info.ldapai_extensions[i]);
-+ api_info.ldapai_extensions[i], NULL);
- ldap_memfree(api_info.ldapai_extensions[i]);
- }
-
---
-2.26.2
-
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch
deleted file mode 100644
index cf1e4e91d41..00000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/proftpd/proftpd/issues/1027
-https://bugs.gentoo.org/726460
-
-From c5f98b6e047e0e5ca841372d78d06c05fe8770c6 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 31 May 2020 18:03:29 +0100
-Subject: [PATCH 2/2] include/str.h: add __attribute__((sentinel)) to variadic
- concats
-
-`pstrcat()` needs to always have literal trailing `NULL`.
-
-Bug: https://github.com/proftpd/proftpd/issues/1027
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- include/str.h | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
---- a/include/str.h
-+++ b/include/str.h
-@@ -39,8 +39,18 @@ const char *quote_dir(pool *p, char *dir);
- char *sstrcat(char *, const char *, size_t);
- const char *sreplace(pool *, const char *, ...);
-
--char *pdircat(pool *, ...);
--char *pstrcat(pool *, ...);
-+char *pdircat(pool *, ...)
-+#ifdef __GNUC__
-+ __attribute__ ((sentinel));
-+#else
-+ ;
-+#endif
-+char *pstrcat(pool *, ...)
-+#ifdef __GNUC__
-+ __attribute__ ((sentinel));
-+#else
-+ ;
-+#endif
- char *pstrdup(pool *, const char *);
- char *pstrndup(pool *, const char *, size_t);
-
---
-2.26.2
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/
@ 2022-11-23 1:45 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-11-23 1:45 UTC (permalink / raw
To: gentoo-commits
commit: 43d6457f839fb1b1a3ef83c2c4214c3b9414613b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Nov 21 18:17:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 01:42:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d6457f
net-ftp/proftpd: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28369
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../proftpd/files/proftpd-1.3.7a-no-ncurses.patch | 269 ---------------------
.../proftpd/files/proftpd-1.3.7a-slibtool.patch | 34 ---
.../proftpd/files/proftpd-1.3.7a-tinfow-segv.patch | 197 ---------------
3 files changed, 500 deletions(-)
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch
deleted file mode 100644
index be18a9954590..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-https://github.com/proftpd/proftpd/commit/8fc570bc13e771d3ecafe53ab94ada0be2b6646a
-https://bugs.gentoo.org/777531
-
-From 8fc570bc13e771d3ecafe53ab94ada0be2b6646a Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Tue, 23 Mar 2021 19:50:49 -0700
-Subject: [PATCH] Issue #1207: Properly honor the `--disable-curses`,
- `--disable-ncurses` configure options.
-
----
- configure | 156 +++++++++++++++++++++++++++++++++++++++++++++++----
- configure.in | 39 +++++++++----
- 2 files changed, 172 insertions(+), 23 deletions(-)
-
-diff --git a/configure b/configure
-index 86cf1360e..59df363fa 100755
---- a/configure
-+++ b/configure
-@@ -22970,7 +22970,7 @@ $as_echo "#define SETGRENT_VOID 1" >>confdefs.h
- fi
-
-
--if test x"$ac_cv_header_curses_h" = xyes; then
-+if test x"$enable_curses" != xno ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5
- $as_echo_n "checking for initscr in -lcurses... " >&6; }
- if ${ac_cv_lib_curses_initscr+:} false; then :
-@@ -23013,12 +23013,154 @@ if test "x$ac_cv_lib_curses_initscr" = xyes; then :
- $as_echo "#define HAVE_LIBCURSES 1" >>confdefs.h
-
-
-+$as_echo "#define PR_USE_CURSES 1" >>confdefs.h
-+
-+
- fi
-
-+
-+ if test x"$enable_nls" = xyes ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfow" >&5
-+$as_echo_n "checking for halfdelay in -ltinfow... " >&6; }
-+if ${ac_cv_lib_tinfow_halfdelay+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltinfow $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char halfdelay ();
-+int
-+main ()
-+{
-+return halfdelay ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_tinfow_halfdelay=yes
-+else
-+ ac_cv_lib_tinfow_halfdelay=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_halfdelay" >&5
-+$as_echo "$ac_cv_lib_tinfow_halfdelay" >&6; }
-+if test "x$ac_cv_lib_tinfow_halfdelay" = xyes; then :
-+ UTILS_LIBS="$UTILS_LIBS -ltinfow"
-+
-+$as_echo "#define HAVE_LIBTINFOW 1" >>confdefs.h
-+
-+
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5
-+$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
-+if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltinfo $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char halfdelay ();
-+int
-+main ()
-+{
-+return halfdelay ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_tinfo_halfdelay=yes
-+else
-+ ac_cv_lib_tinfo_halfdelay=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" >&5
-+$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; }
-+if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then :
-+ UTILS_LIBS="$UTILS_LIBS -ltinfo"
-+
-+$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h
-+
-+
-+fi
-+
-+
-+fi
-+
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5
-+$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
-+if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltinfo $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char halfdelay ();
-+int
-+main ()
-+{
-+return halfdelay ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_tinfo_halfdelay=yes
-+else
-+ ac_cv_lib_tinfo_halfdelay=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" >&5
-+$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; }
-+if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then :
-+ UTILS_LIBS="$UTILS_LIBS -ltinfo"
-+
-+$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h
-+
-+
-+fi
-+
-+ fi
-+fi
-+
-+if test x"$enable_ncurses" != xno ; then
-+ pr_have_ncursesw="no"
-
--pr_have_ncursesw="no"
--if test x"$ac_cv_header_ncurses_h" = xyes; then
-
- if test x"$enable_nls" = xyes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncursesw" >&5
-@@ -23160,15 +23302,7 @@ $as_echo "#define HAVE_LIBNCURSES 1" >>confdefs.h
- fi
-
- fi
--fi
-
--if test x"$enable_curses" != xno ; then
--
--$as_echo "#define PR_USE_CURSES 1" >>confdefs.h
--
--fi
--
--if test x"$enable_ncurses" != xno ; then
-
- if test x"$pr_have_ncursesw" = xyes ; then
-
-diff --git a/configure.in b/configure.in
-index 4bd0f7c19..01ec7863e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2749,17 +2749,38 @@ fi
- dnl Custom-rolled macro for checking return type of setgrent(3)
- PR_FUNC_SETGRENT_VOID
-
--dnl Perform checks for curses/ncurses libraries only if the corresponding
--dnl headers have been found.
--if test x"$ac_cv_header_curses_h" = xyes; then
-+if test x"$enable_curses" != xno ; then
- AC_CHECK_LIB(curses, initscr,
- [ CURSES_LIBS="-lcurses"
- AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have curses])
-+ AC_DEFINE(PR_USE_CURSES, 1, [Define if using curses support])
- ])
-+
-+ dnl Check for the libtinfo library, which contains the stdscr symbol,
-+ dnl halfdelay curses function on some systems (e.g. Gentoo); see
-+ dnl Issue #1207. Note that on some systems, this may need to be libtinfow
-+ dnl instead.
-+ if test x"$enable_nls" = xyes ; then
-+ AC_CHECK_LIB(tinfow, halfdelay,
-+ [ UTILS_LIBS="$UTILS_LIBS -ltinfow"
-+ AC_DEFINE(HAVE_LIBTINFOW, 1, [Define if you have libtinfow])
-+ ],
-+ [ AC_CHECK_LIB(tinfo, halfdelay,
-+ [ UTILS_LIBS="$UTILS_LIBS -ltinfo"
-+ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo])
-+ ])
-+ ])
-+ else
-+ AC_CHECK_LIB(tinfo, halfdelay,
-+ [ UTILS_LIBS="$UTILS_LIBS -ltinfo"
-+ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo])
-+ ])
-+ fi
- fi
-
--pr_have_ncursesw="no"
--if test x"$ac_cv_header_ncurses_h" = xyes; then
-+if test x"$enable_ncurses" != xno ; then
-+ pr_have_ncursesw="no"
-+
- dnl If NLS support has been enabled, then check for the locale-sensitive
- dnl libncursesw library first; if not found, or if no NLS support, then
- dnl check for libncurses.
-@@ -2776,19 +2797,13 @@ if test x"$ac_cv_header_ncurses_h" = xyes; then
- ])
- ])
-
-- else
-+ else
- AC_CHECK_LIB(ncurses, initscr,
- [ CURSES_LIBS="-lncurses"
- AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have ncurses])
- ])
- fi
--fi
--
--if test x"$enable_curses" != xno ; then
-- AC_DEFINE(PR_USE_CURSES, 1, [Define if using curses support])
--fi
-
--if test x"$enable_ncurses" != xno ; then
- dnl Check for the libtinfo library, which contains the halfdelay() curses
- dnl function on some systems (e.g. OpenSuSE); see Bug#3718. Note that on
- dnl some systems, this may need to be libtinfow instead; see Issue #1174.
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch
deleted file mode 100644
index 35676777da05..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/778332
-https://github.com/proftpd/proftpd/commit/4ffe04158840130e023ed3d3e558b8d70e28e20e
-
-From 2a15ce409f70c67ba9b1e09de67c3fca0b38eff8 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Sun, 21 Mar 2021 12:38:52 -0700
-Subject: [PATCH] build: Fix linking the static libsupp.a library.
-
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/configure.in
-+++ b/configure.in
-@@ -88,7 +88,7 @@ if test $ac_cv_prog_gcc = no -a "$OSTYPE" = "-DHPUX10"; then
- CFLAGS="$CFLAGS -Ae"
- fi
-
--LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS"
-+LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS"
-
- # AIX has issues with the -rdynamic linker flag. How many different AIX
- # versions should we support here?
---- a/configure
-+++ b/configure
-@@ -14932,7 +14944,7 @@ if test $ac_cv_c_compiler_gnu = no -a "$OSTYPE" = "-DHPUX10"; then
- CFLAGS="$CFLAGS -Ae"
- fi
-
--LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS"
-+LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS"
-
- # AIX has issues with the -rdynamic linker flag. How many different AIX
- # versions should we support here?
diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch
deleted file mode 100644
index b904c5dbe5ae..000000000000
--- a/net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-https://github.com/proftpd/proftpd/commit/ff413723328da726d1042c7d2067d088765eca57
-https://bugs.gentoo.org/777432
-
-From ff413723328da726d1042c7d2067d088765eca57 Mon Sep 17 00:00:00 2001
-From: TJ Saunders <tj@castaglia.org>
-Date: Sun, 14 Mar 2021 10:08:02 -0700
-Subject: [PATCH] Issue #1174: Check for the libtinfow library when ncursesw is
- being used.
-
-On some systems, such as Gentoo, linking against libtinfo with libncursesw,
-rather than libtinfow, leads to segfaults.
----
- config.h.in | 3 ++
- configure | 98 +++++++++++++++++++++++++++++++++++++++++++++++++---
- configure.in | 24 +++++++++----
- 3 files changed, 114 insertions(+), 11 deletions(-)
-
-diff --git a/config.h.in b/config.h.in
-index 1ba33caf9..775b7a294 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -966,6 +966,9 @@
- /* Define if you have the libtinfo library (-ltinfo). */
- #undef HAVE_LIBTINFO
-
-+/* Define if you have the libtinfow library (-ltinfow). */
-+#undef HAVE_LIBTINFOW
-+
- /* Define if you have the addrinfo struct. */
- #undef HAVE_STRUCT_ADDRINFO
-
-diff --git a/configure b/configure
-index 64080483f..86cf1360e 100755
---- a/configure
-+++ b/configure
-@@ -23169,18 +23169,106 @@ $as_echo "#define PR_USE_CURSES 1" >>confdefs.h
- fi
-
- if test x"$enable_ncurses" != xno ; then
-+
- if test x"$pr_have_ncursesw" = xyes ; then
-
- $as_echo "#define PR_USE_NCURSESW 1" >>confdefs.h
-
-- else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfow" >&5
-+$as_echo_n "checking for halfdelay in -ltinfow... " >&6; }
-+if ${ac_cv_lib_tinfow_halfdelay+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltinfow $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
--$as_echo "#define PR_USE_NCURSES 1" >>confdefs.h
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char halfdelay ();
-+int
-+main ()
-+{
-+return halfdelay ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_tinfow_halfdelay=yes
-+else
-+ ac_cv_lib_tinfow_halfdelay=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_halfdelay" >&5
-+$as_echo "$ac_cv_lib_tinfow_halfdelay" >&6; }
-+if test "x$ac_cv_lib_tinfow_halfdelay" = xyes; then :
-+ UTILS_LIBS="$UTILS_LIBS -ltinfow"
-
-- fi
-+$as_echo "#define HAVE_LIBTINFOW 1" >>confdefs.h
-+
-+
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5
-+$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
-+if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltinfo $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char halfdelay ();
-+int
-+main ()
-+{
-+return halfdelay ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_tinfo_halfdelay=yes
-+else
-+ ac_cv_lib_tinfo_halfdelay=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" >&5
-+$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; }
-+if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then :
-+ UTILS_LIBS="$UTILS_LIBS -ltinfo"
-+
-+$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5
-+
-+fi
-+
-+
-+fi
-+
-+ else
-+
-+$as_echo "#define PR_USE_NCURSES 1" >>confdefs.h
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5
- $as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
- if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
- $as_echo_n "(cached) " >&6
-@@ -23224,6 +23312,8 @@ $as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h
-
- fi
-
-+ fi
-+fi
-
- if test x"$enable_nonblocking_log_open" != xno; then
-
-diff --git a/configure.in b/configure.in
-index 59793a00c..4bd0f7c19 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2789,20 +2789,30 @@ if test x"$enable_curses" != xno ; then
- fi
-
- if test x"$enable_ncurses" != xno ; then
-+ dnl Check for the libtinfo library, which contains the halfdelay() curses
-+ dnl function on some systems (e.g. OpenSuSE); see Bug#3718. Note that on
-+ dnl some systems, this may need to be libtinfow instead; see Issue #1174.
-+
- if test x"$pr_have_ncursesw" = xyes ; then
- AC_DEFINE(PR_USE_NCURSESW, 1, [Define if using ncursesw support])
-+ AC_CHECK_LIB(tinfow, halfdelay,
-+ [ UTILS_LIBS="$UTILS_LIBS -ltinfow"
-+ AC_DEFINE(HAVE_LIBTINFOW, 1, [Define if you have libtinfow])
-+ ],
-+ [ AC_CHECK_LIB(tinfo, halfdelay,
-+ [ UTILS_LIBS="$UTILS_LIBS -ltinfo"
-+ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo])
-+ ])
-+ ])
- else
- AC_DEFINE(PR_USE_NCURSES, 1, [Define if using ncurses support])
-+ AC_CHECK_LIB(tinfo, halfdelay,
-+ [ UTILS_LIBS="$UTILS_LIBS -ltinfo"
-+ AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo])
-+ ])
- fi
- fi
-
--dnl Check for the libtinfo library, which contains the halfdelay() curses
--dnl function on some systems (e.g. OpenSuSE); see Bug#3718.
--AC_CHECK_LIB(tinfo, halfdelay,
-- [ UTILS_LIBS="$UTILS_LIBS -ltinfo"
-- AC_DEFINE(HAVE_LIBTINFO, 1, [Define if you have libtinfo])
-- ])
--
- if test x"$enable_nonblocking_log_open" != xno; then
- AC_DEFINE(PR_USE_NONBLOCKING_LOG_OPEN, 1, [Define if using nonblocking open of log files])
- fi
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-11-23 1:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-27 18:17 [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2022-11-23 1:45 Sam James
2020-09-17 6:58 Sergei Trofimovich
2020-06-17 17:49 Aaron Bauman
2020-04-18 21:31 Sergei Trofimovich
2017-10-17 17:52 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox