diff --git a/PKGBUILD b/PKGBUILD index ad994ae621f0f0ec15dbb5498bd59e2420ecbf6f..f4a8411921fdce94dda5f31e61f959e8188f53d2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=pacman pkgver=7.0.0.r3.g7736133 -pkgrel=2 +pkgrel=2.0 # use annotated tag and patch level commit from release branch (can be empty for no patches) _git_tag=7.0.0 _git_patch_level_commit=77361331ae3864c6ea880e715c5864d59336f275 @@ -51,12 +51,14 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@a 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org> source=("git+https://gitlab.archlinux.org/pacman/pacman.git#tag=v${_git_tag}?signed" revertme-makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch + libalpm-sandbox-guinux.patch #Fix a crash in sandbox pacman.conf makepkg.conf alpm.sysusers rust.conf) sha256sums=('06d082c3ce6f0811ca728515aa82d69d372800bd3ada99f5c445ef9429b6e3a6' 'b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2' + '3475d9f8a33ba51f5f54b53c696556989ed97c7bc6363a62ed4bca9a50a6338a' '59e2dc8a4a7191a256f61c22ec603bf08b738ff899b622d50e8d2d6424effd2b' '62f6bca8ff27bb5d3392d4722b943bf1a2f8d5859faee4a2705f1b0883d7bb36' '41dc4d2d936e95c1a057dd999d51ee0823e8698a6d01cf6cc526885d992bd184' diff --git a/libalpm-sandbox-guinux.patch b/libalpm-sandbox-guinux.patch new file mode 100644 index 0000000000000000000000000000000000000000..402bdb3a3b8264f5751a77fea283829c112f61ad --- /dev/null +++ b/libalpm-sandbox-guinux.patch @@ -0,0 +1,15 @@ +diff --git a/lib/libalpm/sandbox.c b/lib/libalpm/sandbox.c +index 1e96dc00..cdc01dc7 100644 +--- a/lib/libalpm/sandbox.c ++++ b/lib/libalpm/sandbox.c +@@ -235,7 +235,9 @@ bool _alpm_sandbox_process_cb_download(alpm_handle_t *handle, int callback_pipe) + ASSERT(read_from_pipe(callback_pipe, filename, filename_size) != -1, FREE(filename); return false); + filename[filename_size] = '\0'; + +- handle->dlcb(handle->dlcb_ctx, filename, type, &cb_data); ++ if(handle->dlcb) { ++ handle->dlcb(handle->dlcb_ctx, filename, type, &cb_data); ++ } + FREE(filename); + return true; + }