diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-backup/burp/files/1.3.48-bedup-conf-path.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-backup/burp/files/1.3.48-bedup-conf-path.patch')
-rw-r--r-- | app-backup/burp/files/1.3.48-bedup-conf-path.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/app-backup/burp/files/1.3.48-bedup-conf-path.patch b/app-backup/burp/files/1.3.48-bedup-conf-path.patch new file mode 100644 index 000000000000..a9bed192d96c --- /dev/null +++ b/app-backup/burp/files/1.3.48-bedup-conf-path.patch @@ -0,0 +1,33 @@ +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; + } + |