summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/pacman/PKGBUILD10
-rw-r--r--core/pacman/makepkg.conf26
-rw-r--r--core/pacman/pacman.conf5
3 files changed, 25 insertions, 16 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD
index a5b17eae..23c625a8 100644
--- a/core/pacman/PKGBUILD
+++ b/core/pacman/PKGBUILD
@@ -1,14 +1,14 @@
-# upstream git revision: 18811ca7ee347721a700db2080a50df06a0a79fc
+# upstream git revision: fb2af6c105822feb0e5e097d25cc2816416bb294
depends+=(archlinux32-keyring)
# fail if upstream changes makepkg.conf or pacman.conf
for ((i=0; i<${#sha256sums[@]}; i++)); do
- if [ "${sha256sums[${i}]}" = '46a7fda0f2ebd2957db1c0264ed8a659df0916ba30e1353ecc70ef47d2b118ff' ]; then
- sha256sums[${i}]='0af8eda66e530096cd4ff3e64f0b1ef2af669a7fb31b85faf9e6d906c6098ba1'
+ if [ "${sha256sums[${i}]}" = '89d1dd7e7064243754efc1993a8843a400afd5d7c15070787985376ec346d6d9' ]; then
+ sha256sums[${i}]='79c5cb75d53a957db9dcc4605a3aa7cefa27915992267bee1f5747264ac1359d'
fi
- if [ "${sha256sums[${i}]}" = '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2' ]; then
- sha256sums[${i}]='428ceeb0d8b96ac5e4274ef098bde00916f9e1b62369eb3566eaf6f6b3ac3984'
+ if [ "${sha256sums[${i}]}" = '606e55f06c297d2b508bc4438890b229a1abaa68b0374a2d7f94c8e7be6792d7' ]; then
+ sha256sums[${i}]='fa05e6f8a83f09fc347988a8ad9dce6fad50d542b2d77fc07fd1b604309990be'
fi
done
diff --git a/core/pacman/makepkg.conf b/core/pacman/makepkg.conf
index 006ece0d..3e9fd8e7 100644
--- a/core/pacman/makepkg.conf
+++ b/core/pacman/makepkg.conf
@@ -24,6 +24,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'
+ 'fossil::fossil'
'git::git'
'hg::mercurial'
'svn::subversion')
@@ -36,12 +37,11 @@ CARCH="i686"
CHOST="i686-pc-linux-gnu"
#-- Compiler and Linker Flags
-CPPFLAGS=""
+#CPPFLAGS=""
CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
- -Wp,-D_FORTIFY_SOURCE=2,-D_GLIBCXX_ASSERTIONS \
- -Wformat -Werror=format-security \
- -fstack-clash-protection"
-CXXFLAGS="$CFLAGS"
+ -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+ -fstack-clash-protection -fcf-protection"
+CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
#RUSTFLAGS="-C opt-level=2"
#-- Make Flags: change this for DistCC/SMP systems
@@ -55,7 +55,7 @@ DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
# BUILD ENVIRONMENT
#########################################################################
#
-# Defaults: BUILDENV=(!distcc !color !ccache check !sign)
+# Makepkg defaults: BUILDENV=(!distcc !color !ccache check !sign)
# A negated environment option will do the opposite of the comments below.
#
#-- distcc: Use the Distributed C/C++/ObjC compiler
@@ -78,7 +78,7 @@ BUILDENV=(!distcc color !ccache check !sign)
# These are default values for the options=() settings
#########################################################################
#
-# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug)
+# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
# A negated option will do the opposite of the comments below.
#
#-- strip: Strip symbols from binaries/libraries
@@ -89,11 +89,12 @@ BUILDENV=(!distcc color !ccache check !sign)
#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
#-- 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
#
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug !lto)
#-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
-INTEGRITY_CHECK=(md5)
+INTEGRITY_CHECK=(sha256)
#-- Options to be used when stripping binaries. See `man strip' for details.
STRIP_BINARIES="--strip-all"
#-- Options to be used when stripping shared libraries. See `man strip' for details.
@@ -148,3 +149,10 @@ COMPRESSLZ=(lzip -c -f)
#
PKGEXT='.pkg.tar.zst'
SRCEXT='.src.tar.gz'
+
+#########################################################################
+# OTHER
+#########################################################################
+#
+#-- Command used to run pacman as root, instead of trying sudo and su
+#PACMAN_AUTH=()
diff --git a/core/pacman/pacman.conf b/core/pacman/pacman.conf
index 7163168c..ef347ade 100644
--- a/core/pacman/pacman.conf
+++ b/core/pacman/pacman.conf
@@ -31,13 +31,14 @@ Architecture = auto
# Misc options
#UseSyslog
#Color
-#TotalDownload
+#NoProgressBar
CheckSpace
#VerbosePkgLists
+#ParallelDownloads = 5
# 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.
-SigLevel = Required DatabaseOptional DatabaseTrustAll
+SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
#RemoteFileSigLevel = Required