index : packages | |
Archlinux32 package modifications | gitolite user |
summaryrefslogtreecommitdiff |
-rw-r--r-- | core/archlinux32-keyring/PKGBUILD | 11 | ||||
-rw-r--r-- | core/pacman/PKGBUILD | 12 | ||||
-rw-r--r-- | core/pacman/pacman.conf | 2 | ||||
-rw-r--r-- | core/pkgconf/PKGBUILD | 11 |
diff --git a/core/archlinux32-keyring/PKGBUILD b/core/archlinux32-keyring/PKGBUILD index 0f3d38a4..840a79e6 100644 --- a/core/archlinux32-keyring/PKGBUILD +++ b/core/archlinux32-keyring/PKGBUILD @@ -1,8 +1,7 @@ # Maintainer: Erich Eckner <deep42thought@archlinux32.org> pkgname=archlinux32-keyring -pkgver='20240131' -_pkgver='20240131-1-g00da5c3' -pkgrel='5' +pkgver='20240924' +pkgrel='1' pkgdesc='Arch Linux 32 PGP keyring' arch=('any') url='https://archlinux32.org' @@ -10,13 +9,13 @@ license=('GPL') install="${pkgname}.install" conflicts=('archlinux32-keyring-transition') replaces=('archlinux32-keyring-transition') -source=("https://sources.archlinux32.org/sources/${pkgname}-v${_pkgver}.tar.gz"{,.sig}) -sha256sums=('b64db02d172ec9fa93e9e0f17dc2eca422656a18f549ae4abf2aff98fa44f0e2' +source=("https://sources.archlinux32.org/sources/${pkgname}-v${pkgver}.tar.gz"{,.sig}) +sha512sums=('a1b16e4cf43b5f5cfea2184d55c1d19ccd6398d224a09c36bbd29d36a6685eb8a18035c76b33b6363850cfb7243d484f537c661c8f3a6bbfb68ab1bbeb8a94a9' 'SKIP') validpgpkeys=('33CA3597B0D161AAE4173F65C17F1214114574A4') # obtain from https://archlinux32.org/keys.php package() { - cd "${srcdir}/${pkgname}-v${_pkgver}" + cd "${srcdir}/${pkgname}-v${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index e5966c06..99b6a18e 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -1,14 +1,16 @@ -# upstream git revision: 557099dcb495b55b563735a21fdc393d0fc050fb +# upstream git revision: 1a52f2e1d641587a1514c99b96d839368076288d depends+=(archlinux32-keyring) # fail if upstream changes makepkg.conf or pacman.conf for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = '2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef' ]; then - sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894' + # pacman.conf + if [ "${sha256sums[${i}]}" = '0e84952e4b8eacbb38c018608d152ddd6f98e205c4c6c7d3cdca854d4b7d4179' ]; then + sha256sums[${i}]='3e482ca4e98386679cec02b51e32c6a13caf3dee365a850567547f616a69408f' fi - if [ "${sha256sums[${i}]}" = '656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a' ]; then - sha256sums[${i}]='663cbfe0643ff78c1eeb38d59046707da49bde6ab8226fbc5844457a985cb5bc' + # makepkg.conf + if [ "${sha256sums[${i}]}" = 'd99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c' ]; then + sha256sums[${i}]='82e963060a02c9a04cf5296bb4c5e732d3c3d0666d221ddaf2b3367989b9d894' fi done diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf index 75ba5b82..780c9a87 100644 --- a/core/pacman/pacman.conf +++ b/core/pacman/pacman.conf @@ -35,6 +35,8 @@ Architecture = auto CheckSpace #VerbosePkgLists #ParallelDownloads = 5 +DownloadUser = alpm +DisableSandbox # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. diff --git a/core/pkgconf/PKGBUILD b/core/pkgconf/PKGBUILD index 2cc6e9ca..1c4ba27b 100644 --- a/core/pkgconf/PKGBUILD +++ b/core/pkgconf/PKGBUILD @@ -1,13 +1,10 @@ # use i686 personality as main personality, no lib32, no 64-bit source=(${source[@]//x86_64-pc-linux-gnu.personality/}) -sha256sums=(${sha256sums[@]//c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5/}) -sha256sums[1]='4df633eb84275d51c94bc70a6c56def678ad76dd58573a2ac9b1360732883d96' +b2sums=(${b2sums[@]//c04583e19149c1035cb7777a59f0fbc4988b672d8e45105e33def3d0f9054464e33a400a3e7c7e8b99b334e4fe06aaa9d7e34662e806096d4374bd6b12d803db/}) +b2sums[1]='b44d82b4c4fd32eeed11a3e5a5ab7331f27467d0f83c118eb381d872cc41a1d69e00605a598a35e9288edf5e8fdadaebfff4bd83131506665c7ab94ef7a678a3' eval "$( declare -f package | \ - sed ' - /install/s/x86_64-pc-linux-gnu.personality// - /ln.*x86_64-pc-linux-gnu-pkg-config/d - ' -)" + sed 's@{x86_64,i686}@i686@' +)" |