diff options
| author | Erich Eckner <git@eckner.net> | 2020-04-26 15:53:27 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-04-26 15:53:27 +0200 |
| commit | 076f25e5cf7214a4a06fcc536ff04b7cd83ca138 (patch) | |
| tree | 52463a40bc96aa36d88352512e89f2d4e6548c0b /manualPorts/bareos-filedaemon | |
| parent | 343a4750fd88dca578fe242811a058796a127025 (diff) | |
| download | crux-ports-076f25e5cf7214a4a06fcc536ff04b7cd83ca138.tar.xz | |
bareos-filedaemon: more fixes
Diffstat (limited to 'manualPorts/bareos-filedaemon')
| -rw-r--r-- | manualPorts/bareos-filedaemon/.signature | 4 | ||||
| -rw-r--r-- | manualPorts/bareos-filedaemon/Pkgfile | 34 |
2 files changed, 18 insertions, 20 deletions
diff --git a/manualPorts/bareos-filedaemon/.signature b/manualPorts/bareos-filedaemon/.signature index b9f8bdd..9284cd4 100644 --- a/manualPorts/bareos-filedaemon/.signature +++ b/manualPorts/bareos-filedaemon/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/deepthought.pub -RWQxCptPusLGGg2Ifq6cycsdlxgRAMqbkPGjLsj4Gkyu/UZjn2jlv2Hg0hgkNzcinoZu/XIW0IVouVBDMgTBLNnNJotbki9zAAk= -SHA256 (Pkgfile) = 21b8bd81b2f3793fbadf5c553904bc136b16d81a9b830633d82865db65f93971 +RWQxCptPusLGGvyd1VyOxFYKEanCjYMS9pQYiQdA706qUPiIg9vgUpGozMAxvfjbPXIOOnvvrrqhohuYQoAJsIX6e92MK8aMIQ4= +SHA256 (Pkgfile) = e73a1c4cdc0839c13cfa6cab6b08ed7c9ecdffeee6b9222f4d7bafe183f3bd82 SHA256 (.footprint) = bad692d670557e894cc51c7ebf0f40b1f43dc3545fd5ec15c7b19e020384f85b SHA256 (19.2.7.tar.gz) = 283c1fa9cb6a96b1f09b402cd507ecd8bf798458bafcbfad867da08d33d12653 SHA256 (nullify-os-specifics.patch) = d2c0943243aa6f8be7fe0548b2c160cbfb86c979ef535553b7d823dc7ab5462e diff --git a/manualPorts/bareos-filedaemon/Pkgfile b/manualPorts/bareos-filedaemon/Pkgfile index ad7ea75..425d171 100644 --- a/manualPorts/bareos-filedaemon/Pkgfile +++ b/manualPorts/bareos-filedaemon/Pkgfile @@ -90,17 +90,15 @@ build() { \( -type f -o -empty \) \ -delete - find "$PKG/var" "$PKG/usr/var" -depth \ - -type d -empty -delete - new_needed_libs=$( find "$PKG/usr/bin" -type f \ - -exec ldd {} \; \ + -exec objdump -x {} \; \ | sed ' - s/^\s*\(\S\+\.so\)\(\.[0-9.]\+\)\? => not found$/\1/ + s/^\s*NEEDED\s\+\(\S\+\.so\)\(\.[0-9.]\+\)\?$/\1/ t d - ' + ' \ + | sort -u ) while [ -n "$new_needed_libs" ]; do needed_libs=$( @@ -116,34 +114,34 @@ build() { printf -- ' -o -name %s\n' ${new_needed_libs} ) \ \) \ - -exec ldd {} \; \ + -exec objdump -x {} \; \ | sed ' - s/^\s*\(\S\+\.so\)\(\.[0-9.]\+\)\? => not found$/\1/ + s/^\s*NEEDED\s\+\(\S\+\.so\)\(\.[0-9.]\+\)\?$/\1/ t d ' \ - | grep -vxF "${needed_libs}" || true + | grep -vxF "${needed_libs}" \ + | sort -u ) done - find "$PKG/usr/lib" -xdev \ -type d -name scripts -prune , \ $( - find "$PKG/usr/bin" -type f \ - -exec ldd {} \; \ - | sed ' - s/^\s*\(\S\+\.so\)\(\.[0-9.]\+\)\? => not found$/-not -name \1*/ - t - d - ' + printf -- ' -not -name %s*\n' ${needed_libs} ) \ -not -type d \ -exec rm {} + + find "$PKG/usr/lib/bareos/scripts" -xdev \ -not -name 'bareos-config*' \ \( -not -type d -o -empty \) \ -delete - find "$PKG/usr/lib" -xdev \ + + find \ + "$PKG/usr/lib" \ + "$PKG/usr/var" \ + "$PKG/var" \ + -xdev \ -type d \ -empty \ -delete |