pull from https://github.com/louiswpf/nhiicc

Original commit messages:
-----------------------------------------------------------------------
Update comments

* Fix grammar.
* Remove the hard-coding comment since we've fixed it in nhiicc.service.

Use /usr/share/nhiicc for consistency

Since we use /var/lib/nhiicc/cert, use /usr/share/nhiicc for
consistency.

Clean up install and cp usages

* Use a single "install -D" to install a file and creating leading
  directories.
* install: Remove unneeded "-d" and "-t"
* cp: Ownerships are not preserved by default. Remove unneeded
  "--no-preserve=ownership".

Update to 20220530
-----------------------------------------------------------------------

My changes:

* Keep -t for install as it makes commands shorter
* Move the comment about hard-coding to the correct place instead of
  removing it

5 files changed, 18 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 59e0d714dfbe..b7a7aad835df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nhiicc
 	pkgdesc = 台灣健保卡網路註冊憑證元件 (National Health Insurance IC Card)
-	pkgver = 20220110
+	pkgver = 20220530
 	pkgrel = 1
 	epoch = 1
 	url = https://cloudicweb.nhi.gov.tw/cloudic/system/SMC/mEventesting.htm
@@ -14,8 +14,8 @@ pkgbase = nhiicc
 	source = https://cloudicweb.nhi.gov.tw/cloudic/system/SMC/mLNHIICC_Setup.20220110.tar.gz
 	source = nhiicc.service
 	source = regen-certs.sh
-	md5sums = 156de24023a454f9bf779e874d83eb77
-	md5sums = 82b85491957f25f22b43beffca53b9ab
-	md5sums = ba0495f8d54384ac95a93f221366049f
+	md5sums = af4c8e12bdadef7e6ab2b9b1dabb21d4
+	md5sums = 3a7ba068b49eab2edca614ea2495e706
+	md5sums = 605ed8db0ec700bb07ca256c5282ae6a
 
 pkgname = nhiicc
diff --git a/PKGBUILD b/PKGBUILD
index 843604420e5e..b2172e8c88e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,31 @@
 
 pkgname=nhiicc
 epoch=1
-pkgver=20220110
+pkgver=20220530
 pkgrel=1
 arch=(x86_64)
 url='https://cloudicweb.nhi.gov.tw/cloudic/system/SMC/mEventesting.htm'
 license=(custom)
 pkgdesc='台灣健保卡網路註冊憑證元件 (National Health Insurance IC Card)'
-# sed and openssl is for commands used in nhiicc.install
+# sed and openssl are for commands used in nhiicc.install
 depends=(pcsclite sed openssl)
 optdepends=(
   'lib32-pcsclite: for using card readers with 32-bit driver only'
 )
-source=("https://cloudicweb.nhi.gov.tw/cloudic/system/SMC/mLNHIICC_Setup.$pkgver.tar.gz"
+# XXX: Upstream still use 20220110 for the filename
+source=("https://cloudicweb.nhi.gov.tw/cloudic/system/SMC/mLNHIICC_Setup.20220110.tar.gz"
         nhiicc.service
         regen-certs.sh)
 # See https://cloudicweb.nhi.gov.tw/cloudic/system/SMC/mEventesting.htm for MD5 sums
-md5sums=('156de24023a454f9bf779e874d83eb77'
-         '82b85491957f25f22b43beffca53b9ab'
-         'ba0495f8d54384ac95a93f221366049f')
+md5sums=('af4c8e12bdadef7e6ab2b9b1dabb21d4'
+         '3a7ba068b49eab2edca614ea2495e706'
+         '605ed8db0ec700bb07ca256c5282ae6a')
 install=nhiicc.install
 
 package() {
-  # XXX: upstream binary appears to hard-code /usr/local/share/NHIICC :/
-  install -Ddm755 "$pkgdir"/usr/{bin,share/NHIICC}
-  install -Dm755 mLNHIICC_Setup/x64/mLNHIICC -t "$pkgdir"/usr/bin
-  cp -dr --no-preserve=ownership mLNHIICC_Setup/html "$pkgdir"/usr/share/NHIICC/
-  install -Dm755 regen-certs.sh -t "$pkgdir"/usr/share/NHIICC/
+  install -Dm755 mLNHIICC_Setup."$pkgver"/x64/mLNHIICC -t "$pkgdir"/usr/bin
+  install -Dm755 regen-certs.sh -t "$pkgdir"/usr/share/nhiicc/
+  cp -dr mLNHIICC_Setup."$pkgver"/html "$pkgdir"/usr/share/nhiicc/
   find "$pkgdir" \( -name '*~' -or -name '._*' \) -delete
-
-  install -Ddm755 "$pkgdir"/usr/lib/systemd/system
   install -Dm644 nhiicc.service -t "$pkgdir"/usr/lib/systemd/system/
 }
diff --git a/nhiicc.install b/nhiicc.install
index bcf670cf31e8..1b24b9555ead 100644
--- a/nhiicc.install
+++ b/nhiicc.install
@@ -6,7 +6,7 @@ post_install() {
 }
 
 post_upgrade() {
-  /usr/share/NHIICC/regen-certs.sh
+  /usr/share/nhiicc/regen-certs.sh
   cat <<EOF
 >>>
 >>> Certificates for the NHIICC program are generated. You may need to restart browsers to load new certificates.
diff --git a/nhiicc.service b/nhiicc.service
index da118ca07647..e915e4b7fd78 100644
--- a/nhiicc.service
+++ b/nhiicc.service
@@ -6,8 +6,9 @@ Type=simple
 ExecStart=/usr/bin/mLNHIICC
 PrivateTmp=true
 DynamicUser=true
+# XXX: upstream binary appears to hard-code /usr/local/share/NHIICC :/
 TemporaryFileSystem=/usr/local/share:ro
-BindReadOnlyPaths=/usr/share/NHIICC:/usr/local/share/NHIICC
+BindReadOnlyPaths=/usr/share/nhiicc:/usr/local/share/NHIICC
 BindReadOnlyPaths=/var/lib/nhiicc/cert:/usr/local/share/NHIICC/cert
 # Use undocumented /run/credentials as BindReadOnlyPaths= require
 # absolute paths and don't accept environment variables like
diff --git a/regen-certs.sh b/regen-certs.sh
index 098bf16dd132..e1c8f7f6c780 100644
--- a/regen-certs.sh
+++ b/regen-certs.sh
@@ -4,7 +4,7 @@
 org=nhi-localhost-ca
 domain=localhost
 # Upstream script generates 50 year leaf cert and 30 day CA cert. 10
-# years for both sound a better choice
+# years for both sound like a better choice
 days=3650
 
 set -eu