diff --git a/groff/PKGBUILD b/groff/PKGBUILD index fa5555b..4049f93 100644 --- a/groff/PKGBUILD +++ b/groff/PKGBUILD @@ -7,7 +7,7 @@ pkgname=groff pkgver=1.22.4 -pkgrel=08 +pkgrel=09 pkgdesc='GNU troff text-formatting system' url='https://www.gnu.org/software/groff/groff.html' groups=( jobbot ) @@ -53,12 +53,15 @@ package() { ln -s tbl "$pkgdir"/usr/bin/gtbl ln -s soelim "$pkgdir"/usr/bin/zsoelim -# # FS33760 - TERMCAP variables not followed -# # TODO: everyone is doing this - find out why upstream does not... -# cat "$srcdir"/site.tmac >> \ -# "$pkgdir"/usr/share/groff/site-tmac/man.local -# cat "$srcdir"/site.tmac >> \ -# "$pkgdir"/usr/share/groff/site-tmac/mdoc.local + # FS33760 - TERMCAP variables not followed + # TODO: everyone is doing this - find out why upstream does not... +## so they (arch devs) built 1.22.4-8 without it and -9 with it again. +## now they know why everyone else is doing it? Not very trust encouraging approach, +## this is like fixing a farm tractor in the barn. + cat "$srcdir"/site.tmac >> \ + "$pkgdir"/usr/share/groff/site-tmac/man.local + cat "$srcdir"/site.tmac >> \ + "$pkgdir"/usr/share/groff/site-tmac/mdoc.local } @@ -73,8 +76,8 @@ validpgpkeys=('2D0C08D2B0AD0D3D8626670272D23FBAC99D4E75') # Bertrand Garrigues < sha256sums=(e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293 # groff-1.22.4.tar.gz ef546604f5a32814d975f642877dcc9ad8d236489938b39df04e4d42c51fac96 # groff-1.22.4.tar.gz.sig b1e0bcbe1e0737aed1301066ff92a1e7fa0bd8b80a36321f92f519366a1acdb3 # display-utc-times.patch - af59ecde597ce9f8189368a7739279a5f8a391139fe048ef6b4e493ed46e5f5f) # site.tmac + a2f4c5657595c5961c2c2b80e77b1126a2fc0a0caea5c0660b36255b3d85b7ff) # site.tmac -## 0b6c55ba45d7826badc45c9b72bb550a788ea1fc431c3f15fbd141ced8f6754e groff-1.22.4-08-x86_64.pkg.tar.lz +## 3335258cfd97f0382221e0e7f20329b3aedf025c08c4a80f2a5b81950138dda0 groff-1.22.4-09-x86_64.pkg.tar.lz diff --git a/groff/PKGBUILD-arch b/groff/PKGBUILD-arch index f0e40eb..d792917 100644 --- a/groff/PKGBUILD-arch +++ b/groff/PKGBUILD-arch @@ -2,7 +2,7 @@ pkgname=groff pkgver=1.22.4 -pkgrel=8 +pkgrel=9 pkgdesc='GNU troff text-formatting system' arch=('x86_64') url='https://www.gnu.org/software/groff/groff.html' @@ -22,7 +22,7 @@ source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} sha256sums=('e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293' 'SKIP' 'b1e0bcbe1e0737aed1301066ff92a1e7fa0bd8b80a36321f92f519366a1acdb3' - 'af59ecde597ce9f8189368a7739279a5f8a391139fe048ef6b4e493ed46e5f5f') + 'a2f4c5657595c5961c2c2b80e77b1126a2fc0a0caea5c0660b36255b3d85b7ff') prepare() { cd $pkgname-$pkgver @@ -54,4 +54,11 @@ package() { ln -s eqn "$pkgdir"/usr/bin/geqn ln -s tbl "$pkgdir"/usr/bin/gtbl ln -s soelim "$pkgdir"/usr/bin/zsoelim + + # FS33760 - TERMCAP variables not followed + # TODO: everyone is doing this - find out why upstream does not... + cat "$srcdir"/site.tmac >> \ + "$pkgdir"/usr/share/groff/site-tmac/man.local + cat "$srcdir"/site.tmac >> \ + "$pkgdir"/usr/share/groff/site-tmac/mdoc.local } diff --git a/groff/site.tmac b/groff/site.tmac index 8ef1040..7bd28aa 100644 --- a/groff/site.tmac +++ b/groff/site.tmac @@ -6,7 +6,6 @@ . char \- \N'45' . char - \N'45' . char ' \N'39' -. char \' \N'39' . \} . . \" Shut off SGR by default (groff colors) diff --git a/groff/site.tmac.0 b/groff/site.tmac.0 new file mode 100644 index 0000000..8ef1040 --- /dev/null +++ b/groff/site.tmac.0 @@ -0,0 +1,16 @@ +. +.if n \{\ +. \" Character translations for non-keyboard +. \" characters - to make them searchable +. if '\*[.T]'utf8' \{\ +. char \- \N'45' +. char - \N'45' +. char ' \N'39' +. char \' \N'39' +. \} +. +. \" Shut off SGR by default (groff colors) +. \" Require GROFF_SGR envvar defined to turn it on +. if '\V[GROFF_SGR]'' \ +. output x X tty: sgr 0 +.\} diff --git a/sudo/PKGBUILD b/sudo/PKGBUILD index 46f003f..e734e4f 100644 --- a/sudo/PKGBUILD +++ b/sudo/PKGBUILD @@ -6,11 +6,10 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=sudo -_sudover=1.9.13p2 +_sudover=1.9.13p3 pkgrel=01 pkgver=${_sudover/p/.p} pkgdesc="Give certain users the ability to run some commands as root w/o systemd" -arch=('x86_64') url="https://www.sudo.ws/sudo/" groups=( jobbot ) depends=('glibc' 'openssl' 'pam' 'libldap' 'zlib') @@ -84,15 +83,18 @@ package() { install -Dm644 LICENSE.md -t "$pkgdir/usr/share/licenses/sudo" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('custom') validpgpkeys=('59D1E9CCBA2B376704FDD35BA9F4C021CEA470FB') # "Todd C. Miller " -sha256sums=(df2004fde4c1033b1fdca339958e0ec633d393d604fcff9d1513abef1f94574d # sudo-1.9.13p2.tar.gz - b8e4a147b1d4f454a10dd18dffa02a70e38ee6ac2061f38eded7f9d0e99c556e # sudo-1.9.13p2.tar.gz.sig +sha256sums=(92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b # sudo-1.9.13p3.tar.gz + 38781048d9707990ba77609f3508352c186a3cbd0a87ba0c667ea38cc2a85d90 # sudo-1.9.13p3.tar.gz.sig d1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2) # sudo.pam -## 832b05587d5e4243b53ba84c03be21cd52c07c901810204ccee15c20bc565cf5 sudo-1.9.13.p2-01-x86_64.pkg.tar.lz +## 90a01e2dfc0fe59b434929ef9db9bf32f60fd84fc93291b2645baa7744deff64 sudo-1.9.13.p3-01-x86_64.pkg.tar.lz + diff --git a/sudo/PKGBUILD-arch b/sudo/PKGBUILD-arch index c951eae..3cadc92 100644 --- a/sudo/PKGBUILD-arch +++ b/sudo/PKGBUILD-arch @@ -3,7 +3,7 @@ # Contributor: Tom Newsom pkgname=sudo -_sudover=1.9.13p2 +_sudover=1.9.13p3 pkgrel=1 pkgver=${_sudover/p/.p} pkgdesc="Give certain users the ability to run some commands as root" @@ -19,7 +19,7 @@ install=$pkgname.install source=(https://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig} sudo_logsrvd.service sudo.pam) -sha256sums=('df2004fde4c1033b1fdca339958e0ec633d393d604fcff9d1513abef1f94574d' +sha256sums=('92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b' 'SKIP' '8b91733b73171827c360a3e01f4692772b78e62ceca0cf0fd4b770aba35081a1' 'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')