From 0ecc8ea0b41b5a6ac23798afed0c5e3494db482e Mon Sep 17 00:00:00 2001 From: joborun Date: Sun, 3 Mar 2024 11:51:28 +0200 Subject: [PATCH] upg elfutils shadow --- elfutils/PKGBUILD | 161 ++++++++---------- elfutils/PKGBUILD-arch | 158 ++++++++--------- ...-tools-their-man-pages-and-PAM-integ.patch | 4 +- ...pt-login.defs-for-PAM-and-util-linux.patch | 4 +- ...d-Arch-Linux-defaults-for-login.defs.patch | 4 +- shadow/PKGBUILD | 16 +- shadow/PKGBUILD-arch | 20 +-- 7 files changed, 169 insertions(+), 198 deletions(-) diff --git a/elfutils/PKGBUILD b/elfutils/PKGBUILD index 0471991..dda8f78 100644 --- a/elfutils/PKGBUILD +++ b/elfutils/PKGBUILD @@ -6,9 +6,9 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgbase=elfutils -pkgname=(debuginfod elfutils libelf) -pkgver=0.190 -pkgrel=02 +pkgname=(elfutils libelf debuginfod) +pkgver=0.191 +pkgrel=01 pkgdesc="Handle ELF object files and DWARF debugging information" url="https://sourceware.org/elfutils/" makedepends=(bzip2 curl gcc-libs libarchive libmicrohttpd sqlite xz zlib) @@ -16,16 +16,6 @@ makedepends=(bzip2 curl gcc-libs libarchive libmicrohttpd sqlite xz zlib) options=(staticlibs) source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig}) -_pick() { - local p="$1" f d; shift - for f; do - d="$srcdir/$p/${f#$pkgdir/}" - mkdir -p "$(dirname "$d")" - mv "$f" "$d" - rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" - done -} - prepare() { # cd $pkgbase-$pkgver # # Use CURLOPT_PROTOCOLS_STR for libcurl >= 7.85.0 @@ -36,13 +26,8 @@ prepare() { # remove failing test due to missing glibc debug package during test: https://bugs.archlinux.org/task/74875 sed -e 's/run-backtrace-native.sh//g' -i $pkgbase-$pkgver/tests/Makefile.am - ( - cd $pkgbase-$pkgver - autoreconf -fiv - ) - - cp -av $pkgbase-$pkgver $pkgbase-test-$pkgver - + cd $pkgbase-$pkgver + autoreconf -fiv } build() { @@ -53,30 +38,72 @@ build() { --enable-deterministic-archives ) - ( - # fat-lto-objects is required for non-mangled .a files in libelf - CFLAGS+=" -ffat-lto-objects" - cd $pkgbase-$pkgver - ./configure "${configure_options[@]}" - make - ) - ( - cd $pkgbase-test-$pkgver - # debugging information is required for test-suite - CFLAGS+=" -g" - # fat-lto-objects is required for non-mangled .a files in libelf - CFLAGS+=" -ffat-lto-objects" - ./configure "${configure_options[@]}" - make - ) + # fat-lto-objects is required for non-mangled .a files in libelf + CFLAGS+=" -ffat-lto-objects" + + # debugging information is required for test-suite + CFLAGS+=" -g" + + cd $pkgbase-$pkgver + ./configure "${configure_options[@]}" + make } ## a few tests fail on this 0188 build, they didn't on last 0186 but do try them on your ## machine and environment and report if your build didn't fail, otherwise we will try again on next build # -#check() { -# make check -C $pkgbase-test-$pkgver -#} +check() { + make -C $pkgbase-$pkgver check +} + +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + +package_elfutils() { + pkgdesc+=" (utilities)" + license=(GPL-3.0-or-later) + depends=(gcc-libs glibc libarchive libelf=$pkgver sh) + + make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver + + # set the default DEBUGINFOD_URLS environment variable to the distribution's debuginfod URL + echo "https://debuginfod.archlinux.org" > "$pkgdir/etc/debuginfod/archlinux.urls" + + ( + cd "$pkgdir" + + _pick libelf etc/debuginfod + _pick libelf etc/profile.d/* + _pick libelf usr/{include,lib} + _pick debuginfod usr/bin/debuginfod* + _pick debuginfod usr/share/man/*/debuginfod* + ) + + install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" +} + +package_libelf() { + pkgdesc+=" (libraries)" + license=('GPL-2.0-or-later OR LGPL-3.0-or-later') + depends=( + bzip2 libbz2.so + curl libcurl.so + gcc-libs + glibc + xz + zlib) + # NOTE: the shared objects can not be added to provides as they are not versioned + + mv -v libelf/* "$pkgdir" + install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" +} package_debuginfod() { pkgdesc+=" (debuginfod)" @@ -91,52 +118,9 @@ package_debuginfod() { ) optdepends=("elfutils=$pkgver: for translations") - make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver - install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" - - # set the default DEBUGINFOD_URLS environment variable to the distribution's debuginfod URL - printf "https://debuginfod.archlinux.org\n" > "$pkgdir/etc/debuginfod/archlinux.urls" - - ( - cd "$pkgdir" - - _pick libelf etc/debuginfod/* - _pick libelf etc/profile.d/* - _pick libelf usr/{include,lib} - _pick elfutils usr/bin/eu-* - _pick elfutils usr/share/locale - _pick elfutils usr/share/man/man1/eu-* - _pick elfutils usr/share/man/man3/elf_* - ) - -} - -package_elfutils() { - pkgdesc+=" (utilities)" - license=(GPL-3.0-or-later) - depends=(gcc-libs glibc libelf=$pkgver sh) - - mv -v elfutils/* "$pkgdir" + mv -v debuginfod/* "$pkgdir" install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" } - -package_libelf() { - pkgdesc+=" (libraries)" - license=('GPL-2.0-or-later OR LGPL-3.0-or-later') - depends=( - bzip2 libbz2.so - curl libcurl.so - gcc-libs - glibc - xz - zlib - ) - # NOTE: the shared objects can not be added to provides as they are not versioned - - mv -v libelf/* "$pkgdir" - install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" -} - #---- arch license gpg-key & sha256sums ---- arch=(x86_64) @@ -144,12 +128,9 @@ arch=(x86_64) #license=(LGPL3 GPL3) validpgpkeys=(47CC0331081B8BC6D0FD4DA08370665B57816A6A # Mark J. Wielaard - EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A) # Mark Wielaard + EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A # Mark Wielaard + 6C2B631563B8D330578D3CB474FD3FA2779E7073) # Aaron Merey -sha256sums=(8e00a3a9b5f04bc1dc273ae86281d2d26ed412020b391ffcc23198f10231d692 # elfutils-0.190.tar.bz2 - c3bb6c01bd962b8c39f2f4eb49d1573d56becb6a6a3aa0888b1105f95178d9b1) # elfutils-0.190.tar.bz2.sig - -## bc8e9126d4d580f941912a66301cbfa5980e3c8673926dd3f3d81bfa67b0b273 debuginfod-0.190-02-x86_64.pkg.tar.lz -## f26e9c795a0f1f0b8d54aa5141b727e29197424d1ef5335b7ab6899864397d3e elfutils-0.190-02-x86_64.pkg.tar.lz -## 9022d1b000e6e4e13852261258f97eb35aa9d3122d2f4f8ed7e0299e17764b17 libelf-0.190-02-x86_64.pkg.tar.lz +sha256sums=(df76db71366d1d708365fc7a6c60ca48398f14367eb2b8954efc8897147ad871 # elfutils-0.191.tar.bz2 + d07b86df17cbe5187b311cd6e02fc47228cdd20545779cde5cd2a26ca03b7cb1) # elfutils-0.191.tar.bz2.sig diff --git a/elfutils/PKGBUILD-arch b/elfutils/PKGBUILD-arch index 04d990c..bf6dbb2 100644 --- a/elfutils/PKGBUILD-arch +++ b/elfutils/PKGBUILD-arch @@ -5,12 +5,12 @@ pkgbase=elfutils pkgname=( - debuginfod elfutils libelf + debuginfod ) -pkgver=0.190 -pkgrel=2 +pkgver=0.191 +pkgrel=1 pkgdesc="Handle ELF object files and DWARF debugging information" arch=(x86_64) url="https://sourceware.org/elfutils/" @@ -27,15 +27,46 @@ makedepends=( ) options=(staticlibs) source=(https://sourceware.org/$pkgbase/ftp/$pkgver/$pkgbase-$pkgver.tar.bz2{,.sig}) -sha512sums=('9c4f5328097e028286c42f29e39dc3d80914b656cdfbbe05b639e91bc787ae8ae64dd4d69a6e317ce30c01648ded10281b86a51e718295f4c589df1225a48102' +sha512sums=('e22d85f25317a79b36d370347e50284c9120c86f9830f08791b7b6a7b4ad89b9bf4c7c71129133b8d193a0edffb2a2c17987b7e48428b9670aff5ce918777e04' 'SKIP') -b2sums=('9934aff08f1898377708b28595fb52130ef9f80408132ac7d306845b10672ba45cf1ac69783da07b3eea9fd647741d44da45b8b2626c45a768cb2844c6186513' +b2sums=('2a7ad251369eca7ba609ab8644181fd479ad8596ee58dc068398ca22be25a978e96b81a10a92a5555d7574fd1b9227c8d54fb41dceb4025aedfc6ae32870bbca' 'SKIP') validpgpkeys=( - '47CC0331081B8BC6D0FD4DA08370665B57816A6A' # Mark J. Wielaard 'EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A' # Mark Wielaard + '6C2B631563B8D330578D3CB474FD3FA2779E7073' # Aaron Merey ) +prepare() { + # remove failing test due to missing glibc debug package during test: https://bugs.archlinux.org/task/74875 + sed -e 's/run-backtrace-native.sh//g' -i $pkgbase-$pkgver/tests/Makefile.am + + cd $pkgbase-$pkgver + autoreconf -fiv +} + +build() { + local configure_options=( + --prefix=/usr + --sysconfdir=/etc + --program-prefix="eu-" + --enable-deterministic-archives + ) + + # fat-lto-objects is required for non-mangled .a files in libelf + CFLAGS+=" -ffat-lto-objects" + + # debugging information is required for test-suite + CFLAGS+=" -g" + + cd $pkgbase-$pkgver + ./configure "${configure_options[@]}" + make +} + +check() { + make -C $pkgbase-$pkgver check +} + _pick() { local p="$1" f d; shift for f; do @@ -46,83 +77,6 @@ _pick() { done } -prepare() { - # remove failing test due to missing glibc debug package during test: https://bugs.archlinux.org/task/74875 - sed -e 's/run-backtrace-native.sh//g' -i $pkgbase-$pkgver/tests/Makefile.am - ( - cd $pkgbase-$pkgver - autoreconf -fiv - ) - - cp -av $pkgbase-$pkgver $pkgbase-test-$pkgver -} - - -build() { - local configure_options=( - --prefix=/usr - --sysconfdir=/etc - --program-prefix="eu-" - --enable-deterministic-archives - ) - - ( - # fat-lto-objects is required for non-mangled .a files in libelf - CFLAGS+=" -ffat-lto-objects" - cd $pkgbase-$pkgver - ./configure "${configure_options[@]}" - make - ) - ( - cd $pkgbase-test-$pkgver - # debugging information is required for test-suite - CFLAGS+=" -g" - # fat-lto-objects is required for non-mangled .a files in libelf - CFLAGS+=" -ffat-lto-objects" - ./configure "${configure_options[@]}" - make - ) -} - -check() { - make check -C $pkgbase-test-$pkgver -} - -package_debuginfod() { - pkgdesc+=" (debuginfod)" - license=( - GPL-3.0-or-later - ) - depends=( - gcc-libs - glibc - libarchive libarchive.so - libelf=$pkgver - libmicrohttpd libmicrohttpd.so - sqlite libsqlite3.so - ) - optdepends=("elfutils=$pkgver: for translations") - - make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver - install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" - - # set the default DEBUGINFOD_URLS environment variable to the distribution's debuginfod URL - printf "https://debuginfod.archlinux.org\n" > "$pkgdir/etc/debuginfod/archlinux.urls" - - ( - cd "$pkgdir" - - _pick libelf etc/debuginfod/* - _pick libelf etc/profile.d/* - _pick libelf usr/{include,lib} - _pick elfutils usr/bin/eu-* - _pick elfutils usr/share/locale - _pick elfutils usr/share/man/man1/eu-* - _pick elfutils usr/share/man/man3/elf_* - ) - -} - package_elfutils() { pkgdesc+=" (utilities)" license=( @@ -131,11 +85,26 @@ package_elfutils() { depends=( gcc-libs glibc + libarchive libarchive.so libelf=$pkgver sh ) - mv -v elfutils/* "$pkgdir" + make DESTDIR="$pkgdir" install -C $pkgbase-$pkgver + + # set the default DEBUGINFOD_URLS environment variable to the distribution's debuginfod URL + echo "https://debuginfod.archlinux.org" > "$pkgdir/etc/debuginfod/archlinux.urls" + + ( + cd "$pkgdir" + + _pick libelf etc/debuginfod + _pick libelf etc/profile.d/* + _pick libelf usr/{include,lib} + _pick debuginfod usr/bin/debuginfod* + _pick debuginfod usr/share/man/*/debuginfod* + ) + install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" } @@ -158,3 +127,24 @@ package_libelf() { mv -v libelf/* "$pkgdir" install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" } + +package_debuginfod() { + pkgdesc+=" (debuginfod)" + license=( + GPL-3.0-or-later + ) + depends=( + gcc-libs + glibc + libarchive libarchive.so + libelf=$pkgver + libmicrohttpd libmicrohttpd.so + sqlite libsqlite3.so + ) + optdepends=("elfutils=$pkgver: for translations") + + mv -v debuginfod/* "$pkgdir" + install -vDm 644 $pkgbase-$pkgver/{AUTHORS,ChangeLog,NEWS,NOTES,README} -t "$pkgdir/usr/share/doc/$pkgname/" +} + +# vim:set sw=2 sts=-1 et: diff --git a/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch b/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch index 93bf099..5cbc983 100644 --- a/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch +++ b/shadow/0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch @@ -1,4 +1,4 @@ -From 61a54ab81ec8f958962c911a89d02a065469a8b3 Mon Sep 17 00:00:00 2001 +From 65491334d3fda509306bb72335e6dc56888c9724 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 5 Nov 2022 23:40:18 +0100 Subject: [PATCH 1/3] Disable replaced tools, their man pages and PAM @@ -723,5 +723,5 @@ index fcfee9d2..0bab08a8 100644 chmod $(suidperms) $(DESTDIR)$(usbindir)/$$i; \ done -- -2.43.2 +2.44.0 diff --git a/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch b/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch index dc794a7..ccf2409 100644 --- a/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch +++ b/shadow/0002-Adapt-login.defs-for-PAM-and-util-linux.patch @@ -1,4 +1,4 @@ -From dcc12b1d2bd612923c6c73d0da92fbe1aefa46b1 Mon Sep 17 00:00:00 2001 +From bb10dbe53f1c8613a9586d5255b878f3fc954ef1 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 31 Oct 2022 09:45:13 +0100 Subject: [PATCH 2/3] Adapt login.defs for PAM and util-linux @@ -717,5 +717,5 @@ index ab62fa86..d82c47f1 100644 -- -2.43.2 +2.44.0 diff --git a/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch b/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch index eab4214..2fa32ec 100644 --- a/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch +++ b/shadow/0003-Add-Arch-Linux-defaults-for-login.defs.patch @@ -1,4 +1,4 @@ -From 7eb2d0b9eff128c404ef7a6d07aa597ac9ca2d84 Mon Sep 17 00:00:00 2001 +From 5aaec6a5be50c77eb7feb5217f2d26b2fafd3a01 Mon Sep 17 00:00:00 2001 From: David Runge Date: Mon, 31 Oct 2022 10:10:22 +0100 Subject: [PATCH 3/3] Add Arch Linux defaults for login.defs @@ -69,5 +69,5 @@ index 797ca6b3..c4accbf8 100644 # # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. -- -2.43.2 +2.44.0 diff --git a/shadow/PKGBUILD b/shadow/PKGBUILD index 3adacd8..a3315c7 100644 --- a/shadow/PKGBUILD +++ b/shadow/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=shadow -pkgver=4.14.5 +pkgver=4.14.6 pkgrel=01 pkgdesc="Password and account management tool suite with support for shadow files and PAM w/o systemd" url="https://github.com/shadow-maint/shadow" @@ -24,7 +24,7 @@ backup=( ) #options=(debug !emptydirs) options=('!emptydirs') -# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.14.5.arch1 +# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.14.6.arch1 source=( $url/releases/download/$pkgver/$pkgname-$pkgver.tar.xz{,.asc} 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch @@ -114,14 +114,14 @@ license=(BSD-3-Clause) validpgpkeys=(66D0387DB85D320F8408166DB175CFA98F192AF2 # Serge Hallyn A9348594CE31283A826FBDD8D57633D441E25BB5) # Alejandro Colomar -sha256sums=(cba74bc7b05d89c015afe23131f9159ece38779d40a8af4cf162852e6e85ca23 # shadow-4.14.5.tar.xz - 8117982a631822eba6cc8877b58ff5892c5d54ea3af1482cf6bad83786939572 # shadow-4.14.5.tar.xz.asc - 98287eb9eb1033218dc6be82e27bb7a8735c4e1e4b67e79e5a907e2c80e06873 # 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch - 0f781d3085f710b1475940ee7dedebd50d70c1c6acbc38eb538c45f87c4b2b86 # 0002-Adapt-login.defs-for-PAM-and-util-linux.patch - d4403593b0f1a3cce61a0f741dc4a62e45d92c18db2d2c06fea90219c4391bef # 0003-Add-Arch-Linux-defaults-for-login.defs.patch +sha256sums=(17bdd568e7683e5df4e2de6cf69b0905d8a3a028c1689eb189005fea268e0ad6 # shadow-4.14.6.tar.xz + d5c8f322fcde2b84b51ae142ca179d3656d1482b52ef305b76d40c3cc73ce7af # shadow-4.14.6.tar.xz.asc + 0910a752e58576af274bb41e2fa9278001abefb8ee9f746ac6e0ef2f178c7189 # 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch + bde9ba1ce9e8e5eab2875112436026e32ccaf444cc1fe0b1d3d71d9b9d751f2a # 0002-Adapt-login.defs-for-PAM-and-util-linux.patch + da402a6ba555d1e36abd0e2271f965d31fe6677a64cc2657272518e2c249f91f # 0003-Add-Arch-Linux-defaults-for-login.defs.patch 29448220f2ecfeab0a1a7aae296f07ca522d0a75a5b20df30f83950f9d54531f # shadow.sysusers c2faa81b894de452e6cd23660ad7e30a4e03d6a4eacb94ff209c6e578df05e61 # shadow.tmpfiles 2d4b7b85ea1d5cddf93c2d636a11b0e76c1f484474449bdb018e3af0fcbd93c3) # useradd.defaults -## 964a818b4614d2b2e8ff84a0aa60c5fbad0e0089518cf8c894225c820330b3bf shadow-4.14.5-01-x86_64.pkg.tar.lz +## 6fdfd4f85d39ff692bf4bf4fdd5cb81aa8eacddabe1ee2e4beff0ef6503d0f74 shadow-4.14.6-01-x86_64.pkg.tar.lz diff --git a/shadow/PKGBUILD-arch b/shadow/PKGBUILD-arch index a35fea4..c9c9679 100644 --- a/shadow/PKGBUILD-arch +++ b/shadow/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Aaron Griffin pkgname=shadow -pkgver=4.14.5 +pkgver=4.14.6 pkgrel=1 pkgdesc="Password and account management tool suite with support for shadow files and PAM" arch=(x86_64) @@ -32,7 +32,7 @@ backup=( etc/pam.d/passwd ) options=(!emptydirs) -# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.14.5.arch1 +# NOTE: distribution patches are taken from https://gitlab.archlinux.org/archlinux/packaging/upstream/shadow/-/commits/4.14.6.arch1 source=( $url/releases/download/$pkgver/$pkgname-$pkgver.tar.xz{,.asc} 0001-Disable-replaced-tools-their-man-pages-and-PAM-integ.patch @@ -42,21 +42,21 @@ source=( shadow.{sysusers,tmpfiles} useradd.defaults ) -sha512sums=('30de7837874b3ad41d579ffe337a6defa22fbe151fdbf8a32c54f267af1f565c7e06b92d953571482e3b622f98291f08f3155179a23266a3e54df1546b87b156' +sha512sums=('994a81afbafb19622a1d0f84527f96a84b0955c4ffa5e826682ead82af7940b8e3a091514bd2075622ebdf7638643c9c6b6b7ac3e48d985278db896249d70ae6' 'SKIP' - '316f5138ae0a78a04c55a9b31929468001d34642f9b03c2085cc7de9899aa949041dcf5a19d891f3bb0c34db02372845fa554b0505cadeff5293de153e2e4083' - '6586228e329ebdc08645d1989a35cef92899c404d02023c8080378de228ea1bcbe225e1eaf0dbb9564753eb9ab3d257cd643632647cfc98d69a883108a994cb0' - 'bc6bde47387a5d817b94781f5bae2b87b7937b4e2d55a5998f195f184f442e7808efe53519632662dfd9942d206168ae3f44c940bb8d25d17755a7b01a297bb8' + '3c1d20025c238c1f06960b845854fff6074ad33f9894bacc4943dd320d5e8ec1a7614252d497b6fc8459792d06c00a69f4c50cdcbb8b40e3e59059bdb52b2209' + '330e22f2dfbe444b42b40c52be352d62cd0b656dc760bea6e40ab0bb8ab210695185a376483c128cf1a889df413de8b990e3ceebf5f2e16b48fb083bcab2a240' + '54fa3355b67c87d47190ca8bf24557a930fd439e1e197e66989a48d9a819c0bbe8da645be4365142ba3f599ce240d4a092f9df7268dfc41bea92ae0dac378809' 'e4edf705dd04e088c6b561713eaa1afeb92f42ac13722bff037aede6ac5ad7d4d00828cfb677f7b1ff048db8b6788238c1ab6a71dfcfd3e02ef6cb78ae09a621' '2c8689b52029f6aa27d75b8b05b0b36e2fc322cab40fdfbb50cdbe331f61bc84e8db20f012cf9af3de8c4e7fdb10c2d5a4925ca1ba3b70eb5627772b94da84b3' '5afac4a96b599b0b8ed7be751e7160037c3beb191629928c6520bfd3f2adcd1c55c31029c92c2ff8543e6cd9e37e2cd515ba4e1789c6d66f9c93b4e7f209ee7a' '97a6a57c07502e02669dc1a91bffc447dba7d98d208b798d80e07de0d2fdf9d23264453978d2d3d1ba6652ca1f2e22cdadc4309c7b311e83fa71b00ad144f877' '706ba6e7fa8298475f2605a28daffef421c9fa8d269cbd5cbcf7f7cb795b40a24d52c20e8d0b73e29e6cd35cd7226b3e9738dc513703e87dde04c1d24087a69c') -b2sums=('885d2b23ed670cf26452eb208d561478b7410ffbb04a054feb65efb7da6f1d51eb992da61b72409f8991ee35efd7e7cf7a9bc770edec5f855ace32f82aaa7b55' +b2sums=('e910131eab6527c1222afadf02ebd7bd6a3460baf95c23cc9eefa7aa21ddb70c02e58e4f58db2cb24fa8e2996c82b11664420545a8b1af573e4e6a25ceb3f921' 'SKIP' - '01f5acfd50840ce67a13435400b8d759462fba171d1963bad4e4291005db95b451c18e15dcf8fba4f7d26c764a7a4bdabff8204f6009c51f8ba74093b7daf78b' - '984f17bffbaa2a973b8dc6cffbe67258272a52df27287dc70e5b5a534b434c796a72fba6985dedec13eeb3ea8d2e213759e0f72170488dc272cd7ac12ba11cc6' - 'ee9b8ce37ea0838f6228f9f709804cda9c2b8adb110601b3e0f9d4bba8aa16c9c14c1feb9003a4f20432c963c247a2e65575acafb1ada0155ee2def01ddd2bf3' + '565f625b3794aabd68fcb7e72a50a48109674b6650073c5f757b7722f51d4b42dc60ad290b9e24bbd2de41528751c6fa3d1d3b6e69c34576d3568b4f4f625bf6' + '0ea92cade7824c40542dbf1e1c964dc729c92beaa25632f5ee60f89ec9d2ba0c699149af064c057ed68242f85b835d6f9f4d185838fa91efbcbb97c6175883de' + '9ac5719a6f0fc0cae436dda9e8dd3eb8ced4702ee3812db777198e61232d575dbb6be46ef3bbacf39b9c3938dfe0a6e4d00ce0e44fcf3769ec93e68e7365f3fd' '5cfc936555aa2b2e15f8830ff83764dad6e11a80e2a102c5f2bd3b7c83db22a5457a3afdd182e3648c9d7d5bca90fa550f59576d0ac47a11a31dfb636cb18f2b' 'a69191ab966f146c35e7e911e7e57c29fffd54436ea014aa8ffe0dd46aaf57c635d0a652b35916745c75d82b3fca7234366ea5f810b622e94730b45ec86f122c' '511c4ad9f3be530dc17dd68f2a3387d748dcdb84192d35f296b88f82442224477e2a74b1841ec3f107b39a5c41c2d961480e396a48d0578f8fd5f65dbe8d9f04'