[arch-commits] Commit in pacman/repos (6 files)

Allan McRae allan at archlinux.org
Thu Apr 30 10:23:41 UTC 2020


    Date: Thursday, April 30, 2020 @ 10:23:41
  Author: allan
Revision: 381921

archrelease: copy trunk to testing-x86_64

Added:
  pacman/repos/testing-x86_64/
  pacman/repos/testing-x86_64/PKGBUILD
    (from rev 381920, pacman/trunk/PKGBUILD)
  pacman/repos/testing-x86_64/makepkg-fix-one-more-file-seccomp-issue.patch
    (from rev 381920, pacman/trunk/makepkg-fix-one-more-file-seccomp-issue.patch)
  pacman/repos/testing-x86_64/makepkg.conf
    (from rev 381920, pacman/trunk/makepkg.conf)
  pacman/repos/testing-x86_64/pacman-5.2.1-fix-pactest-package-tar-format.patch
    (from rev 381920, pacman/trunk/pacman-5.2.1-fix-pactest-package-tar-format.patch)
  pacman/repos/testing-x86_64/pacman.conf
    (from rev 381920, pacman/trunk/pacman.conf)

---------------------------------------------------+
 PKGBUILD                                          |   65 ++++++++
 makepkg-fix-one-more-file-seccomp-issue.patch     |   30 ++++
 makepkg.conf                                      |  145 ++++++++++++++++++++
 pacman-5.2.1-fix-pactest-package-tar-format.patch |   32 ++++
 pacman.conf                                       |   99 +++++++++++++
 5 files changed, 371 insertions(+)

Copied: pacman/repos/testing-x86_64/PKGBUILD (from rev 381920, pacman/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2020-04-30 10:23:41 UTC (rev 381921)
@@ -0,0 +1,65 @@
+# vim: set ts=2 sw=2 et:
+# Maintainer: Dan McGee <dan at archlinux.org>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=pacman
+pkgver=5.2.1
+pkgrel=5
+pkgdesc="A library-based package manager with dependency support"
+arch=('x86_64')
+url="https://www.archlinux.org/pacman/"
+license=('GPL')
+groups=('base-devel')
+depends=('bash' 'glibc' 'libarchive' 'curl'
+         'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
+makedepends=('asciidoc')
+checkdepends=('python' 'fakechroot')
+optdepends=('perl-locale-gettext: translation support in makepkg-template')
+provides=('libalpm.so')
+backup=(etc/pacman.conf
+        etc/makepkg.conf)
+options=('strip' 'debug')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan at archlinux.org>
+              'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew at archlinux.org>
+source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+        pacman-5.2.1-fix-pactest-package-tar-format.patch
+        makepkg-fix-one-more-file-seccomp-issue.patch
+        pacman.conf
+        makepkg.conf)
+sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
+            'SKIP'
+            '824a5c9dd458fb27b05a9a0b4b5d75b7a392de0dae79a18f5cfe8beaf4d82f0c'
+            'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
+            '3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2'
+            '8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 < ../pacman-5.2.1-fix-pactest-package-tar-format.patch
+  patch -Np1 < ../makepkg-fix-one-more-file-seccomp-issue.patch
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var --enable-doc \
+    --with-scriptlet-shell=/usr/bin/bash \
+    --with-ldconfig=/usr/bin/ldconfig
+  make V=1
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # install Arch specific stuff
+  install -dm755 "$pkgdir/etc"
+  install -m644 "$srcdir/pacman.conf" "$pkgdir/etc"
+  install -m644 "$srcdir/makepkg.conf" "$pkgdir/etc"
+}

Copied: pacman/repos/testing-x86_64/makepkg-fix-one-more-file-seccomp-issue.patch (from rev 381920, pacman/trunk/makepkg-fix-one-more-file-seccomp-issue.patch)
===================================================================
--- testing-x86_64/makepkg-fix-one-more-file-seccomp-issue.patch	                        (rev 0)
+++ testing-x86_64/makepkg-fix-one-more-file-seccomp-issue.patch	2020-04-30 10:23:41 UTC (rev 381921)
@@ -0,0 +1,30 @@
+From 00cfc6c5c9700b597c384743c2f057a2ba7125e2 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz at archlinux.org>
+Date: Thu, 9 Jan 2020 20:49:17 -0500
+Subject: [pacman-dev] [PATCH] makepkg: fix one more file-seccomp issue
+
+When file is called via fakeroot, it doesn't matter whether you use -z
+or not, it is still incompatible with seccomp. Fix by configuring it
+with FILECMD when used in the fakeroot 'tidy' run.
+
+Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
+---
+ scripts/libmakepkg/tidy/strip.sh.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
+index 1bd810f0..876f00f0 100644
+--- a/scripts/libmakepkg/tidy/strip.sh.in
++++ b/scripts/libmakepkg/tidy/strip.sh.in
+@@ -111,7 +111,7 @@ tidy_strip() {
+ 
+ 		local binary strip_flags
+ 		find . -type f -perm -u+w -print0 2>/dev/null | while IFS= read -rd '' binary ; do
+-			case "$(file -bi "$binary")" in
++			case "$(@FILECMD@ -bi "$binary")" in
+ 				*application/x-sharedlib*)  # Libraries (.so)
+ 					strip_flags="$STRIP_SHARED";;
+ 				*application/x-archive*)    # Libraries (.a)
+-- 
+2.24.1
+

Copied: pacman/repos/testing-x86_64/makepkg.conf (from rev 381920, pacman/trunk/makepkg.conf)
===================================================================
--- testing-x86_64/makepkg.conf	                        (rev 0)
+++ testing-x86_64/makepkg.conf	2020-04-30 10:23:41 UTC (rev 381921)
@@ -0,0 +1,145 @@
+#!/hint/bash
+#
+# /etc/makepkg.conf
+#
+
+#########################################################################
+# SOURCE ACQUISITION
+#########################################################################
+#
+#-- 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'
+          'rsync::/usr/bin/rsync --no-motd -z %u %o'
+          'scp::/usr/bin/scp -C %u %o')
+
+# Other common tools:
+# /usr/bin/snarf
+# /usr/bin/lftpget -c
+# /usr/bin/wget
+
+#-- The package required by makepkg to download VCS sources
+#  Format: 'protocol::package'
+VCSCLIENTS=('bzr::bzr'
+            'git::git'
+            'hg::mercurial'
+            'svn::subversion')
+
+#########################################################################
+# ARCHITECTURE, COMPILE FLAGS
+#########################################################################
+#
+CARCH="x86_64"
+CHOST="x86_64-pc-linux-gnu"
+
+#-- Compiler and Linker Flags
+CPPFLAGS="-D_FORTIFY_SOURCE=2"
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
+CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
+#-- 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
+#########################################################################
+#
+# 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
+#-- color:    Colorize output messages
+#-- ccache:   Use ccache to cache compilation
+#-- check:    Run the check() function if present in the PKGBUILD
+#-- sign:     Generate PGP signature file
+#
+BUILDENV=(!distcc color !ccache check !sign)
+#
+#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
+#-- specify a space-delimited list of hosts running in the DistCC cluster.
+#DISTCC_HOSTS=""
+#
+#-- Specify a directory for package building.
+#BUILDDIR=/tmp/makepkg
+
+#########################################################################
+# GLOBAL PACKAGE OPTIONS
+#   These are default values for the options=() settings
+#########################################################################
+#
+# Default: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !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
+#-- debug:      Add debugging flags as specified in DEBUG_* variables
+#
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug)
+
+#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
+INTEGRITY_CHECK=(md5)
+#-- 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.
+STRIP_SHARED="--strip-unneeded"
+#-- Options to be used when stripping static libraries. See `man strip' for details.
+STRIP_STATIC="--strip-debug"
+#-- Manual (man and info) directories to compress (if zipman is specified)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if !docs is specified)
+DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
+#-- Files to be removed from all packages (if purge is specified)
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
+#-- Directory to store source code in for debug packages
+DBGSRCDIR="/usr/src/debug"
+
+#########################################################################
+# PACKAGE OUTPUT
+#########################################################################
+#
+# Default: put built package and cached source in build directory
+#
+#-- Destination: specify a fixed directory where all packages will be placed
+#PKGDEST=/home/packages
+#-- Source cache: specify a fixed directory where source files will be cached
+#SRCDEST=/home/sources
+#-- Source packages: specify a fixed directory where all src packages will be placed
+#SRCPKGDEST=/home/srcpackages
+#-- Log files: specify a fixed directory where all log files will be placed
+#LOGDEST=/home/makepkglogs
+#-- Packager: name/email of the person or organization building packages
+#PACKAGER="John Doe <john at doe.com>"
+#-- Specify a key to use for package signing
+#GPGKEY=""
+
+#########################################################################
+# COMPRESSION DEFAULTS
+#########################################################################
+#
+COMPRESSGZ=(gzip -c -f -n)
+COMPRESSBZ2=(bzip2 -c -f)
+COMPRESSXZ=(xz -c -z -)
+COMPRESSZST=(zstd -c -z -q -)
+COMPRESSLRZ=(lrzip -q)
+COMPRESSLZO=(lzop -q)
+COMPRESSZ=(compress -c -f)
+COMPRESSLZ4=(lz4 -q)
+COMPRESSLZ=(lzip -c -f)
+
+#########################################################################
+# EXTENSION DEFAULTS
+#########################################################################
+#
+PKGEXT='.pkg.tar.xz'
+SRCEXT='.src.tar.gz'

Copied: pacman/repos/testing-x86_64/pacman-5.2.1-fix-pactest-package-tar-format.patch (from rev 381920, pacman/trunk/pacman-5.2.1-fix-pactest-package-tar-format.patch)
===================================================================
--- testing-x86_64/pacman-5.2.1-fix-pactest-package-tar-format.patch	                        (rev 0)
+++ testing-x86_64/pacman-5.2.1-fix-pactest-package-tar-format.patch	2020-04-30 10:23:41 UTC (rev 381921)
@@ -0,0 +1,32 @@
+From b9faf652735c603d1bdf849a570185eb721f11c1 Mon Sep 17 00:00:00 2001
+From: Allan McRae <allan at archlinux.org>
+Date: Tue, 12 Nov 2019 16:14:57 +1000
+Subject: pactest: set package tar format to GNU_FORMAT
+
+python-3.8 changed the default tar format to PAX_FORMAT. This caused
+issues in our testsuite with package extraction of files with UTF-8
+characters as we run the tests under the C locale.
+
+sycn600.py:
+error: error while reading package /tmp/pactest-xuhri4xa/var/cache/pacman/pkg/unicodechars-2.0-1.pkg.tar.gz: Pathname can't be converted from UTF-8 to current locale.
+
+Set format back to GNU_FORMAT.
+
+Signed-off-by: Allan McRae <allan at archlinux.org>
+---
+ test/pacman/pmpkg.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py
+index 6a845222..e40868cc 100644
+--- a/test/pacman/pmpkg.py
++++ b/test/pacman/pmpkg.py
+@@ -142,7 +142,7 @@ class pmpkg(object):
+         util.mkdir(os.path.dirname(self.path))
+ 
+         # Generate package metadata
+-        tar = tarfile.open(self.path, "w:gz")
++        tar = tarfile.open(self.path, "w:gz", format=tarfile.GNU_FORMAT)
+         for name, data in archive_files:
+             info = tarfile.TarInfo(name)
+             info.size = len(data)

Copied: pacman/repos/testing-x86_64/pacman.conf (from rev 381920, pacman/trunk/pacman.conf)
===================================================================
--- testing-x86_64/pacman.conf	                        (rev 0)
+++ testing-x86_64/pacman.conf	2020-04-30 10:23:41 UTC (rev 381921)
@@ -0,0 +1,99 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+#Color
+#TotalDownload
+CheckSpace
+#VerbosePkgLists
+
+# 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
+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`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# 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]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+#[multilib]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs


More information about the arch-commits mailing list