diff options
| -rw-r--r-- | .SRCINFO | 88 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 239 | ||||
| -rw-r--r-- | keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc | 52 | ||||
| -rw-r--r-- | pam-common | 10 | ||||
| -rw-r--r-- | pam-login | 2 | ||||
| -rw-r--r-- | pam-remote | 8 | ||||
| -rw-r--r-- | pam-runuser | 4 | ||||
| -rw-r--r-- | pam-su | 13 | ||||
| -rw-r--r-- | util-linux-BSD-2-Clause.txt | 26 |
10 files changed, 325 insertions, 118 deletions
@@ -1,20 +1,36 @@ pkgbase = util-linux-selinux pkgdesc = SELinux aware miscellaneous system utilities for Linux - pkgver = 2.33.1 - pkgrel = 2 - url = https://www.kernel.org/pub/linux/utils/util-linux/ + pkgver = 2.40 + pkgrel = 1 + url = https://github.com/util-linux/util-linux arch = x86_64 + arch = aarch64 groups = selinux - license = GPL2 - makedepends = systemd - makedepends = python + license = BSD-2-Clause + license = BSD-3-Clause + license = BSD-4-Clause-UC + license = GPL-2.0-only + license = GPL-2.0-or-later + license = GPL-3.0-or-later + license = ISC + license = LGPL-2.1-or-later + license = LicenseRef-PublicDomain + makedepends = asciidoctor + makedepends = bash-completion + makedepends = git makedepends = libcap-ng makedepends = libselinux + makedepends = libxcrypt + makedepends = meson + makedepends = python + makedepends = sqlite + makedepends = systemd options = strip - source = https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.1.tar.xz - source = https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-2.33.1.tar.sign + source = git+https://github.com/util-linux/util-linux#tag=v2.40?signed + source = util-linux-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE source = pam-login source = pam-common + source = pam-remote source = pam-runuser source = pam-su source = util-linux.sysusers @@ -22,48 +38,70 @@ pkgbase = util-linux-selinux source = rfkill-unblock_.service source = rfkill-block_.service validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284 - sha256sums = c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21 - sha256sums = SKIP - sha256sums = 993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92 - sha256sums = fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20 - sha256sums = 95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935 - sha256sums = 51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0 + sha256sums = 153ae22d30a04e8c3ef1edbac63081f21b2d7622467dd7bf324f7f45e45b343d + sha256sums = 6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a + sha256sums = ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275 + sha256sums = 57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af + sha256sums = 8bfbee453618ba44d60ba7fb00eced6c62edebfc592f2e75dede08e769ed8931 + sha256sums = 48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1 + sha256sums = 3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b sha256sums = 10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3 sha256sums = 7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37 sha256sums = 8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376 sha256sums = a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36 pkgname = util-linux-selinux - depends = pam-selinux - depends = shadow-selinux depends = coreutils-selinux - depends = libsystemd-selinux + depends = file + depends = libmagic.so + depends = glibc depends = libcap-ng - depends = libutil-linux-selinux - optdepends = python: python bindings to libmount + depends = libselinux + depends = libselinux.so + depends = libxcrypt + depends = libcrypt.so + depends = ncurses + depends = libncursesw.so + depends = pam-selinux + depends = readline + depends = shadow-selinux + depends = systemd-libs + depends = libsystemd.so + depends = libudev.so + depends = util-linux-libs-selinux + depends = zlib optdepends = words: default dictionary for look provides = rfkill - provides = util-linux=2.33.1-2 - provides = selinux-util-linux=2.33.1-2 + provides = hardlink + provides = util-linux=2.40-1 + provides = selinux-util-linux=2.40-1 conflicts = rfkill + conflicts = hardlink conflicts = util-linux conflicts = selinux-util-linux backup = etc/pam.d/chfn backup = etc/pam.d/chsh backup = etc/pam.d/login + backup = etc/pam.d/remote backup = etc/pam.d/runuser backup = etc/pam.d/runuser-l backup = etc/pam.d/su backup = etc/pam.d/su-l -pkgname = libutil-linux-selinux +pkgname = util-linux-libs-selinux pkgdesc = util-linux-selinux runtime libraries + depends = glibc depends = libselinux + depends = sqlite + optdepends = python: python bindings to libmount + provides = libutil-linux provides = libblkid.so provides = libfdisk.so provides = libmount.so provides = libsmartcols.so provides = libuuid.so - provides = libutil-linux=2.33.1-2 - conflicts = libutil-linux - + provides = util-linux-libs=2.40-1 + provides = libutil-linux-selinux + conflicts = util-linux-libs + conflicts = libutil-linux-selinux + replaces = libutil-linux-selinux diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..d9dbb1e12191 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/util-linux/ @@ -9,126 +9,207 @@ # If you want to help keep it up to date, please open a Pull Request there. pkgbase=util-linux-selinux -pkgname=(util-linux-selinux libutil-linux-selinux) -_pkgmajor=2.33 -pkgver=${_pkgmajor}.1 -pkgrel=2 -pkgdesc="SELinux aware miscellaneous system utilities for Linux" -url="https://www.kernel.org/pub/linux/utils/util-linux/" -arch=('x86_64') +pkgname=(util-linux-selinux util-linux-libs-selinux) +_tag='2.40' +pkgver="${_tag/-/}" +pkgrel=1 +pkgdesc='SELinux aware miscellaneous system utilities for Linux' +url='https://github.com/util-linux/util-linux' +arch=('x86_64' 'aarch64') groups=('selinux') # SELinux package maintenance note: # ArchLinux base packages have a build-time cyclic dependency because # systemd depends on libutil-linux and util-linux depends on libudev # provided by libsystemd (FS#39767). To break this cycle, make # util-linux-selinux depend on systemd at build time. -makedepends=('systemd' 'python' 'libcap-ng' 'libselinux') -license=('GPL2') +makedepends=('asciidoctor' + 'bash-completion' + 'git' + 'libcap-ng' + 'libselinux' + 'libxcrypt' + 'meson' + 'python' + 'sqlite' + 'systemd') +license=( + 'BSD-2-Clause' + 'BSD-3-Clause' + 'BSD-4-Clause-UC' + 'GPL-2.0-only' + 'GPL-2.0-or-later' + 'GPL-3.0-or-later' + 'ISC' + 'LGPL-2.1-or-later' + 'LicenseRef-PublicDomain' +) options=('strip') validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak -source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/${pkgbase/-selinux}-$pkgver.tar."{xz,sign} - pam-{login,common,runuser,su} +source=("git+https://github.com/util-linux/util-linux#tag=v${_tag}?signed" + ${pkgbase/-selinux}-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE + pam-{login,common,remote,runuser,su} 'util-linux.sysusers' '60-rfkill.rules' 'rfkill-unblock_.service' 'rfkill-block_.service') -sha256sums=('c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21' - 'SKIP' - '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92' - 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20' - '95b7cdc4cba17494d7b87f37f8d0937ec54c55de0e3ce9d9ab05ad5cc76bf935' - '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0' +sha256sums=('153ae22d30a04e8c3ef1edbac63081f21b2d7622467dd7bf324f7f45e45b343d' + '6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a' + 'ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275' + '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af' + '8bfbee453618ba44d60ba7fb00eced6c62edebfc592f2e75dede08e769ed8931' + '48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1' + '3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b' '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3' '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37' '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376' 'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36') +_backports=( +) + +_reverts=( +) + +prepare() { + cd "${pkgbase/-selinux}" + + local _c _l + for _c in "${_backports[@]}"; do + if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi + git log --oneline "${_l}" "${_c}" + git cherry-pick --mainline 1 --no-commit "${_c}" + done + for _c in "${_reverts[@]}"; do + if [[ "${_c}" == *..* ]]; then _l='--reverse'; else _l='--max-count=1'; fi + git log --oneline "${_l}" "${_c}" + git revert --mainline 1 --no-commit "${_c}" + done + + # do not mark dirty + sed -i '/dirty=/c dirty=' tools/git-version-gen +} + build() { - cd "${pkgbase/-selinux}-$pkgver" - - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --bindir=/usr/bin \ - --localstatedir=/var \ - --enable-fs-paths-default=/usr/bin:/usr/local/bin \ - --enable-raw \ - --enable-vipw \ - --enable-newgrp \ - --enable-chfn-chsh \ - --enable-write \ - --enable-mesg \ - --with-selinux \ - --with-python=3 - - make + local _meson_options=( + -Dfs-search-path=/usr/bin:/usr/local/bin + + -Dlibuser=disabled + -Dlibutempter=disabled + -Dncurses=disabled + -Dncursesw=enabled + -Deconf=disabled + -Dselinux=enabled + + -Dbuild-chfn-chsh=enabled + -Dbuild-line=disabled + -Dbuild-mesg=enabled + -Dbuild-newgrp=enabled + -Dbuild-vipw=enabled + -Dbuild-write=enabled + ) + + arch-meson "${pkgbase/-selinux}" build "${_meson_options[@]}" + + meson compile -C build } package_util-linux-selinux() { - conflicts=('rfkill' + conflicts=('rfkill' 'hardlink' "${pkgname/-selinux}" "selinux-${pkgname/-selinux}") - provides=('rfkill' + provides=('rfkill' 'hardlink' "${pkgname/-selinux}=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}") - depends=('pam-selinux' 'shadow-selinux' 'coreutils-selinux' - 'libsystemd-selinux' 'libcap-ng' 'libutil-linux-selinux') - optdepends=('python: python bindings to libmount' - 'words: default dictionary for look') + depends=('coreutils-selinux' + 'file' 'libmagic.so' + 'glibc' + 'libcap-ng' + 'libselinux' 'libselinux.so' + 'libxcrypt' 'libcrypt.so' + 'ncurses' 'libncursesw.so' + 'pam-selinux' + 'readline' + 'shadow-selinux' + 'systemd-libs' 'libsystemd.so' 'libudev.so' + 'util-linux-libs-selinux' + 'zlib') + optdepends=('words: default dictionary for look') backup=(etc/pam.d/chfn etc/pam.d/chsh etc/pam.d/login + etc/pam.d/remote etc/pam.d/runuser etc/pam.d/runuser-l etc/pam.d/su etc/pam.d/su-l) - cd "${pkgbase/-selinux}-$pkgver" + _python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')" + + DESTDIR="${pkgdir}" meson install -C build - make DESTDIR="$pkgdir" install + # remove static libraries + rm "${pkgdir}"/usr/lib/lib*.a* # setuid chfn and chsh - chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} + chmod 4755 "${pkgdir}"/usr/bin/{newgrp,ch{sh,fn}} # install PAM files for login-utils - install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" - install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" - install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" - install -m644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser" - install -m644 "$srcdir/pam-runuser" "$pkgdir/etc/pam.d/runuser-l" - install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su" - install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l" + install -Dm0644 pam-common "${pkgdir}/etc/pam.d/chfn" + install -m0644 pam-common "${pkgdir}/etc/pam.d/chsh" + install -m0644 pam-login "${pkgdir}/etc/pam.d/login" + install -m0644 pam-remote "${pkgdir}/etc/pam.d/remote" + install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser" + install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser-l" + install -m0644 pam-su "${pkgdir}/etc/pam.d/su" + install -m0644 pam-su "${pkgdir}/etc/pam.d/su-l" # TODO(dreisner): offer this upstream? - sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket" - - # adjust for usrmove - # TODO(dreisner): fix configure.ac upstream so that this isn't needed - cd "$pkgdir" - mv {,usr/}sbin/* usr/bin - rmdir sbin usr/sbin - - ### runtime libs are shipped as part of libutil-linux - rm "$pkgdir"/usr/lib/lib*.{a,so}* - - ### install systemd-sysusers - install -Dm644 "$srcdir/util-linux.sysusers" \ - "$pkgdir/usr/lib/sysusers.d/util-linux.conf" + sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket" + + # runtime libs are shipped as part of util-linux-libs + install -d -m0755 util-linux-libs/lib/ + mv "$pkgdir"/usr/lib/lib*.so* util-linux-libs/lib/ + mv "$pkgdir"/usr/lib/pkgconfig util-linux-libs/lib/pkgconfig + mv "$pkgdir"/usr/include util-linux-libs/include + mv "$pkgdir"/"${_python_stdlib}"/site-packages util-linux-libs/site-packages + rmdir "$pkgdir"/"${_python_stdlib}" + mv "$pkgdir"/usr/share/man/man3 util-linux-libs/man3 + + # install systemd-sysusers + install -Dm0644 util-linux.sysusers \ + "${pkgdir}/usr/lib/sysusers.d/util-linux.conf" + + install -Dm0644 60-rfkill.rules \ + "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" + + install -Dm0644 rfkill-unblock_.service \ + "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service" + install -Dm0644 rfkill-block_.service \ + "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service" + + install -vDm 644 ${pkgbase/-selinux}/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/" + install -vDm 644 ${pkgbase/-selinux}-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/" +} - install -Dm644 "$srcdir/60-rfkill.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules" +package_util-linux-libs-selinux() { + pkgdesc='util-linux-selinux runtime libraries' + depends=('glibc' + 'libselinux' + 'sqlite') + provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so' + "${pkgname/-selinux}=${pkgver}-${pkgrel}" + 'libutil-linux-selinux') + conflicts=("${pkgname/-selinux}" 'libutil-linux-selinux') + replaces=('libutil-linux-selinux') + optdepends=('python: python bindings to libmount') - install -Dm644 "$srcdir/rfkill-unblock_.service" \ - "$pkgdir/usr/lib/systemd/system/rfkill-unblock@.service" - install -Dm644 "$srcdir/rfkill-block_.service" \ - "$pkgdir/usr/lib/systemd/system/rfkill-block@.service" -} + _python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')" -package_libutil-linux-selinux() { - pkgdesc="util-linux-selinux runtime libraries" - provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so' - "${pkgname/-selinux}=${pkgver}-${pkgrel}") - depends=('libselinux') - conflicts=("${pkgname/-selinux}") + install -d -m0755 "$pkgdir"/{"${_python_stdlib}",usr/share/man/} + mv util-linux-libs/lib/* "$pkgdir"/usr/lib/ + mv util-linux-libs/include "$pkgdir"/usr/include + mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages + mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3 - make -C "${pkgbase/-selinux}-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES + install -vDm 644 ${pkgbase/-selinux}/Documentation/licenses/COPYING.{BSD*,ISC} -t "$pkgdir/usr/share/licenses/$pkgname/" + install -vDm 644 ${pkgbase/-selinux}-BSD-2-Clause.txt -t "$pkgdir/usr/share/licenses/$pkgname/" } diff --git a/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc b/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc new file mode 100644 index 000000000000..306d645e06b9 --- /dev/null +++ b/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +Zh9rvA== +=cevX +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pam-common b/pam-common index a7bf8a4a5b08..066186e3c3dc 100644 --- a/pam-common +++ b/pam-common @@ -1,6 +1,6 @@ #%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_permit.so diff --git a/pam-login b/pam-login index 1960d9497c08..28f6fc5de578 100644 --- a/pam-login +++ b/pam-login @@ -1,7 +1,7 @@ #%PAM-1.0 -auth required pam_securetty.so auth requisite pam_nologin.so auth include system-local-login account include system-local-login session include system-local-login +password include system-local-login diff --git a/pam-remote b/pam-remote new file mode 100644 index 000000000000..7fce079c1d93 --- /dev/null +++ b/pam-remote @@ -0,0 +1,8 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth requisite pam_nologin.so +auth include system-remote-login +account include system-remote-login +session include system-remote-login +password include system-remote-login diff --git a/pam-runuser b/pam-runuser index d5b1ea353ec5..26b59d51c2d5 100644 --- a/pam-runuser +++ b/pam-runuser @@ -1,4 +1,4 @@ #%PAM-1.0 -auth sufficient pam_rootok.so -session include system-login +auth sufficient pam_rootok.so +session include system-login @@ -1,9 +1,10 @@ #%PAM-1.0 -auth sufficient pam_rootok.so +auth sufficient pam_rootok.so # Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid +#auth sufficient pam_wheel.so trust use_uid # Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password include system-auth diff --git a/util-linux-BSD-2-Clause.txt b/util-linux-BSD-2-Clause.txt new file mode 100644 index 000000000000..e4c5da7234ec --- /dev/null +++ b/util-linux-BSD-2-Clause.txt @@ -0,0 +1,26 @@ +xxHash Library +Copyright (c) 2012-2021 Yann Collet +All rights reserved. + +BSD 2-Clause License (https://www.opensource.org/licenses/bsd-license.php) + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |