Merge branch 'master.upstream' into staging.upstream

4 files changed, 84 insertions, 0 deletions

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..a3cef656bdbc
--- /dev/null
+++ b/pkgs/tools/backup/burp/1.3.48.nix
@@ -0,0 +1,30 @@
+{ 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"
+  ];
+
+  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..fe57202bc34a
--- /dev/null
+++ b/pkgs/tools/backup/burp/burp_1.3.48.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/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..5dea4eba4895
--- /dev/null
+++ b/pkgs/tools/backup/burp/default.nix
@@ -0,0 +1,30 @@
+{ 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"
+  ];
+
+  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;
+  };
+}