git.iko.soy/typeable/nixpkgs
on master help sign in
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)

commitd0f75abb39ed62945939fc524f259b20cb997d5d authorRenaud <c0bw3b@users.noreply.github.com> dateTue 21 May 2019, 11:09 (8 years ago) parent3c3085b
2 files changed+24−55
pkgs/servers/ldap/389/default.nix+24−21 pkgs/servers/ldap/389/perl-path.patch−34
pkgs/servers/ldap/389/default.nix+24−21
@@ -1,27 +1,33 @@
1−{ stdenv, fetchurl, pkgconfig, perl, pam, nspr, nss, openldap
2−, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
1+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, doxygen, perl, pam, nspr, nss, openldap
2+, db, cyrus_sasl, svrcore, icu, net_snmp, kerberos, pcre, perlPackages, libevent, openssl, python
33}:
4−let
5− version = "1.3.5.19";
6−in
4+
75stdenv.mkDerivation rec {
8− name = "389-ds-base-${version}";
6+ pname = "389-ds-base";
7+ version = "1.3.9.1";
98
109 src = fetchurl {
11− url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2";
12− sha256 = "1r1n44xfvy51r4r1180dfmjziyj3pqxwmnv6rjvvvjjm87fslmdd";
10+ url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.bz2";
11+ sha256 = "141iv1phgk1lw74sfjj3v7wy6qs0q56lvclwv2p0hqn1wg8ic4q6";
1312 };
1413
15− nativeBuildInputs = [ pkgconfig ];
14+ nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ];
1615 buildInputs = [
1716 perl pam nspr nss openldap db cyrus_sasl svrcore icu
18− net_snmp kerberos pcre
17+ net_snmp kerberos pcre libevent openssl python
1918 ] ++ (with perlPackages; [ MozillaLdap NetAddrIP DBFile ]);
2019
21− # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
22−
23− patches = [ ./perl-path.patch
20+ patches = [
21+ (fetchpatch {
22+ name = "389-ds-nss.patch";
23+ url = "https://aur.archlinux.org/cgit/aur.git/plain/nss.patch?h=389-ds-base&id=b80ed52cc65ff9b1d72f8ebc54dbd462b12f6be9";
24+ sha256 = "07z7jl9z4gzhk3k6qyfn558xl76js8041llyr5n99h20ckkbwagk";
25+ })
2426 ];
27+ postPatch = ''
28+ substituteInPlace Makefile.am \
29+ --replace 's,@perlpath\@,$(perldir),g' 's,@perlpath\@,$(perldir) $(PERLPATH),g'
30+ '';
2531
2632 preConfigure = ''
2733 # Create perl paths for library imports in perl scripts
@@ -43,22 +49,19 @@ stdenv.mkDerivation rec {
4349 "--with-netsnmp=${net_snmp}"
4450 ];
4551
46− preInstall = ''
47− # The makefile doesn't create this directory for whatever reason
48− mkdir -p $out/lib/dirsrv
49− '';
52+ enableParallelBuilding = true;
5053
5154 installFlags = [
52− "sysconfdir=\${out}/etc"
53− "localstatedir=\${TMPDIR}"
55+ "sysconfdir=${placeholder "out"}/etc"
56+ "localstatedir=${placeholder "TMPDIR"}"
5457 ];
5558
5659 passthru.version = version;
5760
5861 meta = with stdenv.lib; {
59− homepage = http://www.port389.org/;
62+ homepage = "https://www.port389.org/";
6063 description = "Enterprise-class Open Source LDAP server for Linux";
61− license = licenses.gpl2;
64+ license = licenses.gpl3Plus;
6265 platforms = platforms.linux;
6366 };
6467}
pkgs/servers/ldap/389/perl-path.patchdeleted−34
@@ -1,34 +0,0 @@
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−