Skip to content
Snippets Groups Projects
Verified Commit 4950709a authored by Morten Linderud's avatar Morten Linderud :surfer:
Browse files

Merge branch 'morten/7.0'

* morten/7.0:
  fix srcinfo
  build from signed annotated tag with optional patch level commit
  add sandbox download user and configuration
  pkgbuild: declare depends for better diffs and less conflicts
  PKGBUILD: move to use release branch
  makpkg.conf: remove --ultra -20
  Move Rust flags to the respective file
  Add base-devel as optional dependency
parents c1c96218 07cce405
No related branches found
No related tags found
1 merge request!19Update to 7.0.0
pkgbase = pacman
pkgdesc = A library-based package manager with dependency support
pkgver = 6.1.0
pkgrel = 3
pkgver = 7.0.0.r1.g7cf2b01
pkgrel = 1
url = https://www.archlinux.org/pacman/
arch = x86_64
license = GPL-2.0-or-later
checkdepends = python
checkdepends = fakechroot
makedepends = meson
checkdepends = python
makedepends = asciidoc
makedepends = doxygen
makedepends = git
makedepends = meson
depends = bash
depends = glibc
depends = libarchive
depends = coreutils
depends = curl
depends = gpgme
depends = pacman-mirrorlist
depends = gettext
depends = gawk
depends = coreutils
depends = gettext
depends = glibc
depends = gnupg
depends = gpgme
depends = grep
depends = libarchive
depends = pacman-mirrorlist
depends = systemd
optdepends = base-devel: required to use makepkg
optdepends = perl-locale-gettext: translation support in makepkg-template
provides = libalpm.so
options = strip
backup = etc/pacman.conf
backup = etc/makepkg.conf
source = https://gitlab.archlinux.org/pacman/pacman/-/releases/v6.1.0/downloads/pacman-6.1.0.tar.xz
source = https://gitlab.archlinux.org/pacman/pacman/-/releases/v6.1.0/downloads/pacman-6.1.0.tar.xz.sig
backup = etc/makepkg.conf.d/rust.conf
source = git+https://gitlab.archlinux.org/pacman/pacman.git#tag=v7.0.0?signed
source = revertme-makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch
source = pacman-fix-msg-unknown-key.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/6bb95c8856437513ee0ab19226bc090d6fd0fb06.patch
source = pacman-man-gitlab.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/95f148c2222db608a0d72d5c5577d0c71e7fa199.patch
source = pacman-make-aligned-titles.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/5e0496260b7d3f9c9fcf2b1c4899e4dbcc20ff03.patch
source = pacman-repo-add-parseopts.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0571ee82bff0edbd5ffac2228d4e6ac510b9008e.patch
source = pacman-drop-result-warn.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/111eed0251238a9d3f90e76d62f2ac01aeccce48.patch
source = pacman-fix-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/bae9594ac1806ce30f2af1de27c49bb101a00d44.patch
source = pacman.conf
source = makepkg.conf
source = alpm.sysusers
source = rust.conf
validpgpkeys = 6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD
validpgpkeys = B8151B117037781095514CA7BBDFFC92306B1121
sha256sums = 5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9
sha256sums = SKIP
sha256sums = 06d082c3ce6f0811ca728515aa82d69d372800bd3ada99f5c445ef9429b6e3a6
sha256sums = b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2
sha256sums = 94c987046c2ff232fa0d395cddc11644840d767806711e04ef34f876a9baf217
sha256sums = 0774d7035e34661f74b673d4b0a94be877bdc0158a555b873ec6bd4e2c936377
sha256sums = 7bb64910265ce2590f593cdfd302076e49f67a68f8cc792a9aaac572d36fc842
sha256sums = 2bbfe40539513ff5775aaf900644c8985ef618f5df9af856b9d571e2501365b0
sha256sums = 160515b741aadc876a67f213029f5f62a51ff072ea4aaeb687bbe614035bf72f
sha256sums = 1f4e4cc54332e60c9da2bdabf9a80dc11db466535f1a0be298cbf654f0723721
sha256sums = 656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a
sha256sums = 2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef
sha256sums = 0e84952e4b8eacbb38c018608d152ddd6f98e205c4c6c7d3cdca854d4b7d4179
sha256sums = d99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c
sha256sums = c8760d7ebb6c9817d508c691c67084be251cd9c8811ee1ccf92c1278bad74c1c
sha256sums = 59a8bbdc32830c90dbce5ead9f90074a2bb31cd85ec92bc5f92251bb4bcf8a1d
pkgname = pacman
......@@ -2,47 +2,78 @@
# Maintainer: Morten Linderud <foxboron@archlinux.org>
pkgname=pacman
pkgver=6.1.0
pkgrel=3
pkgver=7.0.0.r1.g7cf2b01
pkgrel=1
# 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=7cf2b0186d873be4218fe5be127dd029a0af03fe
pkgdesc="A library-based package manager with dependency support"
arch=('x86_64')
url="https://www.archlinux.org/pacman/"
license=('GPL-2.0-or-later')
depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist'
'gettext' 'gawk' 'coreutils' 'gnupg' 'grep')
makedepends=('meson' 'asciidoc' 'doxygen')
checkdepends=('python' 'fakechroot')
optdepends=('perl-locale-gettext: translation support in makepkg-template')
depends=(
bash
coreutils
curl
gawk
gettext
glibc
gnupg
gpgme
grep
libarchive
pacman-mirrorlist
systemd
)
makedepends=(
asciidoc
doxygen
git
meson
)
checkdepends=(
fakechroot
python
)
optdepends=(
'base-devel: required to use makepkg'
'perl-locale-gettext: translation support in makepkg-template'
)
provides=('libalpm.so')
backup=(etc/pacman.conf
etc/makepkg.conf)
options=('strip')
etc/makepkg.conf
etc/makepkg.conf.d/rust.conf)
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org>
'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v$pkgver/downloads/pacman-$pkgver.tar.xz{,.sig}
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
"$pkgname-fix-msg-unknown-key.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/6bb95c8856437513ee0ab19226bc090d6fd0fb06.patch"
"$pkgname-man-gitlab.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/95f148c2222db608a0d72d5c5577d0c71e7fa199.patch"
"$pkgname-make-aligned-titles.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/5e0496260b7d3f9c9fcf2b1c4899e4dbcc20ff03.patch"
"$pkgname-repo-add-parseopts.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0571ee82bff0edbd5ffac2228d4e6ac510b9008e.patch"
"$pkgname-drop-result-warn.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/111eed0251238a9d3f90e76d62f2ac01aeccce48.patch"
"$pkgname-fix-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/bae9594ac1806ce30f2af1de27c49bb101a00d44.patch"
pacman.conf
makepkg.conf)
sha256sums=('5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9'
'SKIP'
makepkg.conf
alpm.sysusers
rust.conf)
sha256sums=('06d082c3ce6f0811ca728515aa82d69d372800bd3ada99f5c445ef9429b6e3a6'
'b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2'
'94c987046c2ff232fa0d395cddc11644840d767806711e04ef34f876a9baf217'
'0774d7035e34661f74b673d4b0a94be877bdc0158a555b873ec6bd4e2c936377'
'7bb64910265ce2590f593cdfd302076e49f67a68f8cc792a9aaac572d36fc842'
'2bbfe40539513ff5775aaf900644c8985ef618f5df9af856b9d571e2501365b0'
'160515b741aadc876a67f213029f5f62a51ff072ea4aaeb687bbe614035bf72f'
'1f4e4cc54332e60c9da2bdabf9a80dc11db466535f1a0be298cbf654f0723721'
'656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a'
'2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef')
'0e84952e4b8eacbb38c018608d152ddd6f98e205c4c6c7d3cdca854d4b7d4179'
'd99c1f9608362fff9ab3a2ca0a3096a317927b42a6725bc86599da6849c9c67c'
'c8760d7ebb6c9817d508c691c67084be251cd9c8811ee1ccf92c1278bad74c1c'
'59a8bbdc32830c90dbce5ead9f90074a2bb31cd85ec92bc5f92251bb4bcf8a1d')
pkgver() {
cd "$pkgname"
git describe --abbrev=7 --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
cd "$pkgname-$pkgver"
cd "$pkgname"
# apply patch level commits on top of annotated tag
if [[ -n ${_git_patch_level_commit} ]]; then
if [[ v${_git_tag} != $(git describe --tags --abbrev=0 "${_git_patch_level_commit}") ]] then
error "patch level commit ${_git_patch_level_commit} is not a descendant of v${_git_tag}"
exit 1
fi
git rebase "${_git_patch_level_commit}"
fi
# handle patches
local -a patches
......@@ -64,7 +95,7 @@ prepare() {
}
build() {
cd "$pkgname-$pkgver"
cd "$pkgname"
meson --prefix=/usr \
--buildtype=plain \
......@@ -78,13 +109,13 @@ build() {
}
check() {
cd "$pkgname-$pkgver"
cd "$pkgname"
meson test -C build
}
package() {
cd "$pkgname-$pkgver"
cd "$pkgname"
DESTDIR="$pkgdir" meson install -C build
......@@ -92,6 +123,8 @@ package() {
install -dm755 "$pkgdir/etc"
install -m644 "$srcdir/pacman.conf" "$pkgdir/etc"
install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
install -D -m644 "$srcdir/alpm.sysusers" "${pkgdir}"/usr/lib/sysusers.d/alpm.conf
install -m644 "$srcdir/rust.conf" "$pkgdir/etc/makepkg.conf.d"
local wantsdir="$pkgdir/usr/lib/systemd/system/sockets.target.wants"
install -dm755 "$wantsdir"
......
u alpm - "Arch Linux Package Management" -
......@@ -48,13 +48,11 @@ CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
-Wl,-z,pack-relative-relocs"
LTOFLAGS="-flto=auto"
RUSTFLAGS="-Cforce-frame-pointers=yes"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
#-- Debugging flags
DEBUG_CFLAGS="-g"
DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
DEBUG_RUSTFLAGS="-C debuginfo=2"
#########################################################################
# BUILD ENVIRONMENT
......@@ -144,7 +142,7 @@ LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32')
COMPRESSGZ=(gzip -c -f -n)
COMPRESSBZ2=(bzip2 -c -f)
COMPRESSXZ=(xz -c -z -)
COMPRESSZST=(zstd -c -T0 --ultra -20 -)
COMPRESSZST=(zstd -c -T0 -)
COMPRESSLRZ=(lrzip -q)
COMPRESSLZO=(lzop -q)
COMPRESSZ=(compress -c -f)
......
......@@ -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.
......
#!/hint/bash
# shellcheck disable=2034
#
# /etc/makepkg.conf.d/rust.conf
#
#########################################################################
# RUST LANGUAGE SUPPORT
#########################################################################
# Flags used for the Rust compiler, similar in spirit to CFLAGS. Read
# linkman:rustc[1] for more details on the available flags.
RUSTFLAGS="-Cforce-frame-pointers=yes"
# Additional compiler flags appended to `RUSTFLAGS` for use in debugging.
# Usually this would include: ``-C debuginfo=2''. Read linkman:rustc[1] for
# more details on the available flags.
DEBUG_RUSTFLAGS="-C debuginfo=2"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment