From b2a958157d2bdab4fe045930fec9c24388ad7730 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 3 Nov 2015 21:37:19 +0100
Subject: [PATCH 1/3] burp: new package (backup program)

---
 pkgs/tools/backup/burp/1.3.48.nix        | 38 ++++++++++++++++++++++++
 pkgs/tools/backup/burp/burp_1.3.48.patch | 22 ++++++++++++++
 pkgs/tools/backup/burp/burp_1.4.40.patch | 12 ++++++++
 pkgs/tools/backup/burp/default.nix       | 38 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 +++
 5 files changed, 114 insertions(+)
 create mode 100644 pkgs/tools/backup/burp/1.3.48.nix
 create mode 100644 pkgs/tools/backup/burp/burp_1.3.48.patch
 create mode 100644 pkgs/tools/backup/burp/burp_1.4.40.patch
 create mode 100644 pkgs/tools/backup/burp/default.nix

diff --git a/pkgs/tools/backup/burp/1.3.48.nix b/pkgs/tools/backup/burp/1.3.48.nix
new file mode 100644
index 000000000000..f680b9826cf2
--- /dev/null
+++ b/pkgs/tools/backup/burp/1.3.48.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit,
+	acl,
+	librsync_0_9,
+	ncurses,
+	openssl,
+	zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "burp-1.3.48";
+
+  src = fetchgit {
+    url = "https://github.com/grke/burp.git";
+    rev = "3636ce0a992904a374234d68170fc1c265bff357";
+    sha256 = "708e06b758e8f918aaf7cc8f7517a7eadd456263fe34618e32330e5ad69438c0";
+  };
+
+  patches = [ ./burp_1.3.48.patch ];
+
+  buildInputs = [ librsync_0_9 ncurses openssl zlib ]
+    # next two lines copied from bacula, as burp needs acl as well
+    # acl relies on attr, which I can't get to build on darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
+
+    configureFlags = [ 
+      "--sbindir=$out/bin" 
+    ];
+
+  #installPhase = ''make install'';
+
+  meta = with stdenv.lib; {
+    description = "BURP - BackUp and Restore Program";
+    homepage    = http://burp.grke.org;
+    license     = licenses.agpl3;
+    maintainers = with maintainers; [ tokudan ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/tools/backup/burp/burp_1.3.48.patch b/pkgs/tools/backup/burp/burp_1.3.48.patch
new file mode 100644
index 000000000000..4349a861a9a1
--- /dev/null
+++ b/pkgs/tools/backup/burp/burp_1.3.48.patch
@@ -0,0 +1,22 @@
+diff -Naur burp~/CHANGELOG burp/CHANGELOG
+--- burp~/CHANGELOG	2015-11-01 21:14:52.621376413 +0000
++++ burp/CHANGELOG	2015-11-01 21:31:44.718110435 +0000
+@@ -1,3 +1,6 @@
++2015-11-01 NixOS Patch:
++  * remove dependency on /var and use localstatedir instead
++
+ 2014-01-27 Changes in burp-1.3.48:
+   * Bug fix for restoring correct file times on Windows clients.
+ 
+diff -Naur burp~/Makefile.in burp/Makefile.in
+--- burp~/Makefile.in	2015-11-01 21:14:52.621376413 +0000
++++ burp/Makefile.in	2015-11-01 22:09:25.098997115 +0000
+@@ -90,8 +90,6 @@
+ 	$(MKDIR) $(DESTDIR)$(sbindir)
+ 	$(MKDIR) $(DESTDIR)$(sysconfdir)
+ 	$(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client
+-	$(MKDIR) $(DESTDIR)/var/run
+-	$(MKDIR) $(DESTDIR)/var/spool/burp
+ 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi
+ 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi
+ 	@if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi
diff --git a/pkgs/tools/backup/burp/burp_1.4.40.patch b/pkgs/tools/backup/burp/burp_1.4.40.patch
new file mode 100644
index 000000000000..fe57202bc34a
--- /dev/null
+++ b/pkgs/tools/backup/burp/burp_1.4.40.patch
@@ -0,0 +1,12 @@
+diff -Naur burp~/Makefile.in burp/Makefile.in
+--- burp~/Makefile.in	2015-11-01 21:14:52.621376413 +0000
++++ burp/Makefile.in	2015-11-01 22:09:25.098997115 +0000
+@@ -90,8 +90,6 @@
+ 	$(MKDIR) $(DESTDIR)$(sbindir)
+ 	$(MKDIR) $(DESTDIR)$(sysconfdir)
+ 	$(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client
+-	$(MKDIR) $(DESTDIR)/var/run
+-	$(MKDIR) $(DESTDIR)/var/spool/burp
+ 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi
+ 	@if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi
+ 	@if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
new file mode 100644
index 000000000000..a81a659eada4
--- /dev/null
+++ b/pkgs/tools/backup/burp/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchgit,
+	acl,
+	librsync,
+	ncurses,
+	openssl,
+	zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "burp-1.4.40";
+
+  src = fetchgit {
+    url = "https://github.com/grke/burp.git";
+    rev = "1e8eebac420f2b0dc29102602b7e5e437d58d5b7";
+    sha256 = "201fe6daf598543eaf3c8cf3495812b3a65695c6841f555410aaaab1098b8f03";
+  };
+
+  patches = [ ./burp_1.4.40.patch ];
+
+  buildInputs = [ librsync ncurses openssl zlib ]
+    # next two lines copied from bacula, as burp needs acl as well
+    # acl relies on attr, which I can't get to build on darwin
+    ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
+
+    configureFlags = [ 
+      "--sbindir=$out/bin" 
+    ];
+
+  #installPhase = ''make install'';
+
+  meta = with stdenv.lib; {
+    description = "BURP - BackUp and Restore Program";
+    homepage    = http://burp.grke.org;
+    license     = licenses.agpl3;
+    maintainers = with maintainers; [ tokudan ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5af665e81ecf..e5943b555e7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -985,6 +985,10 @@ let
     par2Support = (config.bup.par2Support or false);
   };
 
+  burp_1_3 = callPackage ../tools/backup/burp/1.3.48.nix { };
+
+  burp = callPackage ../tools/backup/burp { };
+
   byzanz = callPackage ../applications/video/byzanz {};
 
   ori = callPackage ../tools/backup/ori { };

From 97e65957526029bcd6e3c949508dbb4152ae2dc5 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 3 Nov 2015 23:11:53 +0100
Subject: [PATCH 2/3] burp: remove unnecessary CHANGELOG entry in burp

---
 pkgs/tools/backup/burp/burp_1.3.48.patch | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/tools/backup/burp/burp_1.3.48.patch b/pkgs/tools/backup/burp/burp_1.3.48.patch
index 4349a861a9a1..fe57202bc34a 100644
--- a/pkgs/tools/backup/burp/burp_1.3.48.patch
+++ b/pkgs/tools/backup/burp/burp_1.3.48.patch
@@ -1,13 +1,3 @@
-diff -Naur burp~/CHANGELOG burp/CHANGELOG
---- burp~/CHANGELOG	2015-11-01 21:14:52.621376413 +0000
-+++ burp/CHANGELOG	2015-11-01 21:31:44.718110435 +0000
-@@ -1,3 +1,6 @@
-+2015-11-01 NixOS Patch:
-+  * remove dependency on /var and use localstatedir instead
-+
- 2014-01-27 Changes in burp-1.3.48:
-   * Bug fix for restoring correct file times on Windows clients.
- 
 diff -Naur burp~/Makefile.in burp/Makefile.in
 --- burp~/Makefile.in	2015-11-01 21:14:52.621376413 +0000
 +++ burp/Makefile.in	2015-11-01 22:09:25.098997115 +0000

From 0d18edd645e9197a8b60327cd79b18dbe337e5bb Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Wed, 4 Nov 2015 19:22:39 +0100
Subject: [PATCH 3/3] burp: updates to match the coding conventions

---
 pkgs/tools/backup/burp/1.3.48.nix  | 16 ++++------------
 pkgs/tools/backup/burp/default.nix | 16 ++++------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/backup/burp/1.3.48.nix b/pkgs/tools/backup/burp/1.3.48.nix
index f680b9826cf2..a3cef656bdbc 100644
--- a/pkgs/tools/backup/burp/1.3.48.nix
+++ b/pkgs/tools/backup/burp/1.3.48.nix
@@ -1,10 +1,4 @@
-{ stdenv, fetchgit,
-	acl,
-	librsync_0_9,
-	ncurses,
-	openssl,
-	zlib
-}:
+{ stdenv, fetchgit, acl, librsync_0_9, ncurses, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   name = "burp-1.3.48";
@@ -22,11 +16,9 @@ stdenv.mkDerivation rec {
     # acl relies on attr, which I can't get to build on darwin
     ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
 
-    configureFlags = [ 
-      "--sbindir=$out/bin" 
-    ];
-
-  #installPhase = ''make install'';
+  configureFlags = [
+      "--sbindir=$out/bin"
+  ];
 
   meta = with stdenv.lib; {
     description = "BURP - BackUp and Restore Program";
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index a81a659eada4..5dea4eba4895 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -1,10 +1,4 @@
-{ stdenv, fetchgit,
-	acl,
-	librsync,
-	ncurses,
-	openssl,
-	zlib
-}:
+{ stdenv, fetchgit, acl, librsync, ncurses, openssl, zlib }:
 
 stdenv.mkDerivation rec {
   name = "burp-1.4.40";
@@ -22,11 +16,9 @@ stdenv.mkDerivation rec {
     # acl relies on attr, which I can't get to build on darwin
     ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
 
-    configureFlags = [ 
-      "--sbindir=$out/bin" 
-    ];
-
-  #installPhase = ''make install'';
+  configureFlags = [
+    "--sbindir=$out/bin"
+  ];
 
   meta = with stdenv.lib; {
     description = "BURP - BackUp and Restore Program";