upg os-prober qt5-base tor

This commit is contained in:
joborun linux 2022-06-19 00:40:45 +03:00
parent 05bf64b4d4
commit 3268553344
7 changed files with 33 additions and 72 deletions

View File

@ -7,47 +7,19 @@
pkgbase=os-prober-patched
pkgname=os-prober
pkgver=1.79
pkgrel=02
pkgdesc="Utility to detect other OSes on a set of drives (with additional patches to detect btrfs systems and other systems)"
url="http://joey.kitenet.net/code/os-prober/"
pkgver=1.80
pkgrel=01
pkgdesc="Utility to detect other OSes on a set of drives)"
url='https://joeyh.name/code/os-prober/'
#url="http://joey.kitenet.net/code/os-prober/"
arch=('x86_64')
depends=('sh' 'which')
provides=('os-prober' 'os-prober-garuda')
conflicts=('os-prober-btrfs' 'os-prober-garuda')
replaces=('os-prober-garuda')
source=(http://http.debian.net/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz
os-prober-frugalware.diff
fix-blkid-path.patch
os-prober-bootpart-name-fix.patch
os-prober-btrfsfix.patch
os-prober-factored-logger-efi-fix.patch
os-prober-factor-out-logger.patch
os-prober-gentoo-fix.patch
os-prober-grepfix.patch
os-prober-grub2-multiple-images.patch
os-prober-grub2-parsefix.patch
os-prober-linux-secure-boot.patch
os-prober-mdraidfix.patch
os-prober-mounted-partitions-fix.patch
os-prober-umount-fix.patch)
source=(http://http.debian.net/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz)
prepare() {
cd ${pkgname}
patch -p1 -i "$srcdir"/os-prober-frugalware.diff
patch -p1 -i "$srcdir"/os-prober-mdraidfix.patch
patch -p1 -i "$srcdir"/os-prober-btrfsfix.patch
patch -p1 -i "$srcdir"/os-prober-bootpart-name-fix.patch
patch -p1 -i "$srcdir"/os-prober-mounted-partitions-fix.patch
patch -p1 -i "$srcdir"/os-prober-factor-out-logger.patch
patch -p1 -i "$srcdir"/os-prober-factored-logger-efi-fix.patch
patch -p1 -i "$srcdir"/os-prober-umount-fix.patch
patch -p1 -i "$srcdir"/os-prober-grub2-parsefix.patch
patch -p1 -i "$srcdir"/os-prober-grub2-multiple-images.patch
patch -p1 -i "$srcdir"/os-prober-grepfix.patch
patch -p1 -i "$srcdir"/os-prober-gentoo-fix.patch
patch -p1 -i "$srcdir"/fix-blkid-path.patch
cd ${pkgname}-${pkgver}
# adjust lib dir to allow detection of 64-bit distros
sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro
@ -55,12 +27,12 @@ prepare() {
}
build() {
cd ${pkgname}
cd ${pkgname}-${pkgver}
make newns
}
package() {
cd ${pkgname}
cd ${pkgname}-${pkgver}
depends=(sh which)
install -Dm 755 os-prober linux-boot-prober -t "${pkgdir}/usr/bin"
install -Dm 755 newns -t "${pkgdir}/usr/lib/os-prober"
@ -80,18 +52,5 @@ package() {
license=('GPL3')
sha256sums=(abe6317d078c4e51e322e62036b6df4a698bfe80c5be110a08894841179810ee # os-prober_1.79.tar.xz
9a6c22c91ea5955d665bc20d85d899f6721875a6216862d59a1b7f3f4241fd02 # os-prober-frugalware.diff
87bbb0f69ebb47f5136291d6851967fba791db4f27d8883b35fc5be1653ff7a6 # fix-blkid-path.patch
c3d094f02b8a00026af10fdfe2ea9286cd1af6a1e25afcc82f3b234bdb64b86f # os-prober-bootpart-name-fix.patch
0ebfd75cfc82cfba2d239986ad68213dc8ee92943a1c68111b34e3fefc360232 # os-prober-btrfsfix.patch
08bf632e4716a3a63bd8f20e729c540754b676b23f4f82ff9156c448910c6f94 # os-prober-factored-logger-efi-fix.patch
b5c41ac1bc1a4544dd2d9efdcf190d6e5c2f0822b6d0e5fc8f7e6e5222da1d8d # os-prober-factor-out-logger.patch
02741e0edbc46327501be5d74977ff2bffa5ddaffe6a55a689e38ce4b8372444 # os-prober-gentoo-fix.patch
a9331117892dd9876b346d941969f70da96d54ce122d7a5ff40d9efe36aded42 # os-prober-grepfix.patch
07b919c7559ce6c5a8d8907d752366fc97ccf40b7ad54cbb2de904a9dd373efd # os-prober-grub2-multiple-images.patch
afc201d4d71525b73ffa365f7c667148e007836567be4c8ec25ea661d43b43f8 # os-prober-grub2-parsefix.patch
d66bbed46770f30198c181e6be3168ea288150800098e59874bba78dd0997ace # os-prober-linux-secure-boot.patch
092b0caef6fff45560531c0735e9449cb05a677e2296d72b5a0b4fb568fa4476 # os-prober-mdraidfix.patch
7a9c4a0f5bba4053b1bbf1640c854aee83f526fd086c94bc7691e1d3cb28afb7 # os-prober-mounted-partitions-fix.patch
81a5ce0c5e784480dff7520bdfada8f80dfe96b101e14e41bca2d0992e863e68) # os-prober-umount-fix.patch
sha256sums=(8063c38b9d006b94869e4127057d1189cb1adb561c2085c400b297ffa0cee38f) # os-prober_1.80.tar.xz

View File

@ -3,7 +3,7 @@
# Contributor: darkcoder <mario_vazq@hotmail.com>
pkgname=os-prober
pkgver=1.79
pkgver=1.80
pkgrel=1
pkgdesc='Utility to detect other OSes on a set of drives'
url='https://joeyh.name/code/os-prober/'
@ -11,23 +11,23 @@ arch=('x86_64')
license=('GPL3')
depends=('sh')
source=(http://http.debian.net/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz)
sha512sums=('89b827b9b90a1d3bc11e0090ec04d808502cc1883ab10997b6d9edbe6005dcf8a0acdd7d200102c9dccde56297bda6087d68fb6dec419f0920090c2655c9c7d8')
b2sums=('b3efacce9d7fce3708f5ec727a219e872e8d1de6dea15540cfbc0a0e8372c1033098230d3ddb9066fb5474d44e5584ee28631e0e5ab981e8fb1dc29ee3cbd89d')
sha512sums=('51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5')
b2sums=('56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd')
prepare() {
cd ${pkgname}
cd ${pkgname}-${pkgver}
# adjust lib dir to allow detection of 64-bit distros
sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro
rm -f Makefile
}
build() {
cd ${pkgname}
cd ${pkgname}-${pkgver}
make newns
}
package() {
cd ${pkgname}
cd ${pkgname}-${pkgver}
install -Dm 755 os-prober linux-boot-prober -t "${pkgdir}/usr/bin"
install -Dm 755 newns -t "${pkgdir}/usr/lib/os-prober"

View File

@ -1 +1 @@
rm -rf {src,pkg,os-pr*9.tar.xz}
rm -rf {src,pkg,os-pr*.tar.xz}

View File

@ -1 +1,2 @@

View File

@ -7,10 +7,10 @@
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
_basever=5.15.4
pkgver=5.15.4+kde+r168
pkgrel=01 ## rebuild against postgresql
_commit=b569683a2362ec2823dc834c8e1b42813849ea51
_basever=5.15.5
pkgver=5.15.5+kde+r161
_commit=ac023936446acbd66de73b1fd680e6010c99a692
pkgrel=01
arch=('x86_64')
url='https://www.qt.io'
pkgdesc='A cross-platform application and UI framework'
@ -120,3 +120,5 @@ sha256sums=(SKIP
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qmake-cflags.patch
4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch

View File

@ -3,10 +3,10 @@
pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
_basever=5.15.4
pkgver=5.15.4+kde+r168
_basever=5.15.5
pkgver=5.15.5+kde+r161
pkgrel=1
_commit=b569683a2362ec2823dc834c8e1b42813849ea51
_commit=ac023936446acbd66de73b1fd680e6010c99a692
arch=('x86_64')
url='https://www.qt.io'
license=('GPL3' 'LGPL3' 'FDL' 'custom')

View File

@ -7,7 +7,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=tor
pkgver=0.4.7.7
pkgver=0.4.7.8
pkgrel=01
pkgdesc='Anonymizing overlay network. w/o zstd and systemd'
arch=('x86_64')
@ -15,8 +15,8 @@ arch=('x86_64')
url='https://www.torproject.org/dist'
source=("$url/$pkgname-$pkgver.tar.gz"
#source=("$url/$pkgname-$pkgver.tar.gz"{,.sha256sum,.sha256sum.asc}
https://dist.torproject.org/tor-0.4.7.7.tar.gz.sha256sum
# 'tor-0.4.6.10.tar.gz.sha256sum'
# 'https://dist.torproject.org/$pkgname-$pkgver.tar.gz.sha256sum'
'https://dist.torproject.org/tor-0.4.7.8.tar.gz.sha256sum'
'torrc.patch'
'tor.sysusers'
'tor.tmpfiles')
@ -80,9 +80,8 @@ validpgpkeys=(2133BC600AB133E1D826D173FE43009C4607B1FB # Nick Mathewson
F65CE37F04BA5B360AE6EE17C218525819F78451 # Roger Dingledine
1C1BC007A9F607AA8152C040BEA7B180B1491921) # Alexander Færøy <ahf@0x90.dk>
sha256sums=(3e131158b52b9435d7e43d1c47ef288b96d005342cc44b8c950bb403851a5b44 # tor-0.4.7.7.tar.gz
02081f62d8588694626c6857111645892acde5bac947119ee502f551186a92ba # tor-0.4.7.7.tar.gz.sha256sum
sha256sums=(9e9a5c67ad2acdd5f0f8be14ed591fed076b1708abf8344066990a0fa66fe195 # tor-0.4.7.8.tar.gz
759c4f3146a74ba20232b351b81026ec69bfe7cb45e8cbafcaf9d3d1174609b9 # tor-0.4.7.8.tar.gz.sha256sum
c9632d05816d7a1ccfe1e258518c130808decaee7f3544494f9d53ab828cf22c # torrc.patch
04eec05b4e61efccc58c5da657363f0c1059d7f122cb15c32331a201af2d7f94 # tor.sysusers
07bedb17660a3673b31b0005b6505065c90b32f2c6b28b969241da675560f926) # tor.tmpfiles