diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2017-03-26 22:29:22 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-03-26 22:29:33 +0100 |
| commit | fba48bedb74f80376bb3a6761a052244350f4fd8 (patch) | |
| tree | 0e7d48079b07866bedf7ffffcea5eb4d5a5769fe /net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch | |
| parent | x11-themes/vertex-theme: version bump 20160329 → 20170128{,-r1} (diff) | |
| download | gentoo-fba48bedb74f80376bb3a6761a052244350f4fd8.tar.gz gentoo-fba48bedb74f80376bb3a6761a052244350f4fd8.tar.bz2 gentoo-fba48bedb74f80376bb3a6761a052244350f4fd8.zip | |
net-ftp/proftpd: bump up to 1.3.6_rc4
In https://bugs.gentoo.org/612664 Yuri Mamaev reports
a crash in mod_sftp.
There was a few fixes upstream since.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch')
| -rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch new file mode 100644 index 000000000000..2e90be254cb6 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch @@ -0,0 +1,29 @@ +diff --git a/mod_msg.c b/mod_msg.c +index 70bce69..4ce6bd7 100644 +--- a/mod_msg.c ++++ b/mod_msg.c +@@ -52,10 +52,14 @@ extern pid_t mpid; + + module msg_module; + +-#ifndef USE_CTRLS ++#ifndef PR_USE_CTRLS + # error "mod_msg requires Controls support (--enable-ctrls)" + #endif /* USE_CTRLS */ + ++#define pr_scoreboard_read_entry pr_scoreboard_entry_read ++#define DECLINED PR_DECLINED ++#define HANDLED PR_HANDLED ++ + static ctrls_acttab_t msg_acttab[]; + + static int msg_engine = FALSE; +@@ -709,7 +713,7 @@ static int msg_handle_msg(pr_ctrls_t *ctrl, int reqargc, char **reqargv) { + if (msg_send_msg(score->sce_pid, msgstr) < 0) { + msg_errno = errno; + (void) pr_log_writefile(msg_logfd, MOD_MSG_VERSION, +- "error sending message to all (pid %u): %s", reqargv[1], ++ "error sending message to all (pid %u): %s", + score->sce_pid, strerror(errno)); + + } else |