pyrox.dev
389-ds-base: Fix perl scripts
+20
-5
pkgs/servers/ldap/389/default.nix
+20
-5
pkgs/servers/ldap/389/default.nix
···
1
1
{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap, db, cyrus_sasl
2
-
, svrcore, icu, net_snmp, kerberos, pcre
2
+
, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
3
3
}:
4
-
4
+
let
5
+
version = "1.3.3.5";
6
+
in
5
7
stdenv.mkDerivation rec {
6
-
name = "389-ds-base-1.3.3.5";
8
+
name = "389-ds-base-${version}";
7
9
8
10
src = fetchurl {
9
11
url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2";
···
13
15
buildInputs = [
14
16
pkgconfig perl pam nspr nss openldap db cyrus_sasl svrcore icu
15
17
net_snmp kerberos pcre
16
-
];
18
+
] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
19
+
20
+
# TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
21
+
22
+
patches = [ ./no-etc.patch ./perl-path.patch ];
17
23
18
-
patches = [ ./no-etc.patch ];
24
+
preConfigure = ''
25
+
# Create perl paths for library imports in perl scripts
26
+
PERLPATH=""
27
+
for P in $(echo $PERL5LIB | sed 's/:/ /g'); do
28
+
PERLPATH="$PERLPATH $(echo $P/*/*)"
29
+
done
30
+
export PERLPATH
31
+
'';
19
32
20
33
configureFlags = [
21
34
"--sysconfdir=/etc"
···
30
43
# The makefile doesn't create this directory for whatever reason
31
44
mkdir -p $out/lib/dirsrv
32
45
'';
46
+
47
+
passthru.version = version;
33
48
34
49
meta = with stdenv.lib; {
35
50
homepage = https://directory.fedoraproject.org/;
+12
pkgs/servers/ldap/389/no-etc.patch
+12
pkgs/servers/ldap/389/no-etc.patch
···
1
+
From bcdd781b01beba59b9f6993355732070b9487603 Mon Sep 17 00:00:00 2001
2
+
From: "William A. Kennington III" <william@wkennington.com>
3
+
Date: Fri, 9 Jan 2015 14:51:46 -0800
4
+
Subject: [PATCH 1/2] Makefile: Don't install files to /etc or /var
5
+
6
+
---
7
+
Makefile.in | 17 ++++++++---------
8
+
1 file changed, 8 insertions(+), 9 deletions(-)
9
+
1
10
diff --git a/Makefile.in b/Makefile.in
2
11
index 24a9ddf..c97d1e1 100644
3
12
--- a/Makefile.in
···
48
57
install-taskSCRIPTS install-updateDATA install-updateSCRIPTS
49
58
50
59
install-dvi: install-dvi-am
60
+
--
61
+
2.1.4
62
+
+34
pkgs/servers/ldap/389/perl-path.patch
+34
pkgs/servers/ldap/389/perl-path.patch
···
1
+
From 78a814e4d5e8708893b6ed8b673a4577abae05f4 Mon Sep 17 00:00:00 2001
2
+
From: "William A. Kennington III" <william@wkennington.com>
3
+
Date: Fri, 9 Jan 2015 14:52:11 -0800
4
+
Subject: [PATCH 2/2] Makefile: Add PERLPATH to perl files
5
+
6
+
---
7
+
Makefile.in | 4 ++--
8
+
1 file changed, 2 insertions(+), 2 deletions(-)
9
+
10
+
diff --git a/Makefile.in b/Makefile.in
11
+
index c97d1e1..763bf3b 100644
12
+
--- a/Makefile.in
13
+
+++ b/Makefile.in
14
+
@@ -2870,7 +2870,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
15
+
@BUNDLE_FALSE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
16
+
@BUNDLE_FALSE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
17
+
@BUNDLE_FALSE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
18
+
-@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir),g' \
19
+
+@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH),g' \
20
+
@BUNDLE_FALSE@ -e 's,@defaultuser\@,$(defaultuser),g' \
21
+
@BUNDLE_FALSE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
22
+
@BUNDLE_FALSE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
23
+
@@ -2947,7 +2947,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
24
+
@BUNDLE_TRUE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
25
+
@BUNDLE_TRUE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
26
+
@BUNDLE_TRUE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
27
+
-@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \
28
+
+@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH) $(libdir)/perl/arch $(libdir)/perl,g' \
29
+
@BUNDLE_TRUE@ -e 's,@defaultuser\@,$(defaultuser),g' \
30
+
@BUNDLE_TRUE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
31
+
@BUNDLE_TRUE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
32
+
--
33
+
2.1.4
34
+