| 1 |
commit: d8b0926f25c1c15cca4003a29c850eb6b680ccb8 |
| 2 |
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 7 17:14:55 2018 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 7 17:17:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b0926f |
| 7 |
|
| 8 |
net-analyzer/metasploit: bug #653024 |
| 9 |
|
| 10 |
move from /usr/$(get_libdir) to /usr/lib |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 13 |
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org> |
| 14 |
|
| 15 |
...loit-4.17.21-r2.ebuild => metasploit-4.17.21-r3.ebuild} | 14 +++++++------- |
| 16 |
net-analyzer/metasploit/metasploit-9999.ebuild | 14 +++++++------- |
| 17 |
2 files changed, 14 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild |
| 20 |
similarity index 95% |
| 21 |
rename from net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild |
| 22 |
rename to net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild |
| 23 |
index 73c86666c95..32cb686d0d8 100644 |
| 24 |
--- a/net-analyzer/metasploit/metasploit-4.17.21-r2.ebuild |
| 25 |
+++ b/net-analyzer/metasploit/metasploit-4.17.21-r3.ebuild |
| 26 |
@@ -302,9 +302,9 @@ each_ruby_install() { |
| 27 |
|
| 28 |
#I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. |
| 29 |
# should be as simple as copying everything into the target... |
| 30 |
- dodir /usr/$(get_libdir)/${PN}${SLOT} |
| 31 |
- cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed" |
| 32 |
- rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md |
| 33 |
+ dodir /usr/lib/${PN}${SLOT} |
| 34 |
+ cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed" |
| 35 |
+ rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib${PN}${SLOT}/README.md |
| 36 |
fowners -R root:0 / |
| 37 |
|
| 38 |
} |
| 39 |
@@ -313,16 +313,16 @@ all_ruby_install() { |
| 40 |
# do not remove LICENSE, bug #238137 |
| 41 |
dodir /usr/share/doc/${PF} |
| 42 |
cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die |
| 43 |
- ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation" |
| 44 |
+ ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation" |
| 45 |
|
| 46 |
- fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate |
| 47 |
+ fperms +x /usr/lib/${PN}${SLOT}/msfupdate |
| 48 |
|
| 49 |
#tell revdep-rebuild to ignore binaries meant for the target |
| 50 |
dodir /etc/revdep-rebuild |
| 51 |
cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT} |
| 52 |
#These dirs contain prebuilt binaries for running on the TARGET not the HOST |
| 53 |
- SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter" |
| 54 |
- SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits" |
| 55 |
+ SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter" |
| 56 |
+ SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits" |
| 57 |
EOF |
| 58 |
} |
| 59 |
|
| 60 |
|
| 61 |
diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild |
| 62 |
index 73c86666c95..c4fc0fdabcd 100644 |
| 63 |
--- a/net-analyzer/metasploit/metasploit-9999.ebuild |
| 64 |
+++ b/net-analyzer/metasploit/metasploit-9999.ebuild |
| 65 |
@@ -302,9 +302,9 @@ each_ruby_install() { |
| 66 |
|
| 67 |
#I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. |
| 68 |
# should be as simple as copying everything into the target... |
| 69 |
- dodir /usr/$(get_libdir)/${PN}${SLOT} |
| 70 |
- cp -R * "${ED}"/usr/$(get_libdir)/${PN}${SLOT} || die "Copy files failed" |
| 71 |
- rm -Rf "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/documentation "${ED}"/usr/$(get_libdir)/${PN}${SLOT}/README.md |
| 72 |
+ dodir /usr/lib/${PN}${SLOT} |
| 73 |
+ cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed" |
| 74 |
+ rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib/${PN}${SLOT}/README.md |
| 75 |
fowners -R root:0 / |
| 76 |
|
| 77 |
} |
| 78 |
@@ -313,16 +313,16 @@ all_ruby_install() { |
| 79 |
# do not remove LICENSE, bug #238137 |
| 80 |
dodir /usr/share/doc/${PF} |
| 81 |
cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die |
| 82 |
- ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/$(get_libdir)/${PN}${SLOT}/documentation" |
| 83 |
+ ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation" |
| 84 |
|
| 85 |
- fperms +x /usr/$(get_libdir)/${PN}${SLOT}/msfupdate |
| 86 |
+ fperms +x /usr/lib/${PN}${SLOT}/msfupdate |
| 87 |
|
| 88 |
#tell revdep-rebuild to ignore binaries meant for the target |
| 89 |
dodir /etc/revdep-rebuild |
| 90 |
cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT} |
| 91 |
#These dirs contain prebuilt binaries for running on the TARGET not the HOST |
| 92 |
- SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/meterpreter" |
| 93 |
- SEARCH_DIRS_MASK="/usr/lib*/${PN}${SLOT}/data/exploits" |
| 94 |
+ SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter" |
| 95 |
+ SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits" |
| 96 |
EOF |
| 97 |
} |
Archives