[arch-commits] Commit in pacman/trunk (5 files)
Date: Wednesday, July 1, 2020 @ 01:55:36
Author: allan
Revision: 390677
upgpkg: pacman 5.2.2-1: upstream update
Modified:
pacman/trunk/PKGBUILD
pacman/trunk/makepkg.conf
Deleted:
pacman/trunk/makepkg-fix-one-more-file-seccomp-issue.patch
pacman/trunk/pacman-5.2.1-fix-pactest-package-tar-format.patch
pacman/trunk/pacman-5.2.1-reproducible-libprovides.patch
---+
PKGBUILD | 20 ++--
makepkg-fix-one-more-file-seccomp-issue.patch | 30 --
makepkg.conf |6 ++-
pacman-5.2.1-fix-pactest-package-tar-format.patch | 32
pacman-5.2.1-reproducible-libprovides.patch | 13
5 files changed, 8 insertions(+), 93 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-01 00:57:10 UTC (rev 390676)
+++ PKGBUILD2020-07-01 01:55:36 UTC (rev 390677)
@@ -3,8 +3,8 @@
# Maintainer: Dave Reisner
pkgname=pacman
-pkgver=5.2.1
-pkgrel=6
+pkgver=5.2.2
+pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('x86_64')
url="https://www.archlinux.org/pacman/";
@@ -22,25 +22,13 @@
validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae
'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory
(pacman)
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-5.2.1-reproducible-libprovides.patch
pacman.conf
makepkg.conf)
-sha256sums=('1930c407265fd039cb3a8e6edc82f69e122aa9239d216d9d57b9d1b9315af312'
+sha256sums=('bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0'
'SKIP'
-'824a5c9dd458fb27b05a9a0b4b5d75b7a392de0dae79a18f5cfe8beaf4d82f0c'
-'e481a161bba76729cd434c97e0b319ddfcb1d93b2e4890d72b4e8a32982531d9'
-'667ba659f85e3740fda9808e4751a44a63e0484072594d961b87e474c607b79c'
'3353f363088c73f1f86a890547c0f87c7473e5caf43bbbc768c2e9a7397f2aa2'
-'8c100b64450f5a19a16325dd05c143d49395bdeb96bd957f863cde4b95d3cb86')
+'9c769f13c09a6f24c393a9762474eded2f269d8966e7764d9160d62232a7919b')
-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
- patch -Np1 < ../pacman-5.2.1-reproducible-libprovides.patch
-}
build() {
cd "$pkgname-$pkgver"
Deleted: makepkg-fix-one-more-file-seccomp-issue.patch
===
--- makepkg-fix-one-more-file-seccomp-issue.patch 2020-07-01 00:57:10 UTC
(rev 390676)
+++ makepkg-fix-one-more-file-seccomp-issue.patch 2020-07-01 01:55:36 UTC
(rev 390677)
@@ -1,30 +0,0 @@
-From 00cfc6c5c9700b597c384743c2f057a2ba7125e2 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz
-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
- 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
-
Modified: makepkg.conf
===
--- makepkg.conf2020-07-01 00:57:10 UTC (rev 390676)
+++ makepkg.conf2020-07-01 01:55:36 UTC (rev 390677)
@@ -40,11 +40,13 @@
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"
+#RUSTFLAGS="-C opt-level=2"
#-- 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"
[arch-commits] Commit in pacman/trunk (5 files)
Date: Thursday, October 13, 2011 @ 13:40:33
Author: dan
Revision: 140412
Initial stab at 4.0 update
Modified:
pacman/trunk/PKGBUILD
pacman/trunk/makepkg.conf
pacman/trunk/pacman.conf
pacman/trunk/pacman.conf.x86_64
Deleted:
pacman/trunk/0001-makepkg-fix-removing-symbolic-link.patch
---+
0001-makepkg-fix-removing-symbolic-link.patch | 32
PKGBUILD | 24 --
makepkg.conf | 25 --
pacman.conf | 21 ---
pacman.conf.x86_64| 21 ---
5 files changed, 61 insertions(+), 62 deletions(-)
Deleted: 0001-makepkg-fix-removing-symbolic-link.patch
===
--- 0001-makepkg-fix-removing-symbolic-link.patch 2011-10-13 03:56:02 UTC
(rev 140411)
+++ 0001-makepkg-fix-removing-symbolic-link.patch 2011-10-13 17:40:33 UTC
(rev 140412)
@@ -1,32 +0,0 @@
-From c493eef643ecb3a54c79083c51a8975f816ed9de Mon Sep 17 00:00:00 2001
-From: Allan McRae
-Date: Tue, 28 Jun 2011 22:47:35 +1000
-Subject: [PATCH] makepkg: fix removing symbolic link
-
-The path was not being stripped from $file before prefixing with
-$srcdir resulting in the attempted removal of a very weird
-filename.
-
-Signed-off-by: Allan McRae
-Signed-off-by: Dan McGee
-(cherry picked from commit e92905a2c8c14c7855e2841f44d3c139aa40844c)
- scripts/makepkg.sh.in |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
-index 3ace945..b0b0882 100644
a/scripts/makepkg.sh.in
-+++ b/scripts/makepkg.sh.in
-@@ -509,7 +509,7 @@ download_sources() {
- local file=$(get_filepath "$netfile" || true)
- if [[ -n "$file" ]]; then
- msg2 "$(gettext "Found %s")" "${file##*/}"
-- rm -f "$srcdir/$file"
-+ rm -f "$srcdir/${file##*/}"
- ln -s "$file" "$srcdir/"
- continue
- fi
---
-1.7.6
-
Modified: PKGBUILD
===
--- PKGBUILD2011-10-13 03:56:02 UTC (rev 140411)
+++ PKGBUILD2011-10-13 17:40:33 UTC (rev 140412)
@@ -1,15 +1,17 @@
# $Id$
# Maintainer: Dan McGee
+# Maintainer: Dave Reisner
pkgname=pacman
-pkgver=3.5.4
-pkgrel=4
+pkgver=4.0.0
+pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/";
license=('GPL')
groups=('base')
-depends=('bash' 'glibc>=2.14' 'libarchive>=2.8.4' 'libfetch>=2.28'
'pacman-mirrorlist')
+depends=('bash' 'glibc>=2.14' 'libarchive>=2.8.4' 'curl'
+ 'gpgme' 'pacman-mirrorlist')
optdepends=('fakeroot: for makepkg usage as normal user'
'curl: for rankmirrors usage')
backup=(etc/pacman.conf etc/makepkg.conf)
@@ -18,13 +20,11 @@
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
pacman.conf
pacman.conf.x86_64
-makepkg.conf
-0001-makepkg-fix-removing-symbolic-link.patch)
-md5sums=('2dd3a85d55ee3dd89abd349aa837447c'
- 'e99eb721b6b704f68c5f47468507c102'
- 'f8b939d9b2beb79a0436961a2d707d7c'
- 'c034b061c86b3f26a9646cf8efc7ff11'
- '749a4ddc6d8418d8d031f1c9b4e09d6f')
+makepkg.conf)
+md5sums=('8c97f4804d2a0847956c45888b0ea517'
+ 'ae4abf6df12483d26b39529ab27c0837'
+ '99d8fae7a3c761e3ebad800f6a216e83'
+ 'db051afbd12993b7743ccd4d58668499')
# keep an upgrade path for older installations
PKGEXT='.pkg.tar.gz'
@@ -32,10 +32,8 @@
build() {
cd $srcdir/$pkgname-$pkgver
- patch -Np1 < "$srcdir/0001-makepkg-fix-removing-symbolic-link.patch"
-
./configure --prefix=/usr --sysconfdir=/etc \
---localstatedir=/var --enable-doc
+--localstatedir=/var --enable-doc --enable-debug
make
}
Modified: makepkg.conf
===
--- makepkg.conf2011-10-13 03:56:02 UTC (rev 140411)
+++ makepkg.conf2011-10-13 17:40:33 UTC (rev 140412)
@@ -8,16 +8,16 @@
#
#-- The download utilities that makepkg should use to acquire sources
# Format: 'protocol::agent'
-DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u'
- 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u'
- 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate
-O %o %u'
+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'
'scp::/usr/bin/scp -C %u %o')
# Other common tools:
# /usr/bin/snarf
#
[arch-commits] Commit in pacman/trunk (5 files)
Date: Wednesday, March 16, 2011 @ 14:36:44
Author: dan
Revision: 115075
upgpkg: pacman 3.5.0-1
version bump 3.5.0
Modified:
pacman/trunk/PKGBUILD
pacman/trunk/makepkg.conf
pacman/trunk/pacman.conf
pacman/trunk/pacman.conf.x86_64
pacman/trunk/pacman.install
+
PKGBUILD | 15 ---
makepkg.conf |9 -
pacman.conf|3 ++-
pacman.conf.x86_64 |3 ++-
pacman.install | 27 ++-
5 files changed, 34 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-03-16 18:00:13 UTC (rev 115074)
+++ PKGBUILD2011-03-16 18:36:44 UTC (rev 115075)
@@ -2,14 +2,14 @@
# Maintainer: Dan McGee
pkgname=pacman
-pkgver=3.4.3
+pkgver=3.5.0
pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/";
license=('GPL')
groups=('base')
-depends=('bash' 'libarchive>=2.7.1' 'libfetch>=2.25' 'pacman-mirrorlist')
+depends=('bash' 'libarchive>=2.8.0' 'libfetch>=2.28' 'pacman-mirrorlist')
optdepends=('fakeroot: for makepkg usage as normal user'
'curl: for rankmirrors usage')
backup=(etc/pacman.conf etc/makepkg.conf)
@@ -19,17 +19,18 @@
pacman.conf
pacman.conf.x86_64
makepkg.conf)
-md5sums=('3656a4a05346e28bafa5342879fa278a'
- 'eda9cbdb47f85fabda2e7e63801e3e16'
- '9ba146b4fa7bcb3cc18204b06d1f6157'
- '5beebe36bfc1e1f677d5ae12fcff8083')
+md5sums=('6cd87230cf77b8a83d1c1f093ea5cc64'
+ 'e99eb721b6b704f68c5f47468507c102'
+ '28e6a1f97ed3c47a3961ad00d2a43822'
+ 'a8684989d3dfad5a6e1bcf95af3e571b')
# keep an upgrade path for older installations
PKGEXT='.pkg.tar.gz'
build() {
cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-doc
+ ./configure --prefix=/usr --sysconfdir=/etc \
+--localstatedir=/var --enable-doc
make
}
Modified: makepkg.conf
===
--- makepkg.conf2011-03-16 18:00:13 UTC (rev 115074)
+++ makepkg.conf2011-03-16 18:36:44 UTC (rev 115075)
@@ -39,15 +39,16 @@
# BUILD ENVIRONMENT
#
#
-# Defaults: BUILDENV=(fakeroot !distcc color !ccache)
+# Defaults: BUILDENV=(fakeroot !distcc color !ccache check)
# A negated environment option will do the opposite of the comments below.
#
#-- fakeroot: Allow building packages as a non-root user
#-- 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
#
-BUILDENV=(fakeroot !distcc color !ccache)
+BUILDENV=(fakeroot !distcc color !ccache check)
#
#-- If using DistCC, your MAKEFLAGS will also need modification. In addition,
#-- specify a space-delimited list of hosts running in the DistCC cluster.
@@ -61,7 +62,7 @@
# Default: OPTIONS=(strip docs libtool emptydirs zipman purge)
# A negated option will do the opposite of the comments below.
#
-#-- strip: Strip symbols from binaries/libraries in STRIP_DIRS
+#-- strip: Strip symbols from binaries/libraries
#-- docs: Save doc directories specified by DOC_DIRS
#-- libtool: Leave libtool (.la) files in packages
#-- emptydirs: Leave empty directories in packages
@@ -82,8 +83,6 @@
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})
-#-- Directories to be searched for the strip option (if strip is specified)
-STRIP_DIRS=(bin lib sbin usr/{bin,lib,lib32,sbin,local/{bin,lib,sbin}}
opt/*/{bin,lib,sbin})
#-- Files to be removed from all packages (if purge is specified)
PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
Modified: pacman.conf
===
--- pacman.conf 2011-03-16 18:00:13 UTC (rev 115074)
+++ pacman.conf 2011-03-16 18:36:44 UTC (rev 115075)
@@ -17,7 +17,7 @@
# If upgrades are available for these packages they will be asked for first
SyncFirst = pacman
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#XferCommand = /usr/bin/curl -C - %u > %o
+#XferCommand = /usr/bin/curl -C - -f %u > %o
#CleanMethod = KeepInstalled
Architecture = auto
@@ -33,6 +33,7 @@
#ShowSize
#UseDelta
#TotalDownload
+#CheckSpace
#
# REPOSITORIES
Modified: pacman.conf.x86_64
===
--- pacman.conf.x86_64 2011-03-16 18:00:13 UTC (rev 115074)
+++ pacman.conf.x86_64 2011-03-16 18:36:44 UTC (rev 115075)
@@ -17,7 +17,7 @@
# If upgrades are available for these packages they will be asked for first
SyncFirst = pacman
#XferCommand = /usr/bin/wget
[arch-commits] Commit in pacman/trunk (5 files)
Date: Wednesday, June 16, 2010 @ 22:27:48
Author: dan
Revision: 82777
upgpkg: pacman 3.4.0-1
hot new version
Modified:
pacman/trunk/PKGBUILD
pacman/trunk/makepkg.conf
pacman/trunk/pacman.conf
Deleted:
pacman/trunk/completion.patch
pacman/trunk/vercmp.patch
--+
PKGBUILD | 23 ++
completion.patch | 68 --
makepkg.conf |8 ++
pacman.conf |4 -
vercmp.patch | 191 -
5 files changed, 20 insertions(+), 274 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-06-16 23:28:18 UTC (rev 82776)
+++ PKGBUILD2010-06-17 02:27:48 UTC (rev 82777)
@@ -3,8 +3,8 @@
# Maintainer: Dan McGee
pkgname=pacman
-pkgver=3.3.3
-pkgrel=5
+pkgver=3.4.0
+pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/";
@@ -18,24 +18,19 @@
options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
pacman.conf
-makepkg.conf
-vercmp.patch
-completion.patch)
-md5sums=('a8cef73d68e2a4c3a46fb46c33210719'
- 'abe70dabacee7036368c7afeb686eb10'
- '4d2f2f2ac74cba7bd2d336db9135ab16'
- '84129116c61c8a7cad03a5ae5d80aee5'
- '7eddda58bf55809e6bde14b446e41a15')
+makepkg.conf)
+md5sums=('50ad71be1faaad84842c576e239d1bb5'
+ '80f5bb2a606553512d0db857f78d9ac2'
+ 'aef317285c7d16ac495b0e53deeb948d')
+sha256sums=('cd80e206ee653ce337555c73b7064088e672e9341245317fe09dc52d06bff3c3'
+'97fb68536c1179a7de52dfb8a107c6e9bf3a71eaa6a98d6ae74dc224d4ca5838'
+'3a60e1f895c90c8e74f5ca389fa05fb3328745e9873c5452b8cd1b2e68bee418')
# keep an upgrade path for older installations
PKGEXT='.pkg.tar.gz'
build() {
cd $srcdir/$pkgname-$pkgver
- # avoid linking vercmp against libalpm as this might be broken during a
transaction
- patch -p0 -i $srcdir/vercmp.patch || return 1
- # fix completion for .pkg.tar.xz pacakges (included in next upstream release)
- patch -p1 -i $srcdir/completion.patch || return 1
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
make || return 1
}
Deleted: completion.patch
===
--- completion.patch2010-06-16 23:28:18 UTC (rev 82776)
+++ completion.patch2010-06-17 02:27:48 UTC (rev 82777)
@@ -1,68 +0,0 @@
-From d85421ec62cdcd0b4b1f162b9908dc3eb0b704b4 Mon Sep 17 00:00:00 2001
-From: Pierre Schmitz
-Date: Thu, 18 Feb 2010 04:18:10 +
-Subject: contrib/*_completion: match *.pkg.tar.*
-
-Signed-off-by: Pierre Schmitz
-Signed-off-by: Dan McGee
-diff --git a/contrib/bash_completion b/contrib/bash_completion
-index 62e5bc9..a231eb6 100644
a/contrib/bash_completion
-+++ b/contrib/bash_completion
-@@ -321,7 +321,7 @@ _pacman ()
- case "${op}" in
- U)
- COMPREPLY=( $( compgen -d -- "$cur" ) \
--$( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
-+$( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) )
- return 0
- ;;
- h|V)
-@@ -336,7 +336,7 @@ _pacman ()
- $( compgen -f -- "$cur" ) )
- elif _instring $mod p; then
- COMPREPLY=( $( compgen -d -- "$cur" ) \
-- $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
-+ $( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) )
- elif _instring $mod u; then
- COMPREPLY=''
- return 0
-diff --git a/contrib/zsh_completion b/contrib/zsh_completion
-index 2f43d9b..01b3c44 100644
a/contrib/zsh_completion
-+++ b/contrib/zsh_completion
-@@ -32,7 +32,7 @@ _pacman_opts_common=(
- _pacman_opts_pkgfile=(
- '-d[Skip dependency checks]'
- '-f[Overwrite conflicting files]'
-- '*:package file:_files -g "*.pkg.tar.gz(.)"'
-+ '*:package file:_files -g "*.pkg.tar.*(.)"'
- )
-
- # options for passing to _arguments: subactions for --query command
-@@ -120,7 +120,7 @@ _pacman_action_query() {
- _arguments -s : \
- "$_pacman_opts_comm...@]" \
- "$_pacman_opts_query_modifie...@]" \
-- '*:package file:_files -g "*.pkg.tar.gz"'
-+ '*:package file:_files -g "*.pkg.tar.*"'
- ;;
- query_group)
- _arguments -s : \
-@@ -295,11 +295,11 @@ _pacman() {
- "$_pacman_opts_query_modifie...@]" \
- '*:package file:_files'
- ;;
-- -Q*p*) # file *.pkg.tar.gz
-+ -Q*p*) # file *.pkg.tar.*
- _arguments -s : \
- "$_pacman_opts_comm...@]" \
- "$_
