[PATCH] databases/openldap - rm -Rf %SYSCONFDIR%/openldap/slapd.d/*

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] databases/openldap - rm -Rf %SYSCONFDIR%/openldap/slapd.d/*

Raf Czlonka-2
Hi,

Upon OpenLDAP server upgrade, I received a message prompting me to
remove files in:

        %SYSCONFDIR%/openldap/slapd.d/*

I believe the correct directory should have been:

        /etc/openldap/slapd.d/*

in which case the below patch is required.

Regards,

Raf

Index: databases/openldap/pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/openldap/pkg/PLIST-server,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST-server
--- databases/openldap/pkg/PLIST-server 29 Mar 2018 19:32:12 -0000 1.23
+++ databases/openldap/pkg/PLIST-server 19 Aug 2018 06:02:32 -0000
@@ -5,7 +5,7 @@
 @ask-update openldap-server-<2.4 Make sure your existing database is backed up
 @newgroup _openldap:544
 @newuser _openldap:544:_openldap:daemon:OpenLDAP Account:/nonexistent:/sbin/nologin
-@extraunexec rm -Rf %SYSCONFDIR%/openldap/slapd.d/*
+@extraunexec rm -Rf ${SYSCONFDIR}/openldap/slapd.d/*
 @extraunexec rm -Rf /var/openldap-data/*
 @bin libexec/slapd
 @man man/man5/slapd-bdb.5

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] databases/openldap - rm -Rf %SYSCONFDIR%/openldap/slapd.d/*

Jeremie Courreges-Anglas-2
On Sun, Aug 19 2018, Raf Czlonka <[hidden email]> wrote:

> Hi,
>
> Upon OpenLDAP server upgrade, I received a message prompting me to
> remove files in:
>
> %SYSCONFDIR%/openldap/slapd.d/*
>
> I believe the correct directory should have been:
>
> /etc/openldap/slapd.d/*
>
> in which case the below patch is required.

Yep, but you also need a REVISION bump.

Please cc the maintainer next time. :)


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/openldap/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile 30 Jun 2018 11:41:36 -0000 1.163
+++ Makefile 25 Aug 2018 17:19:34 -0000
@@ -8,6 +8,7 @@ COMMENT-server = open-source LDAP softwa
 DISTNAME = openldap-2.4.46
 PKGNAME-main = ${DISTNAME:S/-/-client-/}
 PKGNAME-server = ${DISTNAME:S/-/-server-/}
+REVISION-server = 0
 
 # overwrite -main pkgname/path to strip FLAVOR, aci only affects the server
 FULLPKGNAME-main = ${DISTNAME:S/-/-client-/}${FLAVOR_EXT:S/-aci//}
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/openldap/pkg/PLIST-server,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST-server
--- pkg/PLIST-server 29 Mar 2018 19:32:12 -0000 1.23
+++ pkg/PLIST-server 25 Aug 2018 17:18:36 -0000
@@ -5,7 +5,7 @@
 @ask-update openldap-server-<2.4 Make sure your existing database is backed up
 @newgroup _openldap:544
 @newuser _openldap:544:_openldap:daemon:OpenLDAP Account:/nonexistent:/sbin/nologin
-@extraunexec rm -Rf %SYSCONFDIR%/openldap/slapd.d/*
+@extraunexec rm -Rf ${SYSCONFDIR}/openldap/slapd.d/*
 @extraunexec rm -Rf /var/openldap-data/*
 @bin libexec/slapd
 @man man/man5/slapd-bdb.5


--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE