normalize 'your-*' PKGBUILDs and install hook messages

2 files changed, 37 insertions, 36 deletions

diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD
index 1a00cf537..8d6213f64 100644
--- a/nonprism/your-privacy/PKGBUILD
+++ b/nonprism/your-privacy/PKGBUILD
@@ -1,31 +1,39 @@
 # SPDX-License-Identifier: CC0-1.0
-# Maintainer: Parabola Project <dev@lists.parabola.nu>
+# Maintainer: Parabola Hackers <dev@lists.parabola.nu>
+
+
+# NOTE: This PKGBUILD does not need to be edited manually.
+#       The package is normally built automatically by autobuilder.
+#       To generate a new package, simply push changes to blacklist.git.
+#       The autobuilder will modify this PKGBUILD,
+#       replacing $pkgver, $_gitver, and the checksum (updpkgsums),
+#       build and publish the package,
+#       and commit the modified PKGBUILD to abslibre.
 
 
 pkgname=your-privacy
-pkgdesc="This package will remove support for protocols and services known to endanger privacy."
-license=('GPL3')
-url="https://git.parabola.nu/blacklist.git"
 pkgver=20211130
-_gitver=ab32447a5a47a2a5ec5a3fa6043dc6b9024e3674
 pkgrel=1
+_gitver=ab32447a5a47a2a5ec5a3fa6043dc6b9024e3674
+pkgdesc="This package will remove support for protocols and services known to endanger privacy."
+arch=(any)
+url=https://wiki.parabola.nu/Blacklist
+license=(GPL3)
 
-arch=('any')
+makedepends=(librelib)
 install=${pkgname}.install
+source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})
 
-makedepends=(librelib)
-source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})
 sha512sums=('9ab837a9ca351bb844ecdfc147d69ec1f0d1971fbe12ceeed3b837fc59c54b10d2476901e60f677b0f53166a805b493b0a8bcd638e9e6638012dd454c7930cf8')
 
 
 package()
 {
-  cd "${srcdir}"
-
+  # collect blacklisted package names as pacman conflicts
   conflicts=( $( libreblacklist normalize < blacklist-${_gitver}.txt | \
                  cut -d: -f1,2                                       | \
                  sed -n 's/:$//p'                                    | \
                  sort -u                                             ) )
 
-  install -Dm644 blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt
+  install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt
 }
diff --git a/nonprism/your-privacy/your-privacy.install b/nonprism/your-privacy/your-privacy.install
index bbb2a3dd1..e2b0f02a7 100644
--- a/nonprism/your-privacy/your-privacy.install
+++ b/nonprism/your-privacy/your-privacy.install
@@ -1,30 +1,23 @@
+notice()
+{
+  cat <<EOF
+  The 'your-privacy' package detects other packages on your system,
+  which are known to support privacy-unsafe protocols/services,
+  and protects you from (accidentally) installing those in the future.
 
-pre_install() {
-  cat <<EOM
-  == IMPORTANT NOTICE ==
+  Also, as any other such packages are identified in the future,
+  an updated 'your-privacy' package will prompt you for their removal.
 
-  This package will help you identify if packages that support 
-  unsafe/dangerous for privacy protocols/services are installed on your
-  system at the time of its installation, as well as protecting you from 
-  (accidentally) installing them.
+  Your feedback/participation is important. It is _your_ privacy, after all.
+  If you notice any problems caused by this package, or notice some package
+  which does or does not deserve to be guarded, please do start a discussion.
 
-  Also, if any other package that support unsafe/dangerous for privacy
-  protocols/services is identified, later updates will ask you for its 
-  removal.
-
-  Have in mind that, if you want to retain certain packages that support
-  unsafe/dangerous for privacy protocols/services installed on your system,
-  you'll have to remove your-privacy :)
-
-  Please report back to the Parabola Project on the usual channels:
-  * https://labs.parabola.nu
-  * irc://irc.libera.chat/#parabola
-  * mailto:dev@lists.parabola.nu
-EOM
-}
-
-pre_upgrade() {
-  pre_install
+  * Bugs:  https://labs.parabola.nu
+  * Forum: https://forum.parabola.nu
+  * Email: mailto:assist@lists.parabola.nu
+  * Chat:  ircs://irc.libera.chat/#parabola
+EOF
 }
 
-# vim:set ts=2 sw=2 et:
+pre_install() { notice ; }
+pre_upgrade() { notice ; }