- Pacman-dev - lists.archlinux.org

[pacman-dev] Fwd: [makepkg patch - generate .SRCINFO file when running "--source"]
by vlad 10 Aug '10

10 Aug '10

Hello, Here is a mail I sent to the arch-general list containing a patch for makepkg which generates a .SRCINFO file when running "makepkg --source". Below I'll make some more comments, present some more ideas on this topic. ----- Forwarded message from vlad <vla(a)uni-bonn.de> ----- Date: Tue, 27 Jul 2010 15:25:55 +0200 From: vlad <vla(a)uni-bonn.de> Subject: makepkg patch - generate .SRCINFO file when running "--source" To: arch-general <arch-general(a)archlinux.org> User-Agent: Mutt/1.5.20 (2009-06-14) Hello list, Here is a patch against makepkg from git which introduces a new function "write_srcinfo()". This generates a file .SRCINFO - like the .PKGINFO one - when "makepkg --source" is run and then it is added to the src.tar.gz archive. I think having such a file is an important step for getting split packages to the AUR. It is also useful for third party applications. Since this file is generated during making the source archive, there is no need for parsing/sourcing the PKGBUILD everytime meta infos are needed afterwards. This is also a way of standardizing the source archive. .SRCINFO looks like (generated for gcc from core): " # Generated by makepkg 3.4.0 # Tue Jul 27 12:56:38 UTC 2010 global pkgbase = gcc global pkgname = gcc global pkgname = gcc-libs global pkgname = gcc-fortran global pkgname = gcc-objc global pkgname = gcc-ada global pkgver = 4.5.0-6 global pkgdesc = The GNU Compiler Collection global url = http://gcc.gnu.org global packager = Vlad George <donvla(a)users.sourceforge.net> global builddate = 1280235398 global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-core-4.5-20100610.tar.… global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-g++-4.5-20100610.tar.b… global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-fortran-4.5-20100610.t… global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-objc-4.5-20100610.tar.… global source = ftp://gcc.gnu.org/pub/gcc/snapshots/4.5-20100610/gcc-ada-4.5-20100610.tar.b… global source = ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.20100312.tar.bz2 global source = gcc_pure64.patch global source = gcc-hash-style-both.patch global source = r160561.patch global license = GPL global license = LGPL global license = custom global arch = i686 global arch = x86_64 global makedepends = binutils>=2.20.1 global makedepends = libmpc>=0.8.2-2 global makedepends = cloog-ppl>=0.15.8 global makedepends = libelf global makedepends = gcc-ada gcc depends = binutils>=2.20.1 gcc depends = libmpc>=0.8.1-2 gcc depends = cloog-ppl>=0.15.8 gcc depends = libelf gcc groups = base-devel gcc install = gcc.install gcc-libs pkgdesc = Runtime libraries shipped by GCC for C and C++ languages gcc-libs groups = base gcc-libs depends = glibc>=2.11.1-2 gcc-libs install = gcc-libs.install gcc-fortran pkgdesc = Fortran front-end for GCC gcc-fortran depends = gcc=4.5.0-6 gcc-fortran install = gcc-fortran.install gcc-objc pkgdesc = Objective-C front-end for GCC gcc-objc depends = gcc=4.5.0-6 gcc-ada pkgdesc = Ada front-end for GCC (GNAT) gcc-ada depends = gcc=4.5.0-6 gcc-ada install = gcc-ada.install " As you see this file consists of different parts separated by a leading tag. "global" denotes the global PKGBUILD vars and the name of the split package denotes the local package variables. However, this is just a first formatting approach. This can be changed according to further needs. I think this is a clear and easily readable/parseable output. Note that "packager" defaults to the person who actually build the source archive. Perhaps this has to be changed to AUR user name, not to the makepkg.conf PACKAGER entry. ----- End forwarded message ----- The main idea behind this is to unify and standardize how PKGBUILDs are handled (mainly AUR). For now information about a package has to be parsed from the PKGBUILD which creates a big overhead and has many security holes. There are some more problems with this. As a user said, there is a problem with if clauses for different arches. Imo there is no sane way to handle this. So we should try a different approach. A possible one is to restrict the way architecture specific variables are written to PKGBUILDs; perhaps only smth like: "[[ $CARCH == "i686" ]] && sources= ... " Though this is quite restrictive, and I see a discussion coming up why this and not the other way. A more elegant way - which I personally prefer - is to introduce a new function "arch_$CARCH" to PKGBUILDs. Actually these are two functions, arch_i686 and arch_x86_64, one for each architecture. These functions appear in the first (global) part of the PKGBUILD before the build/package functions and contain arch specific variables. This may look like (eg for new wine PKGBUILD): " arch=(i686 x86_64) license=(LGPL) arch_i686() { depends=(fontconfig mesa libxcursor libxrandr libxdamage libxxf86dga alsa-lib) makedepends=(autoconf ncurses bison perl fontforge flex prelink 'gcc>=4.5.0-2' cross32-gcc libgphoto2 giflib libxpm libpng libxinerama libxcomposite \ libxmu libxxf86vm libxml2 libxslt libldap lcms mpg123 openal esound jack cups sane samba) optdepends=(libgphoto2 giflib libpng libldap lcms libxml2 mpg123 openal esound jack cups sane samba) } arch_x86_64() { depends=(...) } source=("stuff") md5sums=("numbers") build() { .... } " You get the point. Note that only vars are allowed in these functions; other entries are ignored. There should also be a list/array of allowed vars (like "splitpkg_overrides"). There are: depends, makedepends, optdepends, source, checksums. Note that this does not affect the build/package functions in any way. The main advantages are: * This is a unified way to handle arch specific vars in PKGBUILDs. There are no dirty hacks, no barely readable if clauses, etc. * This is easy to parse - if needed - and easily integrable into makepkg. After sourcing the buildfile, you can first check if there is such a function and than simply run it (eg: "declare -F arch_$CARCH && arch_$CARCH"). In combination with .SRCINFO there is no need to parse the PKGBUILD at all afterwards. * And for the .SRCINFO file: with these functions you can expand (only an example - as I said above, this formatting is just one possibility) the separation tags to "global_i686" and "global_x86_64" which point to the arch specific vars. This completes the output/writing of this file. And now to the AUR. Every "taurball" which is uploaded to the AUR has to be built with "makepkg --source". It contains then a .SRCINFO file which makes the information about this package easy readable. So there is a sane and consistent way to provide and get information for wanted purposes (AUR web interface, third party apps, etc). Thank you for reading, Vlad --

3 4

[pacman-dev] [PATCH] makepkg: add option to skip archive compression
by Christian Himpel 09 Aug '10

09 Aug '10

hi pacman developers, i currently have to `makepkg' a huge package (go-hg) again and again. since compression takes very long (and pacman can handle uncompressed archives very well), i implemented an option to makepkg that skips the compression of the (tar)archive. this speeds-up my workflow enormously. btw, this option might be useful in packages like yaourt as well.. if you find this patch useful, feel free to include it :) thanks for developing this great package manager! cheers, chressie

2 3

[pacman-dev] [PATCH] makepkg: Allow creation of uncompressed packages
by Thomas Bächler 09 Aug '10

09 Aug '10

When performing local testing, it may be useful to add PKGEXT='.pkg.tar' to the PKGBUILD to save time, especially with big packages. --- scripts/makepkg.sh.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 32528b0..1b788ef 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1031,6 +1031,7 @@ create_package() { *tar.gz) EXT=${PKGEXT%.gz} ;; *tar.bz2) EXT=${PKGEXT%.bz2} ;; *tar.xz) EXT=${PKGEXT%.xz} ;; + *tar) EXT=${PKGEXT} ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$PKGEXT" ; EXT=$PKGEXT ;; esac @@ -1050,6 +1051,7 @@ create_package() { *tar.gz) gzip -f -n "$tar_file" ;; *tar.bz2) bzip2 -f "$tar_file" ;; *tar.xz) xz -z -f "$tar_file" ;; + *tar) true ;; esac ret=$? fi @@ -1125,6 +1127,7 @@ create_srcpackage() { *tar.gz) TAR_OPT="z" ;; *tar.bz2) TAR_OPT="j" ;; *tar.xz) TAR_OPT="J" ;; + *tar) TAR_OPT="" ;; *) warning "$(gettext "'%s' is not a valid archive extension.")" \ "$SRCEXT" ;; esac -- 1.7.2.1

3 4

[pacman-dev] [PATCH] repo-add: make --quiet output more quiet
by Allan McRae 08 Aug '10

08 Aug '10

Fixes FS#20403. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 2838f81..2293c46 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -37,6 +37,7 @@ startdir="$PWD" umask 0022 msg() { + (( QUIET )) && return local mesg=$1; shift printf "==> ${mesg}\n" "$@" >&1 } -- 1.7.2.1

1 0

[pacman-dev] Updates for Polish translations of pacman and libalpm
by Mateusz Herych 04 Aug '10

04 Aug '10

Hello, Here are updated .po files for Polish translations of pacman and libalpm. Regards, Mateusz.

2 1

[pacman-dev] 3.4.1 release plans
by Dan McGee 03 Aug '10

03 Aug '10

Hey guys, We've had a handful of fixes go into maint so it might be time to think about a 3.4.1 release. Some other pending issues to think about before we release: * http://bugs.archlinux.org/task/19969, pacman download issues from googlecode.com domain. Looks like not our problem so will probably close this out. * http://bugs.archlinux.org/task/20022, Download progress and completion issues during repo sync. I saw this before the release in git, and it seems like someone else hit it too. It is always involving kernel.org HTTP that we've seen so far. * http://bugs.archlinux.org/task/19854, --ignore is ignored. This is the highest priority issue and something I definitely want to get in 3.4.1; I have started on a fix and it shouldn't be too bad but some code and checks need to move around. * http://bugs.archlinux.org/task/19853, No prompting about groups. Might even get fixed with the above, and with 24 votes, apparently people do care (but not enough to answer the patches welcome call). Thoughts/comments/concerns welcome as always. -Dan

2 3

[pacman-dev] [PATCH] makepkg: check tput support before using
by Allan McRae 03 Aug '10

03 Aug '10

Prevent makepkg aborting whe colors are enabled and the terminal does not support setting colors by tput. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 516e1d7..0527bd6 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1629,12 +1629,22 @@ PACMAN=${PACMAN:-pacman} # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then - ALL_OFF="$(tput sgr0)" - BOLD="$(tput bold)" - BLUE="${BOLD}$(tput setaf 4)" - GREEN="${BOLD}$(tput setaf 2)" - RED="${BOLD}$(tput setaf 1)" - YELLOW="${BOLD}$(tput setaf 3)" + # prefer terminal safe colored and bold text when tput is supported + if tput setaf 0 &>/dev/null; then + ALL_OFF="$(tput sgr0)" + BOLD="$(tput bold)" + BLUE="${BOLD}$(tput setaf 4)" + GREEN="${BOLD}$(tput setaf 2)" + RED="${BOLD}$(tput setaf 1)" + YELLOW="${BOLD}$(tput setaf 3)" + else + ALL_OFF="\033[1;0m" + BOLD="\033[1;1m" + BLUE="${BOLD}\033[1;34m" + GREEN="${BOLD}\033[1;32m" + RED="${BOLD}\033[1;31m" + YELLOW="${BOLD}\033[1;33m" + fi fi readonly ALL_OFF BOLD BLUE GREEN RED YELLOW -- 1.7.2.1

1 0

[pacman-dev] slovak translation for pacman
by Jozef Riha 27 Jul '10

27 Jul '10

attached. cheers, jose

2 3

[pacman-dev] [PATCH] Use the plural features of gettext
by Dan McGee 27 Jul '10

27 Jul '10

Gettext has this whole 'Plural-Form' thing that until now we haven't taken advantage of. Given that not all languages have the same plural form rules as English, take advantage of it by defining a new _n() macro which will normally define to ngettext(), and adjust a few messages as an example of how to use. There are surely other places where we do singular/plural logic without me having noticed, so further patches are welcome to fix those up too. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 13 +++++++++---- src/pacman/query.c | 6 ++++-- src/pacman/util.h | 2 ++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 23804d7..3696d3c 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -283,11 +283,16 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, namelist = alpm_list_add(namelist, (char *)alpm_pkg_get_name(i->data)); } - printf(_(":: the following package(s) cannot be upgraded due to " - "unresolvable dependencies:\n")); + printf(_n( + ":: The following package cannot be upgraded due to unresolvable dependencies:\n", + ":: The following packages cannot be upgraded due to unresolvable dependencies:\n", + alpm_list_count(namelist))); list_display(" ", namelist); - *response = noyes(_("\nDo you want to skip the above " - "package(s) for this upgrade?")); + printf("\n"); + *response = noyes(_n( + "Do you want to skip the above package for this upgrade?", + "Do you want to skip the above packages for this upgrade?", + alpm_list_count(namelist))); alpm_list_free(namelist); } break; diff --git a/src/pacman/query.c b/src/pacman/query.c index 7f064f2..5538e81 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -406,8 +406,10 @@ static int check(pmpkg_t *pkg) } if(!config->quiet) { - printf(_("%s: %d total files, %d missing file(s)\n"), - pkgname, allfiles, errors); + printf(_n("%s: %d total file, ", "%s: %d total files, ", allfiles), + pkgname, allfiles); + printf(_n("%d missing file\n", "%d missing files\n", errors), + errors); } return(errors != 0 ? 1 : 0); diff --git a/src/pacman/util.h b/src/pacman/util.h index bbf4382..d85ba7b 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -30,8 +30,10 @@ #include <libintl.h> /* here so it doesn't need to be included elsewhere */ /* define _() as shortcut for gettext() */ #define _(str) gettext(str) +#define _n(str1, str2, ct) ngettext(str1, str2, ct) #else #define _(str) str +#define _n(str1, str2, ct) (ct == 1 ? str1 : str2) #endif /* update speed for the fill_progress based functions */ -- 1.7.2

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.0-24-g0d6efb3
by dan＠archlinux.org 27 Jul '10

27 Jul '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 0d6efb35ce445747cdc37b4f58cdf63463de6e1a (commit) via 52118bf0f084e891b53bcf05f9e6021ebb26fb13 (commit) via ff689b6a383cbeb5ea699d587fe8975d71cae600 (commit) via fa4f25626c462e88ca0f6457bf9942980a5bd329 (commit) via f8d7cd6b2623a864aa85fbdcdd629f3ff92a631c (commit) via e702f56ea671c6cd1154a0ddb41fa63e97587c85 (commit) via 7f5c486666cc99fba4029b2c059ae062b7dd7933 (commit) from fcb4f0264f2b8e0a6ed1e7eebfe00f662ba94ef2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 4 ++-- lib/libalpm/po/kk.po | 2 +- lib/libalpm/sync.c | 18 +++++++++++------- scripts/makepkg.sh.in | 6 +++--- src/pacman/util.c | 1 + test/pacman/tests/sync022.py | 25 +++++++++++++++++++++++++ test/pacman/tests/sync023.py | 29 +++++++++++++++++++++++++++++ 7 files changed, 72 insertions(+), 13 deletions(-) create mode 100644 test/pacman/tests/sync022.py create mode 100644 test/pacman/tests/sync023.py hooks/post-receive -- The official pacman repository

1 0