[gentoo-commits] gentoo-x86 commit in app-backup/burp/files: 1.3.48-bedup-conf-path.patch 1.4.26-bedup-conf-path.patch burp.initd 1.4.26-tinfo.patch 1.3.8-bedup-conf-path.patch 1.3.48-tinfo.patch

[Amadeusz Zolnowski (aidecoe)]

aidecoe     14/12/01 16:28:47

  Added:                1.3.48-bedup-conf-path.patch
                        1.4.26-bedup-conf-path.patch burp.initd
                        1.4.26-tinfo.patch 1.3.8-bedup-conf-path.patch
                        1.3.48-tinfo.patch
  Log:
  Add initial version of the burp package. Import ebuilds from the aidecoe's
  overlay [1]. Add various versions at once: 1.3.48 is the latest stable
  version, 1.4.26 is the latest stable candidate and 1.3.8 is an old version
  for people who use burp on Debian and want to have the same version.
  
  Thanks for contribution to (in order by first name):
  - Aurelien Reynaud <aurelien@××××××××××.net>
  - Jared B. <nitro@×××××××.net>
  - Jeroen Roovers <jer@g.o>
  
  Thanks to perfinion for review.
  
  [1] https://github.com/aidecoe/aidecoe-overlay
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)

Revision  Changes    Path
1.1                  app-backup/burp/files/1.3.48-bedup-conf-path.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.3.48-bedup-conf-path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.3.48-bedup-conf-path.patch?rev=1.1&content-type=text/plain

Index: 1.3.48-bedup-conf-path.patch
===================================================================
diff -Naur burp-1.3.48/manpages/bedup.8 burp-1.3.48.new/manpages/bedup.8
--- burp-1.3.48/manpages/bedup.8	2014-01-27 11:55:47.000000000 +0100
+++ burp-1.3.48.new/manpages/bedup.8	2014-11-22 12:57:20.241299376 +0100
@@ -16,7 +16,7 @@
 .SH OPTIONS
 .TP
 \fB\-c\fR \fBpath\fR
-Path to config file (default: /etc/burp/burp.conf).
+Path to config file (default: /etc/burp/burp-server.conf).
 .TP
 \fB\-g\fR \fB<list of group names>\fR
 Only run on the directories of clients that are in one of the groups specified. The list is comma-separated. To put a client in a group, use the 'dedup_group' option in the client configuration file on the server.
@@ -42,7 +42,7 @@
 \fB\-V\fR \fB\fR
 Print version and exit.\fR
 .TP
-By default, bedup will read /etc/burp/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR
+By default, bedup will read /etc/burp/burp-server.conf and deduplicate client storage directories using special knowledge of the structure.\fR
 .TP
 With '\-n', this knowledge is turned off and you have to specify the directories to deduplicate on the command line. Running with '\-n' is therefore dangerous if you are deduplicating burp storage directories.
 
diff -Naur burp-1.3.48/src/bedup.c burp-1.3.48.new/src/bedup.c
--- burp-1.3.48/src/bedup.c	2014-01-27 11:55:47.000000000 +0100
+++ burp-1.3.48.new/src/bedup.c	2014-11-22 12:57:20.241299376 +0100
@@ -734,7 +734,7 @@
 static char *get_config_path(void)
 {
         static char path[256]="";
-        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp.conf");
+        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp-server.conf");
         return path;
 }
 



1.1                  app-backup/burp/files/1.4.26-bedup-conf-path.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.4.26-bedup-conf-path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.4.26-bedup-conf-path.patch?rev=1.1&content-type=text/plain

Index: 1.4.26-bedup-conf-path.patch
===================================================================
diff -Naur burp/manpages/bedup.8 burp.new/manpages/bedup.8
--- burp/manpages/bedup.8	2014-10-28 12:45:26.000000000 +0100
+++ burp.new/manpages/bedup.8	2014-11-21 09:49:57.705796144 +0100
@@ -16,7 +16,7 @@
 .SH OPTIONS
 .TP
 \fB\-c\fR \fBpath\fR
-Path to config file (default: /etc/burp/burp.conf).
+Path to config file (default: /etc/burp/burp-server.conf).
 .TP
 \fB\-g\fR \fB<list of group names>\fR
 Only run on the directories of clients that are in one of the groups specified. The list is comma-separated. To put a client in a group, use the 'dedup_group' option in the client configuration file on the server.
@@ -42,7 +42,7 @@
 \fB\-V\fR \fB\fR
 Print version and exit.\fR
 .TP
-By default, bedup will read /etc/burp/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR
+By default, bedup will read /etc/burp/burp-server.conf and deduplicate client storage directories using special knowledge of the structure.\fR
 .TP
 With '\-n', this knowledge is turned off and you have to specify the directories to deduplicate on the command line. Running with '\-n' is therefore dangerous if you are deduplicating burp storage directories.
 
diff -Naur burp/src/bedup.c burp.new/src/bedup.c
--- burp/src/bedup.c	2014-10-28 12:45:56.000000000 +0100
+++ burp.new/src/bedup.c	2014-11-20 21:39:28.728206536 +0100
@@ -740,7 +740,7 @@
 static char *get_config_path(void)
 {
         static char path[256]="";
-        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp.conf");
+        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp-server.conf");
         return path;
 }
 



1.1                  app-backup/burp/files/burp.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/burp.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/burp.initd?rev=1.1&content-type=text/plain

Index: burp.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-backup/burp/files/burp.initd,v 1.1 2014/12/01 16:28:47 aidecoe Exp $

PIDFILE=/run/burp-server.pid

depend() {
	need localmount
	after bootmisc
	use net
}

start() {
	ebegin "Starting burp server"
	checkpath -o burp:burp -m 0775 -d /run/lock/burp
	checkpath -o root:burp -m 0775 -d /etc/burp
	checkpath -o root:burp -m 0775 -d /etc/burp/CA
	checkpath -o root:burp -m 0750 -d /etc/burp/clientconfdir
	checkpath -o root:burp -m 0640 -f /etc/burp/burp-server.conf
	start-stop-daemon --start \
		--pidfile "$PIDFILE" \
		--make-pidfile \
		--background \
		--wait 500 \
		--exec /usr/sbin/burp -- -c /etc/burp/burp-server.conf -F
	eend $? "Failed to start burp server"
}

stop() {
	ebegin "Stopping burp server"
	start-stop-daemon --stop \
		--pidfile "$PIDFILE"
	eend $? "Failed to stop burp server"
}



1.1                  app-backup/burp/files/1.4.26-tinfo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.4.26-tinfo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.4.26-tinfo.patch?rev=1.1&content-type=text/plain

Index: 1.4.26-tinfo.patch
===================================================================
diff -Naur burp/configure.ac burp-new/configure.ac
--- burp/configure.ac	2014-10-28 12:45:56.000000000 +0100
+++ burp-new/configure.ac	2014-11-10 17:40:50.996955441 +0100
@@ -1203,13 +1203,12 @@
 fi
 
 AC_CHECK_HEADERS(ncurses.h)
-AC_CHECK_LIB(ncurses, curs_set, [NCURSES_LIBS="-lncurses"])
 have_ncurses=no
-if test x$NCURSES_LIBS = x-lncurses; then
-   AC_DEFINE(HAVE_NCURSES, 1, [Defined to 1 if libncurses was found])
-   have_ncurses=yes
-fi
-AC_SUBST(NCURSES_LIBS)
+AC_CHECK_LIB(ncurses, endwin,
+	[NCURSES_LIBS="-lncurses"; have_ncurses=yes]
+	AC_SEARCH_LIBS(curs_set, tinfo, [NCURSES_LIBS="$NCURSES_LIBS $ac_res"]),
+	AC_DEFINE(HAVE_NCURSES, 1, [Defined to 1 if libncurses was found])
+	AC_SUBST(NCURSES_LIBS))
 
 dnl
 dnl Check if we have AFS on this system



1.1                  app-backup/burp/files/1.3.8-bedup-conf-path.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.3.8-bedup-conf-path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.3.8-bedup-conf-path.patch?rev=1.1&content-type=text/plain

Index: 1.3.8-bedup-conf-path.patch
===================================================================
diff -Naur burp-1.3.48/manpages/bedup.8 burp-1.3.48.new/manpages/bedup.8
--- burp-1.3.48/manpages/bedup.8	2014-01-27 11:55:47.000000000 +0100
+++ burp-1.3.48.new/manpages/bedup.8	2014-11-22 12:57:20.241299376 +0100
@@ -16,7 +16,7 @@
 .SH OPTIONS
 .TP
 \fB\-c\fR \fBpath\fR
-Path to config file (default: /etc/burp/burp.conf).
+Path to config file (default: /etc/burp/burp-server.conf).
 .TP
 \fB\-g\fR \fB<list of group names>\fR
 Only run on the directories of clients that are in one of the groups specified. The list is comma-separated. To put a client in a group, use the 'dedup_group' option in the client configuration file on the server.
@@ -42,7 +42,7 @@
 \fB\-V\fR \fB\fR
 Print version and exit.\fR
 .TP
-By default, bedup will read /etc/burp/burp.conf and deduplicate client storage directories using special knowledge of the structure.\fR
+By default, bedup will read /etc/burp/burp-server.conf and deduplicate client storage directories using special knowledge of the structure.\fR
 .TP
 With '\-n', this knowledge is turned off and you have to specify the directories to deduplicate on the command line. Running with '\-n' is therefore dangerous if you are deduplicating burp storage directories.
 
diff -Naur burp-1.3.48/src/bedup.c burp-1.3.48.new/src/bedup.c
--- burp-1.3.48/src/bedup.c	2014-01-27 11:55:47.000000000 +0100
+++ burp-1.3.48.new/src/bedup.c	2014-11-22 12:57:20.241299376 +0100
@@ -734,7 +734,7 @@
 static char *get_config_path(void)
 {
         static char path[256]="";
-        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp.conf");
+        snprintf(path, sizeof(path), "%s", SYSCONFDIR "/burp-server.conf");
         return path;
 }
 



1.1                  app-backup/burp/files/1.3.48-tinfo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.3.48-tinfo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/burp/files/1.3.48-tinfo.patch?rev=1.1&content-type=text/plain

Index: 1.3.48-tinfo.patch
===================================================================
diff -Naur burp-1.3.48/configure.in burp-1.3.48.new/configure.in
--- burp-1.3.48/configure.in	2014-01-27 11:55:47.000000000 +0100
+++ burp-1.3.48.new/configure.in	2014-11-22 13:01:01.192403673 +0100
@@ -1203,13 +1203,12 @@
 fi
 
 AC_CHECK_HEADERS(ncurses.h)
-AC_CHECK_LIB(ncurses, curs_set, [NCURSES_LIBS="-lncurses"])
 have_ncurses=no
-if test x$NCURSES_LIBS = x-lncurses; then
-   AC_DEFINE(HAVE_NCURSES, 1, [Defined to 1 if libncurses was found])
-   have_ncurses=yes
-fi
-AC_SUBST(NCURSES_LIBS)
+AC_CHECK_LIB(ncurses, endwin,
+	[NCURSES_LIBS="-lncurses"; have_ncurses=yes]
+	AC_SEARCH_LIBS(curs_set, tinfo, [NCURSES_LIBS="$NCURSES_LIBS $ac_res"]),
+	AC_DEFINE(HAVE_NCURSES, 1, [Defined to 1 if libncurses was found])
+	AC_SUBST(NCURSES_LIBS))
 
 dnl
 dnl Check if we have AFS on this system