diff --git a/groff/PKGBUILD b/groff/PKGBUILD index 2f8f693..9d59895 100644 --- a/groff/PKGBUILD +++ b/groff/PKGBUILD @@ -7,7 +7,7 @@ pkgname=groff pkgver=1.23.0 -pkgrel=02 +pkgrel=03 pkgdesc='GNU troff text-formatting system' url='https://www.gnu.org/software/groff/groff.html' groups=( jobbot ) @@ -19,14 +19,15 @@ optdepends=('netpbm: for use together with man -H command interaction in browser 'perl-file-homedir: for use with glilypond') options=('!docs' '!emptydirs' '!makeflags') source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - display-utc-times.patch) -# 'site.tmac') + display-utc-times.patch + site.tmac) prepare() { cd $pkgname-$pkgver # always use UTC times for display - using localtime is problematic for reproducible builds # fixes FS#69123 - patch taken from Debian patch -Np1 -i ../display-utc-times.patch + } build() { @@ -53,20 +54,13 @@ 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... -## 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. -### Now without it again .. -# cat "$srcdir"/site.tmac >> \ -# "$pkgdir"/usr/share/groff/site-tmac/man.local -# cat "$srcdir"/site.tmac >> \ -# "$pkgdir"/usr/share/groff/site-tmac/mdoc.local + cat "$srcdir"/site.tmac >> \ + "$pkgdir"/usr/share/groff/site-tmac/man.local + cat "$srcdir"/site.tmac >> \ + "$pkgdir"/usr/share/groff/site-tmac/mdoc.local } - #---- arch license gpg-key & sha256sums ---- arch=(x86_64) @@ -77,7 +71,8 @@ validpgpkeys=('2D0C08D2B0AD0D3D8626670272D23FBAC99D4E75') # Bertrand Garrigues < sha256sums=(6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13 # groff-1.23.0.tar.gz 7ec23a8550fba8d942da06b1f84a090d80538ac062e8c73de6a4ad7a4f69e09f # groff-1.23.0.tar.gz.sig - 489bb32bbd1c7bced33bf187611219527914ae46ce05238fe80dc11c4b1bb909) # display-utc-times.patch -# a2f4c5657595c5961c2c2b80e77b1126a2fc0a0caea5c0660b36255b3d85b7ff) # site.tmac + 489bb32bbd1c7bced33bf187611219527914ae46ce05238fe80dc11c4b1bb909 # display-utc-times.patch + f0b8a69d8dc51fe6812d3c7adbdba59b8206cfa952f2ce3ee7ff7f5412903018) # site.tmac + +## 4da0252c193f24a97929218bd434cbfbdd3ffb967f5903c618491a9115abacb7 groff-1.23.0-03-x86_64.pkg.tar.lz -## 99e5d2c5ab7efd378cc0998a22fd29ec9c62dfaefcb1855f9c561b82da8ed62b groff-1.23.0-02-x86_64.pkg.tar.lz diff --git a/groff/PKGBUILD-arch b/groff/PKGBUILD-arch index 996983c..ad62a75 100644 --- a/groff/PKGBUILD-arch +++ b/groff/PKGBUILD-arch @@ -2,7 +2,7 @@ pkgname=groff pkgver=1.23.0 -pkgrel=2 +pkgrel=3 pkgdesc='GNU troff text-formatting system' arch=('x86_64') url='https://www.gnu.org/software/groff/groff.html' @@ -16,10 +16,12 @@ optdepends=('netpbm: for use together with man -H command interaction in browser options=('!docs' '!emptydirs' '!makeflags') validpgpkeys=('2D0C08D2B0AD0D3D8626670272D23FBAC99D4E75') # Bertrand Garrigues source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} - display-utc-times.patch) + display-utc-times.patch + site.tmac) sha256sums=('6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13' 'SKIP' - '489bb32bbd1c7bced33bf187611219527914ae46ce05238fe80dc11c4b1bb909') + '489bb32bbd1c7bced33bf187611219527914ae46ce05238fe80dc11c4b1bb909' + 'f0b8a69d8dc51fe6812d3c7adbdba59b8206cfa952f2ce3ee7ff7f5412903018') prepare() { cd $pkgname-$pkgver @@ -51,4 +53,9 @@ package() { ln -s eqn "$pkgdir"/usr/bin/geqn ln -s tbl "$pkgdir"/usr/bin/gtbl ln -s soelim "$pkgdir"/usr/bin/zsoelim + + 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 7bd28aa..7c04fdc 100644 --- a/groff/site.tmac +++ b/groff/site.tmac @@ -7,9 +7,4 @@ . char - \N'45' . 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/groff/site.tmac.0 b/groff/site.tmac.0 index 8ef1040..7bd28aa 100644 --- a/groff/site.tmac.0 +++ b/groff/site.tmac.0 @@ -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/libarchive/PKGBUILD b/libarchive/PKGBUILD index 2784008..4b14468 100644 --- a/libarchive/PKGBUILD +++ b/libarchive/PKGBUILD @@ -6,20 +6,14 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libarchive -pkgver=3.6.2 +pkgver=3.7.0 pkgrel=02 pkgdesc='Multi-format archive and compression library' -arch=('x86_64') url='https://libarchive.org/' depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib' 'zstd' 'libcrypto.so') provides=('libarchive.so') #options=('debug') source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}) -# temp key server out will try again later and issue pkgrel=02 -# again, for 3rd day in a row, this gpg key is a phantom, Arch reisssues and patches a pseudo-signed source -# which is obviously is not checked by their server. -# ... finally after being mentioned in reddit/arch magically the key appeared to verify the source!!! -#source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz") #"{,.asc}) #prepare() { # cd "$pkgname-$pkgver" @@ -49,17 +43,21 @@ check() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - sed -i "s/iconv //" "$pkgdir"/usr/lib/pkgconfig/libarchive.pc +# sed -i "s/iconv //" "$pkgdir"/usr/lib/pkgconfig/libarchive.pc install -Dm0644 COPYING "$pkgdir/usr/share/licenses/libarchive/COPYING" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('BSD') validpgpkeys=(A5A45B12AD92D964B89EEE2DEC560C81CEC2276E # Martin Matuska DB2C7CF1B4C265FAEF56E3FC5848A18B8F14184B) # Martin Matuska -sha256sums=(9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d # libarchive-3.6.2.tar.xz - c6f1cdc29571dd6b09d3776ae98404a81b2dbe970a2bd9dc0bd9ed183ca49b71) # libarchive-3.6.2.tar.xz.asc +sha256sums=(44729a0cc3b0b0be6742a9873d25e85e240c9318f5f5ebf2cca6bc84d7b91b07 # libarchive-3.7.0.tar.xz + 0fea5d26e44bbe19f73c50907f808ce82337b3c7ddaeba7b3c290b23a4ea3d59) # libarchive-3.7.0.tar.xz.asc + +## d8cdde09922a4865ae27f330199d2ad4ee42fb9097df84ad714ad8f7b9a5f743 libarchive-3.7.0-02-x86_64.pkg.tar.lz diff --git a/libarchive/PKGBUILD-arch b/libarchive/PKGBUILD-arch index 8ff0085..17da4c3 100644 --- a/libarchive/PKGBUILD-arch +++ b/libarchive/PKGBUILD-arch @@ -2,7 +2,7 @@ # Maintainer: Dan McGee pkgname=libarchive -pkgver=3.6.2 +pkgver=3.7.0 pkgrel=2 pkgdesc='Multi-format archive and compression library' arch=('x86_64') @@ -11,11 +11,10 @@ license=('BSD') depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'libcrypto.so' 'xz' 'zlib' 'zstd') provides=('libarchive.so') -options=('debug') validpgpkeys=('A5A45B12AD92D964B89EEE2DEC560C81CEC2276E' # Martin Matuska 'DB2C7CF1B4C265FAEF56E3FC5848A18B8F14184B') # Martin Matuska source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}) -sha256sums=('9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d' +sha256sums=('44729a0cc3b0b0be6742a9873d25e85e240c9318f5f5ebf2cca6bc84d7b91b07' 'SKIP') build() { @@ -39,6 +38,5 @@ package() { cd "${pkgname}-${pkgver}" make DESTDIR="$pkgdir" install - sed -i "s/iconv //" "$pkgdir"/usr/lib/pkgconfig/libarchive.pc install -Dm0644 COPYING "$pkgdir/usr/share/licenses/libarchive/COPYING" } diff --git a/libarchive/deps b/libarchive/deps index 139597f..b28b04f 100644 --- a/libarchive/deps +++ b/libarchive/deps @@ -1,2 +1,3 @@ + diff --git a/libinih/PKGBUILD b/libinih/PKGBUILD index dea55e3..82379cf 100644 --- a/libinih/PKGBUILD +++ b/libinih/PKGBUILD @@ -6,15 +6,14 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=libinih -pkgver=56 +pkgver=57 pkgrel=01 pkgdesc='A simple .INI file parser written in C' -arch=(x86_64) url=https://github.com/benhoyt/inih depends=( gcc-libs glibc ) makedepends=( git meson ) provides=(libinih.so libINIReader.so) -_tag=5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b +_tag=9cecf0643da0846e77f64d10a126d9f48b9e05e8 source=(git+https://github.com/benhoyt/inih.git#tag=${_tag}) #prepare() { @@ -40,9 +39,13 @@ package() { install -Dm 644 inih/LICENSE.txt -t "${pkgdir}"/usr/share/licenses/libinih/ } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(BSD) sha256sums=(SKIP) +## 3c2fcccc30345ffe04bdd315b3bf6b02d628a1fec3e0cbb6876b8f76acc171a9 libinih-57-01-x86_64.pkg.tar.lz + diff --git a/libinih/PKGBUILD-arch b/libinih/PKGBUILD-arch index 1213284..1419dcc 100644 --- a/libinih/PKGBUILD-arch +++ b/libinih/PKGBUILD-arch @@ -2,7 +2,7 @@ # Contributor: Alberto Oporto Ames pkgname=libinih -pkgver=56 +pkgver=57 pkgrel=1 pkgdesc='A simple .INI file parser written in C' arch=(x86_64) @@ -20,7 +20,7 @@ provides=( libinih.so libINIReader.so ) -_tag=5e1d9e2625842dddb3f9c086a50f22e4f45dfc2b +_tag=9cecf0643da0846e77f64d10a126d9f48b9e05e8 source=(git+https://github.com/benhoyt/inih.git#tag=${_tag}) b2sums=(SKIP)