upgpkg: nonsystemd/ 20180826-2.nonsystemd1

Signed-off-by: David P <megver83@parabola.nu>

2 files changed, 51 insertions, 19 deletions

diff --git a/nonsystemd/libretools/PKGBUILD b/nonsystemd/libretools/PKGBUILD
index 5d890e681..e01be8fad 100644
--- a/nonsystemd/libretools/PKGBUILD
+++ b/nonsystemd/libretools/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 
 pkgname=libretools
-pkgver=20180815
-pkgrel=1
+pkgver=20180826
+pkgrel=2
 pkgrel+=.nonsystemd1
 pkgdesc="Programs for Parabola development"
 arch=('any')
@@ -20,7 +20,7 @@ conflicts=(devtools libretools-mips64el)
 replaces=(libretools-mips64el)
 depends=(
   "librelib=$pkgver"
-  'pacman>=5.1' 'pacman<5.2'
+  'pacman>=5.1.1-1.parabola5' 'pacman<5.2'
   arch-install-scripts # `mkarchroot` uses `pacstrap`
   binutils # `libremakepkg` uses `makepkg` uses `strip`
   expac # `libredbdiff`
@@ -38,13 +38,13 @@ optdepends=('qemu-user-static-binfmt: To build ARM packages from x86')
 makedepends=(ruby-ronn)
 checkdepends=(
   sh-roundup git
-  'pacman>=5.1' 'pacman<5.2'
+  'pacman>=5.1.1-1.parabola5' 'pacman<5.2'
   expac
   tokyocabinet
 )
 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}
         Remove-systemd-support.patch)
-sha256sums=('787907a2cbc9a2aafece5e31543a93c17ca91aa6a0b714e0c6bc158df75d9b2a'
+sha256sums=('63e473cd979804652a1324171f94cf74e0fcc1d2eb2258911adad2e98a473952'
             'SKIP'
             '4257e7c5383df8c322d79f8e601893f71eeccbd1b9ceac76c8ebbc90fb609875')
 validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker
diff --git a/nonsystemd/libretools/libretools.install b/nonsystemd/libretools/libretools.install
index 759e32dc4..1c1e77baa 100644
--- a/nonsystemd/libretools/libretools.install
+++ b/nonsystemd/libretools/libretools.install
@@ -1,20 +1,52 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-	librefetch-install install etc/makepkg.conf
-}
+#!/hint/bash
 
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
-	if [[ "$(vercmp 20160505 "$2")" -eq 1 ]]; then
-		echo ":: The archroot format has changed from v3 to v4;"
-		echo "   you will need delete and re-create your chroots."
-	fi
-	librefetch-install install etc/makepkg.conf
-}
-
-pre_remove() {
 	librefetch-install remove etc/makepkg.conf
+
+	# Now that we've reverted the change, automatically resolve
+	# makepkg.conf.pacnew, if we can.
+	if [[ -f etc/makepkg.conf && -f etc/makepkg.conf.pacnew ]]; then
+		# remove a trailing newline--a likely remnant of merging .pacnew with the librefetch bit
+		sed -i '${/^$/d}' etc/makepkg.conf
+
+		local stock_sha256sum stock_sha256sums sha256sum
+
+		# Let's go back 1 year (from 2018-08-26)
+		stock_sha256sums=(
+			# 5.0.2-2.parabola1 (2017-08-05) -- 5.0.2-2.parabola1.3 (2018-01-25)
+			9dd688519366f12a4386fc890f76c48b3f9d6defef4c2ed0b33e813667612f19 # armv7h
+			9e18db6242b8eb6ae6285a3ed7d975b3825ec3d25aecb1942c8ad4f98329398f # i686
+			166c69b1adafd5374c50fbd2e85b4c1d292fdf7e07b4b0151e2ebfd5bfcb37bd # x86_64
+
+			# 5.0.2-2.parabola2 (2018-04-29) -- 5.0.2-3.parabola1 (2018-05-11)
+			055e4425b293e505701e8fbe7bde3c9b22797ddcde061e0bafda126d956764c2 # armv7h
+			616c87d521368de328e7d1498e819dd9b834601bca6077a99b3f0df73b6a6a7c # i686
+			013a073181ef2f958e22b6fb4083744473291e338f0aa18823439efd49052332 # x86_64
+
+			# 5.1.0-1.parabola1 (2018-05-29)
+			9e41020da19521777fc783123732ffef8e860ca377905896cbefe5a167f37410 # armv7h
+			3b46c6a51af00d822892dd8103e2b2657e17ad1e1043b87ca8bed8b965d61fb1 # i686
+			0bc5faf94f535504f12853ad5704a464ae80b6e9febd19a08070c66329a55135 # x86_64
+
+			# 5.1.0-2.parabola1 (2018-06-23) -- 5.1.1-1.parabola3 (2018-08-07)
+			45cf2da36894a71c6054bf4d3b822e3d55816de69b2f4eae6ea2c055d7ac0f29 # armv7h
+			c3b0d878aeebff2cca9390deb730883c856922035f60b07fc683a06267dee050 # i686
+			509568f5d12dd7e82a9e42a7e43b444d72b7cd49b9c8b7cc372025c0fcf3703b # x86_64
+
+			# 5.1.1-1.parabola4 (2018-08-26) --
+			b461585848d187b6bd6fcdc3774d46cf22574a5dc28ccd10421b0e824cd4916f # armv7h
+			4bb5d938f7da8e7575bf85804eee4b752fe39ca92a4dd9407fe97d867289082c # i686
+			6d94554dab59489ce6d7f60909e6828f0eb63435919f7890aec165965ea3187a # x86_64
+		)
+
+		read sha256sum _ < <(sha256sum etc/makepkg.conf)
+		for stock_sha256sum in "${stock_sha256sums[@]}"; do
+			if [[ $sha256sum = "$stock_sha256sum" ]]; then
+				mv -fTv etc/makepkg.conf.pacnew etc/makepkg.conf
+				break
+			fi
+		done
+	fi
 }