diff --git a/mkinitcpio/PKGBUILD b/mkinitcpio/PKGBUILD index 0317a4a..99d8965 100644 --- a/mkinitcpio/PKGBUILD +++ b/mkinitcpio/PKGBUILD @@ -7,28 +7,18 @@ pkgname=mkinitcpio pkgver=31 -pkgrel=02 +pkgrel=03 pkgdesc='Modular initramfs image creation utility w/o systemd' _url='https://github.com/archlinux/mkinitcpio' url="https://sources.archlinux.org/other" -source=( - "$url/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} - '001-remove-systemd-and-kept-gzip-as-default.patch' - 'add_udev_rule_function.patch' -) - -makedepends=( - 'binutils' - 'asciidoc' - 'sed' -) - +source=("$url/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + '001-remove-systemd-and-kept-gzip-as-default.patch' + 'add_udev_rule_function.patch' + '0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch') +makedepends=('binutils' 'asciidoc' 'sed') arch=(x86_64) - install=mkinitcpio.install - -depends=( - 'mkinitcpio-busybox>=1.19.4-2' +depends=( 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' @@ -67,7 +57,7 @@ prepare() { ## Apply 0003-remove-systemd.patch patch -Np1 < $srcdir/001-remove-systemd-and-kept-gzip-as-default.patch patch -Np1 < $srcdir/add_udev_rule_function.patch - + patch -Np1 < "$srcdir"/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch } check() { @@ -87,4 +77,6 @@ validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB') # Giancarlo Razzolini sha256sums=(8f2811250b852ab78375bf90e1a7430daa132e57e128b0f6eaadddd9b27bbc63 # mkinitcpio-31.tar.gz 493e04724241e28d9d089bf09748f36b79fd455cb4e62c2e5c8c3d5fb67b6d62 # mkinitcpio-31.tar.gz.sig a7dcad6ec0a3ea32896f2ca218ea4ba1550feaed25d58ed609bfbb7f9fd03619 # 001-remove-systemd-and-kept-gzip-as-default.patch - 0fd3bc75aeb24d3ac272e2f8500fe289ec8606295b25fa299b80ac0834efdbe8) # add_udev_rule_function.patch + 0fd3bc75aeb24d3ac272e2f8500fe289ec8606295b25fa299b80ac0834efdbe8 # add_udev_rule_function.patch + 127816da46476bc37178d1484fb531c97cd269b520f033bcb5841c41d16c34bb) # 0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch + diff --git a/mkinitcpio/PKGBUILD-arch b/mkinitcpio/PKGBUILD-arch index a90b1d6..7e153e8 100644 --- a/mkinitcpio/PKGBUILD-arch +++ b/mkinitcpio/PKGBUILD-arch @@ -4,7 +4,7 @@ pkgname=mkinitcpio pkgver=31 -pkgrel=2 +pkgrel=3 pkgdesc="Modular initramfs image creation utility" arch=('any') url='https://github.com/archlinux/mkinitcpio' @@ -19,17 +19,22 @@ optdepends=('gzip: Use gzip compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') provides=('initramfs') backup=('etc/mkinitcpio.conf') -source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + 0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch) install=mkinitcpio.install sha512sums=('4ef87c2e4f579b292c38f9c487e78b3b99f6db77909cab322e860e5ca70aca3747fcfc272e2e15c9a3605c924ab178057b8b23151f98debc5d96e65f3c0c49d5' - 'SKIP') + 'SKIP' + 'fd348d6fcff249672b495db50fa67ce06d5d9a0c8f749c8b488bc1e4b43c9b850a5ad87392230fbe8b715422bb14e760bb0ad219cfcf1d7e132c6a7e4dd118a6') b2sums=('0113e288906e3b5fa485c29c00e7df60d85addd96718c45531031a686f18c739fa18303b6cac374d35b85edb7b663e221c8dc9158dff08c75858a4ed4dd154bf' - 'SKIP') + 'SKIP' + '5a05cee0382284d6cc0a2033e872b7c4c9f01ddfe6d3550974b5eab9a8a18690d1115b57d8d08153497fed08fd55b69f8b4a4cbcbe67795d615cc06ea7c86618') validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB') # Giancarlo Razzolini -# prepare() { -# cd $pkgname-$pkgver -# } +prepare() { + cd $pkgname-$pkgver + patch -Np1 < "$srcdir"/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch + +} check() { make -C "$pkgname-$pkgver" check diff --git a/mkinitcpio/deps b/mkinitcpio/deps index 7841e79..a409a3a 100644 --- a/mkinitcpio/deps +++ b/mkinitcpio/deps @@ -1,2 +1,4 @@ asciidoc mkinitcpio-busybox + + diff --git a/openssl/PKGBUILD b/openssl/PKGBUILD index 50a40ff..e3d6788 100644 --- a/openssl/PKGBUILD +++ b/openssl/PKGBUILD @@ -6,7 +6,7 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=openssl -_ver=1.1.1p +_ver=1.1.1q # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} ## Joborun: All this manouver with _ver instead of pkgver is for naming the pkg 1.1.1.l instead of 1.1.1l @@ -71,6 +71,6 @@ license=('custom:BSD') validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C') -sha256sums=(bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f # openssl-1.1.1p.tar.gz - 76e3933d27083db080ce5dfc162859659a29ea7fe44f4949d0a58b5d8320062d # openssl-1.1.1p.tar.gz.asc +sha256sums=(d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca # openssl-1.1.1q.tar.gz + 3ca1d670075b9dcd213071c701a5334cf6a206cf7686ae6db4e79db3090ad9ad # openssl-1.1.1q.tar.gz.asc 75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2) # ca-dir.patch diff --git a/openssl/PKGBUILD-arch b/openssl/PKGBUILD-arch index a138915..54b81e4 100644 --- a/openssl/PKGBUILD-arch +++ b/openssl/PKGBUILD-arch @@ -1,7 +1,7 @@ # Maintainer: Pierre Schmitz pkgname=openssl -_ver=1.1.1p +_ver=1.1.1q # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 @@ -16,7 +16,7 @@ replaces=('openssl-perl' 'openssl-doc') backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc} 'ca-dir.patch') -sha256sums=('bf61b62aaa66c7c7639942a94de4c9ae8280c08f17d4eac2e44644d9fc8ace6f' +sha256sums=('d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca' 'SKIP' '75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2') validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491' diff --git a/openssl/deps b/openssl/deps index b28b04f..fd40910 100644 --- a/openssl/deps +++ b/openssl/deps @@ -1,3 +1,4 @@ + diff --git a/openssl/key b/openssl/key index 34fbfed..8628889 100644 --- a/openssl/key +++ b/openssl/key @@ -1 +1,2 @@ gpg -v --recv-key D9C4D26D0E604491 +gpg --recv-keys D5E9E43F7DF9EE8C