Attachment 245385 Details for Bug 274220 – Mechanically s/openldap24/openldap26/

[patch] Mechanically s/openldap24/openldap26/

ldap.patch (text/plain), 19.28 KB, created by fullermd on 2023-10-02 16:18:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fullermd

Created: 2023-10-02 16:18:10 UTC

Size: 19.28 KB

patch

obsolete

>From 41a5b699e83e4b0cfef6b7ac6722f00a6513add0 Mon Sep 17 00:00:00 2001
>From: "Matthew D. Fuller" <fullermd@over-yonder.net>
>Date: Mon, 2 Oct 2023 11:12:10 -0500
>Subject: [PATCH] Mechanically convert openldap24 reference to openldap26.
>
>2.4 was removed a month ago, and the default version was switched to 2.6
>over a year ago anyway.
>---
> .../content/en/articles/ldap-auth/_index.adoc | 10 +++++-----
> .../content/en/articles/ldap-auth/_index.po   | 10 +++++-----
> .../content/es/articles/ldap-auth/_index.adoc |  8 ++++----
> .../content/es/articles/ldap-auth/_index.po   | 20 +++++++++----------
> .../pt-br/articles/ldap-auth/_index.adoc      |  8 ++++----
> .../pt-br/articles/ldap-auth/_index.po        | 20 +++++++++----------
> 6 files changed, 38 insertions(+), 38 deletions(-)
>
>diff --git a/documentation/content/en/articles/ldap-auth/_index.adoc b/documentation/content/en/articles/ldap-auth/_index.adoc
>index 5ae1f8681a..10bba18534 100644
>--- a/documentation/content/en/articles/ldap-auth/_index.adoc
>+++ b/documentation/content/en/articles/ldap-auth/_index.adoc
>@@ -70,8 +70,8 @@ Its most recent specifications are in http://www.ietf.org/rfc/rfc4510.txt[RFC451
> Essentially it is a database that expects to be read from more often than it is written to.
> 
> The LDAP server http://www.openldap.org/[OpenLDAP] will be used in the examples in this document; while the principles here should be generally applicable to many different servers, most of the concrete administration is OpenLDAP-specific.
>-There are several server versions in ports, for example package:net/openldap24-server[].
>-Client servers will need the corresponding package:net/openldap24-client[] libraries.
>+There are several server versions in ports, for example package:net/openldap26-server[].
>+Client servers will need the corresponding package:net/openldap26-client[] libraries.
> 
> There are (basically) two areas of the LDAP service which need configuration.
> The first is setting up a server to receive connections properly, and the second is adding entries to the server's directory so that FreeBSD tools know how to interact with it.
>@@ -97,7 +97,7 @@ First, install OpenLDAP:
> 
> [source,shell]
> ....
>-# cd /usr/ports/net/openldap24-server
>+# cd /usr/ports/net/openldap26-server
> # make install clean
> ....
> 
>@@ -209,7 +209,7 @@ ldap     slapd      3261  7  tcp4   *:389                 *:*
> [[ldap-connect-client]]
> ==== Configuring the Client
> 
>-Install the package:net/openldap24-client[] port for the OpenLDAP libraries.
>+Install the package:net/openldap26-client[] port for the OpenLDAP libraries.
> The client machines will always have OpenLDAP libraries since that is all package:security/pam_ldap[] and package:net/nss_ldap[] support, at least for the moment.
> 
> The configuration file for the OpenLDAP libraries is [.filename]#/usr/local/etc/openldap/ldap.conf#.
>@@ -317,7 +317,7 @@ If it does, your database is properly configured to be used as an LDAP authentic
> [[client]]
> == Client Configuration
> 
>-The client should already have OpenLDAP libraries from <<ldap-connect-client>>, but if you are installing several client machines you will need to install package:net/openldap24-client[] on each of them.
>+The client should already have OpenLDAP libraries from <<ldap-connect-client>>, but if you are installing several client machines you will need to install package:net/openldap26-client[] on each of them.
> 
> FreeBSD requires two ports to be installed to authenticate against an LDAP server, package:security/pam_ldap[] and package:net/nss_ldap[].
> 
>diff --git a/documentation/content/en/articles/ldap-auth/_index.po b/documentation/content/en/articles/ldap-auth/_index.po
>index abedf38f7b..fbe4016307 100644
>--- a/documentation/content/en/articles/ldap-auth/_index.po
>+++ b/documentation/content/en/articles/ldap-auth/_index.po
>@@ -105,8 +105,8 @@ msgid ""
> "examples in this document; while the principles here should be generally "
> "applicable to many different servers, most of the concrete administration is "
> "OpenLDAP-specific.  There are several server versions in ports, for example "
>-"package:net/openldap24-server[].  Client servers will need the corresponding "
>-"package:net/openldap24-client[] libraries."
>+"package:net/openldap26-server[].  Client servers will need the corresponding "
>+"package:net/openldap26-client[] libraries."
> msgstr ""
> 
> #. type: Plain text
>@@ -147,7 +147,7 @@ msgstr ""
> #: documentation/content/en/articles/ldap-auth/_index.adoc:102
> #, no-wrap
> msgid ""
>-"# cd /usr/ports/net/openldap24-server\n"
>+"# cd /usr/ports/net/openldap26-server\n"
> "# make install clean\n"
> msgstr ""
> 
>@@ -349,7 +349,7 @@ msgstr ""
> #. type: Plain text
> #: documentation/content/en/articles/ldap-auth/_index.adoc:214
> msgid ""
>-"Install the package:net/openldap24-client[] port for the OpenLDAP "
>+"Install the package:net/openldap26-client[] port for the OpenLDAP "
> "libraries.  The client machines will always have OpenLDAP libraries since "
> "that is all package:security/pam_ldap[] and package:net/nss_ldap[] support, "
> "at least for the moment."
>@@ -554,7 +554,7 @@ msgstr ""
> msgid ""
> "The client should already have OpenLDAP libraries from <<ldap-connect-"
> "client>>, but if you are installing several client machines you will need to "
>-"install package:net/openldap24-client[] on each of them."
>+"install package:net/openldap26-client[] on each of them."
> msgstr ""
> 
> #. type: Plain text
>diff --git a/documentation/content/es/articles/ldap-auth/_index.adoc b/documentation/content/es/articles/ldap-auth/_index.adoc
>index 7e08784e5b..2797ed5148 100644
>--- a/documentation/content/es/articles/ldap-auth/_index.adoc
>+++ b/documentation/content/es/articles/ldap-auth/_index.adoc
>@@ -64,7 +64,7 @@ Este artÃculo no pretende ser una explicaciÃ³n exhaustiva de las consideracione
> 
> LDAP significa "Lightweight Directory Access Protocol" (Protocolo Ligero de Acceso a Directorio) y es un subconjunto del Protocolo de Acceso a Directorio X.500. Su especificaciÃ³n mÃ¡s reciente se encuentra en http://www.ietf.org/rfc/rfc4510.txt[RFC4510]. En esencia es una base de datos que espera recibir muchas mÃ¡s consultas que escrituras.
> 
>-En los ejemplos de este documento se utilizarÃ¡ el servidor LDAP http://www.openldap.org/[OpenLDAP]; aunque los procedimientos deberÃan ser aplicables a los diferentes servidores, la mayor parte de la administraciÃ³n es especÃfica de OpenLDAP. Hay varias versiones del servidor en la colecciÃ³n de ports, por ejemplo, package:net/openldap24-server[]. Los clientes necesitarÃ¡n las librerÃas necesarias del paquete package:net/openldap24-client[].
>+En los ejemplos de este documento se utilizarÃ¡ el servidor LDAP http://www.openldap.org/[OpenLDAP]; aunque los procedimientos deberÃan ser aplicables a los diferentes servidores, la mayor parte de la administraciÃ³n es especÃfica de OpenLDAP. Hay varias versiones del servidor en la colecciÃ³n de ports, por ejemplo, package:net/openldap26-server[]. Los clientes necesitarÃ¡n las librerÃas necesarias del paquete package:net/openldap26-client[].
> 
> Hay (bÃ¡sicamente) dos Ã¡reas del servicio LDAP que necesitan configuraciÃ³n. Lo primero es configurar un servidor para recibir conexiones correctamente, y lo segundo es aÃ±adir entradas al directorio del servidor para que las herramientas de FreeBSD sepan como interactuar con Ã©l.
> 
>@@ -88,7 +88,7 @@ Primero, instala OpenLDAP:
> 
> [source, shell]
> ....
>-# cd /usr/ports/net/openldap24-server
>+# cd /usr/ports/net/openldap26-server
> # make install clean
> ....
> 
>@@ -186,7 +186,7 @@ ldap     slapd      3261  7  tcp4   *:389                 *:*
> [[ldap-connect-client]]
> ==== Configurar el Cliente
> 
>-Instala el port package:net/openldap24-client[] para obtener las librerÃas de OpenLDAP. Las mÃ¡quinas cliente siempre tendrÃ¡n las librerÃas de OpenLDAP pues que eso es lo Ãºnico que soportan package:security/pam_ldap[] y package:net/nss_ldap[], al menos por el momento.
>+Instala el port package:net/openldap26-client[] para obtener las librerÃas de OpenLDAP. Las mÃ¡quinas cliente siempre tendrÃ¡n las librerÃas de OpenLDAP pues que eso es lo Ãºnico que soportan package:security/pam_ldap[] y package:net/nss_ldap[], al menos por el momento.
> 
> El fichero de configuraciÃ³n para las librerÃas de OpenLDAP es [.filename]#/usr/local/etc/openldap/ldap.conf#. Edita este fichero para que contenga los siguientes valores:
> 
>@@ -277,7 +277,7 @@ La utilidad `ldapsearch` en la mÃ¡quina del cliente deberÃa devolver estas entr
> [[client]]
> == ConfiguraciÃ³n del Cliente
> 
>-El cliente ya deberÃa tener las librerÃas de OpenLDAP de <<ldap-connect-client>>, pero si estÃ¡s instalando varias mÃ¡quinas cliente, necesitarÃ¡s instalar package:net/openldap24-client[] en cada una de ellas.
>+El cliente ya deberÃa tener las librerÃas de OpenLDAP de <<ldap-connect-client>>, pero si estÃ¡s instalando varias mÃ¡quinas cliente, necesitarÃ¡s instalar package:net/openldap26-client[] en cada una de ellas.
> 
> FreeBSD requiere de la instalaciÃ³n de dos ports para autenticarse en un servidor LDAP, package:security/pam_ldap[] y package:net/nss_ldap[].
> 
>diff --git a/documentation/content/es/articles/ldap-auth/_index.po b/documentation/content/es/articles/ldap-auth/_index.po
>index 2a58d41fc6..bc1f161f1f 100644
>--- a/documentation/content/es/articles/ldap-auth/_index.po
>+++ b/documentation/content/es/articles/ldap-auth/_index.po
>@@ -131,15 +131,15 @@ msgid ""
> "examples in this document; while the principles here should be generally "
> "applicable to many different servers, most of the concrete administration is "
> "OpenLDAP-specific.  There are several server versions in ports, for example "
>-"package:net/openldap24-server[].  Client servers will need the corresponding "
>-"package:net/openldap24-client[] libraries."
>+"package:net/openldap26-server[].  Client servers will need the corresponding "
>+"package:net/openldap26-client[] libraries."
> msgstr ""
> "En los ejemplos de este documento se utilizarÃ¡ el servidor LDAP http://www."
> "openldap.org/[OpenLDAP]; aunque los procedimientos deberÃan ser aplicables a "
> "los diferentes servidores, la mayor parte de la administraciÃ³n es especÃfica "
> "de OpenLDAP. Hay varias versiones del servidor en la colecciÃ³n de ports, por "
>-"ejemplo, package:net/openldap24-server[]. Los clientes necesitarÃ¡n las "
>-"librerÃas necesarias del paquete package:net/openldap24-client[]."
>+"ejemplo, package:net/openldap26-server[]. Los clientes necesitarÃ¡n las "
>+"librerÃas necesarias del paquete package:net/openldap26-client[]."
> 
> #. type: Plain text
> #: documentation/content/en/articles/ldap-auth/_index.adoc:78
>@@ -185,10 +185,10 @@ msgstr "Primero, instala OpenLDAP:"
> #: documentation/content/en/articles/ldap-auth/_index.adoc:102
> #, no-wrap
> msgid ""
>-"# cd /usr/ports/net/openldap24-server\n"
>+"# cd /usr/ports/net/openldap26-server\n"
> "# make install clean\n"
> msgstr ""
>-"# cd /usr/ports/net/openldap24-server\n"
>+"# cd /usr/ports/net/openldap26-server\n"
> "# make install clean\n"
> 
> #. type: delimited block = 4
>@@ -449,12 +449,12 @@ msgstr "Configurar el Cliente"
> #. type: Plain text
> #: documentation/content/en/articles/ldap-auth/_index.adoc:214
> msgid ""
>-"Install the package:net/openldap24-client[] port for the OpenLDAP "
>+"Install the package:net/openldap26-client[] port for the OpenLDAP "
> "libraries.  The client machines will always have OpenLDAP libraries since "
> "that is all package:security/pam_ldap[] and package:net/nss_ldap[] support, "
> "at least for the moment."
> msgstr ""
>-"Instala el port package:net/openldap24-client[] para obtener las librerÃas "
>+"Instala el port package:net/openldap26-client[] para obtener las librerÃas "
> "de OpenLDAP. Las mÃ¡quinas cliente siempre tendrÃ¡n las librerÃas de OpenLDAP "
> "pues que eso es lo Ãºnico que soportan package:security/pam_ldap[] y package:"
> "net/nss_ldap[], al menos por el momento."
>@@ -736,11 +736,11 @@ msgstr "ConfiguraciÃ³n del Cliente"
> msgid ""
> "The client should already have OpenLDAP libraries from <<ldap-connect-"
> "client>>, but if you are installing several client machines you will need to "
>-"install package:net/openldap24-client[] on each of them."
>+"install package:net/openldap26-client[] on each of them."
> msgstr ""
> "El cliente ya deberÃa tener las librerÃas de OpenLDAP de <<ldap-connect-"
> "client>>, pero si estÃ¡s instalando varias mÃ¡quinas cliente, necesitarÃ¡s "
>-"instalar package:net/openldap24-client[] en cada una de ellas."
>+"instalar package:net/openldap26-client[] en cada una de ellas."
> 
> #. type: Plain text
> #: documentation/content/en/articles/ldap-auth/_index.adoc:323
>diff --git a/documentation/content/pt-br/articles/ldap-auth/_index.adoc b/documentation/content/pt-br/articles/ldap-auth/_index.adoc
>index bafccd4ffd..1bea4f2116 100644
>--- a/documentation/content/pt-br/articles/ldap-auth/_index.adoc
>+++ b/documentation/content/pt-br/articles/ldap-auth/_index.adoc
>@@ -64,7 +64,7 @@ Este artigo nÃ£o pretende ser um relato exaustivo da seguranÃ§a, robustez ou con
> 
> LDAP significa "Lightweight Directory Access Protocol" e Ã© um subconjunto do X.500 Directory Access Protocol. Suas especificaÃ§Ãµes mais recentes estÃ£o na http://www.ietf.org/rfc/rfc4510.txt[RFC4510] e documentos amigÃ¡veis. Essencialmente, Ã© um banco de dados que espera ser lido com mais frequÃªncia do que Ã© escrito.
> 
>-O servidor LDAP http://www.openldap.org/[OpenLDAP] serÃ¡ usado nos exemplos deste documento; embora os princÃpios aqui devam ser geralmente aplicÃ¡veis a muitos servidores diferentes, a maior parte da administraÃ§Ã£o concreta Ã© especificamente para OpenLDAP. Existem vÃ¡rias versÃµes de servidor nos ports, por exemplo package:net/openldap24-server[]. Os servidores clientes precisarÃ£o das bibliotecas package:net/openldap24-client[] correspondentes.
>+O servidor LDAP http://www.openldap.org/[OpenLDAP] serÃ¡ usado nos exemplos deste documento; embora os princÃpios aqui devam ser geralmente aplicÃ¡veis a muitos servidores diferentes, a maior parte da administraÃ§Ã£o concreta Ã© especificamente para OpenLDAP. Existem vÃ¡rias versÃµes de servidor nos ports, por exemplo package:net/openldap26-server[]. Os servidores clientes precisarÃ£o das bibliotecas package:net/openldap26-client[] correspondentes.
> 
> Existem (basicamente) duas Ã¡reas do serviÃ§o LDAP que precisam de configuraÃ§Ã£o. A primeira Ã© a configuraÃ§Ã£o de um servidor para receber as conexÃµes corretamente, e o segundo Ã© adicionar entradas ao diretÃ³rio do servidor para que as ferramentas do FreeBSD saibam como interagir com ele.
> 
>@@ -88,7 +88,7 @@ Primeiro, instale o OpenLDAP:
> 
> [source, shell]
> ....
>-# cd /usr/ports/net/openldap24-server
>+# cd /usr/ports/net/openldap26-server
> # make install clean
> ....
> 
>@@ -186,7 +186,7 @@ ldap     slapd      3261  7  tcp4   *:389                 *:*
> [[ldap-connect-client]]
> ==== Configurando o Cliente
> 
>-Instale o port package:net/openldap24-client[] para as bibliotecas do OpenLDAP. As mÃ¡quinas cliente sempre terÃ£o bibliotecas OpenLDAP, jÃ¡ que Ã© todo o suporte a package:security/pam_ldap[] e package:net/nss_ldap[], pelo menos por enquanto.
>+Instale o port package:net/openldap26-client[] para as bibliotecas do OpenLDAP. As mÃ¡quinas cliente sempre terÃ£o bibliotecas OpenLDAP, jÃ¡ que Ã© todo o suporte a package:security/pam_ldap[] e package:net/nss_ldap[], pelo menos por enquanto.
> 
> O arquivo de configuraÃ§Ã£o para as bibliotecas OpenLDAP Ã© [.filename]#/usr/local/etc/openldap/ldap.conf#. Edite este arquivo para conter os seguintes valores:
> 
>@@ -277,7 +277,7 @@ O utilitÃ¡rio `ldapsearch` na mÃ¡quina cliente deve agora retornar essas entrada
> [[client]]
> == ConfiguraÃ§Ã£o do Cliente
> 
>-O cliente jÃ¡ deve ter bibliotecas do OpenLDAP do <<ldap-connect-client>>, mas se vocÃª estiver instalando vÃ¡rias mÃ¡quinas clientes, precisarÃ¡ instalar o package:net/openldap24-client[] em cada um deles.
>+O cliente jÃ¡ deve ter bibliotecas do OpenLDAP do <<ldap-connect-client>>, mas se vocÃª estiver instalando vÃ¡rias mÃ¡quinas clientes, precisarÃ¡ instalar o package:net/openldap26-client[] em cada um deles.
> 
> O FreeBSD requer que dois ports sejam instalados para autenticaÃ§Ã£o em um servidor LDAP, package:security/pam_ldap[] e package:net/nss_ldap[].
> 
>diff --git a/documentation/content/pt-br/articles/ldap-auth/_index.po b/documentation/content/pt-br/articles/ldap-auth/_index.po
>index ed9d1c7e98..0c998bf278 100644
>--- a/documentation/content/pt-br/articles/ldap-auth/_index.po
>+++ b/documentation/content/pt-br/articles/ldap-auth/_index.po
>@@ -130,15 +130,15 @@ msgid ""
> "examples in this document; while the principles here should be generally "
> "applicable to many different servers, most of the concrete administration is "
> "OpenLDAP-specific.  There are several server versions in ports, for example "
>-"package:net/openldap24-server[].  Client servers will need the corresponding "
>-"package:net/openldap24-client[] libraries."
>+"package:net/openldap26-server[].  Client servers will need the corresponding "
>+"package:net/openldap26-client[] libraries."
> msgstr ""
> "O servidor LDAP http://www.openldap.org/[OpenLDAP] serÃ¡ usado nos exemplos "
> "deste documento; embora os princÃpios aqui devam ser geralmente aplicÃ¡veis a "
> "muitos servidores diferentes, a maior parte da administraÃ§Ã£o concreta Ã© "
> "especificamente para OpenLDAP. Existem vÃ¡rias versÃµes de servidor nos ports, "
>-"por exemplo package:net/openldap24-server[]. Os servidores clientes "
>-"precisarÃ£o das bibliotecas package:net/openldap24-client[] correspondentes."
>+"por exemplo package:net/openldap26-server[]. Os servidores clientes "
>+"precisarÃ£o das bibliotecas package:net/openldap26-client[] correspondentes."
> 
> #. type: Plain text
> #: documentation/content/en/articles/ldap-auth/_index.adoc:78
>@@ -184,10 +184,10 @@ msgstr "Primeiro, instale o OpenLDAP:"
> #: documentation/content/en/articles/ldap-auth/_index.adoc:102
> #, no-wrap
> msgid ""
>-"# cd /usr/ports/net/openldap24-server\n"
>+"# cd /usr/ports/net/openldap26-server\n"
> "# make install clean\n"
> msgstr ""
>-"# cd /usr/ports/net/openldap24-server\n"
>+"# cd /usr/ports/net/openldap26-server\n"
> "# make install clean\n"
> 
> #. type: delimited block = 4
>@@ -448,12 +448,12 @@ msgstr "Configurando o Cliente"
> #. type: Plain text
> #: documentation/content/en/articles/ldap-auth/_index.adoc:214
> msgid ""
>-"Install the package:net/openldap24-client[] port for the OpenLDAP "
>+"Install the package:net/openldap26-client[] port for the OpenLDAP "
> "libraries.  The client machines will always have OpenLDAP libraries since "
> "that is all package:security/pam_ldap[] and package:net/nss_ldap[] support, "
> "at least for the moment."
> msgstr ""
>-"Instale o port package:net/openldap24-client[] para as bibliotecas do "
>+"Instale o port package:net/openldap26-client[] para as bibliotecas do "
> "OpenLDAP. As mÃ¡quinas cliente sempre terÃ£o bibliotecas OpenLDAP, jÃ¡ que Ã© "
> "todo o suporte a package:security/pam_ldap[] e package:net/nss_ldap[], pelo "
> "menos por enquanto."
>@@ -736,11 +736,11 @@ msgstr "ConfiguraÃ§Ã£o do Cliente"
> msgid ""
> "The client should already have OpenLDAP libraries from <<ldap-connect-"
> "client>>, but if you are installing several client machines you will need to "
>-"install package:net/openldap24-client[] on each of them."
>+"install package:net/openldap26-client[] on each of them."
> msgstr ""
> "O cliente jÃ¡ deve ter bibliotecas do OpenLDAP do <<ldap-connect-client>>, "
> "mas se vocÃª estiver instalando vÃ¡rias mÃ¡quinas clientes, precisarÃ¡ instalar "
>-"o package:net/openldap24-client[] em cada um deles."
>+"o package:net/openldap26-client[] em cada um deles."
> 
> #. type: Plain text
> #: documentation/content/en/articles/ldap-auth/_index.adoc:323
>-- 
>2.42.0
>

Actions: View | Diff

Attachments on bug 274220: 245385