- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] fix pacman stacked completion
by Daniel Wallace 29 Nov '12

29 Nov '12

make it so that -Sy<tab> doesn't end up as -y --- contrib/zsh_completion.in | 321 ++++++++++++++++++++++++++++------------------ 1 file changed, 194 insertions(+), 127 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 84ee93c..4d1766e 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,51 +285,116 @@ _pacman_get_command() { done } -# main dispatcher +_sync_shortopts=( + '-S[sync command]' + '+b[set an alternate database location]' + '+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]' + '-p[print the targets instead of performing the operation]' + '-q[show less information for query and search]' + '+r[set an alternate installation root]' + '+s[search remote repositories for matching strings]' + '-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]' + '-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]' + '*-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>]' + '+p[query a package file instead of the database]' + '-q[show less information for query and search]' + '+r[set an alternate installation root]' + '+s[search locally-installed packages for matching strings]' + '-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 + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:package file:_files' + ;; + -Q*p) # file *.pkg.tar* + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:package file:_files -g "*.pkg.tar*"' + ;; + -Q*b) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:package file:_files -/' + ;; + -Q*r) + _arguments '*:change root:_files -/' + ;; + -Q*s) + _message "regex"; + ;; + -Q*) _pacman_action_query ;; + -R*) _pacman_action_remove ;; + -S*c*) # no completion + return 0 + ;; + -S*l) # repos + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:package repo:_pacman_completions_repositories' \ + ;; + -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 ;; + * ) _pacman_action_sync ;; + esac +} _pacman_zsh_comp() { - case $words[2] in - -Q*g*) # ipkg groups - _arguments -s : \ - "$_pacman_opts_common[@]" \ - "$_pacman_opts_query_modifiers[@]" \ - '*:groups:_pacman_completions_installed_groups' - ;; - -Q*o*) # file - _arguments -s : \ - "$_pacman_opts_common[@]" \ - "$_pacman_opts_query_modifiers[@]" \ - '*:package file:_files' - ;; - -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 ;; - -S*c*) # no completion - return 0 - ;; - -S*l*) # repos - _arguments -s : \ - "$_pacman_opts_common[@]" \ - "$_pacman_opts_sync_modifiers[@]" \ - '*:package repo:_pacman_completions_repositories' \ - ;; - -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 ;; - esac + varcur="${(M)#words:#-*}" + if (( varcur == 1 )) && (( CURRENT < 3 )); then + case ${(M)words:#-*} in + -S*) _arguments -s -w "$_sync_shortopts[@]" ;; + -Q*) _arguments -s -w "$_query_shortopts[@]" ;; + esac + else + if _pacman_maincomp ${${(M)words:#-*}[-1]} ; then + _pacman_maincomp $words[2] + fi + fi } _key_shortopts=( @@ -373,39 +438,39 @@ _pacman_key_options=( ) _pacman_key() { - case $words[CURRENT] in - --*) - _arguments -s : \ - "$_pacman_key_options[@]" \ - "$_key_longopts[@]" - ;; - -*) - _arguments -s : \ - "$_pacman_key_options[@]" \ - "$_key_shortopts[@]" \ - "$_key_longopts[@]" - ;; - *) - i=$#; - while [[ $words[$i] != -* ]] && [[ $words[$i] != "pacman-key" ]];do - i=$(($i-1)) - done - case $i in - --*) - _arguments -s : \ - "$_pacman_key_options[@]" \ - "$_key_longopts[@]" - ;; - -*) - _arguments -s : \ - "$_pacman_key_options[@]" \ - "$_key_shortopts[@]" \ - "$_key_longopts[@]" - ;; - *) return 1;; - esac - ;; - esac + case $words[CURRENT] in + --*) + _arguments -s : \ + "$_pacman_key_options[@]" \ + "$_key_longopts[@]" + ;; + -*) + _arguments -s : \ + "$_pacman_key_options[@]" \ + "$_key_shortopts[@]" \ + "$_key_longopts[@]" + ;; + *) + i=$#; + while [[ $words[$i] != -* ]] && [[ $words[$i] != "pacman-key" ]];do + i=$(($i-1)) + done + case $i in + --*) + _arguments -s : \ + "$_pacman_key_options[@]" \ + "$_key_longopts[@]" + ;; + -*) + _arguments -s : \ + "$_pacman_key_options[@]" \ + "$_key_shortopts[@]" \ + "$_key_longopts[@]" + ;; + *) return 1;; + esac + ;; + esac } _keys() { @@ -487,49 +552,51 @@ _makepkg_longopts=( '--noprogressbar[Do not show a progress bar when downloading files]' ) _makepkg(){ - case $words[CURRENT] in - -*) - _arguments -s -w : \ - "$_makepkg_shortopts[@]" \ - "$_makepkg_longopts[@]" - ;; - --* ) - _arguments -s \ - "$_makepkg_longopts[@]" - ;; - - )_makepkg_action_none ;; - * ) - i=$# - while [[ $words[i] != -* ]] && [[ $words[$i] != "makepkg" ]];do - i=$((i-1)); - done - case $words[$i] in - -*) - _arguments -s -w : \ - "$_makepkg_shortopts[@]" \ - "$_makepkg_longopts[@]" - ;; - --* ) - _arguments -s \ - "$_makepkg_longopts[@]" - ;; - - )_makepkg_action_none ;; - * ) return 1 ;; - esac - ;; - esac + case $words[CURRENT] in + -*) + _arguments -s -w : \ + "$_makepkg_shortopts[@]" \ + "$_makepkg_longopts[@]" + ;; + --* ) + _arguments -s \ + "$_makepkg_longopts[@]" + ;; + - )_makepkg_action_none ;; + * ) + i=$# + while [[ $words[i] != -* ]] && [[ $words[$i] != "makepkg" ]];do + i=$((i-1)); + done + case $words[$i] in + -*) + _arguments -s -w : \ + "$_makepkg_shortopts[@]" \ + "$_makepkg_longopts[@]" + ;; + --* ) + _arguments -s \ + "$_makepkg_longopts[@]" + ;; + - )_makepkg_action_none ;; + * ) return 1 ;; + esac + ;; + esac } _pacman_comp() { - case "$service" in - makepkg) - _makepkg "$@";; - pacman-key) - _pacman_key "$@";; - pacman) - _pacman_zsh_comp "$@";; - *) - _message "Error";; - esac + case "$service" in + makepkg) + _makepkg "$@";; + pacman-key) + _pacman_key "$@";; + pacman) + _pacman_zsh_comp "$@";; + *) + _message "Error";; + esac } _pacman_comp "$@" + +#vim: set ft=zsh ts=4 sw=4 et -- 1.8.0.1

1 0

[pacman-dev] [PATCH] Added LOGDEST variable
by wgiokas 29 Nov '12

29 Nov '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 send to network shares as they're written or compressed/cleaned en masse. Signed-off-by: wgiokas <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 dcd9417..6c9ed0e 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 starting + directory. This can be used to send log files to a network drive or + to a program, and also facilitate the cleaning and compression of logs. + **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 1319c7a..9a67031 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 a5ac59a..2fe6605 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 @@ -2532,6 +2532,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} @@ -2624,6 +2625,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

3 2

[pacman-dev] [PATCH] pmtest: resolve path to scriptlet shell
by Dave Reisner 29 Nov '12

29 Nov '12

In order to support a variety of values for the --with-scriptlet-shell configure flag, pmtest has to be aware of what kind of path was passed, be it an absolute path or a fragment for a path lookup. For absolute paths, leave the path alone. For fragments, search the PATH environment var for the resolved path to the binary. In both cases, join the resultant path to the root directory defined for the test, not a pre-determined bin directory. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- This applies to allan's working branch. test/pacman/pmtest.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index b69275b..a644860 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -103,6 +103,17 @@ def load(self): else: raise IOError("file %s does not exist!" % self.name) + def resolve_binary(self, binary): + if binary[0] == '/': + return binary + + for path in os.environ["PATH"].split(':'): + resolved = os.path.join(path, binary) + if os.path.exists(resolved): + return resolved + + return binary + def generate(self, pacman): print "==> Generating test environment" @@ -121,13 +132,16 @@ def generate(self, pacman): etcdir = os.path.join(self.root, os.path.dirname(util.PACCONF)) bindir = os.path.join(self.root, "bin") sbindir = os.path.join(self.root, "sbin") - sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir, sbindir] + scriptlet_shell = self.resolve_binary(pacman["scriptlet-shell"]) + sys_dirs = [dbdir, cachedir, syncdir, tmpdir, logdir, etcdir, bindir, + sbindir, os.path.dirname(scriptlet_shell)] for sys_dir in sys_dirs: if not os.path.isdir(sys_dir): vprint("\t%s" % sys_dir[len(self.root)+1:]) os.makedirs(sys_dir, 0755) # Only the dynamically linked binary is needed for fakechroot - shutil.copy("/bin/sh", os.path.join(sbindir, pacman["scriptlet-shell"])) + if not os.path.samefile("/bin/sh", os.path.join(self.root, scriptlet_shell)): + shutil.copy("/bin/sh", os.path.join(self.root, scriptlet_shell)) shutil.copy(os.path.join(util.SELFPATH, "ldconfig.stub"), os.path.join(sbindir, "ldconfig")) ld_so_conf = open(os.path.join(etcdir, "ld.so.conf"), "w") -- 1.8.0

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-436-g254329f
by allan＠archlinux.org 27 Nov '12

27 Nov '12

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 254329f6fb10a1fa59a0259fa5b2930530f63aae (commit) via dbbe3e7cb4ad2ebc45d12acf4427635142165e6e (commit) via 13667fd4b132c655e300535e787ebcf9cbc29cd7 (commit) via 7e8d9dfda2e80529b58cb345d359f805149fb68d (commit) via a5e81f55993c1be170c73b78b4281845e127a6f3 (commit) via bd4ff4a377ce32e36e5b72bd60c0b3a59e194720 (commit) via a53fd796326727e3a891413762725cd4450bf986 (commit) via 6be96e7612877adb76fcf7b212765c387388597d (commit) via 6c22ef2c8287ef16f57fba08077520ad0c68dff8 (commit) via 7199fb3b1aab6ec36e56af8a3ab1949c7510c767 (commit) via a459156a4e727d0e9354ec2b9c8a9cea4304f4ee (commit) via d9e8197e60a6ffea1fd470aa746f6cc4849dac72 (commit) via 8054a254cb70229da30d758f57ff6203d2215eed (commit) via 1c0c292728c6bb5987b418c7ecbaf998a26c066d (commit) via e1fdcfb145aa45eb1115ba400587cfed5eaf5455 (commit) via c4c5b8ba1d191bcde65eb09c9ce30b18c4619a35 (commit) via 6b1deedf15d14e426e5450b759710e8782c22ab3 (commit) via 3536975bbf89214d393068195563bebb7236ab70 (commit) via 3531533c2f703693b87e074dfbe8951b9bef910f (commit) via 86233476b0eff3d9569978350a7bb5e4eff07362 (commit) via 0285c678ab65898ff1fec4170f5389921c9f872e (commit) via 3232c975c6e67a01f201cc7e341f979420cd3645 (commit) via 93148d0879c501235a51c0f9f5f7e457c6efd445 (commit) via fbf96203ab4eeb41953022b1dd3f6835fdbf0b6d (commit) via fc35b16fd48fd4c6b89826ebe268425600e76f34 (commit) via b1d614a01db7a89543d96747afde009ec3b6545d (commit) via b25dda737b0b6f64f90b611ef909d065f4d3eee5 (commit) via fe8bd95092f9c641f59b0ec5427140d324acc93d (commit) via ded25aeb98caf32c32e7cae8c2fc3a1d23cf111e (commit) via 40d68949100d534e4dea766c7f8f60ed36aa4429 (commit) via 768c8ba100f1bdef9bb99f8ca619d23f055877ce (commit) via 977489d9ab7d1d70ec95f14a2dcad0bac2e96242 (commit) via 1d0ab50c050bbb52968b55293fd12c22e4fe1482 (commit) via b57ada336bae086a3e4c8acfc3f2fe02deeff037 (commit) from 2abe1f16461133c0dc386f8ecb8b06865c22940b (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 254329f6fb10a1fa59a0259fa5b2930530f63aae Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 29 16:54:19 2012 +1000 makepkg: install debug symbol packages if requested When using "makepkg -i", install the debugging symbol packages too if present. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit dbbe3e7cb4ad2ebc45d12acf4427635142165e6e Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 29 16:44:36 2012 +1000 makepkg: assign debugging symbol directory to a variable Simplifies the stripping of files a lot. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 13667fd4b132c655e300535e787ebcf9cbc29cd7 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Sep 29 16:17:12 2012 +1000 makepkg: allow debug package suffix to be configurable Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7e8d9dfda2e80529b58cb345d359f805149fb68d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 24 00:30:46 2012 +1000 makepkg: create package from stripped debug symbols Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a5e81f55993c1be170c73b78b4281845e127a6f3 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 24 00:06:36 2012 +1000 makepkg: output the name of the package being created Although it should be currently quite obvious what package is being created when "Creating package..." is printed, it will not be in the future when a debug package is potentially created too. Also, given $pkgname is always correctly set when split packaging now, we no longer need to pass that around. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bd4ff4a377ce32e36e5b72bd60c0b3a59e194720 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 23 23:23:26 2012 +1000 makepkg: strip debugging symbols into separate folder When using the "debug" option in combination with "strip", move the debugging symbols into a separate directory ($pkgdir-debug/usr/lib/debug) suitable for creating a package from. Create hardlinks between debugging symbols of hardlinked files and add symlinks in the .build_id directory if the binary has a build ID. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a53fd796326727e3a891413762725cd4450bf986 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 23 22:02:29 2012 +1000 makepkg: always use pkg/$pkgname as $pkgdir Unify split and single packages to always use a folder within pkg/ as thier $pkgdir. This will allow a folder for storing a package with stripped debug symbols to be added within pkg/ too. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6be96e7612877adb76fcf7b212765c387388597d Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 23 21:28:03 2012 +1000 makepkg: move debug symbol stripping to separate function Move stripping of files to a spearate function that will be expanded for the handling of creating debug symbol packages. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6c22ef2c8287ef16f57fba08077520ad0c68dff8 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 23 17:06:34 2012 +1000 makepkg: add option to include debugging compiler flags Add a "debug" option that appends the compiler flags specified in the variables DEBUG_CFLAGS and DEBUG_CXXFLAGS in makepkg.conf to their counterpart buildflags. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7199fb3b1aab6ec36e56af8a3ab1949c7510c767 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Sep 23 21:52:40 2012 +1000 makepkg: always run tidy_install on repackaging When using "makepkg -R" without a packge function, we should still run tidy_install as the user might have added other packaging options such as (e.g.) '!emptydir' to remove empty directories on repackaging. Of course we can not revert some options when repackaging without a package function. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a459156a4e727d0e9354ec2b9c8a9cea4304f4ee Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Oct 26 14:22:48 2012 -0400 pactree: unindent first limb Removing the leader for the toplevel package shifted the name left but not it's limb. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d9e8197e60a6ffea1fd470aa746f6cc4849dac72 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 15 15:38:46 2012 -0400 pactree: unify output between utf8 and ascii Ensure that both output formats have equal spacing, and therefore an equivalent layout. This change also removes the styling from the toplevel package being searched for. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8054a254cb70229da30d758f57ff6203d2215eed Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 15 15:27:42 2012 -0400 pactree: fix style violations Stick to c89 and avoid mixed code and declarations, and always brace block statements, even if they're only 1 line. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1c0c292728c6bb5987b418c7ecbaf998a26c066d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 15 15:06:14 2012 -0400 pactree: autodetect and use unicode line drawing characters Add a compile time check for langinfo.h so that we can possibly use unicode line drawing characters if the current locale is supportive of them. This can be explicitly disabled at runtime with the use of a new switch: -a, --ascii. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e1fdcfb145aa45eb1115ba400587cfed5eaf5455 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 15 14:29:08 2012 -0400 pactree: style last branch node differently Also removes the less helpful provides-specific branch tip. Old: New: |--pkg |--pkg +--dep1 provides dep5 |--dep1 provides dep5 | |--dep2 | `--dep2 |--dep3 `--dep3 |--dep4 `--dep4 [dreisner(a)archlinux.org: switch original suggestion of \-- to `--] Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c4c5b8ba1d191bcde65eb09c9ce30b18c4619a35 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Oct 15 14:29:07 2012 -0400 pactree: fix --sync getopt value The long --sync options has apparently never worked. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6b1deedf15d14e426e5450b759710e8782c22ab3 Author: wgiokas <1007380(a)gmail.com> Date: Mon Nov 19 18:51:06 2012 -0600 Add --needed option to makepkg Simply add the option to pass the --needed flag to pacman when using -i with makepkg. When using makepkg in scripts, particularly for git packages with the new version functions and not just a date, this can save disk io and time instead of reinstalling. This would mostly be useful with the --noconfirm option. Signed-off-by: wgiokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3536975bbf89214d393068195563bebb7236ab70 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Mon Nov 19 19:13:10 2012 -0500 Use sentence case in makepkg Most of makepkg already uses sentence case. This cleans up the last few stragglers. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3531533c2f703693b87e074dfbe8951b9bef910f Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 13 13:04:21 2012 +1000 makepkg: save path to PACMAN and test availability After we install dependencies, we source /etc/profile so that new elements get added to the path. As this can override any local setting of PATH, we store the full path of the PACMAN variable passed to makepkg. Also, add a check for PACMAN availability if it is needed to deal with any dependency operations. Reported-by: Martin Panter <vadmium à gmail·com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 86233476b0eff3d9569978350a7bb5e4eff07362 Author: Martin Panter <vadmium à gmail·com> Date: Wed Oct 31 03:05:42 2012 +0000 Remove last traces of handling command arguments in $PACMAN This resolves an inconsistency with how the $PACMAN variable was interpreted. Previously “makepkg” would extract the first word from the $PACMAN variable and check that it existed as a command. This appears to have been happening ever since the variable was implemented in revision 66c6d28 (makepkg: allow to specify an alternative pacman command). Thus it looks like command arguments were originally allowed in the variable. However the run_pacman() function now quotes $PACMAN, so the whole variable has to be just the command name. This quoting was introduced more recently, perhaps in revision 622326b (makepkg: fix sudo/su calling of pacman). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0285c678ab65898ff1fec4170f5389921c9f872e Author: Christian Hesse <list(a)eworm.de> Date: Sat Nov 3 15:43:44 2012 +1000 makepkg: fix signing built package Fixes issue introduced in 9dd42dc0 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3232c975c6e67a01f201cc7e341f979420cd3645 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 24 14:34:13 2012 +1000 makepkg: deprecate PKGBUILDs without a package() function The package() function has been around since pacman-3.3 and has significant advantages including limited fakeroot usage and correct repackaging. The ability to use PKGBUILDs without a package function will be removed in a future release. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 93148d0879c501235a51c0f9f5f7e457c6efd445 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Sep 20 22:00:47 2012 +1000 makepkg: print "SKIP" for signature checksums There are valid reasons for a source files PGP signature to be changed (expired key, expired signature, additional person signing...). Thus providing a checksum for signature files can potentially cause a PKGBUILD to require unnecessary updating. Avoid this issue by using "SKIP" for the signature checksum. Fixes FS#31590. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fbf96203ab4eeb41953022b1dd3f6835fdbf0b6d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Sep 17 17:02:17 2012 +1000 makepkg: use last match in BUILDENV/OPTIONS array Using the last match in the BUILDENV and OPTIONS arrays allows the user to easily override these values without specifying the entire array. For example add "BUILDENV+=(sign)" in ~/.makepkg.conf. Fixes FS#26701. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fc35b16fd48fd4c6b89826ebe268425600e76f34 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Fri Nov 16 01:26:44 2012 -0500 pacman: add -n/--native filter to -Q Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b1d614a01db7a89543d96747afde009ec3b6545d Author: Allan McRae <allan(a)archlinux.org> Date: Wed Nov 14 10:35:38 2012 +1000 doc: PKGBUILD.5 - fix output of bzr command Add quotes around 'bzr help revisionspec' to make it clearer that this is a command to be run. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b25dda737b0b6f64f90b611ef909d065f4d3eee5 Author: Paul Barbu Gheorghe <barbu.paul.gheorghe(a)gmail.com> Date: Mon Jul 30 19:57:43 2012 +0000 fixed erroneous memory access to newurl in alpm_db_remove_server Signed-off-by: Barbu Paul - Gheorghe <barbu.paul.gheorghe(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fe8bd95092f9c641f59b0ec5427140d324acc93d Author: Allan McRae <allan(a)archlinux.org> Date: Tue Sep 25 13:59:30 2012 +1000 repo-add: quote filename for consistent output style Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ded25aeb98caf32c32e7cae8c2fc3a1d23cf111e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Sep 19 10:48:47 2012 -0400 etc/Makefile: simplify build rule for conf files This lets us define the build rule and the dependency all at once, and additionally removes the need for an intermediate temp file. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 40d68949100d534e4dea766c7f8f60ed36aa4429 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 18 23:38:21 2012 -0400 buildsys: eschew use of DEFS, prefer AM_CPPFLAGS This is redundant, and any usage of -D should belong to CPPFLAGS. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 768c8ba100f1bdef9bb99f8ca619d23f055877ce Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 18 23:33:06 2012 -0400 configure.ac: cleanup duplication in --enable-git-version Avoid adding our own messaging, as autoconf will add this for us with the result of the AC_CHECK_FILE test. Reuse the cache variable from autoconf to set our local variable. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 977489d9ab7d1d70ec95f14a2dcad0bac2e96242 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Sep 19 16:04:24 2012 +1000 m4/po.m4: Remove use of deprecated macro Switch from AM_PROG_MKDIR_P to AC_PROG_MKDIR_P to avoid automake warning. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1d0ab50c050bbb52968b55293fd12c22e4fe1482 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 18 21:34:07 2012 -0500 Fix thinko in configure.ac CFLAGS empty checking Since commit d2669b47, CFLAGS specified on the command line haven't been respected at all, resulting in no optimization being applied to builds. This exposed one warning flag issue in some new code, which is also fixed here. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b57ada336bae086a3e4c8acfc3f2fe02deeff037 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Sep 18 21:34:06 2012 -0500 Fix typo in acinclude.m4 fs_old_*flags Introduced in commit d2669b47. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 21 +++--- doc/PKGBUILD.5.txt | 7 +- doc/makepkg.8.txt | 4 ++ doc/makepkg.conf.5.txt | 19 ++++- doc/pacman.8.txt | 4 ++ doc/pactree.8.txt | 4 ++ etc/Makefile.am | 17 ++--- etc/makepkg.conf.in | 8 ++- lib/libalpm/Makefile.am | 5 +- lib/libalpm/db.c | 9 ++- m4/acinclude.m4 | 6 +- m4/po.m4 | 2 +- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 188 +++++++++++++++++++++++++++++++++++++----------- scripts/repo-add.sh.in | 2 +- src/pacman/Makefile.am | 18 +++-- src/pacman/conf.h | 1 + src/pacman/pacman.c | 3 + src/pacman/query.c | 6 +- src/util/Makefile.am | 14 ++-- src/util/pactree.c | 100 ++++++++++++++++++-------- 21 files changed, 314 insertions(+), 125 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] pkgdelta: avoid use of eval and IFS manipulation
by Dave Reisner 25 Nov '12

25 Nov '12

Instead of blindly consuming data from the .PKGINFO file, parse it more closely and only declare variables as needed. Should help to avoid nonsensical errors and possibly dangerous command execution as seen in FS#32852. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/pkgdelta.sh.in | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 08835ac..f9b40c9 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -72,23 +72,19 @@ isnumeric() { [[ $1 != *[!0-9]* ]] } -read_pkginfo() -{ - pkgname= pkgver= arch= - local OLDIFS=$IFS - # IFS (field separator) is only the newline character - IFS=" -" - local line var val - for line in $(bsdtar -xOqf "$1" .PKGINFO 2>/dev/null | - grep -v "^#" | sed 's|$\w*$\s*=\s*$.*$|\1="\2"|'); do - eval "$line" - if [[ -n $pkgname && -n $pkgver && -n $arch ]]; then - IFS=$OLDIFS - return 0 - fi +read_pkginfo() { + while IFS='=' read -r field value; do + # skip comments and invalid lines + [[ $field = '#'* || -z $value ]] && continue + + # skip lines which aren't fields we care about + [[ $field != @(pkgver|pkgname|arch) ]] || continue + + declare "$field=$value" + + [[ $pkgname && $pkgver && $arch ]] && return 0 done - IFS=$OLDIFS + error "$(gettext "Invalid package file '%s'.")" "$1" return 1 } -- 1.8.0

1 1

[pacman-dev] [PATCH] Plug various minor memory leaks
by Andrew Gregory 24 Nov '12

24 Nov '12

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/be_local.c | 1 + lib/libalpm/dload.c | 1 + lib/libalpm/sync.c | 2 +- src/pacman/pacman.c | 5 +++-- src/pacman/util.c | 2 ++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 5a37463..8f82374 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1018,6 +1018,7 @@ int _alpm_local_db_remove(alpm_db_t *db, alpm_pkg_t *info) dirp = opendir(pkgpath); if(!dirp) { + free(pkgpath); return -1; } /* go through the local DB entry, removing the files within, which we know diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 6aaff1d..3e1659e 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -358,6 +358,7 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat CLOSE(fd); _alpm_log(payload->handle, ALPM_LOG_ERROR, _("failed to create temporary file for download\n")); + free(randpath); return NULL; } /* fp now points to our alpmtmp.XXXXXX */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index ff1efcc..d99020a 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -709,7 +709,7 @@ static int apply_deltas(alpm_handle_t *handle) snprintf(from, len, "%s/%s", cachedir, d->from); } len = strlen(cachedir) + strlen(d->to) + 2; - MALLOC(to, len, RET_ERR(handle, ALPM_ERR_MEMORY, 1)); + MALLOC(to, len, free(from); RET_ERR(handle, ALPM_ERR_MEMORY, 1)); snprintf(to, len, "%s/%s", cachedir, d->to); /* build the patch command */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index b529265..e86b5c7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -811,10 +811,11 @@ int main(int argc, char *argv[]) /* we support reading targets from stdin if a cmdline parameter is '-' */ if(!isatty(fileno(stdin)) && alpm_list_find_str(pm_targets, "-")) { size_t current_size = PATH_MAX; - char *line = malloc(current_size); + char *vdata, *line = malloc(current_size); /* remove the '-' from the list */ - pm_targets = alpm_list_remove_str(pm_targets, "-", NULL); + pm_targets = alpm_list_remove_str(pm_targets, "-", &vdata); + free(vdata); i = 0; while((line[i] = (char)fgetc(stdin)) != EOF) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 2bd9d99..e8060cd 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -510,6 +510,8 @@ static size_t table_calc_widths(const alpm_list_t *header, colwidths = malloc(totalcols * sizeof(size_t)); coldata = calloc(totalcols, sizeof(int)); if(!colwidths || !coldata) { + free(colwidths); + free(coldata); return 0; } /* header determines column count and initial values of longest_strs */ -- 1.8.0

1 0

[pacman-dev] [PATCH] Resubmit: Use sentence case in makepkg
by Jason St. John 22 Nov '12

22 Nov '12

From: "Jason St. John" <jstjohn(a)purdue.edu> Most of makepkg already uses sentence case. This cleans up the last few stragglers. This commit implements feedback from the ML for the first submission. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- scripts/makepkg.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d387b7d..51b97fd 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -645,7 +645,7 @@ download_svn() { } download_sources() { - msg "$(gettext "Retrieving Sources...")" + msg "$(gettext "Retrieving sources...")" local GET_VCS=1 if [[ $1 == "fast" ]]; then @@ -951,7 +951,7 @@ resolve_deps() { [[ -z $deplist ]] && return $R_DEPS_SATISFIED fi - msg "$(gettext "Missing Dependencies:")" + msg "$(gettext "Missing dependencies:")" local dep for dep in $deplist; do msg2 "$dep" @@ -1214,7 +1214,7 @@ check_source_integrity() { } extract_sources() { - msg "$(gettext "Extracting Sources...")" + msg "$(gettext "Extracting sources...")" local netfile for netfile in "${source[@]}"; do local file=$(get_filename "$netfile") @@ -1612,7 +1612,7 @@ find_libprovides() { esac if (( missing )); then - warning "$(gettext "Can not find library listed in %s: %s")" "'provides'" "$p" + warning "$(gettext "Cannot find library listed in %s: %s")" "'provides'" "$p" fi done -- 1.8.0

2 1

[pacman-dev] [PATCH] pacman: add -n/--native filter to -Q
by Simon Gomizelj 21 Nov '12

21 Nov '12

Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- doc/pacman.8.txt | 4 ++++ src/pacman/conf.h | 1 + src/pacman/pacman.c | 3 +++ src/pacman/query.c | 4 ++++ 4 files changed, 12 insertions(+) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 24c2243..de28b9c 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -273,6 +273,10 @@ Query Options[[QO]] database(s). Typically these are packages that were downloaded manually and installed with '\--upgrade'. +*-n, \--native*:: + Restrict or filter output to packages that are found in the sync + database(s). This is the inverse filter of '\--foreign'. + *-o, \--owns* <file>:: Search for packages that own the specified file(s). The path can be relative or absolute and one or more files can be specified. diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 69c955e..aee6859 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -51,6 +51,7 @@ typedef struct __config_t { unsigned short op_q_info; unsigned short op_q_list; unsigned short op_q_foreign; + unsigned short op_q_native; unsigned short op_q_unrequired; unsigned short op_q_deps; unsigned short op_q_explicit; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 478196e..1ca746d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -142,6 +142,7 @@ static void usage(int op, const char * const myname) addlist(_(" -k, --check check that the files owned by the package(s) are present\n")); addlist(_(" -l, --list list the contents of the queried package\n")); addlist(_(" -m, --foreign list installed packages not found in sync db(s) [filter]\n")); + addlist(_(" -n, --native list installed packages only found in sync db(s) [filter]\n")); addlist(_(" -o, --owns <file> query the package that owns <file>\n")); addlist(_(" -p, --file <package> query a package file instead of the database\n")); addlist(_(" -q, --quiet show less information for query and search\n")); @@ -462,6 +463,7 @@ static int parsearg_query(int opt) case 'k': config->op_q_check = 1; break; case 'l': config->op_q_list = 1; break; case 'm': config->op_q_foreign = 1; break; + case 'n': config->op_q_native = 1; break; case 'o': config->op_q_owns = 1; break; case 'p': config->op_q_isfile = 1; break; case 'q': config->quiet = 1; break; @@ -594,6 +596,7 @@ static int parseargs(int argc, char *argv[]) {"check", no_argument, 0, 'k'}, {"list", no_argument, 0, 'l'}, {"foreign", no_argument, 0, 'm'}, + {"native", no_argument, 0, 'n'}, {"nosave", no_argument, 0, 'n'}, {"owns", no_argument, 0, 'o'}, {"file", no_argument, 0, 'p'}, diff --git a/src/pacman/query.c b/src/pacman/query.c index fc2c90c..059a078 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -380,6 +380,10 @@ static int filter(alpm_pkg_t *pkg) alpm_pkg_get_reason(pkg) != ALPM_PKG_REASON_DEPEND) { return 0; } + /* check if this pkg is in a sync DB */ + if(config->op_q_native && is_foreign(pkg)) { + return 0; + } /* check if this pkg isn't in a sync DB */ if(config->op_q_foreign && !is_foreign(pkg)) { return 0; -- 1.8.0

2 1