Attachment 248207 Details for Bug 261792 – Fix grep error message

[patch] Fix grep error message

openldap_rc_fix.patch (text/plain), 1.95 KB, created by Michael Glaus on 2024-02-05 15:56:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Glaus

Created: 2024-02-05 15:56:23 UTC

Size: 1.95 KB

patch

obsolete

>--- net/openldap25-server/Makefile
>+++ net/openldap25-server/Makefile
>@@ -45,7 +45,7 @@ CONFLICTS_INSTALL=	${PORTNAME}2[0-46-9]-server ${PORTNAME}-server
> GNU_CONFIGURE=		yes
> 
> PORTREVISION_CLIENT=	0
>-PORTREVISION_SERVER=	0
>+PORTREVISION_SERVER=	1
> OPENLDAP_SHLIB_MAJOR=	0
> OPENLDAP_SHLIB_MINOR=	1.12
> OPENLDAP_MAJOR=		${DISTVERSION:R}
>--- net/openldap25-server/files/slapd.in
>+++ net/openldap25-server/files/slapd.in
>@@ -71,7 +71,7 @@ pidfile="%%LDAP_RUN_DIR%%/slapd.pid"
> if checkyesno slapd_cn_config; then
>   required_dirs="%%PREFIX%%/etc/openldap/slapd.d"
>   required_files="%%PREFIX%%/etc/openldap/slapd.d/cn=config.ldif"
>-  DATABASEDIR=`grep olcDbDirectory %%PREFIX%%/etc/openldap/slapd.d/cn=config/olcDatabase=* | awk '{ print $2 }'`
>+  DATABASEDIR=`grep -r olcDbDirectory %%PREFIX%%/etc/openldap/slapd.d/cn=config/olcDatabase=* | awk '{ print $2 }'`
> else
>   required_files="%%PREFIX%%/etc/openldap/slapd.conf"
>   DATABASEDIR=`awk '$1 == "directory" { print $2 }' "%%PREFIX%%/etc/openldap/slapd.conf" 2>&1 /dev/null`
>--- net/openldap26-server/Makefile
>+++ net/openldap26-server/Makefile
>@@ -47,7 +47,7 @@ GNU_CONFIGURE=		yes
> GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
> 
> PORTREVISION_CLIENT=	0
>-PORTREVISION_SERVER=	0
>+PORTREVISION_SERVER=	1
> OPENLDAP_SHLIB_MAJOR=	2
> OPENLDAP_SHLIB_MINOR=	0.200
> 
>--- net/openldap26-server/files/slapd.in
>+++ net/openldap26-server/files/slapd.in
>@@ -71,7 +71,7 @@ pidfile="%%LDAP_RUN_DIR%%/slapd.pid"
> if checkyesno slapd_cn_config; then
>   required_dirs="%%PREFIX%%/etc/openldap/slapd.d"
>   required_files="%%PREFIX%%/etc/openldap/slapd.d/cn=config.ldif"
>-  DATABASEDIR=`grep olcDbDirectory %%PREFIX%%/etc/openldap/slapd.d/cn=config/olcDatabase=* | awk '{ print $2 }'`
>+  DATABASEDIR=`grep -r olcDbDirectory %%PREFIX%%/etc/openldap/slapd.d/cn=config/olcDatabase=* | awk '{ print $2 }'`
> else
>   required_files="%%PREFIX%%/etc/openldap/slapd.conf"
>   DATABASEDIR=`awk '$1 == "directory" { print $2 }' "%%PREFIX%%/etc/openldap/slapd.conf" 2>&1 /dev/null`

Actions: View | Diff

Attachments on bug 261792: 248207