- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-219-g31fcdec
by allan＠archlinux.org 15 Dec '13

15 Dec '13

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, master has been updated via 31fcdec619a5d738221b6629ec5e48205b4e04fe (commit) via e8ec7e54e5c293fd4e3e36b8aeb4f7d60a44a466 (commit) via 841c60f2b396c3b59c7d673dc39dacc3ccbf5658 (commit) via 76a05e94c19922ee27a9c3b751ec3836c13a1bab (commit) via 916c7085d829e6fec4f31b7ea3dbbdf571f9cd81 (commit) via b847d1d8e7a032afa51c7ccce1b253ec451bb6b7 (commit) via 9749fb033c8794e8ac4b931678659aa2b79ae1b1 (commit) via ae2c9bba5a0de58454814c5fa438cf1db52707ae (commit) via af2c0a15371058ba93d6bb423b3fe90e45380d7a (commit) via 20127e732c66897506449c38baff9ec1a893032c (commit) via 759c48cd34235a0650f8189223b812dad53780cc (commit) via 1340ed792501c3a2c65b83ff90b232e6e01f5537 (commit) from a15fd48016014249a13db7a437b5e4f5937f6158 (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 ----------------------------------------------------------------- commit 31fcdec619a5d738221b6629ec5e48205b4e04fe Author: Allan McRae <allan(a)archlinux.org> Date: Fri Dec 13 20:53:12 2013 +1000 Fix pactest README The --test option no longer exists. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e8ec7e54e5c293fd4e3e36b8aeb4f7d60a44a466 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Dec 11 11:58:27 2013 -0500 remove useless continue Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 841c60f2b396c3b59c7d673dc39dacc3ccbf5658 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 30 20:45:02 2013 -0500 db.c: require unique database names 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 76a05e94c19922ee27a9c3b751ec3836c13a1bab Author: Sébastien Luttringer <seblu(a)seblu.net> Date: Tue Dec 10 01:59:24 2013 +0100 makepkg: fix consistency of downloaded sources permissions Running 'makepkg -g' or 'makepkg' to download source files results in different permissions on the files if the user has a non-default umask. Put the umask definition at the "beginning" of the makepkg script to ensure all files generated by makepkg have a 0022 umask. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 916c7085d829e6fec4f31b7ea3dbbdf571f9cd81 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Nov 25 11:16:47 2013 -0500 alpm_sync_sysupgrade: skip packages being removed Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b847d1d8e7a032afa51c7ccce1b253ec451bb6b7 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Nov 21 12:55:39 2013 +1000 Color output from pm_vasprintf This makes sure warning and error messages from _alpm_log are colored. Fixes FS#35160. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9749fb033c8794e8ac4b931678659aa2b79ae1b1 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Thu Nov 14 23:06:24 2013 -0500 Fix misspellings and some grammar issues in output of some pacman contrib scripts Affected files: -- contrib/bacman.sh.in -- contrib/paccache.sh.in -- contrib/pacdiff.sh.in -- contrib/rankmirrors.sh.in Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ae2c9bba5a0de58454814c5fa438cf1db52707ae Author: Vasiliy Korchagin <vasiliy.korchagin(a)gmail.com> Date: Mon Nov 18 13:01:38 2013 +1000 pacdiff: do not remove pacfile after viewing Automatically removing the file after viewing is not good if on viewing you decide to deal with it later. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit af2c0a15371058ba93d6bb423b3fe90e45380d7a Author: Jason St. John <jstjohn(a)purdue.edu> Date: Fri Nov 15 23:56:05 2013 -0500 pacscripts: Improve error message when sudo binary is not found Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 20127e732c66897506449c38baff9ec1a893032c Author: Wolfgang Bumiller <wry.git(a)bumiller.com> Date: Fri Nov 15 20:54:27 2013 +1000 Close file descirptor before fork FreeBSD chroot(2) fails with EPERM when a directory file descriptor is open with either `kern.chroot_allow_open_directories` being 0, or when the process already is inside a chroot. This is exposed in alpm_run_chroot that uses opendir() to open a file descriptor to the current directory before doing the forking and chrooting. Since the file descriptor is not used in the forked process, we close it. Fixes FS#36161. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 759c48cd34235a0650f8189223b812dad53780cc Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 15 12:08:35 2013 +1000 .gitignore: Add intl directory. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1340ed792501c3a2c65b83ff90b232e6e01f5537 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Nov 15 11:59:18 2013 +1000 paccache: clarify help output The help output referred to variables in the script rather than what they were labelled in the parameter argument. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .gitignore | 1 + contrib/bacman.sh.in | 4 ++-- contrib/paccache.sh.in | 10 +++++----- contrib/pacdiff.sh.in | 13 +++++++------ contrib/pacscripts.sh.in | 4 ++-- contrib/rankmirrors.sh.in | 41 +++++++++++++++++++++++++++++------------ doc/pacman.conf.5.txt | 9 +++++---- lib/libalpm/db.c | 13 +++++++++++++ lib/libalpm/sync.c | 6 +++++- lib/libalpm/util.c | 1 + scripts/makepkg.sh.in | 6 +++--- src/pacman/util.c | 6 ++++-- test/pacman/README | 5 ++--- 13 files changed, 79 insertions(+), 40 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Test suite failures using fakechroot-2.17.1
by Allan McRae 14 Dec '13

14 Dec '13

Using fakechroot-2.17.1 from the Arch [testing] repo, I get 4 pactest failures. All appear to be due to install scriptlets failing. The ldconfig tests work so the _alpm_run_chroot commands work. I think it has something to do with symlinks and the shell... The guilty upstream commit is 52502dbbb - "It is safe to use relative paths which won't escape from fake chroot". Can someone help figuring out whether this is a pacman testsuite issue or a fakechroot issue? Allan

2 3

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

14 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