From e47a33ddfb3a8a06e90c634d9a79f2d90dde7529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 7 Mar 2019 11:29:47 +0100 Subject: [PATCH] bird2: 2.0.2 -> 2.0.4 https://gitlab.labs.nic.cz/labs/bird/blob/v2.0.4/NEWS The patch doesn't need so much context. --- pkgs/servers/bird/default.nix | 4 ++-- pkgs/servers/bird/dont-create-sysconfdir-2.patch | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 7e0bf298b02..4f07dc5a2fd 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -57,7 +57,7 @@ in }; bird2 = generic { - version = "2.0.2"; - sha256 = "03s8hcl761y3489j1krarm3r3iy5qid26508i91yvy38ypb92pq3"; + version = "2.0.4"; + sha256 = "1phl8ycasbzgla83d9zbzzy1ymjz30k1qh1pmywmjhbxa6vi0q37"; }; } diff --git a/pkgs/servers/bird/dont-create-sysconfdir-2.patch b/pkgs/servers/bird/dont-create-sysconfdir-2.patch index fd86da8a129..24716446118 100644 --- a/pkgs/servers/bird/dont-create-sysconfdir-2.patch +++ b/pkgs/servers/bird/dont-create-sysconfdir-2.patch @@ -1,13 +1,6 @@ -diff --git a/Makefile.in b/Makefile.in -index fdd5e6c..45f81a1 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -165,7 +165,7 @@ tags: - # Install - +@@ -165,2 +165,2 @@ install: all -- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@ +- $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir) + $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) - $(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird - $(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl - if test -n "@CLIENT@" ; then \