8 files changed, 56 insertions, 11 deletions
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index c0329913ac4a..36a6ac65cdf1 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -22,13 +22,13 @@ DIST amanda-3.4.3.tar.gz 5355137 SHA256 8ebca59d7b5fc64179fee3d9de4289cd9e8dbb49
 DIST amanda-3.4.4.tar.gz 5363929 SHA256 467e44eccd47170cf8ec40e914a2fbc1e6d50966e6a71c46d96091183c54a3d3 SHA512 e73ee29a6074396a885b08d9b1160b1e379423596dde872a14a8c8cf5845c9fcf3ea08038007a99063169a863d8b9f3ca9c23b8f5609d463a5b1f2ddcd44be96 WHIRLPOOL 221848cd608fd3e45b4f172f56ab691dc2a1dd659f3a5f15df6a2e973daae0964d88fd359c9975147b358289feb77779342f26956b0e693f8683da8d621f04ea
 DIST amanda-3.4.5.tar.gz 5365381 SHA256 bf05ea512676c7520ccff8d711e17176ea2aec47f7c517669cee02e8ab201343 SHA512 441efef6a34a1cb645c8c5d1e909f25230322ceb38d1efa0a104de2d9051640f7032255c8d8c7391a918102aceeb5073048070471fb642e185a2a113c817e00c WHIRLPOOL c21b1cbf276d60fae48c9178b7ae56416c81af4729341e9251b95c50775a3fdaf147c8d1d0e7c33b9477cd215ea4c0c51ac22e16348d2dfd9af20587d53f4b32
 DIST amanda-3.5.tar.gz 5386719 SHA256 099eb36321b1360ebde6156fb1e75f3e0245520b6f886a0e8e0f31a7a6169be4 SHA512 31340eb250972b2d7b2ad5e51c4f3fafb9de15b9f51f688447214174c77ea89d344f50709ca51d6ba965f8ed6977608f22d7bc6811cc97b63207f7a7cec8219c WHIRLPOOL b6d12e046203f3f553e197215c1da8ed610f07a34ac6b8ca7e5b11846308d1ee490aaaaeee8daeae94b8b6b18fcb18bc26e434dc95042d08b443118ccb504801
-EBUILD amanda-3.3.9.ebuild 16036 SHA256 5b67f5d069e07a48107619859d5f2a7581ba1eb8f6cc169cec788b9b25627637 SHA512 bdad3638e00cd1dacea03f2d3bf65c3e4d0583d65e5a6225b7c662b15811a589f66a0efce3a0278437c86c3fee3b158d0f68df06d184898e1ed21f53290909ed WHIRLPOOL 4bf2fc533b6d913d324a037e11f2a2df65ab92c67e11e80426526426f3ba3ff6248125042fafda10ffce95fc6464d50b59fa8a454f511ed4d0c8a9e0cc7e78b7
-EBUILD amanda-3.4.1.ebuild 16498 SHA256 a2e11040f80fe04ebccb91b85646293cd70ceddedb25417fb4548258b310344c SHA512 bc02c4d64af086d84780ae834e3e3d908a2ea1d35d48566b546b1be64ea2d17c771715b88defb7ce7066717a6a6dd8a1b30255d4a71daeab51b00811814fff25 WHIRLPOOL 5bb42bf6f4335ec291aa8ddbe7caf79573cc8d69837fd5e1f37c47660eddbc1b175cefd460cfe17b2d3ef87091da020dd106592f813833bedfe9637e8fe1d37d
-EBUILD amanda-3.4.2.ebuild 16404 SHA256 0570908d57a2104337f4fd80bdbffda465f853841fe7e2b3d3c83c8a6b6934f7 SHA512 a515bcac574e1e372d1031bf62861229848db57b38b93636cba7d419b3df931261df2973c2a866ec76b865d6c51c18d2cd4e26506007ab5066f77b2ecf52fbe3 WHIRLPOOL a65376e768697bbf3320499dabd4b6f6dc06a4625cbbceed1292246426b46b8e0c0592e421b2d25bfbbee630cc2b92323e0290a741570049aa587c992d55947e
-EBUILD amanda-3.4.3.ebuild 16404 SHA256 0570908d57a2104337f4fd80bdbffda465f853841fe7e2b3d3c83c8a6b6934f7 SHA512 a515bcac574e1e372d1031bf62861229848db57b38b93636cba7d419b3df931261df2973c2a866ec76b865d6c51c18d2cd4e26506007ab5066f77b2ecf52fbe3 WHIRLPOOL a65376e768697bbf3320499dabd4b6f6dc06a4625cbbceed1292246426b46b8e0c0592e421b2d25bfbbee630cc2b92323e0290a741570049aa587c992d55947e
-EBUILD amanda-3.4.4.ebuild 16404 SHA256 0570908d57a2104337f4fd80bdbffda465f853841fe7e2b3d3c83c8a6b6934f7 SHA512 a515bcac574e1e372d1031bf62861229848db57b38b93636cba7d419b3df931261df2973c2a866ec76b865d6c51c18d2cd4e26506007ab5066f77b2ecf52fbe3 WHIRLPOOL a65376e768697bbf3320499dabd4b6f6dc06a4625cbbceed1292246426b46b8e0c0592e421b2d25bfbbee630cc2b92323e0290a741570049aa587c992d55947e
-EBUILD amanda-3.4.5.ebuild 16404 SHA256 0570908d57a2104337f4fd80bdbffda465f853841fe7e2b3d3c83c8a6b6934f7 SHA512 a515bcac574e1e372d1031bf62861229848db57b38b93636cba7d419b3df931261df2973c2a866ec76b865d6c51c18d2cd4e26506007ab5066f77b2ecf52fbe3 WHIRLPOOL a65376e768697bbf3320499dabd4b6f6dc06a4625cbbceed1292246426b46b8e0c0592e421b2d25bfbbee630cc2b92323e0290a741570049aa587c992d55947e
-EBUILD amanda-3.5.ebuild 16495 SHA256 274c6bf76eba6005ff8b83f0c93077d4dbd136233a2133626cf75539a15f45f8 SHA512 601b6a130d93bca171cb926a75bac5293c97a30df3944fa7eba9ff732c5a69d85df2cc645b7781adfe7dac6ff5a0562a0d7f38f9e25c183484cac5d2fb5bff16 WHIRLPOOL 7193c4a1c5f3014212add36fbbf271cea59d7cc5f715d86992990c909bd191cbe125f55626128f979b1a3cdb3d090358b45357f0bab19793e55a320f2e37aa47
+EBUILD amanda-3.3.9.ebuild 16110 SHA256 ef40be9f7dec019bac53dc18c04a1ae62168fbf341900803fbe2f02968476007 SHA512 d3d0523405799ea6c07df9a794c8f79fef780c0e367b595d61d25ed6a76a402fa85586268bfc490116e4363238f8d6c330614c252a02000d859c63d67a2220de WHIRLPOOL cd54be7163a1b3b762fcfd5a6c4e608b8fa0c7ea6711958b03f6e9ac96602dd5748431a1dba6c38239ecda8390afcf1fad2a4083e5881fca065ab8f8313f18fc
+EBUILD amanda-3.4.1.ebuild 16572 SHA256 219d378936a239f3a2a9ca79121db8359b7463b270c09bd6dd4f1205a617642a SHA512 f23b802ce76b9f91295921747fd0985e3befed5ec7743feffba4f9d96346c2fb6b4010af27598fd07d3a7e97bbe5fa615a8f65ca0b83851e905e09077f8d9372 WHIRLPOOL 57bfcf1fd97aba57d17160cb1cbf4b9c0243d058be78282574c1c1e53ba3852087324184c7cf8a086cc1ae8e597bd3f59f8c8743e1b6c61d03a7f59ffe104c9f
+EBUILD amanda-3.4.2.ebuild 16478 SHA256 6c5dc09b3355c715be660ef57364676eb4f9e00e64dc5b3884e43c4acbc83b18 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f WHIRLPOOL d97dc7196d60f383e812c387124e95311853fd8120c92889d82706f3c493a033e6393cf069d09539532f9b26b0a7324eac39927de7f1fea540aaae468805b703
+EBUILD amanda-3.4.3.ebuild 16478 SHA256 6c5dc09b3355c715be660ef57364676eb4f9e00e64dc5b3884e43c4acbc83b18 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f WHIRLPOOL d97dc7196d60f383e812c387124e95311853fd8120c92889d82706f3c493a033e6393cf069d09539532f9b26b0a7324eac39927de7f1fea540aaae468805b703
+EBUILD amanda-3.4.4.ebuild 16478 SHA256 6c5dc09b3355c715be660ef57364676eb4f9e00e64dc5b3884e43c4acbc83b18 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f WHIRLPOOL d97dc7196d60f383e812c387124e95311853fd8120c92889d82706f3c493a033e6393cf069d09539532f9b26b0a7324eac39927de7f1fea540aaae468805b703
+EBUILD amanda-3.4.5.ebuild 16478 SHA256 6c5dc09b3355c715be660ef57364676eb4f9e00e64dc5b3884e43c4acbc83b18 SHA512 02dc61995f38cf2e5dd038f638f510de42040ac8319311ea548055bd304abb07bdad15120807b4a077a8e4c52e0ecef1f57bad3567162d04fd77dbe6b82c257f WHIRLPOOL d97dc7196d60f383e812c387124e95311853fd8120c92889d82706f3c493a033e6393cf069d09539532f9b26b0a7324eac39927de7f1fea540aaae468805b703
+EBUILD amanda-3.5-r1.ebuild 16938 SHA256 99898ba6361c338abd98550aa608cb345a045115ab3d6e740453b4634baa5890 SHA512 a59b3f14fec406868d2f9ff1de19e3f8ed3eda4348675f084ae6cd8b92f52108788a1527e6772463b98a61dfbd89cacd06fd40d721f5e23eb8ffe9a5c770c07d WHIRLPOOL d2c47e3d0b591e1d86011715a31846c06fde960e211b535476dce77de2260548835d29378f3cbd9a3e6e832beea53423d2169af1e5a103dd59240040ddd2ca76
 MISC ChangeLog 4708 SHA256 831e7eae515c8fec5369492b7860e85d80daccbbce108f436cbda0cc28b76854 SHA512 4479c9237de008ca99b7b0450b6355c73bcd818dc6a8ac9a6d697b0a318fbe3be461233cf9e0420cc0e19a9efc8e2bcc7b8ce4915438e84a06469e02ac96d605 WHIRLPOOL 9511a0c196f102ab373a8989d27d239bd92dd8ba9e1bfbbc2a020f6830448307438ffbfe7a7a334a4e93645db843f2b93ff7fca1116d268c316c271ad97b8e85
 MISC ChangeLog-2015 29730 SHA256 88035835a53c6f684fac73efcfcfab0b929f27fc9d31cba1cf0af35d94c3e5b7 SHA512 1b4e399131cd7254aa9810591b1f7995e090bf3d7158eb294f2026a9f6c8c9c6d4b0faeb467cda34897de2a3453449c4db5cf6a085c648cc368eeaa335a9c47a WHIRLPOOL 7805794488bc08ca51b19295ff968cee8b05740211323974dd8833f077f5d9b2ad0d7d6941d0a4e963df2056015db6f5765500474148d598b712f3a5bab2c8d5
 MISC metadata.xml 1046 SHA256 91e5309fe6fc12615fd05a0320d8085da36631bbfb7aa3d3329cbb664e4a3f1f SHA512 1bce4cd8ded5c4eb69693ed0c09b80919a21007063e2c4be3d86f683026b9c67ac4c72290744e04938724c230ab625bf0bffd3c01866e98fffa7afc121e6ab87 WHIRLPOOL e0175d6099f3fd8abc46dd4e411693e9b283574d69979779d9d655cd857629e1d8abe072dc1765e80c0ae8d869a292d1070b42deba47bc59dd1c7187c1eaaaac
diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild
index 70ea0b2ba30e..968e236abaa5 100644
--- a/app-backup/amanda/amanda-3.3.9.ebuild
+++ b/app-backup/amanda/amanda-3.3.9.ebuild
@@ -473,3 +473,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.1.ebuild b/app-backup/amanda/amanda-3.4.1.ebuild
index 3171fd4f7c86..aa6f63879983 100644
--- a/app-backup/amanda/amanda-3.4.1.ebuild
+++ b/app-backup/amanda/amanda-3.4.1.ebuild
@@ -480,3 +480,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.2.ebuild b/app-backup/amanda/amanda-3.4.2.ebuild
index 9e26503c1a4a..aec64fedec3e 100644
--- a/app-backup/amanda/amanda-3.4.2.ebuild
+++ b/app-backup/amanda/amanda-3.4.2.ebuild
@@ -477,3 +477,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.3.ebuild b/app-backup/amanda/amanda-3.4.3.ebuild
index 9e26503c1a4a..aec64fedec3e 100644
--- a/app-backup/amanda/amanda-3.4.3.ebuild
+++ b/app-backup/amanda/amanda-3.4.3.ebuild
@@ -477,3 +477,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.4.ebuild b/app-backup/amanda/amanda-3.4.4.ebuild
index 9e26503c1a4a..aec64fedec3e 100644
--- a/app-backup/amanda/amanda-3.4.4.ebuild
+++ b/app-backup/amanda/amanda-3.4.4.ebuild
@@ -477,3 +477,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.4.5.ebuild b/app-backup/amanda/amanda-3.4.5.ebuild
index 9e26503c1a4a..aec64fedec3e 100644
--- a/app-backup/amanda/amanda-3.4.5.ebuild
+++ b/app-backup/amanda/amanda-3.4.5.ebuild
@@ -477,3 +477,8 @@ amanda_permissions_fix() {
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
+}
diff --git a/app-backup/amanda/amanda-3.5.ebuild b/app-backup/amanda/amanda-3.5-r1.ebuild
index f59aebd6c048..058d9b9ccb9d 100644
--- a/app-backup/amanda/amanda-3.5.ebuild
+++ b/app-backup/amanda/amanda-3.5-r1.ebuild
@@ -326,6 +326,10 @@ src_install() {
 	einfo "Installing environment config file"
 	doenvd "${MYFILESDIR}/${ENVDFILE}"
 
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket
+	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
+
 	# Lock down next section (up until docs).
 	insopts -m0640
 	# Installing Amanda Xinetd Services Definition
@@ -343,10 +347,6 @@ src_install() {
 		newins "${MYFILESDIR}/amanda-cron" amanda
 	fi
 
-	einfo "Installing systemd service and socket files for Amanda"
-	systemd_dounit "${FILESDIR}"/amanda.socket
-	systemd_newunit "${FILESDIR}"/amanda.service 'amanda@.service'
-
 	insinto /etc/amanda
 	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
 	doins "${T}/amandahosts"
@@ -477,7 +477,22 @@ amanda_permissions_fix() {
 	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
 		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
 		"${le}"/planner ; do
+	    [ -e "${root}"/${i} ] || continue
 		chown root:${AMANDA_GROUP_NAME} "${root}"/${i} || die
 		chmod u=srwx,g=rx,o= "${root}"/${i} || die
 	done
+
+	# amanda-security.conf is a config file with similar requirements:
+	# writable only by root
+	# world-readable
+	# 3.3.9: introduced in /etc/amanda-security.conf
+	# 3.4.2: moved to /etc/amanda/amanda-security.conf
+	f=/etc/amanda/amanda-security.conf
+	chown root:root "${root}""${f}" || die
+	chmod u=rw,go=r "${root}""${f}" || die
+}
+
+# We do not want the perl-module tests.
+src_test() {
+	default_src_test
 }