December 2012 - Pacman-dev - lists.archlinux.org

[pacman-dev] Next push to master
by Allan McRae 13 Dec '12

13 Dec '12

I am about to push another bunch of patches to master. These are a bit more in depth than my previous push but the big thing are all well pactested. It will merge my "merge" branch which has the following: - fixed conflict checking with directory symlinks - fixed package list resolving with "--ignore" - fixed conflict resolving with new directories on upgrade - optdeps informational output - then a whole bunch of small fixes It was going to be a smaller pull, but the more important fixes all overlapped other patches to such a degree that this was the best way forward. I'll push this in the next day. Allan

1 0

[pacman-dev] [PATCH] Added a -n option to repo-add to only add new packages
by dangets＠gmail.com 13 Dec '12

13 Dec '12

From: Danny George <dangets(a)gmail.com> Packages are already in the pkg db were given a warning, and then readded anyway. With -n specified, the warning is printed, but skips readding it. Signed-off-by: Danny George <dangets(a)gmail.com> --- scripts/repo-add.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 5a3bf23..162beec 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -30,6 +30,7 @@ declare -r confdir='@sysconfdir@' QUIET=0 DELTA=0 +ONLYADDNEW=0 WITHFILES=0 SIGN=0 VERIFY=0 @@ -55,6 +56,7 @@ Multiple packages to add can be specified on the command line.\n")" printf -- "\n" printf -- "$(gettext "Options:\n")" printf -- "$(gettext " -d, --delta generate and add delta for package update\n")" + printf -- "$(gettext " -n, --new only add packages that aren't already in the database\n")" printf -- "$(gettext " -f, --files update database's file list\n")" elif [[ $cmd == "repo-remove" ]] ; then printf -- "$(gettext "Usage: repo-remove [options] <path-to-db> <packagename|delta> ...\n")" @@ -290,6 +292,9 @@ db_write_entry() { if [[ -d $tmpdir/tree/$pkgname-$pkgver ]]; then warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" + if (( ONLYADDNEW )); then + return 0; + fi else if (( DELTA )); then pkgentry=$(find_pkgentry "$pkgname") @@ -603,6 +608,7 @@ while (( $# )); do case $1 in -q|--quiet) QUIET=1;; -d|--delta) DELTA=1;; + -n|--new) ONLYADDNEW=1;; -f|--files) WITHFILES=1;; -s|--sign) check_gpg -- 1.8.0.1

2 1

[pacman-dev] [PATCH] [makepkg] Added LOGDEST variable
by William Giokas 13 Dec '12

13 Dec '12

Places logs in a pre-defined location. The logs are always neatly labeled with package names and numbers, and this way can be more easily sent to network shares as they are written or compressed/cleaned en masse. Signed-off-by: William Giokas <1007380(a)gmail.com> --- doc/makepkg.conf.5.txt | 5 +++++ etc/makepkg.conf.in | 2 ++ scripts/makepkg.sh.in | 11 ++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 4172d21..76854ee 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -231,6 +231,11 @@ Options in the current directory. Many people like to keep all source package files in a central location for easy cleanup, so this path can be set here. +**LOGDEST=**"/path/to/folder":: + If this value is not set, log files are written to the current + directory. This centralizes the log location, facilitating cleanup + and compression. + **PACKAGER=**"John Doe <john(a)example.com>":: This value is used when querying a package to see who was the builder. It is recommended you change this to your name and email address. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 0de85c9..3b98cc6 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -106,6 +106,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #SRCDEST=/home/sources #-- Source packages: specify a fixed directory where all src packages will be placed #SRCPKGDEST=/home/srcpackages +#-- Log Files: specify a fixed directory where all log files will be placed +#LOGDEST=/home/makepkglogs #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john(a)doe.com>" #-- Specify a key to use for package signing diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 800ab30..2bf8e95 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1362,7 +1362,7 @@ run_function() { local ret=0 if (( LOGGING )); then local fullver=$(get_full_version) - local BUILDLOG="${startdir}/${pkgbase}-${fullver}-${CARCH}-$pkgfunc.log" + local BUILDLOG="$LOGDEST/${pkgbase}-${fullver}-${CARCH}-$pkgfunc.log" if [[ -f $BUILDLOG ]]; then local i=1 while true; do @@ -2531,6 +2531,7 @@ trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' E [[ -n ${PKGDEST} ]] && _PKGDEST=$(canonicalize_path ${PKGDEST}) [[ -n ${SRCDEST} ]] && _SRCDEST=$(canonicalize_path ${SRCDEST}) [[ -n ${SRCPKGDEST} ]] && _SRCPKGDEST=$(canonicalize_path ${SRCPKGDEST}) +[[ -n ${LOGDEST} ]] && _LOGDEST=$(canonicalize_path ${LOGDEST}) [[ -n ${BUILDDIR} ]] && _BUILDDIR=$(canonicalize_path ${BUILDDIR}) [[ -n ${PKGEXT} ]] && _PKGEXT=${PKGEXT} [[ -n ${SRCEXT} ]] && _SRCEXT=${SRCEXT} @@ -2623,6 +2624,14 @@ if (( SOURCEONLY )) && [[ ! -w $SRCPKGDEST ]]; then exit 1 fi +LOGDEST=${_LOGDEST:-$LOGDEST} +LOGDEST=${LOGDEST:-$startdir} #default to $startdir if undefined +if (( LOGGING )) && [[ ! -w $LOGDEST ]]; then + error "$(gettext "You do not have write permission to store logs in %s.")" "$LOGDEST" + plain "$(gettext "Aborting...")" + exit 1 +fi + PKGEXT=${_PKGEXT:-$PKGEXT} SRCEXT=${_SRCEXT:-$SRCEXT} GPGKEY=${_GPGKEY:-$GPGKEY} -- 1.8.0.1

2 1

[pacman-dev] [PATCH 1/2] Add pactests for not detecting directory conflicts with upgrades
by Allan McRae 11 Dec '12

11 Dec '12

From: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/fileconflict020.py | 20 ++++++++++++++++++++ test/pacman/tests/fileconflict021.py | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 test/pacman/tests/fileconflict020.py create mode 100644 test/pacman/tests/fileconflict021.py diff --git a/test/pacman/tests/fileconflict020.py b/test/pacman/tests/fileconflict020.py new file mode 100644 index 0000000..306aca2 --- /dev/null +++ b/test/pacman/tests/fileconflict020.py @@ -0,0 +1,20 @@ +self.description = "upgrade introduces new directory that conflicts with a package file" + +lp1 = pmpkg("pkg1") +lp1.files = ["usr/bin/foo"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) + +p = pmpkg("pkg2", "1.0-2") +p.files = ["usr/bin/foo/"] +self.addpkg2db("sync", p) + +self.args = "-S pkg2" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=pkg2|1.0-1") +self.addrule("!DIR_EXIST=usr/bin/foo/") + +self.expectfailure = True diff --git a/test/pacman/tests/fileconflict021.py b/test/pacman/tests/fileconflict021.py new file mode 100644 index 0000000..ccb70f2 --- /dev/null +++ b/test/pacman/tests/fileconflict021.py @@ -0,0 +1,18 @@ +self.description = "upgrade package overwriting existing unowned file with directory" + +lp1 = pmpkg("pkg1") +self.addpkg2db("local", lp1) + +self.filesystem = ["file"] + +p = pmpkg("pkg1", "1.0-2") +p.files = ["file/"] +self.addpkg2db("sync", p) + +self.args = "-S pkg1" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=pkg1|1.0-1") +self.addrule("!DIR_EXIST=file/") + +self.expectfailure = True -- 1.8.0.1

2 2

[pacman-dev] [PATCH] Print package name before changelog entry with -Qc
by Simon Gomizelj 11 Dec '12

11 Dec '12

Fixes FS#32362 Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- src/pacman/package.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/package.c b/src/pacman/package.c index 77d58e1..f3e7e96 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -315,6 +315,7 @@ void dump_pkg_changelog(alpm_pkg_t *pkg) alpm_pkg_get_name(pkg)); return; } else { + fprintf(stdout, _("Changelog for %s:\n"), alpm_pkg_get_name(pkg)); /* allocate a buffer to get the changelog back in chunks */ char buf[CLBUF_SIZE]; size_t ret = 0; -- 1.8.0.1

1 0

[pacman-dev] [PATCH] It turns out we do care about directories...
by Allan McRae 06 Dec '12

06 Dec '12

This is a bug that has been around for over a year now. On a package upgrade (either by -S or -U) a new directory could overwrite any file. This is caused by the filelist difference calculation ignoring all directories and thus no new directories were checked for conflicting files on the filesystem. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I saw the comment was added to that code in 2011, but I think this issue has been around for a very long time before that. Please look at the patch and give it an ack somewhat urgently. I intend to backport to the Arch Linux pacman package. lib/libalpm/filelist.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index bf7645b..f8a5258 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -228,23 +228,17 @@ alpm_list_t *_alpm_filelist_difference(alpm_filelist_t *filesA, alpm_file_t *fileA = filesA->files + ctrA; const char *strA = filesA->resolved_path[ctrA]; const char *strB = filesB->resolved_path[ctrB]; - /* skip directories, we don't care about them */ - if(strA[strlen(strA)-1] == '/') { + + int cmp = strcmp(strA, strB); + if(cmp < 0) { + /* item only in filesA, qualifies as a difference */ + ret = alpm_list_add(ret, fileA); ctrA++; - } else if(strB[strlen(strB)-1] == '/') { + } else if(cmp > 0) { ctrB++; } else { - int cmp = strcmp(strA, strB); - if(cmp < 0) { - /* item only in filesA, qualifies as a difference */ - ret = alpm_list_add(ret, fileA); - ctrA++; - } else if(cmp > 0) { - ctrB++; - } else { - ctrA++; - ctrB++; - } + ctrA++; + ctrB++; } } -- 1.8.0.1

1 1

[pacman-dev] [PATCHv2] fix zsh stacked commpletion
by Daniel Wallace 01 Dec '12

01 Dec '12

Now it doesn't do pacman -Sy<tab> pacman -y Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> --- This should be formatted a bit better. Without all the whitespace issues fartherdown in the file contrib/zsh_completion.in | 143 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 116 insertions(+), 27 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 84ee93c..fbd7af5 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -117,11 +117,10 @@ _pacman_action_query() { local context state line typeset -A opt_args -# _arguments -s : \ -# "$_pacman_opts_common[@]" \ -# "$_pacman_opts_query_actions[@]" \ -# "$_pacman_opts_query_modifiers[@]" - + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_actions[@]" \ + "$_pacman_opts_query_modifiers[@]" case $state in query_file) _arguments -s : \ @@ -143,6 +142,7 @@ _pacman_action_query() { ;; query_search) _arguments -s : \ + "$_pacman_opts_query_actions[@]" \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ '*:search text: ' @@ -169,10 +169,10 @@ _pacman_action_sync() { local context state line typeset -A opt_args -# _arguments -s : \ -# "$_pacman_opts_common[@]" \ -# "$_pacman_opts_sync_actions[@]" #\ -# #"$_pacman_opts_sync_modifiers[@]" + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_actions[@]" \ + "$_pacman_opts_sync_modifiers[@]" case $state in sync_clean) @@ -285,52 +285,139 @@ _pacman_get_command() { done } -# main dispatcher -_pacman_zsh_comp() { - case $words[2] in - -Q*g*) # ipkg groups +_sync_shortopts=( + '-S[sync command]' + '-b[set an alternate database location]:files:_files -/' + '*-c[remove old packages from cache directory (-cc for all)]' + '-d[skip dependency version checks (-dd to skip all checks)]' + '-g[view all members of a package group]' + '*-i[view package information]' + '-l[view a list of packages in a repo]:package repo:_pacman_completions_repositories' + '-p[print the targets instead of performing the operation]' + '-q[show less information for query and search]' + '-r[set an alternate installation root]:files:_files -/' + '-s[search remote repositories for matching strings]:regex:' + '-u[upgrade installed packages (-uu allows downgrade)]' + '-v[be verbose]' + '-w[download packages but do not install/upgrade anything]' + '*-y[download fresh package databases from the server]' +) + +_query_shortopts=( + '-Q[query command]' + '-b[an alternate database location]:files:_files -/' + '-c[view the changelog of a package]' + '-d[list packages installed as dependencies]' + '-e[list packages explicitly installed]' + '-g[view all members of a package group]:groups:_pacman_completions_installed_groups' + '*-i[view package information (-ii for backup files)]' + '-k[check that the files owned by the package(s) are present]' + '-l[list the contents of the queried package]' + '-m[list installed packages not found in sync db(s)]' + '-n[list installed packages only found in sync db(s)]' + '-o[query the package that own <file>]:package file:_files' + '-p[query a package file instead of the database]:package file:_files -g "*.pkg.tar*"' + '-q[show less information for query and search]' + '-r[set an alternate installation root]:directories:_files -/' + '-s[search locally-installed packages for matching strings]:regex:' + '-t[list packages not required by any package]' + '-u[list outdated packages]' + '-v[be verbose]' + ) + + +_pacman_maincomp(){ + case $1 in + -Q*g) # ipkg groups _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ '*:groups:_pacman_completions_installed_groups' ;; - -Q*o*) # file + -Q*o) # file _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ '*:package file:_files' ;; - -Q*p*) # file *.pkg.tar* + -Q*p) # file *.pkg.tar* _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ '*:package file:_files -g "*.pkg.tar*"' ;; - -Q*) _pacman_action_query ;; - -R*) _pacman_action_remove ;; + -Q*b|-Q*r) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '2:directories:_files -/' \ + '*:query:_pacman_action_query' + ;; + -Q*s) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '2:regex:' + ;; + -Q*) + _pacman_action_query ;; + -R*) + _pacman_action_remove ;; -S*c*) # no completion return 0 ;; - -S*l*) # repos + -S*l) # repos _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_sync_modifiers[@]" \ - '*:package repo:_pacman_completions_repositories' \ + '*:package repo:_pacman_completions_repositories' ;; - -S*g*) # pkg groups + -S*g) # pkg groups _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_sync_modifiers[@]" \ '*:package group:_pacman_completions_all_groups' - ;; - -S*) _pacman_action_sync ;; - -U*) _pacman_action_upgrade ;; - -V*) _pacman_action_version ;; - -h*) _pacman_action_help ;; - - ) _pacman_action_none ;; - * ) return 1 ;; + ;; + -S*b|-S*r) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '2:directories:_files -/' \ + '*:sync:_pacman_action_sync' + ;; + -S*s) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '2:regex:' + ;; + -S*) + _pacman_action_sync ;; + -U*) + _pacman_action_upgrade ;; + -V*) + _pacman_action_version ;; + -h*) + _pacman_action_help ;; + - ) + _pacman_action_none ;; + * ) + return 1 ;; esac } +_pacman_zsh_comp() { + varcur="${(M)#words:#-*}" + if (( varcur == 1 )) && (( CURRENT < 3 )); then + case ${(M)words:#-*} in + -S*) _arguments -w "$_sync_shortopts[@]" ;; + -Q*) _arguments -w "$_query_shortopts[@]" ;; + esac + else + if _pacman_maincomp ${${(M)words:#-*}[-1]} ; then + _pacman_maincomp $words[2] + fi + fi +} _key_shortopts=( '-h[show help]' \ @@ -533,3 +620,5 @@ _pacman_comp() { } _pacman_comp "$@" + +# vim: set ft=zsh ts=2 sw=2 sts=2 noet: -- 1.8.0.1

2 1

[pacman-dev] [PATCH] query.c: simplify is_foreign
by Andrew Gregory 01 Dec '12

01 Dec '12

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/query.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index b6913f0..7c4aebd 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -367,19 +367,13 @@ static int is_foreign(alpm_pkg_t *pkg) alpm_list_t *j; alpm_list_t *sync_dbs = alpm_get_syncdbs(config->handle); - int match = 0; for(j = sync_dbs; j; j = alpm_list_next(j)) { - alpm_db_t *db = j->data; - alpm_pkg_t *findpkg = alpm_db_get_pkg(db, pkgname); - if(findpkg) { - match = 1; - break; + alpm_db_t* db = j->data; + if(alpm_db_get_pkg(db, pkgname)) { + return 0; } } - if(match == 0) { - return 1; - } - return 0; + return 1; } static int is_unrequired(alpm_pkg_t *pkg) -- 1.8.0

3 3

[pacman-dev] [PATCH] Fix Bug FS#31558 and All Other Instances of the Problem
by Richard Pougnet 01 Dec '12

01 Dec '12

Provide full path names in warning messages by printing filename instead of entryname. Signed-off-by: Richard Pougnet <richard(a)pougnet.ca> --- lib/libalpm/add.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index edddc31..77fc81f 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -178,9 +178,9 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* if a file is in NoExtract then we never extract it */ if(alpm_list_find(handle->noextract, entryname, _alpm_fnmatch)) { _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract, skipping extraction\n", - entryname); + filename); alpm_logaction(handle, "note: %s is in NoExtract, skipping extraction\n", - entryname); + filename); archive_read_data_skip(archive); return 0; } @@ -217,20 +217,20 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, /* if filesystem perms are different than pkg perms, warn user */ mode_t mask = 07777; _alpm_log(handle, ALPM_LOG_WARNING, _("directory permissions differ on %s\n" - "filesystem: %o package: %o\n"), entryname, lsbuf.st_mode & mask, + "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask, entrymode & mask); alpm_logaction(handle, "warning: directory permissions differ on %s\n" - "filesystem: %o package: %o\n", entryname, lsbuf.st_mode & mask, + "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask, entrymode & mask); } _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n", - entryname); + filename); archive_read_data_skip(archive); return 0; } else { /* case 10/11: trying to overwrite dir with file/symlink, don't allow it */ _alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"), - entryname); + filename); archive_read_data_skip(archive); return 1; } @@ -239,20 +239,20 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, if(S_ISDIR(sbuf.st_mode)) { /* the symlink on FS is to a directory, so we'll use it */ _alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n", - entryname); + filename); archive_read_data_skip(archive); return 0; } else { /* this is BAD. symlink was not to a directory */ _alpm_log(handle, ALPM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"), - entryname); + filename); archive_read_data_skip(archive); return 1; } } else if(S_ISREG(lsbuf.st_mode) && S_ISDIR(entrymode)) { /* case 6: trying to overwrite file with dir */ _alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n", - entryname); + filename); } else if(S_ISREG(entrymode)) { /* case 4,7: */ /* if file is in NoUpgrade, don't touch it */ -- 1.8.0

2 1