diff options
author | éclairevoyant | 2024-04-01 17:06:38 -0400 |
---|---|---|
committer | éclairevoyant | 2024-04-01 17:07:29 -0400 |
commit | 30d515cb1de3824bc0c340fba0877aabfe51da37 (patch) | |
tree | 164ef3c5d2d9e2caef5a49c5e58dc900bad27d77 | |
parent | 0cbc9ee393789252456652a15a909d71cbd81789 (diff) | |
download | aur-30d515cb1de3824bc0c340fba0877aabfe51da37.tar.gz |
pacman-git: update conf files, license
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 14 | ||||
-rw-r--r-- | makepkg.conf | 43 | ||||
-rw-r--r-- | pacman.conf.arm | 7 | ||||
-rw-r--r-- | pacman.conf.x86_64 | 9 |
5 files changed, 46 insertions, 43 deletions
@@ -1,6 +1,6 @@ pkgbase = pacman-git pkgdesc = A library-based package manager with dependency support - pkgver = 6.0.1.r152.g34611a66 + pkgver = 6.1.0.r15.g01e64e8b pkgrel = 1 url = https://www.archlinux.org/pacman/ arch = i686 @@ -9,7 +9,7 @@ pkgbase = pacman-git arch = armv6h arch = armv7h arch = aarch64 - license = GPL + license = GPL-2.0-or-later checkdepends = python checkdepends = fakechroot makedepends = git @@ -29,7 +29,7 @@ pkgbase = pacman-git depends = grep optdepends = pacman-contrib: various helper utilities optdepends = perl-locale-gettext: translation support in makepkg-template - provides = pacman=6.0.1 + provides = pacman=6.1.0 conflicts = pacman options = emptydirs options = strip @@ -41,10 +41,10 @@ pkgbase = pacman-git source = pacman.conf.x86_64 source = pacman.conf.arm source = makepkg.conf - sha256sums = SKIP - sha256sums = 0e09eb240512da85f7eaa314a5a98fe7d4c4e7ed5eebde7e3e937c0ae4ee7054 - sha256sums = 7ff75a61a07eabbc1718a7171b897b6504a6370f2f59a14caf42bbf0dce26ea6 - sha256sums = 3fa640a4a2138b8d07b6e6366ff0743206ecb32fc3b7f53490a614388c492cf3 - sha256sums = 0c1ecbb8c57e8ef2c600b41d4458269095fc4ddb6778d0000d4a9a067f68fe2d + b2sums = SKIP + b2sums = 86bf80c73295988b1d9ae2f17ac35e4e758c3326f7a3e71152182714d889af0a8c6cb14cc58012386cd352fad1786f87755a330180d738b67766dce9ea448625 + b2sums = 3643ddf0b75ec2f3ef762e45b7a57b3985226a29f7834ddf68e29bf3adba58f741d29211dff38dc787c629ee37b318ab69fca82a41a984a9ddf8cef79483aeed + b2sums = 8bd23f50f157bf01a5b8eb880ce949f555f27ef6f0d71173dd4494119c863f7cb10eaabe03b68d423a5250e8ad9a365274485ed73cceae85316c3ddcc0c66fc5 + b2sums = 11156dd4a7e16f22d5f8d31bc313a2b6d0021298fdb06ea32255fbac06ee7f2f0ddd2455f491183e1dbbc5756add9f85d188f7fc7f74ae92293a95b5a1a45666 pkgname = pacman-git @@ -6,12 +6,12 @@ # Contributor: Andres Perera <aepd87 at gmail dot com> pkgname=pacman-git -pkgver=6.0.1.r152.g34611a66 +pkgver=6.1.0.r15.g01e64e8b pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://www.archlinux.org/pacman/" -license=('GPL') +license=('GPL-2.0-or-later') depends=('bash' 'glibc' 'libarchive' 'curl' 'gpgme' 'pacman-mirrorlist' 'gettext' 'gawk' 'coreutils' 'gnupg' 'grep') optdepends=('pacman-contrib: various helper utilities' @@ -28,11 +28,11 @@ source=("git+https://gitlab.archlinux.org/pacman/pacman.git" "pacman.conf.x86_64" "pacman.conf.arm" "makepkg.conf") -sha256sums=('SKIP' - '0e09eb240512da85f7eaa314a5a98fe7d4c4e7ed5eebde7e3e937c0ae4ee7054' - '7ff75a61a07eabbc1718a7171b897b6504a6370f2f59a14caf42bbf0dce26ea6' - '3fa640a4a2138b8d07b6e6366ff0743206ecb32fc3b7f53490a614388c492cf3' - '0c1ecbb8c57e8ef2c600b41d4458269095fc4ddb6778d0000d4a9a067f68fe2d') +b2sums=('SKIP' + '86bf80c73295988b1d9ae2f17ac35e4e758c3326f7a3e71152182714d889af0a8c6cb14cc58012386cd352fad1786f87755a330180d738b67766dce9ea448625' + '3643ddf0b75ec2f3ef762e45b7a57b3985226a29f7834ddf68e29bf3adba58f741d29211dff38dc787c629ee37b318ab69fca82a41a984a9ddf8cef79483aeed' + '8bd23f50f157bf01a5b8eb880ce949f555f27ef6f0d71173dd4494119c863f7cb10eaabe03b68d423a5250e8ad9a365274485ed73cceae85316c3ddcc0c66fc5' + '11156dd4a7e16f22d5f8d31bc313a2b6d0021298fdb06ea32255fbac06ee7f2f0ddd2455f491183e1dbbc5756add9f85d188f7fc7f74ae92293a95b5a1a45666') pkgver() { cd pacman diff --git a/makepkg.conf b/makepkg.conf index 14698a7e00d7..ce9389687c59 100644 --- a/makepkg.conf +++ b/makepkg.conf @@ -1,4 +1,6 @@ #!/hint/bash +# shellcheck disable=2034 + # # /etc/makepkg.conf # @@ -9,10 +11,10 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' - 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' +DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' + 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' + 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' + 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' 'rsync::/usr/bin/rsync --no-motd -z %u %o' 'scp::/usr/bin/scp -C %u %o') @@ -23,7 +25,7 @@ DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u' #-- The package required by makepkg to download VCS sources # Format: 'protocol::package' -VCSCLIENTS=('bzr::bzr' +VCSCLIENTS=('bzr::breezy' 'fossil::fossil' 'git::git' 'hg::mercurial' @@ -39,17 +41,20 @@ CHOST="@CHOST@" #-- Compiler and Linker Flags #CPPFLAGS="" CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fno-plt -fexceptions \ - -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection" + -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection \ + -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS" -LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now" -#RUSTFLAGS="-C opt-level=2" +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 -fvar-tracking-assignments" -DEBUG_CXXFLAGS="-g -fvar-tracking-assignments" -#DEBUG_RUSTFLAGS="-C debuginfo=2" +DEBUG_CFLAGS="-g" +DEBUG_CXXFLAGS="$DEBUG_CFLAGS" +DEBUG_RUSTFLAGS="-C debuginfo=2" ######################################################################### # BUILD ENVIRONMENT @@ -78,7 +83,7 @@ BUILDENV=(!distcc color !ccache check !sign) # These are default values for the options=() settings ######################################################################### # -# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto) +# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps) # A negated option will do the opposite of the comments below. # #-- strip: Strip symbols from binaries/libraries @@ -90,10 +95,11 @@ BUILDENV=(!distcc color !ccache check !sign) #-- purge: Remove files specified by PURGE_TARGETS #-- debug: Add debugging flags as specified in DEBUG_* variables #-- lto: Add compile flags for building with link time optimization +#-- autodeps: Automatically add depends/provides # -OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto) +OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto) -#-- File integrity checks to use. Valid: ck, md5, sha1, sha224, sha256, sha384, sha512, b2 +#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2 INTEGRITY_CHECK=(sha256) #-- Options to be used when stripping binaries. See `man strip' for details. STRIP_BINARIES="--strip-all" @@ -109,6 +115,8 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #-- Directory to store source code in for debug packages DBGSRCDIR="/usr/src/debug" +#-- Prefix and directories for library autodeps +LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32') ######################################################################### # PACKAGE OUTPUT @@ -136,7 +144,7 @@ DBGSRCDIR="/usr/src/debug" COMPRESSGZ=(gzip -c -f -n) COMPRESSBZ2=(bzip2 -c -f) COMPRESSXZ=(xz -c -z -) -COMPRESSZST=(zstd -c -z -q -) +COMPRESSZST=(zstd -c -T0 --ultra -20 -) COMPRESSLRZ=(lrzip -q) COMPRESSLZO=(lzop -q) COMPRESSZ=(compress -c -f) @@ -155,4 +163,5 @@ SRCEXT='.src.tar.gz' ######################################################################### # #-- Command used to run pacman as root, instead of trying sudo and su -PACMAN_AUTH=() +#PACMAN_AUTH=() +# vim: set ft=sh ts=2 sw=2 et: diff --git a/pacman.conf.arm b/pacman.conf.arm index 536606173401..b2a0d20147b8 100644 --- a/pacman.conf.arm +++ b/pacman.conf.arm @@ -43,8 +43,8 @@ LocalFileSigLevel = Optional #RemoteFileSigLevel = Required # NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. +# keyring can then be populated with the keys of all official Arch Linux ARM +# packagers with `pacman-key --populate archlinuxarm`. # # REPOSITORIES @@ -75,9 +75,6 @@ Include = /etc/pacman.d/mirrorlist [extra] Include = /etc/pacman.d/mirrorlist -[community] -Include = /etc/pacman.d/mirrorlist - [alarm] Include = /etc/pacman.d/mirrorlist diff --git a/pacman.conf.x86_64 b/pacman.conf.x86_64 index ef39bf8b6148..abf496f4df4a 100644 --- a/pacman.conf.x86_64 +++ b/pacman.conf.x86_64 @@ -69,19 +69,16 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -#[testing] +#[core-testing] #Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] +#[extra-testing] #Include = /etc/pacman.d/mirrorlist -[community] +[extra] Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, |