diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-26 16:07:02 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-26 16:07:02 -0700 |
| commit | c7a0045b80ddf199af66246477eae267576b3b20 (patch) | |
| tree | 42cbf0c49573e72063466b00e948fbc91df54512 /pkgs/tools/networking/openntpd | |
| parent | 65e303570e15465319301414024c788d03010e8c (diff) | |
openntpd: 5.7p3 -> 5.7p4
Diffstat (limited to 'pkgs/tools/networking/openntpd')
| -rw-r--r-- | pkgs/tools/networking/openntpd/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/tools/networking/openntpd/no-install.patch | 26 |
2 files changed, 12 insertions, 30 deletions
diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 167fea806220..55147464416d 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -5,15 +5,13 @@ stdenv.mkDerivation rec { name = "openntpd-${version}"; - version = "5.7p3"; + version = "5.7p4"; src = fetchurl { url = "mirror://openbsd/OpenNTPD/${name}.tar.gz"; - sha256 = "4f417c8a4c21ed7ec3811107829f931404f9bf121855b8571a2ca3355695343a"; + sha256 = "08ybpi351284wj53qqrmg13j8l7md397yrqsmg0aqxg3frcxk4x9"; }; - patches = [ ./no-install.patch ]; - configureFlags = [ "--with-privsep-path=${privsepPath}" "--with-privsep-user=${privsepUser}" @@ -23,6 +21,16 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; + installFlags = [ "DESTDIR=\${out}" ]; + + postInstall = '' + mv $out/$out/* $out + DIR=$out/$out + while rmdir $DIR 2>/dev/null; do + DIR="$(dirname "$DIR")" + done + ''; + meta = with stdenv.lib; { homepage = "http://www.openntpd.org/"; license = licenses.bsd3; diff --git a/pkgs/tools/networking/openntpd/no-install.patch b/pkgs/tools/networking/openntpd/no-install.patch deleted file mode 100644 index 0194e414062b..000000000000 --- a/pkgs/tools/networking/openntpd/no-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -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." ; \ |