Fixed patches for 3.3.0

app-backup/backuppc/Manifest

@@ -8,6 +8,9 @@ AUX 3.2.0/02-fix-config.pl-formatting.patch 23376 SHA256 74eed985679d7b4a8452489
 AUX 3.2.0/03-reasonable-config.pl-defaults.patch 1206 SHA256 6265059ff712926de2b2c345f36a6e3cd3238de73c77b299b714a5d39e33c105 SHA512 ac6d2b0e6cd378958368fde18293d45cd3576126e333d75e295d4dc27bb0656d24d9639725c6ddf6ce75ee6b02604aee0e866c49f86c43b931b1c63476c174eb WHIRLPOOL e0c57e2350f70aa0c05e27cdcc3285adf897b5bf4a082ab7be9fed4aa31964f36728b1008558559373dbd09d6f0565fc6b680b437cff08eb4bf466d6da786dcc
 AUX 3.2.0/04-add-docdir-marker.patch 470 SHA256 9236caf66f1d5cd607ced53173cd127d49bfacb08212e93e0beff37ad80cc4bb SHA512 82b3fbb9c86405f2d8ab12f0a8de21d4b793ec012bfb1cd0fb3a51b769c3d29cfda1adf1b701826fd3e36e0a8aaf10b84b75643620b6512bd2351bbe768fc636 WHIRLPOOL 3526872a7f3ee121791624f4ba8c19a9cbbf899813ec832e2bcb6da77b9e936c845f893e9665d038d918802cc99fee92712737df12d734a411c118a97376d2ed
 AUX 3.2.0/05-nicelevel.patch 756 SHA256 a707a592754fadc92a769a488518b355468afa8d57a280e29adff4e8c4384566 SHA512 b33fe04ba54c8d28c51a3c2d85b13e204db9a7f4f193d25888c168234f6fbe6f02a49403b7097f056d7ab8495cddaf457f1776d64bcc84188d2d67e8ea77c1f6 WHIRLPOOL bf6150e8e4c149762c0b53ac79d591215f2594eaeabb1408c6bc432653a5b713bf5894e94d4480eb765be10a3b7a9294f87994e022529e750e19ebe68f4ce746
+AUX 3.3.0/01-fix-configure.pl.patch 1098 SHA256 54b7371fd3f68a9d3dde5f06b93992aa3c5a17f0d759c7b674fa7a640b461d43 SHA512 532b88689e50c0a399b42a3264975e1fc71a97b9edfd60faf5e94d0bfad972717c380b8925ca4d7df1e402b13f7104082a57bbecd3fbf74113c6f0e4d0990584 WHIRLPOOL 1eb3dcc5bae154a02132a55c80142196dd98f932678df73cdb88b2fafaa3cc88d9583cee21046794f7e6eeb24573d4d6258fd6bcf84ac0a2da45ae4c613d639f
+AUX 3.3.0/02-fix-config.pl-formatting.patch 23353 SHA256 9f68c0b8b0e9ce8e2a5b9498dfd553368eac78ce0c942340f7bcdbdf5725e542 SHA512 0999f7b7f5ae29435e2b833082d69c5244c44fb0a64b7b7531647bd33134b70b99492f594ae33efa32cf69922a05fcbc086152373c697eb8858297d44c149a64 WHIRLPOOL 1f0ab6cbe64dffacfce78135b7a6a4b897047ef525fef418c0be726dfe66fd3c47ca99ec3b530837927b1c6b68eb7ab016bbe06626619f25b8bb0fd4bd2afe49
+AUX 3.3.0/03-reasonable-config.pl-defaults.patch 1206 SHA256 bad0508f0a4d030a018774aebb39952acbbba5d8955b7453bf98999dd19d0d2b SHA512 317f5aab5eebe31a7f1c938b4dfbb4f8ebc20bb42ccc5cd17307e21aacfd581cb1e4be9bef372cdde048c4958577e72cc1477f462e820c60f2b25bdd9b6cd0ec WHIRLPOOL cdbfc81ba43438c0a1aaa59e4e286fae4f93a851c290b3eee16d036185093872039fea461e7e7c35e55c7112575d0c37146e7a3592d6ce1314ea9d3db893197a
 AUX apache2-backuppc.conf 3047 SHA256 68204bd1f4e0ce88b1e883f5ca3a46abaeb07ec84b9a92030ab40c8d4af817e8 SHA512 f1bbf29cb3b47ee835078fbc3ccfc1114e4c67e283098a0230f6ae7046846cac738ee5c66e29d02ec1df88da3b323b5155cb691db10ed23c22059ee78738637b WHIRLPOOL 07af72e4868e0b3a54ce5b436b5fa4884828455c0fd02273283df094b10b258ce2a66c6214c238255b132e1813964ade1132aa8be3ec25462dc5ba94ff622abf
 AUX apache2-backuppc.init 3800 SHA256 a8b29805a82315f47e0b8e8583c530ba0e4c0b0393001bed4cd2759c2a0c6bb9 SHA512 3dc5c3e0b2f4d8a63271230f92564e458c570ffad1630edbcfb1c40a2b747e8ac65a840c033a0150a6523d13ee266a5647da8e4c72fb699110a30b78ad1057ce WHIRLPOOL 121685a279a78150475effffc49ebe783b47d4f260953edcc32f890df529976fbb484fdb061c409300f7109ffbe24d8d060a5dbe6b7348715a6d066adfa3d9b8
 AUX httpd.conf 11857 SHA256 20a5e1b7c9c0ccd0627a72c9bc8b4b6febcecf8912a990516373ea5899d33d9c SHA512 8d63fa0b0fcd00159330cbc2f6ec617800b6e4d2eadda1c001921a799bc5ca87574e0d106ee2e8b5b24d40977ff6d8887803d22f8676c5a30e2bc092244c5292 WHIRLPOOL 0a47db39b4282bdb0879a660fa4c762297fc64bbbce7f1d83d94d246994121b1ce02f261038af645e2e9ab16e45cbcfd8562c51593973308269b6e9403b9922f
@@ -21,6 +24,6 @@ EBUILD backuppc-3.1.0-r3.ebuild 6068 SHA256 a2e8c422bbe158890d2560259c4d0427e533
 EBUILD backuppc-3.2.0-r1.ebuild 6152 SHA256 1b8b2b5eee2d12fadbbacc33ea01ba916412054972aff44ccaf48146d6232794 SHA512 9054df759a72a11c907767559ddec308ae2e133098fc12e0aed3f84491c83db74f9d17f79fc57c69ed5480743993cfa0116870a9f38043d7db144d7e7bfee81a WHIRLPOOL 94f65625749b61f672e67e596db4d576cf4fff42879d456894f484b2ea232877c8f026f6cb9c25cb8f8a8272fe5c7ed87467979ef8016bf534dd73ad41cbdadf
 EBUILD backuppc-3.2.1-r2.ebuild 6665 SHA256 8c96adfd9a8754b0fc5dad2dbea2e3db3c712db1ace11d9dbb45b9c856a90d57 SHA512 3f17cf3c1e72b480e5645eac5da47be4ef1d8e7e6047a84a7eff16694f4feb53dce082a260f1c04acb6534a40fc8e52cab4f335f4f36a5bfa608b6f78e756079 WHIRLPOOL eb3369173cb8026cd9668cafd20189940bc31dd8cd4deb538ee26a2574003f416c74131bd997c45c957c6acab2017e6ddae614dabe1aa49b0c4521e8a20f34b8
 EBUILD backuppc-3.2.1.ebuild 6152 SHA256 6e3c35582f11cfb8facece1cb5ea848ba71dcce3bdc9e538ddc15da0bebd2559 SHA512 159e93916064934e8b44fed42c9fc3f7c79c1b7ed1af7db3fcb373f65573d4eb03fb102996021bb535c5d525acbbfbaef24065e92ea210df0cb649825a75ce4b WHIRLPOOL 077cbe22defd86e668006cc85de324198ae5dff544c932cda7c1631635d1ddebb6cab8515865914d0e586d84eb30c75b6a04b295a6692c9813b33091c3e86a95
-EBUILD backuppc-3.3.0.ebuild 6594 SHA256 949dd60616156f24688a0df8d415559af5ee6807ff3486f3cb3caef82a7c2bc6 SHA512 37f1173bcec82b3ef98be167e9f3baf69e8a95f090c452b4bbb1d8c06eb14e6083a66f5e56b509ef1e5ef5a899ba290b0839d30b9e61c70b6c74d9435fd32621 WHIRLPOOL c133622520377aec0786a7997331431b69c0b999b8117b00cc48f072fd71a9e43cdefcbe1453387f4e96ab8fd336a91f46abdd5e2ddfae05e411dac0e4a9bbf7
+EBUILD backuppc-3.3.0.ebuild 6594 SHA256 6ff20998812c87c46eece3cfb237a81a1f0c11747ab8338f2f76e6b7fc452eff SHA512 fa96d1dd97255e60a641b1233394b1d434622c2c1fc65dfad498e05890c746adbb2423603c161d7aab9d03d2af17c2c36a8a7ae25caf07dc75b6c31ad94529dc WHIRLPOOL bbca039ee9ef5e1f8f2875db2d0e42826202f75ed06fdf1541a04c2fc60af66e6eca1b92b2469e91e2db732f5c001b6e90608d97f5310a96ece81be3e80f288f
 MISC ChangeLog 1020 SHA256 8d49c1785d88e2f3ae3832d3d6d2c672cc98bbff9d37b558c6ccc74862274d52 SHA512 9d33d9133b75563047082ffa855eade3e0dcd22b80cd206c77879f7df480eab3151867920637ea2359b46c8644b78504653566c1fa738cf1cdb508ee1aac8170 WHIRLPOOL 14110b06bbabb17417d138010c2da5d7f3f71cdfb20b61702463982138d4612be4c67566c701ad673a7ce986292449473756a81faf1dd4fcfb1b271255ca3bbb
 MISC metadata.xml 505 SHA256 2c461cd601ed00f142b5994f2998df2308a47f79c46c1016e83b4109fb9d044e SHA512 4bb2698f556eea009cdc4617b71c3ab111aed836cb199a7089b7d8fe4f9815e61f55018f17899a2d0448cbe4a324e858784c9a8410b869d5f4c4d53fb29bb938 WHIRLPOOL 566037349de78144d5987c5cb3973ecf99646217744fc5ba7e855ae188b87ab00cc9e43cbb3c954f33e4102a6f019c87fcb28d1cf201f2ae9dd34b3eace1dd76

app-backup/backuppc/backuppc-3.3.0.ebuild

@@ -57,9 +57,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/3.2.0/01-fix-configure.pl.patch"
-	epatch "${FILESDIR}/3.2.0/02-fix-config.pl-formatting.patch"
-	epatch "${FILESDIR}/3.2.0/03-reasonable-config.pl-defaults.patch"
+	epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
+	epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
+	epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
 
 	# Fix the documentation location in the CGI interface
 	epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"

app-backup/backuppc/files/3.3.0/01-fix-configure.pl.patch

@@ -0,0 +1,30 @@
+--- configure.pl.dist	2013-09-23 23:01:19.524743747 +0300
++++ configure.pl	2013-09-23 23:01:37.344567459 +0300
+@@ -158,7 +158,7 @@
+ # config file to get all the defaults.
+ #
+ my $ConfigPath = "";
+-my $ConfigFileOK = 1;
++my $ConfigFileOK = 0;
+ while ( 1 ) {
+     if ( $ConfigFileOK && -f "/etc/BackupPC/config.pl" ) {
+         $ConfigPath = "/etc/BackupPC/config.pl";
+@@ -213,7 +213,8 @@
+         $bpc->{LogDir} = $Conf{LogDir}  = "$Conf{TopDir}/log"
+                     if ( $Conf{LogDir} eq '' );
+     }
+-    $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
++    # Disable this as it's not really neccessary for this ebuild
++    # $bpc->{ConfDir} = $Conf{ConfDir} = $confDir;
+     my $err = $bpc->ServerConnect($Conf{ServerHost}, $Conf{ServerPort}, 1);
+     if ( $err eq "" ) {
+         print <<EOF;
+@@ -729,7 +730,7 @@
+     if ( $Conf{CgiDir} =~ m{cgi-bin(/.*)} ) {
+ 	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin$1/BackupPC_Admin'";
+     } else {
+-	$Conf{CgiURL} = "'http://$Conf{ServerHost}/cgi-bin/BackupPC_Admin'";
++	$Conf{CgiURL} = "'http://$Conf{ServerHost}/BackupPC_Admin'";
+     }
+ }
+