- Pacman-dev - lists.archlinux.org

[pacman-dev] More flexibility on *-vcs building
by 郑文辉(Techlive Zheng) 13 Dec '13

13 Dec '13

Now, we can specify 'fragment' parameter to the source url of a VCS package to build a specific version, I wonder if it is possible to make this parameter also accept environment variables, and let `makepkg` handles a depends array elememnt in PKGBUILD like `*-vcs=SPECVIED-vesion` automatically. This way, we can build the a static version of a package but use the source fetched from git.

2 1

[pacman-dev] [PATCH] Fix consistency of downloaded sources permissions
by Sébastien Luttringer 13 Dec '13

13 Dec '13

Calls to makepg -g and makepkg to download a source files, result in different permissions on the file if user umask != 0022. Run makepkg with -g option, will download source files before makepkg set umask to 0022. Downloaded files permissions will depend on user umask. Run bare makepkg, will call download source routines after umask was set to 0022. Downloaded files permissions will be group and world readable. A collateral damage: When a user who has a restricted umask (like 077), update a PKGBUKLD with updpkgsums (which call makepkg -g), and call a devtools scripts (extra-i686-build) to build the package, he will get a 'Permission denied', because the builder (another makepkg call) will be run as nobody user. Another side effect, when several users share a SRCDEST directory, they cannot access to files generated by another user with restricted umask. Altough, this can be workarounded by default ACL in the SRCDEST directory. The oldest commit with this umask is the first git commit (d04baab) with no revelent informations provided about the purpose of using an umask. The last commit moving the umask was 171808. The precious commit message refered to bug FS#9242 and FS#9362 which recommend to put umask at the top in makepkg. This patch put the umask definition at the "beginning" of the makepkg script. This let us rely that all files generated by makepkg will be with 0022 umask. Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 28e8e7a..81354df 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2544,6 +2544,9 @@ There is NO WARRANTY, to the extent permitted by law.\n")" # PROGRAM START +# ensure we have a sane umask set +umask 0022 + # determine whether we have gettext; make it a no-op if we do not if ! type -p gettext >/dev/null; then gettext() { @@ -2979,9 +2982,6 @@ else fi fi -# ensure we have a sane umask set -umask 0022 - # get back to our src directory so we can begin with sources mkdir -p "$srcdir" chmod a-s "$srcdir" -- 1.8.4.2

4 5

[pacman-dev] [PATCH] Fix pactest README
by Allan McRae 13 Dec '13

13 Dec '13

The --tests option no longer exists. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/README | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/pacman/README b/test/pacman/README index 958ff28..c7aeb10 100644 --- a/test/pacman/README +++ b/test/pacman/README @@ -52,13 +52,12 @@ Upon completion, it checks that: Usage ===== -pactest will run the suite of tests defined by the "--test" parameter. +pactest will run the suite of test files passed as arguments. Example: - ./pactest.py --test tests/*.py + ./pactest.py tests/*.py This example will run all tests from the "tests" directory. -Note: several "--test" options can be passed to pactest. Use the "help" option to get the full list of parameters: ./pactest.py --help -- 1.8.5.1

1 0

[pacman-dev] Bug in libalpm: sizeof(off_t)
by Jeremy Heiner 11 Dec '13

11 Dec '13

An app developer can sometimes choose how big they want off_t to be (by #defining _FILE_OFFSET_BITS). The default for i686 is 32 bits (a bit odd, that). Pacman's configure attempts to choose 64 bits, and succeeds in doing so for the Arch builds (but doesn't force that choice). Bad things happen when the app developer chooses differently than configure did, but not until runtime. For example, the app's .o files will think sizeof(alpm_file_t) == 12, whereas libalpm thinks it == 16. The compile and link phases don't catch this. One possible solution might be to "mv alpm.h alpm.h.in", and add something like: #if sizeof(off_t) != @???@ #error ??? #endif Not sure yet what to put in those "???" spots, but the basic idea is to prevent the compiler from generating any .o files that disagree with the ABI of /usr/lib/libalpm. Hope that all made sense, and that I'm not duplicating - I searched the mailing list and the bug database and found zero hits. Anyone see a better solution? Jeremy

4 22

[pacman-dev] [PATCH] remove useless continue
by Andrew Gregory 11 Dec '13

11 Dec '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 551f926..7dbb8a0 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -536,7 +536,6 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL); /* rsync is not a transaction target anymore */ trans->unresolvable = alpm_list_add(trans->unresolvable, rsync); - continue; } alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_conflict_free); -- 1.8.5.1

1 0

[pacman-dev] [PATCH] db.c: require unique database names
by Andrew Gregory 11 Dec '13

11 Dec '13

Allowing multiple databases with the same name causes conflicts as they both point to the same database file but may use different servers, usages, or siglevels. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- doc/pacman.conf.5.txt | 9 +++++---- lib/libalpm/db.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 8cd2d0e..9c3dffe 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -202,10 +202,11 @@ Repository Sections ------------------- Each repository section defines a section name and at least one location where the packages can be found. The section name is defined by the string within -square brackets (the two above are 'current' and 'custom'). Locations are -defined with the 'Server' directive and follow a URL naming structure. If you -want to use a local directory, you can specify the full path with a ``file://'' -prefix, as shown above. +square brackets (the two above are 'core' and 'custom'). Repository names +must be unique and the name 'local' is reserved for the database of installed +packages. Locations are defined with the 'Server' directive and follow a URL +naming structure. If you want to use a local directory, you can specify the +full path with a ``file://'' prefix, as shown above. A common way to define DB locations utilizes the 'Include' directive. For each repository defined in the configuration file, a single 'Include' directive can diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 528b04b..2069a7b 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -46,6 +46,8 @@ alpm_db_t SYMEXPORT *alpm_register_syncdb(alpm_handle_t *handle, const char *treename, alpm_siglevel_t level) { + alpm_list_t *i; + /* Sanity checks */ CHECK_HANDLE(handle, return NULL); ASSERT(treename != NULL && strlen(treename) != 0, @@ -53,6 +55,17 @@ alpm_db_t SYMEXPORT *alpm_register_syncdb(alpm_handle_t *handle, /* Do not register a database if a transaction is on-going */ ASSERT(handle->trans == NULL, RET_ERR(handle, ALPM_ERR_TRANS_NOT_NULL, NULL)); + /* ensure database name is unique */ + if(strcmp(treename, "local") == 0) { + RET_ERR(handle, ALPM_ERR_DB_NOT_NULL, NULL); + } + for(i = handle->dbs_sync; i; i = i->next) { + alpm_db_t *d = i->data; + if(strcmp(treename, d->treename) == 0) { + RET_ERR(handle, ALPM_ERR_DB_NOT_NULL, NULL); + } + } + return _alpm_db_register_sync(handle, treename, level); } -- 1.8.4.2

2 1

[pacman-dev] [PATCH] alpm_sync_sysupgrade: skip packages being removed
by Andrew Gregory 11 Dec '13

11 Dec '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- pacman can't run into this (yet), but other front-ends might. lib/libalpm/sync.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 551f926..af82dc5 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -209,6 +209,11 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade) for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { alpm_pkg_t *lpkg = i->data; + if(alpm_pkg_find(trans->remove, lpkg->name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "%s is marked for removal -- skipping\n", lpkg->name); + continue; + } + if(alpm_pkg_find(trans->add, lpkg->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is already in the target list -- skipping\n", lpkg->name); continue; -- 1.8.4.2

2 1

Re: [pacman-dev] [PATCH 4/4] makepkg: git: update existing sources in srcdir without removing them first.
by Ido Rosen 10 Dec '13

10 Dec '13

I think I found a bug: If the repository URL/source array entry has changed but the directory name has not, the user would have to manually delete the cloned repository, otherwise the git fetch/checkout would be from the incorrect upstream repo. On Mon, Dec 9, 2013 at 3:31 PM, Lukáš Jirkovský <l.jirkovsky(a)gmail.com>wrote: > The local changes are discarded when updating. This matches the behaviour > when non-VCS sources are used. It also allows incremental builds. > > Signed-off-by: Lukáš Jirkovský <l.jirkovsky(a)gmail.com> > --- > scripts/makepkg.sh.in | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) > > diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in > index 1421bec..99af551 100644 > --- a/scripts/makepkg.sh.in > +++ b/scripts/makepkg.sh.in > @@ -581,9 +581,18 @@ extract_git() { > > msg2 "$(gettext "Creating working copy of %s %s repo...")" > "${repo}" "git" > pushd "$srcdir" &>/dev/null > - rm -rf "${dir##*/}" > > - if ! git clone "$dir"; then > + local updating=false > + if [[ -d "${dir##*/}" ]]; then > + updating=true > + cd_safe "${dir##*/}" > + if ! git fetch; then > + error "$(gettext "Failure while updating working > copy of %s %s repo")" "${repo}" "git" > + plain "$(gettext "Aborting...")" > + exit 1 > + fi > + cd_safe "$srcdir" > + elif ! git clone "$dir"; then > error "$(gettext "Failure while creating working copy of > %s %s repo")" "${repo}" "git" > plain "$(gettext "Aborting...")" > exit 1 > @@ -591,7 +600,7 @@ extract_git() { > > cd_safe "${dir##*/}" > > - local ref > + local ref=origin/HEAD > if [[ -n $fragment ]]; then > case ${fragment%%=*} in > commit|tag) > @@ -607,8 +616,8 @@ extract_git() { > esac > fi > > - if [[ -n $ref ]]; then > - if ! git checkout -b makepkg $ref; then > + if [[ -n $ref ]] || ((updating)) ; then > + if ! git checkout --force -B makepkg $ref; then > error "$(gettext "Failure while creating working > copy of %s %s repo")" "${repo}" "git" > plain "$(gettext "Aborting...")" > exit 1 > -- > 1.8.5.1 > > >

2 1

[pacman-dev] Questions about how to show messages (warnings, etc)
by Olivier Brunel 04 Dec '13

04 Dec '13

Hi, So I'm working on changing the events callback as discussed earlier, and I'm running into some little issues (discrepancies really) when it comes to showing warnings/errors. As you know, pacman can show warnings/errors to the user; and when colors are used those prefixes will be shown in color. Except, not always. There seems to be some inconsistency when it comes to this, because when a warning/error needs to be shown, pacman can do one of two things: - show it right away - cache it and show it later, i.e. when the current progress will be done Now, when shown right away, prefixes are in color, and messages are shown on stderr. However, when delayed, there will be no colors (because unlike pm_vfprintf(), pm_vasprintf() doesn't add colors to the prefixes) *and* messages will be shown on stdout. Unless there's a reason for this I'm not aware of, I think that this should probably be fixed, as in have delayed messages use colors & show on stderr? As a side note, the FS#37711 that Andrew mentioned previously was about the lack of colors for creation of .pac* files, but it might actually have been a manifestation of this bug/discrepancy (i.e. when fixed, or if using --noprogressbar, one would have colors on those warnings already). -j

3 4

[pacman-dev] [PATCH] Added mirror support to makepkg's source array.
by Florian Pritz 25 Nov '13

25 Nov '13

From: Ido Rosen <code(a)idorosen.com> To specify multiple mirrors, simply add multiple files to the source array that have the same downloaded filename, e.g.: source=("file.tar.gz::http://mirror1.example.com/file.tar.gz" "file.tar.gz::http://mirror2.example.com/file.tar.gz") ...makepkg will try them all, and if all fail, will abort. This also applies to VCS repositories and local files references in the source array, so for example: source=("git+https://github.com/torvalds/linux.git "git+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git") ...will allow cloning the git repository from GitHub if kernel.org is down or fails. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- I've swichted from get_filepath for the array index to get_filename as get_filepath only returns something useful if the local file already exists. I guess this was just an oversight, but noted for reference. I've also tested this a little for http urls and it seems to work as expected. One thing that we might want to fix is that the downloads get validated multiple times right now (once for each entry). scripts/makepkg.sh.in | 73 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 28 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4cb8173..452df09 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -326,7 +326,7 @@ download_local() { else local filename=$(get_filename "$netfile") error "$(gettext "%s was not found in the build directory and is not a URL.")" "$filename" - exit 1 # $E_MISSING_FILE + return 1 # $E_MISSING_FILE fi } @@ -375,8 +375,7 @@ download_file() { if (( ret )); then [[ ! -s $dlfile ]] && rm -f -- "$dlfile" error "$(gettext "Failure while downloading %s")" "$filename" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi # rename the temporary download file to the final destination @@ -460,8 +459,7 @@ download_bzr() { msg2 "$(gettext "Branching %s ...")" "${displaylocation}" if ! bzr branch "$url" "$dir" --no-tree --use-existing-dir; then error "$(gettext "Failure while branching %s")" "${displaylocation}" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then # Make sure we are fetching the right repo @@ -470,15 +468,13 @@ download_bzr() { if [[ -n $distant_url ]]; then if [[ $distant_url != "$local_url" ]]; then error "$(gettext "%s is not a branch of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi else if [[ $url != "$local_url" ]] ; then error "$(gettext "%s is not a branch of %s")" "$dir" "$url" error "$(gettext "The local URL is %s")" "$local_url" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi fi msg2 "$(gettext "Pulling %s ...")" "${displaylocation}" @@ -545,16 +541,14 @@ download_git() { msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" if ! git clone --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then cd_safe "$dir" # Make sure we are fetching the right repo if [[ "$url" != "$(git config --get remote.origin.url)" ]] ; then error "$(gettext "%s is not a clone of %s")" "$dir" "$url" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" if ! git fetch --all -p; then @@ -634,8 +628,7 @@ download_hg() { msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "hg" if ! hg clone -U "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "hg" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "hg" @@ -673,15 +666,13 @@ extract_hg() { ;; *) error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 + return 1 esac fi if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi popd &>/dev/null @@ -711,8 +702,7 @@ download_svn() { mkdir -p "$dir/.makepkg" if ! svn checkout --config-dir "$dir/.makepkg" "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" - plain "$(gettext "Aborting...")" - exit 1 + return 1 fi elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn" @@ -776,34 +766,61 @@ download_sources() { GET_VCS=0 fi + declare -A downloaded # local since no -g supplied to declare. + declare -A expected # local since no -g supplied to declare. local netfile for netfile in "${source[@]}"; do pushd "$SRCDEST" &>/dev/null + local filename=$(get_filename "${netfile}") + expected["${filename}"]=1 + if [[ ${downloaded["${filename}"]} ]]; then + msg "$(gettext "Skipping mirror: %s")" "$netfile" + continue # file already downloaded, current mirror is redundant. + fi local proto=$(get_protocol "$netfile") case "$proto" in local) - download_local "$netfile" + download_local "$netfile" && \ + downloaded["${filename}"]=1 ;; bzr*) - (( GET_VCS )) && download_bzr "$netfile" + (( GET_VCS )) && download_bzr "$netfile" && \ + downloaded["${filename}"]=1 ;; git*) - (( GET_VCS )) && download_git "$netfile" + (( GET_VCS )) && download_git "$netfile" && \ + downloaded["${filename}"]=1 ;; hg*) - (( GET_VCS )) && download_hg "$netfile" + (( GET_VCS )) && download_hg "$netfile" && \ + downloaded["${filename}"]=1 ;; svn*) - (( GET_VCS )) && download_svn "$netfile" + (( GET_VCS )) && download_svn "$netfile" && \ + downloaded["${filename}"]=1 ;; *) - download_file "$netfile" + download_file "$netfile" && \ + downloaded["${filename}"]=1 ;; esac - popd &>/dev/null done + + local failed=() + for expectedfilename in "${!expected[@]}"; do + if [[ ${downloaded["${expectedfilename}"]} ]]; then + continue + else + failed=(${failed[@]} "${expectedfilename}") + error "$(gettext "Fatal failure while downloading file %s")" "${expectedfilename}" + fi + done + if [[ ${#failed[@]} -gt 0 ]]; then + plain "$(gettext "Aborting...")" + exit 1 + fi } # Automatically update pkgver variable if a pkgver() function is provided -- 1.8.4.2

8 15