ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

389-ds-base: 1.3.3.5 -> 1.3.3.9

Browse Source
This commit is contained in:
William A. Kennington III 2015-04-17 14:09:41 -07:00
parent 556c2a919c
commit 93d6ac9a0c
2 changed files with 8 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/servers/ldap/389/default.nix
View File

@ -2,14 +2,14 @@
, svrcore, icu, net_snmp, kerberos, pcre, perlPackages
}:
let
version = "1.3.3.5";
version = "1.3.3.9";
in
stdenv.mkDerivation rec {
name = "389-ds-base-${version}";
src = fetchurl {
url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2";
sha256 = "09w81salyr56njsvq9p96ijrrs0vwsczd43jf6384ylzj1jrxxl5";
sha256 = "1qqwv5j60f38hz4xpbzn4pixhkj07yjzbp7kz7cvfkgvdwy9jqxx";
};
buildInputs = [
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
# TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
patches = [ ./no-etc.patch ./perl-path.patch ];
patches = [ ./perl-path.patch ];
preConfigure = ''
# Create perl paths for library imports in perl scripts
@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/dirsrv
'';
installFlags = [
"sysconfdir=\${out}/etc"
"localstatedir=\${TMPDIR}"
];
passthru.version = version;
meta = with stdenv.lib; {

62
pkgs/servers/ldap/389/no-etc.patch
View File

@ -1,62 +0,0 @@
From bcdd781b01beba59b9f6993355732070b9487603 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 9 Jan 2015 14:51:46 -0800
Subject: [PATCH 1/2] Makefile: Don't install files to /etc or /var
---
Makefile.in | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 24a9ddf..c97d1e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,15 +169,14 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(serverdir)" \
"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" \
+ "$(DESTDIR)$(sbindir)" \
"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" \
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" \
- "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" \
- "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" \
+ "$(DESTDIR)$(infdir)" \
+ "$(DESTDIR)$(mibdir)" \
"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" \
"$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" \
- "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" \
"$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"
LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
@@ -10207,7 +10206,7 @@ check: $(BUILT_SOURCES)
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
$(MANS) $(DATA) $(HEADERS) config.h
installdirs:
- for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
+ for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -10363,13 +10362,13 @@ info: info-am
info-am:
-install-data-am: install-configDATA install-infDATA \
- install-initSCRIPTS install-initconfigDATA install-man \
+install-data-am: install-infDATA \
+ install-man \
install-mibDATA install-nodist_propertyDATA install-perlDATA \
install-pkgconfigDATA install-propertyDATA install-pythonDATA \
- install-sampledataDATA install-schemaDATA \
+ install-sampledataDATA \
install-serverLTLIBRARIES install-serverincHEADERS \
- install-serverpluginLTLIBRARIES install-systemdsystemunitDATA \
+ install-serverpluginLTLIBRARIES \
install-taskSCRIPTS install-updateDATA install-updateSCRIPTS
install-dvi: install-dvi-am
--
2.1.4