mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-16 23:19:31 +00:00
bb90632ae7the module 'radius' have an outdated built-in-md5 that fails with modern compilers. force md5-openssl to solve it. deps : only the module 'rewrite' needs idn and the two libidn/libidn2 are supported add zlib for the modules 'deflate' and 'sftp' the module 'kerberos' requires libcom_err from e2fsprogs sodium is only used with sql's modules clamav is only a runtime dep remove a no-op sed for gss, configure.ac was renew since patches : fix C23 unprototyped functions (PR merged) make conditionnal an old cipher Closes: https://bugs.gentoo.org/880481 Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/43785 Closes: https://github.com/gentoo/gentoo/pull/43785 Signed-off-by: Sam James <sam@gentoo.org>
118 lines
4.3 KiB
Diff
118 lines
4.3 KiB
Diff
PR merged https://github.com/proftpd/proftpd/pull/1979.patch
|
|
fix c23
|
|
see https://bugs.gentoo.org/880481 for a part
|
|
--- a/lib/pr_fnmatch.c
|
|
+++ b/lib/pr_fnmatch.c
|
|
@@ -355,10 +355,7 @@ is_char_class (const wchar_t *wcs)
|
|
|
|
|
|
int
|
|
-pr_fnmatch (pattern, string, flags)
|
|
- const char *pattern;
|
|
- const char *string;
|
|
- int flags;
|
|
+pr_fnmatch (const char *pattern, const char *string, int flags)
|
|
{
|
|
# if HANDLE_MULTIBYTE
|
|
if (__builtin_expect (MB_CUR_MAX, 1) != 1)
|
|
--- a/lib/pr_fnmatch_loop.c
|
|
+++ b/lib/pr_fnmatch_loop.c
|
|
@@ -62,13 +62,8 @@ __mempcpy (void *dest, const void *src, size_t n)
|
|
|
|
static int
|
|
internal_function
|
|
-FCT (pattern, string, string_end, no_leading_period, flags, ends)
|
|
- const CHAR *pattern;
|
|
- const CHAR *string;
|
|
- const CHAR *string_end;
|
|
- int no_leading_period;
|
|
- int flags;
|
|
- struct STRUCT *ends;
|
|
+FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|
+ int no_leading_period, int flags, struct STRUCT *ends)
|
|
{
|
|
register const CHAR *p = pattern, *n = string;
|
|
register UCHAR c;
|
|
--- a/src/memcache.c
|
|
+++ b/src/memcache.c
|
|
@@ -325,7 +325,7 @@ static int mcache_ping_servers(pr_memcache_t *mcache) {
|
|
|
|
alive_server_list = NULL;
|
|
for (i = 0; i < server_count; i++) {
|
|
- memcached_server_instance_st server;
|
|
+ const memcached_instance_st *server;
|
|
|
|
server = memcached_server_instance_by_position(clone, i);
|
|
|
|
@@ -448,7 +448,7 @@ static int mcache_stat_servers(pr_memcache_t *mcache) {
|
|
case MEMCACHED_SOME_ERRORS:
|
|
case MEMCACHED_SERVER_MARKED_DEAD:
|
|
case MEMCACHED_CONNECTION_FAILURE: {
|
|
- memcached_server_instance_st server;
|
|
+ const memcached_instance_st *server;
|
|
|
|
server = memcached_server_get_last_disconnect(mcache->mc);
|
|
if (server != NULL) {
|
|
@@ -988,7 +988,7 @@ int pr_memcache_kadd(pr_memcache_t *mcache, module *m, const char *key,
|
|
|
|
case MEMCACHED_SERVER_MARKED_DEAD:
|
|
case MEMCACHED_CONNECTION_FAILURE: {
|
|
- memcached_server_instance_st server;
|
|
+ const memcached_instance_st *server;
|
|
|
|
server = memcached_server_get_last_disconnect(mcache->mc);
|
|
if (server != NULL) {
|
|
@@ -1058,7 +1058,7 @@ int pr_memcache_kdecr(pr_memcache_t *mcache, module *m, const char *key,
|
|
|
|
case MEMCACHED_SERVER_MARKED_DEAD:
|
|
case MEMCACHED_CONNECTION_FAILURE: {
|
|
- memcached_server_instance_st server;
|
|
+ const memcached_instance_st *server;
|
|
|
|
server = memcached_server_get_last_disconnect(mcache->mc);
|
|
if (server != NULL) {
|
|
@@ -1131,7 +1131,7 @@ void *pr_memcache_kget(pr_memcache_t *mcache, module *m, const char *key,
|
|
|
|
case MEMCACHED_SERVER_MARKED_DEAD:
|
|
case MEMCACHED_CONNECTION_FAILURE: {
|
|
- memcached_server_instance_st server;
|
|
+ const memcached_instance_st *server;
|
|
|
|
server = memcached_server_get_last_disconnect(mcache->mc);
|
|
if (server != NULL) {
|
|
@@ -1213,7 +1213,7 @@ char *pr_memcache_kget_str(pr_memcache_t *mcache, module *m, const char *key,
|
|
|
|
case MEMCACHED_SERVER_MARKED_DEAD:
|
|
case MEMCACHED_CONNECTION_FAILURE: {
|
|
- memcached_server_instance_st server;
|
|
+ const memcached_instance_st *server;
|
|
|
|
server = memcached_server_get_last_disconnect(mcache->mc);
|
|
if (server != NULL) {
|
|
@@ -1303,7 +1303,7 @@ int pr_memcache_kincr(pr_memcache_t *mcache, module *m, const char *key,
|
|
|
|
case MEMCACHED_SERVER_MARKED_DEAD:
|
|
case MEMCACHED_CONNECTION_FAILURE: {
|
|
- memcached_server_instance_st server;
|
|
+ const memcached_instance_st *server;
|
|
|
|
server = memcached_server_get_last_disconnect(mcache->mc);
|
|
if (server != NULL) {
|
|
@@ -1368,7 +1368,7 @@ int pr_memcache_kremove(pr_memcache_t *mcache, module *m, const char *key,
|
|
|
|
case MEMCACHED_SERVER_MARKED_DEAD:
|
|
case MEMCACHED_CONNECTION_FAILURE: {
|
|
- memcached_server_instance_st server;
|
|
+ const memcached_instance_st *server;
|
|
|
|
server = memcached_server_get_last_disconnect(mcache->mc);
|
|
if (server != NULL) {
|
|
@@ -1437,7 +1437,7 @@ int pr_memcache_kset(pr_memcache_t *mcache, module *m, const char *key,
|
|
|
|
case MEMCACHED_SERVER_MARKED_DEAD:
|
|
case MEMCACHED_CONNECTION_FAILURE: {
|
|
- memcached_server_instance_st server;
|
|
+ const memcached_instance_st *server;
|
|
|
|
server = memcached_server_get_last_disconnect(mcache->mc);
|
|
if (server != NULL) {
|