gmid: upgrade to v2.0

1 files changed, 43 insertions, 31 deletions

diff --git a/pcr/gmid/PKGBUILD b/pcr/gmid/PKGBUILD
index da9c37fef..e1cdafeaa 100644
--- a/pcr/gmid/PKGBUILD
+++ b/pcr/gmid/PKGBUILD
@@ -10,8 +10,8 @@
 
 
 pkgname=gmid
-pkgver=1.8.6
-pkgrel=4
+pkgver=2.0
+pkgrel=1
 pkgdesc='Fast Gemini server written with security in mind.'
 arch=('x86_64')
 arch+=('i686' 'armv7h')
@@ -20,37 +20,40 @@ license=('custom:ISC')
 install=${pkgname}.install
 backup=(etc/conf.d/${pkgname}
         etc/${pkgname}.conf)
-depends=('libretls' 'libevent')
-mksource=(https://github.com/omar-polo/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz)
+depends=('libretls' 'libbsd')
 source=(
-	https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.gz{,.sig}
-	"gmid.service"
-	"gmid.sysusers"
-	"gmid.confd"
-	"gmid.initd"
-	"gmid.conf"
-	"index.gmi"
-)
-mksha256sums=('5e027012f50f56709a7f08a530fd0ecc90402142acdcd7cba6e23bd7a37d0bc8')
-sha256sums=(
-	'3fc017112983f0432aad7c0fb07f103a36d3eb3d85a324032508cfab5d4deed4'
-	'SKIP'
-	'946de0766343225068a0e3f38cb39a4a93ef312525dd775226b938cd08706b94'
-	'4d943727a57dbf5f246963c0f90ccc54919cc2296538457e6b16f29f7580d9d6'
-	'eddbe93741d01077426bc0239db42815c75a0da5191b4e6528df60ae3e0e5bb3'
-	'f396c7db961c45ddb8e48acf42708b3faf9df2a3eaa56f30d9e64d4de0971e88'
-	'7acf491fee5f2693b30666b1f2c6eb0a4db33e9ef3154e1cbfb62186c6fa7be6'
-	'361cd4ef2b47437b0f5729d56d0ef88851e56812ab88546c82cda0092fe86139'
+  "https://ftp.omarpolo.com/$pkgname-$pkgver.tar.gz"
+	#"gmid.service" # parabola mksource over-ride
+	#"gmid.conf"    # parabola mksource over-ride
 )
+sha256sums=('b6e0213eea014ce00326e9e0417150632e1988d79eab1d8d044c7dd3ea018f9d')
 validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger
 
-
-# NOTE: The files removed in mksource() are not actually present in this release
-#       However, mksource() is retained for now,
-#       because it is not certain that the files will be absent in the next release;
-#       or perhaps their omission from this release was a happy accident.
+# parabola mksource over-rides
+mksource=(     ${source[*]}     )
+mksha256sums=( ${sha256sums[*]} )
+source=(https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-${pkgver}.parabola.tar.gz{,.sig}
+        gmid.service
+        gmid.sysusers
+        gmid.confd
+        gmid.initd
+        gmid.conf
+        index.gmi)
+sha256sums=('136d01b3cdf591e9ade7b34f9ade5d960e3a59d7cc63f2e01c4745a980364795'
+            'SKIP'
+            '946de0766343225068a0e3f38cb39a4a93ef312525dd775226b938cd08706b94'
+            '4d943727a57dbf5f246963c0f90ccc54919cc2296538457e6b16f29f7580d9d6'
+            'eddbe93741d01077426bc0239db42815c75a0da5191b4e6528df60ae3e0e5bb3'
+            'f396c7db961c45ddb8e48acf42708b3faf9df2a3eaa56f30d9e64d4de0971e88'
+            '7acf491fee5f2693b30666b1f2c6eb0a4db33e9ef3154e1cbfb62186c6fa7be6'
+            '361cd4ef2b47437b0f5729d56d0ef88851e56812ab88546c82cda0092fe86139')
+
+
+# NOTE: The files removed in mksource() are not always present.
+#       They tend to disappear and re-appear.
 _MKSOURCE_ERR_FMT="ERROR: %s - mksource() was not applied or needs re-working - sources may contain non-free files"
-_NONFREE_FILES=( contrib site )
+_NONFREE_FILES=( contrib )
+_PREV_NONFREE_FILES=( site )
 
 
 _version_constraint() # (dep_pkgname [precision])
@@ -111,16 +114,25 @@ mksource() {
 	local err_msgs=()
 	for nonfree_file in "${_NONFREE_FILES[@]}"
 	do
-		if [[ ! -e ${nonfree_file} ]] || ! rm -r ${nonfree_file}
+		if [[ ! -e ${nonfree_file} ]]
+		then
+			err_msgs+=( "nonfree_file: '${nonfree_file}' does not exist" )
+		elif ! rm -r ${nonfree_file}
 		then
 			err_msgs+=( "cannot delete nonfree_file: '${nonfree_file}'" )
-			return 1
+		fi
+	done
+	for nonfree_file in "${_PREV_NONFREE_FILES[@]}"
+	do
+		if [[ -e ${nonfree_file} ]]
+		then
+			err_msgs+=( "previous nonfree_file: '${nonfree_file}' re-appeared" )
 		fi
 	done
 
 	# display error report
 	if (( ${#err_msgs} ))
-	then printf "${_MKSOURCE_ERR_FMT/ERROR:/WARNING:}" "${err_msgs[@]}"
+	then printf "${_MKSOURCE_ERR_FMT}" "${err_msgs[@]}"
 		return 1
 	fi
 }