- Pacman-dev - lists.archlinux.org

[pacman-dev] Fwd: [arch-projects] [ABS] [PATCHv2] Merge bzr, git, hg and svn into a generic proto
by Allan McRae 24 Jan '14

24 Jan '14

I am proposing we include this PKGBUILD-vcs.proto into pacman (after removing the pointer to the Arch wiki). Comments? Allan -------- Original Message -------- Subject: [arch-projects] [ABS] [PATCHv2] Merge bzr, git, hg and svn into a generic proto Date: Tue, 8 Oct 2013 16:13:25 +0200 From: Maxime Gauduin <alucryd(a)gmail.com> Reply-To: Arch Linux projects development discussion <arch-projects(a)archlinux.org> To: arch-projects(a)archlinux.org Having separate prototypes for each VCS type is no longer relevant since Pacman 4.1. Having a generic prototype for regular, bzr, git hg and svn packages makes more sense. Left cvs, and darcs protos untouched as they are not yet supported in Pacman. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 64 ---------------------------- prototypes/PKGBUILD-git.proto | 64 ---------------------------- prototypes/PKGBUILD-hg.proto | 65 ---------------------------- prototypes/PKGBUILD-svn.proto | 63 ---------------------------- prototypes/PKGBUILD-vcs.proto | 98 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 256 deletions(-) delete mode 100644 prototypes/PKGBUILD-bzr.proto delete mode 100644 prototypes/PKGBUILD-git.proto delete mode 100644 prototypes/PKGBUILD-hg.proto delete mode 100644 prototypes/PKGBUILD-svn.proto create mode 100644 prototypes/PKGBUILD-vcs.proto <snip> diff --git a/prototypes/PKGBUILD-vcs.proto b/prototypes/PKGBUILD-vcs.proto new file mode 100644 index 0000000..805f4ff --- /dev/null +++ b/prototypes/PKGBUILD-vcs.proto @@ -0,0 +1,98 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# The following guidelines are specific to BZR, GIT, HG and SVN packages. +# CVS and DARCS are not natively supported in pacman yet, please refer to the +# dedicated prototypes instead. +# See http://wiki.archlinux.org/index.php/VCS_PKGBUILD_Guidelines for more +# information on packaging from VCS sources. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME-VCS # '-bzr', '-git', '-hg' or '-svn' +pkgver=VERSION +pkgrel=1 +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=('VCS_PACKAGE') # 'bzr', 'git', 'mercurial' or 'subversion' +provides=("${pkgname%-VCS}") +conflicts=("${pkgname%-VCS}") +replaces=() +backup=() +options=() +install= +source=('DIR_NAME::VCS+REPO_URL#FRAGMENT') +noextract=() +md5sums=('SKIP') + +################################################################################ + +# DIR_NAME: Use to change the source directory name if needed + +# VCS: Use to specify the VCS type, not needed when REPO_URL is explicit (for +# example git://URL, svn://URL or lp:NAME) + +# FRAGMENT: Use to pull a specific branch, commit/revision or tag +# Bazaar accepts the 'revision' keyword +# Git accepts the 'branch', 'commit' and 'tag' keywords +# Mercurial accepts the 'branch', 'revision' and 'tag' keywords +# Subversion accepts the 'revision' keyword + +# Examples: +# source=("lp:${pkgname%-bzr}#revision=42") +# source=("git+https://github.com/author/${pkgname%-git}.git#branch=unstable") +# source=('hg+https://bitbucket.org/author/project#tag=2.0') +# source=("${pkgname%-svn}::svn://svn.code.sf.net/p/project/code/trunk"} + +################################################################################ + +pkgver() { + cd "$srcdir/${pkgname%-VCS}" + +# Bazaar + printf "%s" "$(bzr revno)" + +# Git, tags available + printf "%s" "$(git describe --long | sed 's/-/./g')" + +# Git, no tags available + printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + +# Mercurial + printf "%s.%s" "$(hg identify -n)" "$(hg identify -i)" + +# Subversion + printf "%s" "$(svnversion | tr -d 'A-z')" + +# Fallback + printf "%s" "$(date +%Y%m%d)" +} + +prepare() { + cd "$srcdir/${pkgname%-VCS}" + patch -p1 -i "$srcdir/${pkgname%-VCS}.patch" +} + +build() { + cd "$srcdir/${pkgname%-VCS}" + ./autogen.sh + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/${pkgname%-VCS}" + make -k check +} + +package() { + cd "$srcdir/${pkgname%-VCS}" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: -- 1.8.4

4 6

[pacman-dev] Orphaning files in the filesystem after unsuccessful pacman -R
by smiszym 22 Jan '14

22 Jan '14

Hello, It seems I found a bug in pacman. Some information first: version: pacman 4.1.2-5 prebuilt from official repo system: Linux 3.12.7-2-ARCH i686 So it happened when I tried to remove alex package. $ sudo pacman -R alex [sudo] password for michael: checking dependencies... Packages (1): alex-3.1.3-1 Total Removed Size: 1.18 MiB :: Do you want to remove these packages? [Y/n] y error: cannot remove file '/usr/': Read-only file system ldconfig: Can't create temporary cache file /etc/ld.so.cache~: Read-only file system error: command failed to execute correctly Uhm... I forgot I have root filesystem mounted read-only. No problem. $ sudo mount / -o remount,rw $ sudo pacman -R alex error: target not found: alex What? How could pacman remove the package from a read-only filesystem? Or maybe... $ sudo pacman -S alex resolving dependencies... looking for inter-conflicts... Packages (1): alex-3.1.3-1 Total Installed Size: 1.18 MiB :: Proceed with installation? [Y/n] y (1/1) checking keys in keyring [###] 100% (1/1) checking package integrity [###] 100% (1/1) loading package files [###] 100% (1/1) checking for file conflicts [###] 100% error: failed to commit transaction (conflicting files) alex: /usr/bin/alex exists in filesystem alex: /usr/share/alex/AlexTemplate exists in filesystem alex: /usr/share/alex/AlexTemplate-debug exists in filesystem alex: /usr/share/alex/AlexTemplate-ghc exists in filesystem alex: /usr/share/alex/AlexTemplate-ghc-debug exists in filesystem alex: /usr/share/alex/AlexTemplate-ghc-nopred exists in filesystem alex: /usr/share/alex/AlexWrapper-basic exists in filesystem alex: /usr/share/alex/AlexWrapper-basic-bytestring exists in filesystem alex: /usr/share/alex/AlexWrapper-gscan exists in filesystem alex: /usr/share/alex/AlexWrapper-monad exists in filesystem alex: /usr/share/alex/AlexWrapper-monad-bytestring exists in filesystem alex: /usr/share/alex/AlexWrapper-monadUserState exists in filesystem alex: /usr/share/alex/AlexWrapper-monadUserState-bytestring exists in filesystem alex: /usr/share/alex/AlexWrapper-posn exists in filesystem alex: /usr/share/alex/AlexWrapper-posn-bytestring exists in filesystem alex: /usr/share/alex/AlexWrapper-strict-bytestring exists in filesystem alex: /usr/share/licenses/alex/BSD3 exists in filesystem Errors occurred, no packages were upgraded. ...it didn't remove anything of course, but broke the database. Here is the point of the bug report. I repaired things like this: $ sudo pacman -S --force alex resolving dependencies... looking for inter-conflicts... Packages (1): alex-3.1.3-1 Total Installed Size: 1.18 MiB :: Proceed with installation? [Y/n] y (1/1) checking keys in keyring [###] 100% (1/1) checking package integrity [###] 100% (1/1) loading package files [###] 100% (1/1) checking for file conflicts [###] 100% (1/1) checking available disk space[###] 100% (1/1) installing alex [###] 100% $ sudo pacman -R alex checking dependencies... Packages (1): alex-3.1.3-1 Total Removed Size: 1.18 MiB :: Do you want to remove these packages? [Y/n] y (1/1) removing alex [###] 100% but this is all but elegant. The same problem occurred for several other packages, in identical way. I'm very surpised to find bug like that in pacman and still not sure that it isn't just my mistake somewhere. Anyway, please test it. I hope this report will help you. What do you think? Best regards Michał Szymański

3 3

[pacman-dev] [PATCH 2/3] pacsearch with repo-agnostic coloring
by Pierre Neidhardt 18 Jan '14

18 Jan '14

The 6 basic shell colors are stored in an array. An arbitrary hash of the repo name sets which color is used for the output. Added CLI option -n, --nocolor. Currently, "ver", "group" and "installed" are not bold. A single variable can print them bold. Now to_color() takes an array instead of a string. This removes the need for another row of regex substitutions, while making the code shorter and faster. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 113 ++++++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 51 deletions(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 2418e19..d860471 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -1,7 +1,7 @@ #!/usr/bin/perl -# pacsearch - Adds color and install information to a 'pacman -Ss' search +# pacsearch - Perform a pacman search using both the local and the sync databases # -# Copyright (C) 2008-2011 Dan McGee <dan(a)archlinux.org> +# Copyright (C) 2008-2014 Dan McGee <dan(a)archlinux.org> # # Based off original shell script version: # Copyright (C) 2006-2007 Dan McGee <dan(a)archlinux.org> @@ -19,9 +19,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -#TODO: colors flag on commandline -#TODO: for now the whole line is bold and some parts have the same formatting (e.g. extra and version), maybe it would be better to use regular formatting - use strict; use warnings; @@ -31,13 +28,15 @@ my $myver = '@PACKAGE_VERSION@'; sub usage { print "$myname (pacman) v$myver\n\n"; print "Perform a pacman search using both the local and the sync databases.\n\n"; - print "Usage: $myname <pattern>\n\n"; + print "Usage: $myname [-n] <pattern>\n\n"; + print "Options:\n"; + print " -n, --nocolor: turn off coloring\n\n"; print "Example: $myname ^gnome\n"; } sub version { printf "%s %s\n", $myname, $myver; - print "Copyright (C) 2008-2011 Dan McGee <dan\@archlinux.org>\n\n"; + print "Copyright (C) 2008-2014 Dan McGee <dan\@archlinux.org>\n\n"; print "Based off original shell script version:\n"; print "Copyright (C) 2006-2007 Dan McGee <dan\@archlinux.org>\n"; } @@ -56,37 +55,47 @@ if ($ARGV[0] eq "--version" || $ARGV[0] eq "-V") { } # define formatting variables -my $FMT_BLUE = "\e[1;94m"; -my $FMT_CYAN = "\e[1;96m"; -my $FMT_GREEN = "\e[1;92m"; -my $FMT_MAGENTA = "\e[1;95m"; -my $FMT_RED = "\e[1;91m"; -my $FMT_YELLOW = "\e[1;93m"; -my $FMT_BOLD = "\e[1m"; -my $FMT_RESET = "\e[0m"; +my $BLUE = "\e[94m"; +my $CYAN = "\e[96m"; +my $GREEN = "\e[92m"; +my $MAGENTA = "\e[95m"; +my $RED = "\e[91m"; +my $YELLOW = "\e[93m"; +my $BOLD = "\e[1m"; +my $REGULAR = ""; +my $RESET = "\e[0m"; +if ($ARGV[0] eq "--nocolor" || $ARGV[0] eq "-n") { + shift; + $BLUE = ""; + $CYAN = ""; + $GREEN = ""; + $MAGENTA = ""; + $RED = ""; + $YELLOW = ""; + $BOLD = ""; + $REGULAR = ""; + $RESET = ""; +} + +my @COLORS=($RED, $GREEN, $YELLOW, $BLUE, $MAGENTA, $CYAN); + +# We can choose if we output repo/pkgname bold or not. Same thing for 'ver group +# installed'. Not sure if it's worth a CLI option. +my $FMT_REPO = $BOLD; +my $FMT_OTHER = $REGULAR; # Color a "repo/pkgname pkgver (goups) [installed]" line. # We try to stick to pacman colors. sub to_color { - my $line = shift; - # get the installed text colored first (between square brackets) - $line =~ s/(\[.*\]$)/$FMT_CYAN$1$FMT_RESET/; - # group (between parentheses) - $line =~ s/($.*$)/$FMT_BLUE$1$FMT_RESET/; - # version (second field) - $line =~ s/^([^ ]+) ([^ ]+) /$1 $FMT_GREEN$2$FMT_RESET /; - # name (word after slash) - $line =~ s/\/([\w-]*)/\/$FMT_BOLD$1$FMT_RESET/; - # repo (word before slash inclusive) - $line =~ s/(^core\/)/$FMT_BLUE$1$FMT_RESET/; - $line =~ s/(^extra\/)/$FMT_GREEN$1$FMT_RESET/; - $line =~ s/(^community\/)/$FMT_MAGENTA$1$FMT_RESET/; - $line =~ s/(^testing\/)/$FMT_CYAN$1$FMT_RESET/; - $line =~ s/(^community-testing\/)/$FMT_RED$1$FMT_RESET/; - $line =~ s/(^multilib\/)/$FMT_YELLOW$1$FMT_RESET/; - $line =~ s/(^local\/)/$FMT_CYAN$1$FMT_RESET/; - # any other unknown repository - $line =~ s/(^[\w-]*\/)/$FMT_YELLOW$1$FMT_RESET/; + my @v = @_; + # Each repo name is hashed to give a unique, persistant color index. The + # hash function (x*2+1) is completely arbitrary. + my $repohash = $v[0]; + $repohash =~ s/(.)/ord($1)*2+1/ge; + my $repo_color=$COLORS[$repohash % 6]; + my $line = "$RESET$FMT_REPO$repo_color$v[0]/$RESET$FMT_REPO$v[1]$RESET $GREEN$FMT_OTHER$v[2]$RESET"; + $line .= " $BLUE$FMT_OTHER$v[3]$RESET" if $v[3] ne ""; + $line .= " $CYAN$FMT_OTHER$v[4]$RESET" if $v[4] ne ""; return $line; } @@ -103,16 +112,17 @@ if ($#syncpkgs >= 0) { # counter var for packages, used here and in the query loop too my $cnt = 0; foreach $_ (@syncpkgs) { - # we grab 4 fields here: repo, name/ver, installed, and desc - my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; + # we grab the following fields: repo, name, ver, group, installed, and desc + my @pkgfields = /^(.*?)\/(.*?) (.*?) ?($.*?$)? ?(\[.*\])?\n(.*)$/s; if(not @pkgfields) { # skip any non-matching line and just print it for the user print $_, "\n"; next; } - # since installed is optional, we should fill it in if necessary - $pkgfields[2] = "" if not defined $pkgfields[2]; - # add a fifth field that indicates original order + # since 'group' and 'installed' are optional, we should fill it in if necessary + $pkgfields[3] = "" if not defined $pkgfields[3]; + $pkgfields[4] = "" if not defined $pkgfields[4]; + # add a last field that indicates original order push (@pkgfields, $cnt++); # add each sync pkg by name/ver to a hash table for quick lookup $allpkgs{$pkgfields[1]} = [ @pkgfields ]; @@ -127,30 +137,31 @@ if ($#querypkgs >= 0) { } foreach $_ (@querypkgs) { - # we grab 4 fields here: repo, name/ver, installed, and desc - my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; + # we grab the following fields: repo, name, ver, group, installed, and desc + my @pkgfields = /^(.*?)\/(.*?) (.*?) ?($.*?$)? ?(\[.*\])?\n(.*)$/s; + # my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; # skip any non-matching line next if not defined $pkgfields[1]; - # since installed is optional, we should fill it in if necessary - $pkgfields[2] = "" if not defined $pkgfields[2]; # check if the package was listed in the sync out if (not exists $allpkgs{$pkgfields[1]}) { - $pkgfields[2] = "[installed]"; - # add a fifth field that indicates original order (after sync) + # since 'group' is optional, we should fill it in if necessary + $pkgfields[3] = "" if not defined $pkgfields[3]; + # TODO: localize the "installed" word + $pkgfields[4] = "[installed]"; + # add a last field that indicates original order (after sync) push (@pkgfields, $cnt++); # add our local-only package to the hash $allpkgs{$pkgfields[1]} = [ @pkgfields ]; } } -# sort by original order (the fifth field) and print -foreach $_ ( sort{ @{$allpkgs{$a}}[4] <=> @{$allpkgs{$b}}[4] } keys %allpkgs) { +# sort by original order (the last field) and print +foreach $_ ( sort{ @{$allpkgs{$a}}[6] <=> @{$allpkgs{$b}}[6] } keys %allpkgs) { my @v = @{$allpkgs{$_}}; - my $line = "$v[0]/$v[1] $v[2]"; - $line = to_color($line); - # print colorized "repo/pkgname pkgver" string with possible installed text + my $line = to_color(@v); + # print colorized "repo/pkgname pkgver ..." string with possible installed text print "$line\n"; - print "$v[3]\n"; + print "$v[5]\n"; } #vim: set noet: -- 1.8.5.2

5 10

[pacman-dev] [RFC] Introduce pkgsuffix to PKGBUILD spec
by Dave Reisner 17 Jan '14

17 Jan '14

Hi, I've been parsing a large number of PKGBUILDs recently, and in doing so, learned a lot about how people misuse PKGBUILDs. One case in particular that intrigues me is the core/linux PKGBUILD in Arch[1] which uses code generation to create the package_* functions. This is mainly done for the purposes of making users' lives easier, as they have fewer changes they need to maintain. On the other hand, this makes the PKGBUILD far harder to parse, and perhaps arguably harder to read. I thought about how else this could be solved and came up with the idea of introducing a 'pkgsuffix' variable in the PKGBUILD spec. The name should make it obvious as to what it does -- for any package defined in the PKGBUILD, append $pkgsuffix to the name. I've already written an initial patch for makepkg which ends up being quite simple. Implementation details: The suffix should be as transparent as possible. The only time the full with-suffix names appear is in the final package output (tarball name and .PKGINFO). That means packages (when referenced via the --pkg flag) will still be the non-suffixed name. Source packages are a little trickier. I can imagine cases for including or excluding the suffix in the tarball name, but I went with the exclusion route. Note that the pkgname portion of the source tarball name is somewhat insignificant, as you could have pkgbase=voltron, pkgname=daibazaal, and the source tarball name would be voltron. Appending the suffix is, IMO, equally insigificant since the suffix applies to the output package names, not the pkgbase. Something that surfaced early in testing is a question about dependencies. My patch currently implicitly adds provides and conflicts for the pkgname sans-suffix. I think that there's a lot more cases where this is the right, rather than wrong, thing to do. At the moment, these added dependencies are unversioned. Thoughts? d [1] https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=…

3 4

[pacman-dev] [PATCH] checkupdates: Add package download mode with "-d"
by Chris Down 17 Jan '14

17 Jan '14

This new mode, which must be run as root, allows for the precaching of packages which can then subsequently be updated by calling "pacman -Syu" as normal. This can then be integrated with a cron script (for example, checkupdates-cron[0]) for automated, safe downloading of packages alongside getting the list of packages to update, or run manually on the command line to download new packages, but avoid updating the main package database. As a side effect of adding the -d option, argument handling (which was previously not present) is now done using "getopts". This seems like a reasonable way to do it instead of just hacking in a check for "-d" as $1 now, but I'm not particularly averse to either. "getopts" would just allow for better future flexibility in this area. It is possible to do this as another script, say, downloadupdates, but we would encounter pretty heavy code duplication with "checkupdates", so it seems more sensible to do it here. Due to the use of --noconfirm, this has some limitations when we encounter more complex upgrade scenarios, for example when a new package conflict occurs, an upgrade path cannot be correctly/automatically determined, a package was replaced, etc. This is not a major problem -- in the worst case, we just don't get the packages that we wanted downloaded and an error message is displayed to the user. The choice to hide both STDOUT and STDERR of "pacman -Syuw" is potentially up for debate. It makes it more difficult to determine where the problem was if the command fails -- we still display a message saying that that was the case, and set the exit code accordingly, but the actual cause needs to be determined by the user elsewhere. For this reason, "-p" exists to force the package download to output as normal. It seems desirable that "-p" also affects the silence of the database update, but this is also up for discussion if people feel it should not be within the remit of the (( silent )) checks. [0]: https://github.com/cdown/checkupdates-cron --- contrib/checkupdates.sh.in | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index 413b78a..4a74632 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -21,16 +21,46 @@ declare -r myname='checkupdates' declare -r myver='@PACKAGE_VERSION@' -if (( $# > 0 )); then +download=0 +silent=1 + +usage() { echo "${myname} (pacman) v${myver}" echo echo "Safely print a list of pending updates" echo echo "Usage: ${myname}" echo + echo "Options:" + echo " -d Download upgradeable packages to pacman package cache." + echo " -p Print pacman output from the database upgrade and package download." + echo echo 'Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.' exit 0 -fi +} + +run_silent() { + { + (( silent )) && exec &>/dev/null + "$@" + } +} + + +while getopts ':dp' opt; do + case $opt in + d) + if (( UID )); then + echo "Download mode can only be run as root." >&2 + exit 2 + fi + + download=1 + ;; + p) silent=0 ;; + \?) usage ;; + esac +done if [[ -z $CHECKUPDATES_DB ]]; then CHECKUPDATES_DB="${TMPDIR:-/tmp}/checkup-db-${USER}/" @@ -43,9 +73,17 @@ eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' @sysconfdir@/pacman.con mkdir -p "$CHECKUPDATES_DB" ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null -fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null +run_silent fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null +if (( download )); then + if ! run_silent pacman -Suw --noconfirm --dbpath "$CHECKUPDATES_DB"; then + ret=$? + (( silent )) && echo "Failed to download packages." >&2 + exit "$ret" + fi +fi + exit 0 # vim: set ts=2 sw=2 noet: -- 1.8.5.3

1 1

[pacman-dev] [PATCH] Change the default makepkg checksum from MD5 to SHA-1
by Jason St. John 17 Jan '14

17 Jan '14

MD5 has been significantly compromised for years; switching to a more secure hash function, such as SHA-1, is long overdue. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- I was tempted to switch straight to SHA-256 because SHA-1 has had some theoretical vulnerabilities for years; however, because there are effectively no practical/feasible, real-world attacks on SHA-1, plus the much larger hash size that users like to complain about, I figure that SHA-1 is good enough for now. etc/makepkg.conf.in | 2 +- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 43a6cf2..796aea7 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -81,7 +81,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign) OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 -INTEGRITY_CHECK=(md5) +INTEGRITY_CHECK=(sha1) #-- Options to be used when stripping binaries. See `man strip' for details. STRIP_BINARIES="@STRIP_BINARIES@" #-- Options to be used when stripping shared libraries. See `man strip' for details. diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index f1dd420..e8a3bf1 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -28,7 +28,7 @@ changelog= source=("${pkgbase}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.patch") noextract=() -md5sums=() # generate with 'updpkgsums' +sha1sums=() # generate with 'updpkgsums' prepare() { cd "${pkgname}-${pkgver}" diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 0eb1c20..de966cf 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -27,7 +27,7 @@ changelog= source=("${pkgname}-${pkgver}.tar.gz" "${pkgname}-${pkgver}.patch") noextract=() -md5sums=() # generate with 'updpkgsums' +sha1sums=() # generate with 'updpkgsums' prepare() { cd "${pkgname}-${pkgver}" -- 1.8.5.3

2 3

[pacman-dev] [PATCH 1/3] Updated pacsearch colors to match pacman's coloring
by Pierre Neidhardt 15 Jan '14

15 Jan '14

For now I've kept the original pacsearch colors for the repos. Some fields have the same colors--e.g. 'extra' and 'version' are both bold green. Maybe it would look nicer to make repo/name bold and to leave the other fields regular. I have changed repo-specific variables to formatting variables. I have been using correct indentation rules this time. Additionally I have rephrased the help message; the previous message would let one think this script was rather useless compared to a simple pacman -Ss. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 55 +++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 624f201..2418e19 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -20,6 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. #TODO: colors flag on commandline +#TODO: for now the whole line is bold and some parts have the same formatting (e.g. extra and version), maybe it would be better to use regular formatting use strict; use warnings; @@ -29,7 +30,7 @@ my $myver = '@PACKAGE_VERSION@'; sub usage { print "$myname (pacman) v$myver\n\n"; - print "Add color and install information to a 'pacman -Ss' search\n\n"; + print "Perform a pacman search using both the local and the sync databases.\n\n"; print "Usage: $myname <pattern>\n\n"; print "Example: $myname ^gnome\n"; } @@ -54,32 +55,38 @@ if ($ARGV[0] eq "--version" || $ARGV[0] eq "-V") { exit 0; } -# define our colors to use when printing -my $CLR1 = "\e[0;34m"; -my $CLR2 = "\e[0;32m"; -my $CLR3 = "\e[0;35m"; -my $CLR4 = "\e[0;36m"; -my $CLR5 = "\e[0;31m"; -my $CLR6 = "\e[0;33m"; -my $CLR7 = "\e[1;36m"; -my $INST = "\e[1;31m"; -my $BASE = "\e[0m"; - -# color a "repo/pkgname pkgver" line based on the repository name +# define formatting variables +my $FMT_BLUE = "\e[1;94m"; +my $FMT_CYAN = "\e[1;96m"; +my $FMT_GREEN = "\e[1;92m"; +my $FMT_MAGENTA = "\e[1;95m"; +my $FMT_RED = "\e[1;91m"; +my $FMT_YELLOW = "\e[1;93m"; +my $FMT_BOLD = "\e[1m"; +my $FMT_RESET = "\e[0m"; + +# Color a "repo/pkgname pkgver (goups) [installed]" line. +# We try to stick to pacman colors. sub to_color { my $line = shift; - # get the installed text colored first - $line =~ s/(\[.*\]$)/$INST$1$BASE/; - # and now the repo and dealings - $line =~ s/(^core\/.*)/$CLR1$1$BASE/; - $line =~ s/(^extra\/.*)/$CLR2$1$BASE/; - $line =~ s/(^community\/.*)/$CLR3$1$BASE/; - $line =~ s/(^testing\/.*)/$CLR4$1$BASE/; - $line =~ s/(^community-testing\/.*)/$CLR5$1$BASE/; - $line =~ s/(^multilib\/.*)/$CLR6$1$BASE/; - $line =~ s/(^local\/.*)/$CLR7$1$BASE/; + # get the installed text colored first (between square brackets) + $line =~ s/(\[.*\]$)/$FMT_CYAN$1$FMT_RESET/; + # group (between parentheses) + $line =~ s/($.*$)/$FMT_BLUE$1$FMT_RESET/; + # version (second field) + $line =~ s/^([^ ]+) ([^ ]+) /$1 $FMT_GREEN$2$FMT_RESET /; + # name (word after slash) + $line =~ s/\/([\w-]*)/\/$FMT_BOLD$1$FMT_RESET/; + # repo (word before slash inclusive) + $line =~ s/(^core\/)/$FMT_BLUE$1$FMT_RESET/; + $line =~ s/(^extra\/)/$FMT_GREEN$1$FMT_RESET/; + $line =~ s/(^community\/)/$FMT_MAGENTA$1$FMT_RESET/; + $line =~ s/(^testing\/)/$FMT_CYAN$1$FMT_RESET/; + $line =~ s/(^community-testing\/)/$FMT_RED$1$FMT_RESET/; + $line =~ s/(^multilib\/)/$FMT_YELLOW$1$FMT_RESET/; + $line =~ s/(^local\/)/$FMT_CYAN$1$FMT_RESET/; # any other unknown repository - $line =~ s/(^[\w-]*\/.*)/$CLR6$1$BASE/; + $line =~ s/(^[\w-]*\/)/$FMT_YELLOW$1$FMT_RESET/; return $line; } -- 1.8.5.2

2 2

[pacman-dev] [PATCH] Allow sync_prepare to work when no sync packages are being used
by Allan McRae 15 Jan '14

15 Jan '14

Commit 9363e7dc allowed sync prepare to work when not sync packages were being used and databases were missing. However, it still required any databases that were present had valid signatures (if these were required). Relax this further so that sync database status is not considered when on using local package files. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/sync.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 17a3e8e..5015237 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -387,15 +387,16 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } } - /* ensure all sync database are valid if we will be using them */ - for(i = handle->dbs_sync; i; i = i->next) { - const alpm_db_t *db = i->data; - if(db->status & DB_STATUS_INVALID) { - RET_ERR(handle, ALPM_ERR_DB_INVALID, -1); - } - /* missing databases are not allowed if we have sync targets */ - if(from_sync && db->status & DB_STATUS_MISSING) { - RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1); + /* ensure all sync database are present and valid if we will be using them */ + if(from_sync) { + for(i = handle->dbs_sync; i; i = i->next) { + const alpm_db_t *db = i->data; + if(db->status & DB_STATUS_INVALID) { + RET_ERR(handle, ALPM_ERR_DB_INVALID, -1); + } + if(db->status & DB_STATUS_MISSING) { + RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1); + } } } -- 1.8.5.2

2 2

[pacman-dev] [PATCH 3/3] pacsearch now has localized output
by Pierre Neidhardt 15 Jan '14

15 Jan '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index d860471..10a6148 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -77,13 +77,16 @@ if ($ARGV[0] eq "--nocolor" || $ARGV[0] eq "-n") { $RESET = ""; } -my @COLORS=($RED, $GREEN, $YELLOW, $BLUE, $MAGENTA, $CYAN); +my @COLORS = ($RED, $GREEN, $YELLOW, $BLUE, $MAGENTA, $CYAN); # We can choose if we output repo/pkgname bold or not. Same thing for 'ver group # installed'. Not sure if it's worth a CLI option. my $FMT_REPO = $BOLD; my $FMT_OTHER = $REGULAR; +# localization +my $LC_INSTALLED = `gettext pacman installed`; + # Color a "repo/pkgname pkgver (goups) [installed]" line. # We try to stick to pacman colors. sub to_color { @@ -146,8 +149,7 @@ foreach $_ (@querypkgs) { if (not exists $allpkgs{$pkgfields[1]}) { # since 'group' is optional, we should fill it in if necessary $pkgfields[3] = "" if not defined $pkgfields[3]; - # TODO: localize the "installed" word - $pkgfields[4] = "[installed]"; + $pkgfields[4] = "[" . $LC_INSTALLED . "]"; # add a last field that indicates original order (after sync) push (@pkgfields, $cnt++); # add our local-only package to the hash -- 1.8.5.2

2 1

[pacman-dev] [PATCH] Fix compilation without gpgme
by Dan McGee 10 Jan '14

10 Jan '14

Two issues have snuck in that prevent the compile from working. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This and the rest of the patches available on my 'random-fixes' branch. lib/libalpm/sync.c | 2 +- src/pacman/package.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e358585..9531fa2 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1225,7 +1225,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) return -1; } -#if HAVE_LIBGPGME +#ifdef HAVE_LIBGPGME /* make sure all required signatures are in keyring */ if(check_keyring(handle)) { return -1; diff --git a/src/pacman/package.c b/src/pacman/package.c index 52219ff..c44696b 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -193,6 +193,10 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } if(from == ALPM_PKG_FROM_SYNCDB && extra) { + string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg), cols); + string_display(_("SHA-256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); + +#ifdef HAVE_LIBGPGME const char *base64_sig = alpm_pkg_get_base64_sig(pkg); alpm_list_t *keys = NULL; if(base64_sig) { @@ -204,10 +208,8 @@ void dump_pkg_full(alpm_pkg_t *pkg, int extra) } else { keys = alpm_list_add(keys, _("None")); } - - string_display(_("MD5 Sum :"), alpm_pkg_get_md5sum(pkg), cols); - string_display(_("SHA-256 Sum :"), alpm_pkg_get_sha256sum(pkg), cols); list_display(_("Signatures :"), keys, cols); +#endif } else { list_display(_("Validated By :"), validation, cols); } -- 1.8.5.2

3 16