Sync pacman.conf and makepkg.conf with pacman 4.1 (092fe2ff) · Commits · archlinux / devtools

makepkg-i686.conf

+30 −13

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
		'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
		'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
		'rsync::/usr/bin/rsync -z %u %o'
		'rsync::/usr/bin/rsync --no-motd -z %u %o'
		'scp::/usr/bin/scp -C %u %o')

		# Other common tools:
		@@ -29,11 +29,15 @@ CHOST="i686-pc-linux-gnu"
		#-- Compiler and Linker Flags
		# -march (or -mcpu) builds exclusively for an architecture
		# -mtune optimizes for an architecture, but builds for whole processor family
		CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
		CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
		CPPFLAGS="-D_FORTIFY_SOURCE=2"
		CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
		CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
		LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
		#-- Make Flags: change this for DistCC/SMP systems
		#MAKEFLAGS="-j2"
		#-- Debugging flags
		DEBUG_CFLAGS="-g -fvar-tracking-assignments"
		DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"

		#########################################################################
		# BUILD ENVIRONMENT
		@@ -63,18 +67,20 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
		# These are default values for the options=() settings
		#########################################################################
		#
		# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
		# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
		# A negated option will do the opposite of the comments below.
		#
		#-- strip: Strip symbols from binaries/libraries
		#-- docs: Save doc directories specified by DOC_DIRS
		#-- libtool: Leave libtool (.la) files in packages
		#-- staticlibs: Leave static library (.a) files in packages
		#-- emptydirs: Leave empty directories in packages
		#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
		#-- purge: Remove files specified by PURGE_TARGETS
		#-- upx: Compress binary executable files using UPX
		#-- debug: Add debugging flags as specified in DEBUG_* variables
		#
		OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
		OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)

		#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
		INTEGRITY_CHECK=(md5)
		@@ -108,6 +114,17 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
		#-- Specify a key to use for package signing
		#GPGKEY=""

		#########################################################################
		# COMPRESSION DEFAULTS
		#########################################################################
		#
		COMPRESSGZ=(gzip -c -f -n)
		COMPRESSBZ2=(bzip2 -c -f)
		COMPRESSXZ=(xz -c -z -)
		COMPRESSLRZ=(lrzip -q)
		COMPRESSLZO=(lzop -q)
		COMPRESSZ=(compress -c -f)

		#########################################################################
		# EXTENSION DEFAULTS
		#########################################################################

makepkg-x86_64.conf

+30 −13

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
		'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
		'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
		'rsync::/usr/bin/rsync -z %u %o'
		'rsync::/usr/bin/rsync --no-motd -z %u %o'
		'scp::/usr/bin/scp -C %u %o')

		# Other common tools:
		@@ -29,11 +29,15 @@ CHOST="x86_64-unknown-linux-gnu"
		#-- Compiler and Linker Flags
		# -march (or -mcpu) builds exclusively for an architecture
		# -mtune optimizes for an architecture, but builds for whole processor family
		CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
		CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
		CPPFLAGS="-D_FORTIFY_SOURCE=2"
		CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
		CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
		LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
		#-- Make Flags: change this for DistCC/SMP systems
		#MAKEFLAGS="-j2"
		#-- Debugging flags
		DEBUG_CFLAGS="-g -fvar-tracking-assignments"
		DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"

		#########################################################################
		# BUILD ENVIRONMENT
		@@ -63,18 +67,20 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
		# These are default values for the options=() settings
		#########################################################################
		#
		# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
		# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
		# A negated option will do the opposite of the comments below.
		#
		#-- strip: Strip symbols from binaries/libraries
		#-- docs: Save doc directories specified by DOC_DIRS
		#-- libtool: Leave libtool (.la) files in packages
		#-- staticlibs: Leave static library (.a) files in packages
		#-- emptydirs: Leave empty directories in packages
		#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
		#-- purge: Remove files specified by PURGE_TARGETS
		#-- upx: Compress binary executable files using UPX
		#-- debug: Add debugging flags as specified in DEBUG_* variables
		#
		OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
		OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)

		#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
		INTEGRITY_CHECK=(md5)
		@@ -108,6 +114,17 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
		#-- Specify a key to use for package signing
		#GPGKEY=""

		#########################################################################
		# COMPRESSION DEFAULTS
		#########################################################################
		#
		COMPRESSGZ=(gzip -c -f -n)
		COMPRESSBZ2=(bzip2 -c -f)
		COMPRESSXZ=(xz -c -z -)
		COMPRESSLRZ=(lrzip -q)
		COMPRESSLZO=(lzop -q)
		COMPRESSZ=(compress -c -f)

		#########################################################################
		# EXTENSION DEFAULTS
		#########################################################################

pacman-extra.conf

+5 −9

Original line number	Diff line number	Diff line
		@@ -15,11 +15,10 @@
		#LogFile = /var/log/pacman.log
		#GPGDir = /etc/pacman.d/gnupg/
		HoldPkg = pacman glibc
		# If upgrades are available for these packages they will be asked for first
		SyncFirst = pacman
		#XferCommand = /usr/bin/curl -C - -f %u > %o
		#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
		#CleanMethod = KeepInstalled
		#UseDelta = 0.7
		Architecture = auto

		# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
		@@ -31,7 +30,7 @@ Architecture = auto

		# Misc options
		#UseSyslog
		#UseDelta
		#Color
		#TotalDownload
		# We cannot check disk space from within a chroot environment
		#CheckSpace
		@@ -39,7 +38,9 @@ Architecture = auto

		# 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 = Optional TrustedOnly
		SigLevel = Required DatabaseOptional
		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
		@@ -69,23 +70,18 @@ Architecture = auto
		# after the header, and they will be used before the default mirrors.

		#[testing]
		#SigLevel = PackageRequired
		#Include = /etc/pacman.d/mirrorlist

		[core]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[extra]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		#[community-testing]
		#SigLevel = PackageRequired
		#Include = /etc/pacman.d/mirrorlist

		[community]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		# An example of a custom package repository. See the pacman manpage for

pacman-gnome-unstable.conf

+5 −10

Original line number	Diff line number	Diff line
		@@ -15,11 +15,10 @@
		#LogFile = /var/log/pacman.log
		#GPGDir = /etc/pacman.d/gnupg/
		HoldPkg = pacman glibc
		# If upgrades are available for these packages they will be asked for first
		SyncFirst = pacman
		#XferCommand = /usr/bin/curl -C - -f %u > %o
		#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
		#CleanMethod = KeepInstalled
		#UseDelta = 0.7
		Architecture = auto

		# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
		@@ -31,7 +30,7 @@ Architecture = auto

		# Misc options
		#UseSyslog
		#UseDelta
		#Color
		#TotalDownload
		# We cannot check disk space from within a chroot environment
		#CheckSpace
		@@ -39,7 +38,9 @@ Architecture = auto

		# 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 = Optional TrustedOnly
		SigLevel = Required DatabaseOptional
		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
		@@ -69,27 +70,21 @@ Architecture = auto
		# after the header, and they will be used before the default mirrors.

		[gnome-unstable]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[testing]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[core]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[extra]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[community-testing]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[community]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		# An example of a custom package repository. See the pacman manpage for

pacman-kde-unstable.conf

+5 −10

Original line number	Diff line number	Diff line
		@@ -15,11 +15,10 @@
		#LogFile = /var/log/pacman.log
		#GPGDir = /etc/pacman.d/gnupg/
		HoldPkg = pacman glibc
		# If upgrades are available for these packages they will be asked for first
		SyncFirst = pacman
		#XferCommand = /usr/bin/curl -C - -f %u > %o
		#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
		#CleanMethod = KeepInstalled
		#UseDelta = 0.7
		Architecture = auto

		# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
		@@ -31,7 +30,7 @@ Architecture = auto

		# Misc options
		#UseSyslog
		#UseDelta
		#Color
		#TotalDownload
		# We cannot check disk space from within a chroot environment
		#CheckSpace
		@@ -39,7 +38,9 @@ Architecture = auto

		# 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 = Optional TrustedOnly
		SigLevel = Required DatabaseOptional
		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
		@@ -69,27 +70,21 @@ Architecture = auto
		# after the header, and they will be used before the default mirrors.

		[kde-unstable]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[testing]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[core]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[extra]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[community-testing]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		[community]
		SigLevel = PackageRequired
		Include = /etc/pacman.d/mirrorlist

		# An example of a custom package repository. See the pacman manpage for