openntpd: More build fixes

This commit is contained in:
William A. Kennington III 2015-02-04 16:17:24 -08:00
parent 6a872c304c
commit 1dd23a28cb
2 changed files with 29 additions and 3 deletions

View file

@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
sha256 = "4f417c8a4c21ed7ec3811107829f931404f9bf121855b8571a2ca3355695343a";
};
postPatch = ''
sed -i -e '/^install:/,/^$/{/@if.*PRIVSEP_PATH/,/^$/d}' Makefile.in
'';
patches = [ ./no-install.patch ];
configureFlags = [
"--with-privsep-path=${privsepPath}"
"--with-privsep-user=${privsepUser}"
"--sysconfdir=/etc"
"--localstatedir=/var"
];
buildInputs = [ openssl ];

View file

@ -0,0 +1,26 @@
diff --git a/Makefile.in b/Makefile.in
index 81549cf..1262bbf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1740,21 +1740,6 @@ uninstall-man: uninstall-man5 uninstall-man8
install-exec-hook:
@ln -f "$(DESTDIR)$(sbindir)/ntpd" "$(DESTDIR)$(sbindir)/ntpctl"
- @if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \
- $(INSTALL) -m 755 -d "$(DESTDIR)$(sysconfdir)"; \
- fi
- @if [ ! -d "$(DESTDIR)$(localstatedir)/run" ]; then \
- $(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/run"; \
- fi
- @if [ ! -d "$(DESTDIR)$(localstatedir)/db" ]; then \
- $(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/db"; \
- fi
- @if [ ! -f "$(DESTDIR)$(sysconfdir)/ntpd.conf" ]; then \
- $(INSTALL) -m 644 "$(srcdir)/ntpd.conf" "$(DESTDIR)$(sysconfdir)/ntpd.conf"; \
- else \
- echo; \
- echo " $(DESTDIR)$(sysconfdir)/ntpd.conf already exists, install will not overwrite"; \
- fi
@if [ ! -d "$(PRIVSEP_PATH)" ]; then \
echo; \
echo " Please created a privilege separation directory for ntpd." ; \