389-ds-base: 1.3.5.19 -> 1.3.9.1 (#61675)
http://www.port389.org/docs/389ds/releases/release-notes.html + fix build failure with <nss.h> + enable parallel building (faster)
This commit is contained in:
parent
3c3085bb71
commit
d0f75abb39
|
@ -1,27 +1,33 @@
|
|||
{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap
|
||||
, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
|
||||
{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap
|
||||
, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages, libevent, openssl, python
|
||||
}:
|
||||
let
|
||||
version = "1.3.5.19";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "389-ds-base-${version}";
|
||||
pname = "389-ds-base";
|
||||
version = "1.3.9.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2";
|
||||
sha256 = "1r1n44xfvy51r4r1180dfmjziyj3pqxwmnv6rjvvvjjm87fslmdd";
|
||||
url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ];
|
||||
buildInputs = [
|
||||
perl pam nspr nss openldap db cyrus_sasl svrcore icu
|
||||
net_snmp kerberos pcre
|
||||
net_snmp kerberos pcre libevent openssl python
|
||||
] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
|
||||
|
||||
# TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
|
||||
|
||||
patches = [ ./perl-path.patch
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "389-ds-nss.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/nss.patch?h=389-ds-base&id=b80ed52cc65ff9b1d72f8ebc54dbd462b12f6be9";
|
||||
sha256 = "07z7jl9z4gzhk3k6qyfn558xl76js8041llyr5n99h20ckkbwagk";
|
||||
})
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace Makefile.am \
|
||||
--replace 's,@perlpath\@,$(perldir),g' 's,@perlpath\@,$(perldir) $(PERLPATH),g'
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
# Create perl paths for library imports in perl scripts
|
||||
|
@ -43,22 +49,19 @@ stdenv.mkDerivation rec {
|
|||
"--with-netsnmp=${net_snmp}"
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
# The makefile doesn't create this directory for whatever reason
|
||||
mkdir -p $out/lib/dirsrv
|
||||
'';
|
||||
enableParallelBuilding = true;
|
||||
|
||||
installFlags = [
|
||||
"sysconfdir=\${out}/etc"
|
||||
"localstatedir=\${TMPDIR}"
|
||||
"sysconfdir=${placeholder "out"}/etc"
|
||||
"localstatedir=${placeholder "TMPDIR"}"
|
||||
];
|
||||
|
||||
passthru.version = version;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.port389.org/;
|
||||
homepage = "https://www.port389.org/";
|
||||
description = "Enterprise-class Open Source LDAP server for Linux";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
From 78a814e4d5e8708893b6ed8b673a4577abae05f4 Mon Sep 17 00:00:00 2001
|
||||
From: "William A. Kennington III" <william@wkennington.com>
|
||||
Date: Fri, 9 Jan 2015 14:52:11 -0800
|
||||
Subject: [PATCH 2/2] Makefile: Add PERLPATH to perl files
|
||||
|
||||
---
|
||||
Makefile.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index c97d1e1..763bf3b 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -2870,7 +2870,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
|
||||
@BUNDLE_FALSE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
|
||||
@BUNDLE_FALSE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
|
||||
@BUNDLE_FALSE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
|
||||
-@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir),g' \
|
||||
+@BUNDLE_FALSE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH),g' \
|
||||
@BUNDLE_FALSE@ -e 's,@defaultuser\@,$(defaultuser),g' \
|
||||
@BUNDLE_FALSE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
|
||||
@BUNDLE_FALSE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
|
||||
@@ -2947,7 +2947,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
|
||||
@BUNDLE_TRUE@ -e 's,@CONSOLE_VERSION\@,$(CONSOLE_VERSION),g' \
|
||||
@BUNDLE_TRUE@ -e 's,@BUILDNUM\@,$(BUILDNUM),g' \
|
||||
@BUNDLE_TRUE@ -e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
|
||||
-@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \
|
||||
+@BUNDLE_TRUE@ -e 's,@perlpath\@,$(perldir) $(PERLPATH) $(libdir)/perl/arch $(libdir)/perl,g' \
|
||||
@BUNDLE_TRUE@ -e 's,@defaultuser\@,$(defaultuser),g' \
|
||||
@BUNDLE_TRUE@ -e 's,@defaultgroup\@,$(defaultgroup),g' \
|
||||
@BUNDLE_TRUE@ -e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
|
||||
--
|
||||
2.1.4
|
||||
|
Loading…
Reference in a new issue