commit: d0dd978818a93e1253cd70ba569898a4cc599127 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Feb 18 03:37:44 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Feb 18 03:38:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0dd9788
net-nds/openldap: drop more obsolete patches Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/openldap-2.6.1-fix-missing-mapping.patch | 15 -- .../openldap/files/openldap-2.6.4-clang16.patch | 234 --------------------- .../openldap/files/openldap-2.6.4-libressl.patch | 38 ---- .../openldap-2.6.6-fix-type-mismatch-lloadd.patch | 42 ---- net-nds/openldap/openldap-2.6.8-r1.ebuild | 2 - net-nds/openldap/openldap-2.6.9.ebuild | 1 - 6 files changed, 332 deletions(-) diff --git a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch b/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch deleted file mode 100644 index 1d6595566c73..000000000000 --- a/net-nds/openldap/files/openldap-2.6.1-fix-missing-mapping.patch +++ /dev/null @@ -1,15 +0,0 @@ -From 59e013602d7b1aa0d7da79d65367c9ec391b96f8 Mon Sep 17 00:00:00 2001 -From: Simon Pichugin <spich...@redhat.com> -Date: Wed, 3 Nov 2021 19:03:40 -0700 -Subject: [PATCH] Fix missing mapping - ---- a/libraries/liblber/lber.map -+++ b/libraries/liblber/lber.map -@@ -121,6 +121,7 @@ OPENLDAP_2.200 - ber_sockbuf_io_fd; - ber_sockbuf_io_readahead; - ber_sockbuf_io_tcp; -+ ber_sockbuf_io_udp; - ber_sockbuf_remove_io; - ber_sos_dump; - ber_start; diff --git a/net-nds/openldap/files/openldap-2.6.4-clang16.patch b/net-nds/openldap/files/openldap-2.6.4-clang16.patch deleted file mode 100644 index bcbdf0b5819e..000000000000 --- a/net-nds/openldap/files/openldap-2.6.4-clang16.patch +++ /dev/null @@ -1,234 +0,0 @@ -https://git.openldap.org/openldap/openldap/-/merge_requests/605 - -From 83e2db9bf9fc2530a0ea6ca538a7732f6ad9de0e Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Thu, 9 Feb 2023 23:17:53 +0000 -Subject: [PATCH 1/3] build: fix compatibility with stricter C99 compilers - -Fix the following warnings: -- -Wimplicit-int (fatal with Clang 16) -- -Wimplicit-function-declaration (fatal with Clang 16) -- -Wincompatible-function-pointer-types (fatal with Clang 16) -- -Wint-conversion (fatal with Clang 15) -- Old style prototypes (K&R, removed from C23) - -These warnings-now-error led to misconfigurations and failure to build -OpenLDAP, as the tests used during configure caused the wrong results -to be emitted. - -For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], -or the (new) c-std-porting mailing list [3]. - -[0] https://lwn.net/Articles/913505/ -[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 -[2] https://wiki.gentoo.org/wiki/Modern_C_porting -[3] hosted at lists.linux.dev. - -Bug: https://bugs.gentoo.org/871288 -Signed-off-by: Sam James <s...@gentoo.org> ---- a/build/openldap.m4 -+++ b/build/openldap.m4 -@@ -154,6 +154,7 @@ fi - if test $ol_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <ctype.h> -+#include <stdlib.h> - #ifndef HAVE_EBCDIC - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -360,9 +361,7 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ - AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], - [AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES - --int main(argc, argv) -- int argc; -- char **argv; -+int main(int argc, char **argv) - { - OL_PTHREAD_TEST_FUNCTION - } -@@ -484,7 +483,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[ - #include <sys/types.h> - #include <regex.h> - static char *pattern, *string; --main() -+int main(void) - { - int rc; - regex_t re; -@@ -511,7 +510,8 @@ AC_DEFUN([OL_C_UPPER_LOWER], - [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #include <ctype.h> --main() -+#include <stdlib.h> -+int main(void) - { - if ('C' == toupper('C')) - exit(0); -@@ -569,7 +569,7 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R], - ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no]) - else - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -- main() { -+ int main(void) { - char buf[100]; - buf[0] = 0; - strerror_r( 1, buf, sizeof buf ); ---- a/configure.ac -+++ b/configure.ac -@@ -1017,7 +1017,11 @@ dnl ---------------------------------------------------------------- - AC_CHECK_HEADERS( sys/epoll.h ) - if test "${ac_cv_header_sys_epoll_h}" = yes; then - AC_MSG_CHECKING(for epoll system call) -- AC_RUN_IFELSE([AC_LANG_SOURCE([[int main(int argc, char **argv) -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h> -+#ifdef HAVE_SYS_POLL_H -+#include <sys/epoll.h> -+#endif -+int main(int argc, char **argv) - { - int epfd = epoll_create(256); - exit (epfd == -1 ? 1 : 0); -@@ -1479,10 +1483,8 @@ pthread_rwlock_t rwlock; - dnl save the flags - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <pthread.h> --#ifndef NULL --#define NULL (void*)0 --#endif --]], [[pthread_detach(NULL);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) -+pthread_t thread; -+]], [[pthread_detach(thread);]])],[ol_cv_func_pthread_detach=yes],[ol_cv_func_pthread_detach=no]) - ]) - - if test $ol_cv_func_pthread_detach = no ; then -@@ -1537,6 +1539,9 @@ dnl esac - AC_CACHE_CHECK([if select yields when using pthreads], - ol_cv_pthread_select_yields,[ - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+#define _XOPEN_SOURCE 500 /* For pthread_setconcurrency() on glibc */ -+#include <stdlib.h> -+#include <stdio.h> - #include <sys/types.h> - #include <sys/time.h> - #include <unistd.h> -@@ -1547,8 +1552,7 @@ dnl esac - - static int fildes[2]; - --static void *task(p) -- void *p; -+static void *task(void *p) - { - int i; - struct timeval tv; -@@ -1572,9 +1576,7 @@ static void *task(p) - exit(0); /* if we exit here, the select blocked the whole process */ - } - --int main(argc, argv) -- int argc; -- char **argv; -+int main(int argc, char **argv) - { - pthread_t t; - --- -GitLab - - -From 853d613f39ae9e8d7dad4492076959c2d80e38c1 Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Thu, 9 Feb 2023 23:20:32 +0000 -Subject: [PATCH 2/3] contrib: fix old-style K&R declarations - -Removed in C23. - -For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], -or the (new) c-std-porting mailing list [3]. - -[0] https://lwn.net/Articles/913505/ -[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 -[2] https://wiki.gentoo.org/wiki/Modern_C_porting -[3] hosted at lists.linux.dev. - -Signed-off-by: Sam James <s...@gentoo.org> ---- a/contrib/ldaptcl/tclAppInit.c -+++ b/contrib/ldaptcl/tclAppInit.c -@@ -45,9 +45,7 @@ EXTERN int Tcltest_Init _ANSI_ARGS_((Tcl_Interp *interp)); - */ - - int --main(argc, argv) -- int argc; /* Number of command-line arguments. */ -- char **argv; /* Values of command-line arguments. */ -+main(int argc, char **argv) - { - #ifdef USE_TCLX - TclX_Main(argc, argv, Tcl_AppInit); ---- a/contrib/ldaptcl/tkAppInit.c -+++ b/contrib/ldaptcl/tkAppInit.c -@@ -37,16 +37,9 @@ int (*tclDummyMathPtr)() = matherr; - * This is the main program for the application. - *----------------------------------------------------------------------------- - */ --#ifdef __cplusplus - int - main (int argc, - char **argv) --#else --int --main (argc, argv) -- int argc; -- char **argv; --#endif - { - #ifdef USE_TCLX - TkX_Main(argc, argv, Tcl_AppInit); -@@ -68,14 +61,8 @@ main (argc, argv) - * interp->result if an error occurs. - *----------------------------------------------------------------------------- - */ --#ifdef __cplusplus - int - Tcl_AppInit (Tcl_Interp *interp) --#else --int --Tcl_AppInit (interp) -- Tcl_Interp *interp; --#endif - { - if (Tcl_Init (interp) == TCL_ERROR) { - return TCL_ERROR; --- -GitLab - - -From b4b3d026461b16f4f462e70225a5a0493647f0c8 Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Thu, 9 Feb 2023 23:20:51 +0000 -Subject: [PATCH 3/3] servers: fix -Wstrict-prototypes - -For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], -or the (new) c-std-porting mailing list [3]. - -[0] https://lwn.net/Articles/913505/ -[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 -[2] https://wiki.gentoo.org/wiki/Modern_C_porting -[3] hosted at lists.linux.dev. - -Signed-off-by: Sam James <s...@gentoo.org> ---- a/servers/slapd/syslog.c -+++ b/servers/slapd/syslog.c -@@ -209,7 +209,7 @@ openlog(const char *ident, int logstat, int logfac) - } - - void --closelog() -+closelog(void) - { - (void)close(LogFile); - LogFile = -1; --- -GitLab diff --git a/net-nds/openldap/files/openldap-2.6.4-libressl.patch b/net-nds/openldap/files/openldap-2.6.4-libressl.patch deleted file mode 100644 index 48a8a43e731a..000000000000 --- a/net-nds/openldap/files/openldap-2.6.4-libressl.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/903001 -https://bugs.openldap.org/show_bug.cgi?id=10039 -https://git.openldap.org/openldap/openldap/-/merge_requests/613 -https://git.openldap.org/openldap/openldap/-/commit/cb73e60a49f85bf5207b2fd0f557013be29ac072 - -From cb73e60a49f85bf5207b2fd0f557013be29ac072 Mon Sep 17 00:00:00 2001 -From: orbea <or...@riseup.net> -Date: Wed, 12 Apr 2023 12:55:46 -0700 -Subject: [PATCH] ITS#10039 Test for SSL_CTX_set_ciphersuites() - -When configuring OpenLDAP using --with-tls=openssl with LibreSSL the -configure will fail to detect SSL_export_keyring_material_early() since -LibreSSL doesn't support this function yet. However OpenLDAP doesn't -actually use this function and only checks for it to ensure a modern -OpenSSL API is used. This can be easily solved by checking for an -equivalent modern OpenSSL function which both LibreSSL and OpenSSL both -support such as SSL_CTX_set_ciphersuites(). Doing this allows the build -and tests to succeed with modern LibreSSL versions. This was tested with -LibreSSL >= 3.6. - -Bug: https://bugs.openldap.org/show_bug.cgi?id=10039 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 2cf28ef346..c4e2a905e2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1243,7 +1243,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then - [#endif]])], - , [AC_MSG_FAILURE([OpenSSL 1.1.1 or newer required])]) - -- AC_CHECK_LIB(ssl, SSL_export_keying_material_early, -+ AC_CHECK_LIB(ssl, SSL_CTX_set_ciphersuites, - [have_openssl=yes], [have_openssl=no], - [-lcrypto]) - diff --git a/net-nds/openldap/files/openldap-2.6.6-fix-type-mismatch-lloadd.patch b/net-nds/openldap/files/openldap-2.6.6-fix-type-mismatch-lloadd.patch deleted file mode 100644 index d2335bce9bfd..000000000000 --- a/net-nds/openldap/files/openldap-2.6.6-fix-type-mismatch-lloadd.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://git.openldap.org/openldap/openldap/-/commit/de89b06b031537fb2d14a532d79f7b0772fc1700 -From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <on...@mistotebe.net> -Date: Thu, 27 Jul 2023 11:19:20 +0100 -Subject: [PATCH] ITS#10074 Fix type mismatches in lloadd - ---- a/servers/lloadd/libevent_support.c -+++ b/servers/lloadd/libevent_support.c -@@ -131,6 +131,12 @@ lload_libevent_cond_timedwait( - return ldap_pvt_thread_cond_wait( cond, mutex ); - } - -+unsigned long -+lload_libevent_thread_self( void ) -+{ -+ return (unsigned long)ldap_pvt_thread_self(); -+} -+ - int - lload_libevent_init( void ) - { -@@ -152,7 +158,7 @@ lload_libevent_init( void ) - - evthread_set_lock_callbacks( &cbs ); - evthread_set_condition_callbacks( &cond_cbs ); -- evthread_set_id_callback( ldap_pvt_thread_self ); -+ evthread_set_id_callback( lload_libevent_thread_self ); - return 0; - } - ---- a/servers/lloadd/module_init.c -+++ b/servers/lloadd/module_init.c -@@ -151,7 +151,6 @@ lload_back_initialize( BackendInfo *bi ) - { - bi->bi_flags = SLAP_BFLAG_STANDALONE; - bi->bi_open = lload_back_open; -- bi->bi_config = config_generic_wrapper; - bi->bi_pause = lload_pause_cb; - bi->bi_unpause = lload_unpause_cb; - bi->bi_close = lload_back_close; --- -GitLab - diff --git a/net-nds/openldap/openldap-2.6.8-r1.ebuild b/net-nds/openldap/openldap-2.6.8-r1.ebuild index 5013213b7f8a..684b983b7614 100644 --- a/net-nds/openldap/openldap-2.6.8-r1.ebuild +++ b/net-nds/openldap/openldap-2.6.8-r1.ebuild @@ -148,9 +148,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.1-cloak.patch "${FILESDIR}"/${PN}-2.6.1-flags.patch "${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.v2.patch - #"${FILESDIR}"/${PN}-2.6.6-fix-type-mismatch-lloadd.patch "${FILESDIR}"/${PN}-2.6.x-gnutls-pointer-error.patch - #"${FILESDIR}"/${PN}-2.6.x-slapd-pointer-types.patch # included upstream ) openldap_filecount() { diff --git a/net-nds/openldap/openldap-2.6.9.ebuild b/net-nds/openldap/openldap-2.6.9.ebuild index 02070c6b1974..7a273c10f7f3 100644 --- a/net-nds/openldap/openldap-2.6.9.ebuild +++ b/net-nds/openldap/openldap-2.6.9.ebuild @@ -151,7 +151,6 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.1-cloak.patch "${FILESDIR}"/${PN}-2.6.1-flags.patch "${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.v2.patch - #"${FILESDIR}"/${PN}-2.6.6-fix-type-mismatch-lloadd.patch ) openldap_filecount() {
