Apply patch changing default config path for bedup

Package-Manager: portage-2.2.14 Manifest-Sign-Key: F0134531E1DBFAB5
aidecoe · Nov 21, 2014 · 7a2d3b0 · 7a2d3b0
1 parent 23b18e4
commit 7a2d3b0
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 10 deletions.
diff --git a/app-backup/burp/ChangeLog b/app-backup/burp/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Nov 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> burp-1.4.26.ebuild,
+  +files/1.4.26-bedup-conf-path.patch:
+  Apply patch changing default config path for bedup.
+
   19 Nov 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> burp-1.4.26.ebuild:
   Don't generate certificates in postinst phase. Print instructions instead.
 

diff --git a/app-backup/burp/Manifest b/app-backup/burp/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.4.26-bedup-conf-path.patch 1620 SHA256 d82432b127efa3f9b409ae8acdb81b90b213afe30a070fb5b58c0215ac6ba89e SHA512 89298b0d8ce135570070ac688e1798c0eb73c1b2d0cad233c417638afcdcd7409fa029ac78b5c13fd98d6cf6c297c1cb545f5b0b706b53f70b181db174a16255 WHIRLPOOL 36b25bae02b58279fbefaeff1c95d5e7d4c20cb3033ea4e0a07f5a388cbdfb09308020c2140b96e5f07035544449c1ff6f886c24c341786657a1c53adb3297bf
 AUX 1.4.26-tinfo.patch 767 SHA256 5283a6e2ebbfc5192a9598bf2cbf3bc63d6a11613d1fa650708358da584ad519 SHA512 2f2a60951357f9d05213616ae1e623feb052bdd480e8c46e47eaabb86b53a5822e8ffcbd321d502de49b670f72075445e303ef78bcb02deb9ee16ae7f7590b65 WHIRLPOOL 3bb7a934be592b0f282aaf93e94c4ae7c939bd9cc945e122c40ba242284f48cac3855c240081fc654b6e684ddbd5769ead1ff0c2d3ccbd6e7bda824b34f7ba18
 AUX burp.initd 747 SHA256 25f3916271523a4fdda027c188698b35576aa431ccc19f1f80d2b63d2ebfb59b SHA512 f00295d843ab6fa1f1ff14f182ead2bdf806686139cd2ebdb410c6fa0a10989253cd82e0828d3e4bca6d64e5c1cc53c4e9ead4a0bf608d17212492e6052b6a73 WHIRLPOOL 2983efd6f1845fb0756e9b33693f02c8173e46bb2ad566c69cb5cde2e0511a8129e72b5c76079ce0978cc7094b77540dd4690565b4d049d0701f41ebb4ff5d31
 DIST burp-1.4.26.tar.bz2 710273 SHA256 04111dd0d41277b6b257d7551333f394a3b6da12ffefc8222ba99777ed9448ff SHA512 d42249ac837a642ad0ca980060053d58685c2a5aa61d790ad67a72828fe632f99346886d29e175f6f533267608e55d784db86d5f0ee946519b937ef2825d4530 WHIRLPOOL f724d0a91d4447c5a2ce7920662078a845ae300966bc9425632f80f81cfd19b223c8f0c108c7e6e636a4503837b7202b643bc3c933d3e894d3a0f7a0358d4458
-EBUILD burp-1.4.26.ebuild 2421 SHA256 7c525378d84d6039e63c33584669d4b2899d53439817a3de378b30698dff139b SHA512 319d864f8a7d4c150fbeded222ef09df9215b6ae7274e7e68a2e810d59be415b53455e1b3be5fa80ee8ed699b69955d67bc88931176e38cba509d414f5438721 WHIRLPOOL b74ef84508b25f44993aa7b2e4ba4fb3ae47448f9fa90b97dba5c97277798a7d58188ce9dc9a26ab3b5dec08ef95931b87f334bfb68b4e77f1f7fa473d3ca3d9
-MISC ChangeLog 1594 SHA256 3f30996a8fe1af22aa35b8eb3187ceb9719d30f1f4d7c40f34cbd327fb56be82 SHA512 b8123559ee50c2316be5f7a512d80f93ef66aa9ae67dc2f3cea2c3a9418d6ddc675762ff7e2260acd57670f7e17cdff2f8156329d0e57a12bfb3860ab4fc0669 WHIRLPOOL b0726c93b1353520d85c4278e23bf8f30e36797da00783c4fbcdc337c6b4ef6437b1b5033e2d5ffe506e2fbe6ac5644fa8d34ed9671b64904b0646d759dde6c2
+EBUILD burp-1.4.26.ebuild 2468 SHA256 05336c89f0851897f344b1597be56532c76671dab656138330df6ddaef7b34c9 SHA512 45602204afc12871f381262782f09c607d6ebff1ecaf6b0a38bc1b5cbeb7f1a8396f3ee7742d840a5417b5e1460795d26f9aed644e5ae8e0c5aa13f327df8b48 WHIRLPOOL 0b51e66888349f0ac8a303c5d581ec9837c76c47d02d7e4038b0f5bff34b9c04293caecb5acbd9e766cd8d5faf897630a741890d848c96f32afa3300a44ec9d2
+MISC ChangeLog 1765 SHA256 9bc03bc76452aed371088e54cb7f9b645c72fcb8b635b6a9a3954764bc7deac0 SHA512 ecab5b68de674a792199d399eba4ca44f75df5896d9bc95dd197bcb2164a5cbabd3ca12e519d45ed4ba9dfd6e461907e7390d69cf07312f57b13a567dab09173 WHIRLPOOL 783044377d4e93475546f76be632cfd82c75c9aff28f0550e594fcd9b66119ece557a91805964cdf2490f0b40631c5fd0e9b4b8f92965baa09355ecf865d430b
 MISC metadata.xml 556 SHA256 9c70bf04bfc1bf607ab5319f644fb52eb4e3aa53fe1cc6d7453a6eae3d8463e6 SHA512 31801c6438c7e6bd44dbd2cd137c509584d91c57837dca6392544bd312a6ff4abb5cbd9b7486983d2146a18f9b22303bfa69a66982cbdecbf8daff78b43cdfae WHIRLPOOL ab1cc652c1a6a78777f09678649faa17dc648139dcc8f9c7045a0c0aaaf18b1178be75f60b89939c9606885dce4b152c95aae061e8bd0ff2b6cf644ec7d4df24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUbRQ3AAoJEPATRTHh2/q1cM4H/1KlXSjdnBt+amUaCiltB8as
-4LprSQUzoUU9z2WSdT0QBVRGJJhLpPO35VY9PtFDzQ2t9Sp8FzOqMAuT1mkJswGT
-JNPS3dDFyY8NKKIlNmdCzEyLmzLaIvxSdcEPHVQ60wI5jd77Tdgt70/hi4VdEv0j
-ZYeG5UmTu0bwIHjRgvDU0PZxgsBMDiwJMPMbqq33Z0CLjxpi9g3TM9oEQNkv2YMQ
-EOV26cyGOrJ1JaLnmn8YIML3m5C6xnqy7MX6azMmb11PBCvBkrqg5rtFpyMcG3NY
-3WYvkeEhCidn92M9X4JFbAzkrsPkGrHo+FVEbrdwBWJ1CNNkZlYkYfEC0VkuaSg=
-=3XPh
+iQEcBAEBCAAGBQJUbv2CAAoJEPATRTHh2/q1lkAH/3vv3zZ0jAEZBL0V9lbmadGz
+zOiw15kHZ4AgNSLb16sCR6o4usHMchy0FuaUrCsSUwmHcuK6VkSLnDvnvo4JU3Mr
+4hY8bC72ehiSsEoFws6M/vl2K8P2GWt6ipYqjum6y0lBGmGXKWiTyryED3Q/XTx6
+Yzr+KR/usUPDGXhfrefd56LvYqdclu7uog1iE8TJSiCWD4JO5pDULIuyxQLMFtGc
+RIKYzoO6ueHez/xv6AHBinCrm8EbZO+KwY1i8G0Gx/e34iAMCU23O50YzUbpbkWT
+sfonvy+C+t3KobcRNuzBHuSZHrK/8UZAVpcI+MsqiISz9Y2LqohAji//ZJTg8Ec=
+=hQVJ
 -----END PGP SIGNATURE-----
diff --git a/app-backup/burp/burp-1.4.26.ebuild b/app-backup/burp/burp-1.4.26.ebuild
@@ -33,7 +33,10 @@ RDEPEND="${DEPEND}
 	"
 
 DOCS=( CONTRIBUTORS DONATIONS UPGRADING )
-PATCHES=( ${FILESDIR}/${PV}-tinfo.patch )
+PATCHES=(
+	"${FILESDIR}/${PV}-bedup-conf-path.patch"
+	"${FILESDIR}/${PV}-tinfo.patch"
+	)
 
 pkg_setup() {
 	enewgroup "${PN}"

diff --git a/app-backup/burp/files/1.4.26-bedup-conf-path.patch b/app-backup/burp/files/1.4.26-bedup-conf-path.patch
@@ -0,0 +1,33 @@
+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;
+ }
+