- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Update source URL
by Allan McRae 27 Mar '15

27 Mar '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/index.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.txt b/doc/index.txt index d4d8ebf..170717e 100644 --- a/doc/index.txt +++ b/doc/index.txt @@ -174,7 +174,7 @@ Releases |====== Source code for all releases is available at -link:ftp://ftp.archlinux.org/other/pacman/[]. To install, download the newest +link:https://sources.archlinux.org/other/pacman/[]. To install, download the newest available source tarball, unpack it in a directory, and run the three magic commands: -- 2.3.4

1 0

[pacman-dev] [PATCH 3/3] makepkg: Empty/create only $pkgdir's relevant to current PKGBUILD (unless CLEANUP is set)
by David Macek 26 Mar '15

26 Mar '15

--- scripts/makepkg.sh.in | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6ca678e..af8a606 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2822,6 +2822,11 @@ run_split_packaging() { local pkgname_backup=${pkgname[@]} for pkgname in ${pkgname_backup[@]}; do pkgdir="$pkgdirbase/$pkgname" + # clean existing pkg directory + if [[ -d $pkgdir ]]; then + msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" + rm -rf "$pkgdir" + fi mkdir "$pkgdir" backup_package_variables run_package $pkgname @@ -3276,6 +3281,11 @@ if (( INFAKEROOT )); then chmod 755 "$pkgdirbase" if (( ! SPLITPKG )); then pkgdir="$pkgdirbase/$pkgname" + # clean existing pkg directory + if [[ -d $pkgdir ]]; then + msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" + rm -rf "$pkgdir" + fi mkdir "$pkgdir" if (( PKGFUNC )); then run_package @@ -3396,11 +3406,6 @@ else cd_safe "$startdir" fi - # clean existing pkg directory - if [[ -d $pkgdirbase ]]; then - msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" - rm -rf "$pkgdirbase" - fi mkdir -p "$pkgdirbase" chmod a-srwx "$pkgdirbase" -- 1.9.4.msysgit.2 -- David Macek

3 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-134-ge374e68
by allan＠archlinux.org 26 Mar '15

26 Mar '15

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 e374e6829cea3512f0b4a4069c5a6168f0f8d8a0 (commit) via 721b785e73333bdbd1b4ba3b0505cc14918064ad (commit) via edeafcc988012615dbbb1cc9ac02090ad2dd8dac (commit) via bf3aec8c327528521b06befc8e9b6f55dd4fa07c (commit) via b520c6312ff0ffec864576b5218f1638fae1e18b (commit) via 2408d46c1b23da029c75e2937d71de53fa5e0338 (commit) via eb5da52c0e720191266bb5333e6dc1fc4e60b86f (commit) via b630f455d2cb3a4c11b2de65285657ea7ec6f3c3 (commit) via cb0f2bd0385f447e045e2b2aab9ffa55df3c2d8a (commit) via 30c9dbcdeb82ddecf20bddd24faed64a73ff502a (commit) via 6aef45ee1aaf27dba21265fbdd65139061a91123 (commit) via 81d233b79345d05d5bf17a4b2844085e14f9ee36 (commit) via d2cb52de12d3b2f313d80156f474b1d731ad67cf (commit) via f3fc9af2b74d4d1da9718a703c4fbd5d5a13fd59 (commit) via e7e0c137623253c6f1bad0c89e36586713eee526 (commit) via b543c055b9607161e6bd47b9d3709243057c8771 (commit) via b8f2d713e00c453efab035f467d63508897f08ea (commit) via eb21e9eb93a0e479e846ee5e415c9fdf7d74797b (commit) from f34e48a9886150147da4864230b6804d6f6ccc58 (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 e374e6829cea3512f0b4a4069c5a6168f0f8d8a0 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Mar 25 05:54:26 2015 -0400 close stdin before running install scripts libalpm does not guarantee that script output will be presented to the user or that stdin will be connected to a terminal. Close stdin so that scripts do not attempt to use it for user interaction. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 721b785e73333bdbd1b4ba3b0505cc14918064ad Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Mar 25 05:53:07 2015 -0400 be_package: fallback to standard filelist loading In order to work properly, loading the filelist from an mtree file requires a libarchive patch that has not yet been included in an official release.[1] Under certain circumstances, an unpatched libarchive may refuse to read the mtree file due to inconsistencies between it and the user's file system. In order to allow alpm to recover in this situation, read the mtree data into a temporary filelist that is only copied over to the package if the entire read is successful. [1] https://github.com/libarchive/libarchive/commit/661684170b970ef7d6eff135b57… Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit edeafcc988012615dbbb1cc9ac02090ad2dd8dac Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Wed Mar 25 05:53:06 2015 -0400 add_entry_to_files_list: pass filelist directly Allows entries to be added to arbitrary filelists not connected to a package. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bf3aec8c327528521b06befc8e9b6f55dd4fa07c Author: Ivy Foster <joyfulgirl(a)archlinux.us> Date: Fri Mar 20 19:19:57 2015 -0500 Add makepkg option --packagelist makepkg --packagelist prints the name of each package that would normally be produced, minus $PKGEXT, and exits. Implements FS#42150 Signed-off-by: Ivy Foster <joyfulgirl(a)archlinux.us> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b520c6312ff0ffec864576b5218f1638fae1e18b Author: Allan McRae <allan(a)archlinux.org> Date: Thu Mar 19 15:25:53 2015 +1000 repo-add: merge desc and depends files There is little point in these two files being separated as the whole sync db is parsed at once. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2408d46c1b23da029c75e2937d71de53fa5e0338 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Mar 19 14:23:28 2015 +1000 makepkg: write validpgpkeys to .SRCINFO Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eb5da52c0e720191266bb5333e6dc1fc4e60b86f Author: Allan McRae <allan(a)archlinux.org> Date: Thu Mar 19 14:16:28 2015 +1000 PKGBUILD.5: have epoch directly following pkgver/pkgrel These three fields should be grouped together. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b630f455d2cb3a4c11b2de65285657ea7ec6f3c3 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Jan 27 21:58:52 2015 +1000 update repo-add documentation for removal of -f flag Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cb0f2bd0385f447e045e2b2aab9ffa55df3c2d8a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 15 18:31:29 2015 +1000 Always create files database Both the "db" and "files" databases are created in one call to repo-add. Only the "foo.db.tar.xz" name is passed to repo-add. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 30c9dbcdeb82ddecf20bddd24faed64a73ff502a Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 15 17:49:40 2015 +1000 repo-add: remove duplication finding old package details The information needed to create a delta entry and remove the old package from the filesystem are the same. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6aef45ee1aaf27dba21265fbdd65139061a91123 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 15 16:40:11 2015 +1000 repo-add: check early for xdelta if it is needed The check for xdelta3 was done as needed (and not in all cases). Do this check early so that repo-add does not abort part way through. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 81d233b79345d05d5bf17a4b2844085e14f9ee36 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 15 16:32:56 2015 +1000 repo-add: only update database if entire command succeeded It is not hard to think of situations where the repo database should not be updated unless the whole operation succeeds. Error out before a partial database update occurs. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d2cb52de12d3b2f313d80156f474b1d731ad67cf Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 15 15:56:20 2015 +1000 repo-add: move database creation into its own function Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f3fc9af2b74d4d1da9718a703c4fbd5d5a13fd59 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Jan 23 15:58:04 2015 +1000 repo-add: move database rotation into its own function Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e7e0c137623253c6f1bad0c89e36586713eee526 Merge: f34e48a b543c05 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Mar 26 14:43:13 2015 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 10 +- doc/makepkg.8.txt | 3 + doc/repo-add.8.txt | 22 +-- lib/libalpm/be_package.c | 52 +++++--- lib/libalpm/util.c | 1 + proto/PKGBUILD-split.proto | 3 - scripts/makepkg.sh.in | 36 ++++- scripts/repo-add.sh.in | 324 +++++++++++++++++++++++++++------------------ 8 files changed, 271 insertions(+), 180 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.2.1-4-gb543c05
by allan＠archlinux.org 26 Mar '15

26 Mar '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via b543c055b9607161e6bd47b9d3709243057c8771 (commit) via b8f2d713e00c453efab035f467d63508897f08ea (commit) via eb21e9eb93a0e479e846ee5e415c9fdf7d74797b (commit) via 92b8c09000ac34e4740deb1e02eaf0cd852cdb0a (commit) from 068f8cec42057751f528b19cece37db13ae92541 (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 b543c055b9607161e6bd47b9d3709243057c8771 Author: Ivy Foster <joyfulgirl(a)archlinux.us> Date: Fri Mar 20 19:19:56 2015 -0500 Make get_pkg_arch treat arch as an array We use the get_pkg_arch function with the package name parameter in two places: 1) checking if the package is already built 2) installing build packages Currently this failed when a package override for "arch" was an array, despite all our documentation stating that it is indeed an array. This change makes these two places fail if there is package override for arch that is not an array - i.e. of the form arch='i686'. Signed-off-by: Ivy Foster <joyfulgirl(a)archlinux.us> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b8f2d713e00c453efab035f467d63508897f08ea Author: Allan McRae <allan(a)archlinux.org> Date: Wed Mar 25 15:26:36 2015 +1000 Update PKGBUILD-split.proto allowed overrides Commit 8a02abcf194 disallowed overridding pkgver/pkgrel/epoch. Update the split package prototype to refelct this change. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eb21e9eb93a0e479e846ee5e415c9fdf7d74797b Author: Christian Hesse <mail(a)eworm.de> Date: Wed Mar 25 13:55:34 2015 +0100 fix source package signing with SRCPKGDIR set Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 2 ++ proto/PKGBUILD-split.proto | 3 --- scripts/makepkg.sh.in | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] add_entry_to_files_list: pass filelist directly
by Andrew Gregory 26 Mar '15

26 Mar '15

Allows entries to be added to arbitrary filelists not connected to a package. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/be_package.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index e284254..37aa428 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -384,15 +384,16 @@ static int handle_simple_path(alpm_pkg_t *pkg, const char *path) * @param path path of the file to be added * @return <0 on error, 0 on success */ -static int add_entry_to_files_list(alpm_pkg_t *pkg, size_t *files_size, - struct archive_entry *entry, const char *path) +static int add_entry_to_files_list(alpm_filelist_t *filelist, + size_t *files_size, struct archive_entry *entry, const char *path) { - const size_t files_count = pkg->files.count; + const size_t files_count = filelist->count; alpm_file_t *current_file; mode_t type; size_t pathlen; - if(!_alpm_greedy_grow((void **)&pkg->files.files, files_size, (files_count + 1) * sizeof(alpm_file_t))) { + if(!_alpm_greedy_grow((void **)&filelist->files, + files_size, (files_count + 1) * sizeof(alpm_file_t))) { return -1; } @@ -400,7 +401,7 @@ static int add_entry_to_files_list(alpm_pkg_t *pkg, size_t *files_size, pathlen = strlen(path); - current_file = pkg->files.files + files_count; + current_file = filelist->files + files_count; /* mtree paths don't contain a tailing slash, those we get from * the archive directly do (expensive way) @@ -418,7 +419,7 @@ static int add_entry_to_files_list(alpm_pkg_t *pkg, size_t *files_size, } current_file->size = archive_entry_size(entry); current_file->mode = archive_entry_mode(entry); - pkg->files.count++; + filelist->count++; return 0; } @@ -509,7 +510,7 @@ static int build_filelist_from_mtree(alpm_handle_t *handle, alpm_pkg_t *pkg, str continue; } - if(add_entry_to_files_list(pkg, &files_size, mtree_entry, path) < 0) { + if(add_entry_to_files_list(&pkg->files, &files_size, mtree_entry, path) < 0) { goto error; } } @@ -617,7 +618,7 @@ alpm_pkg_t *_alpm_pkg_load_internal(alpm_handle_t *handle, continue; } else if(full && !hit_mtree) { /* building the file list: expensive way */ - if(add_entry_to_files_list(newpkg, &files_size, entry, entry_name) < 0) { + if(add_entry_to_files_list(&newpkg->files, &files_size, entry, entry_name) < 0) { goto error; } } -- 2.3.4

2 2

[pacman-dev] [PATCH] Add makepkg option --printproducts; fix bug #42150
by joyfulgirl＠archlinux.us 25 Mar '15

25 Mar '15

From: Ivy Foster <joyfulgirl(a)archlinux.us> makepkg --printproducts prints the name of each package that would normally be produced, minus $PKGEXT, and exits. --- doc/makepkg.8.txt | 2 ++ scripts/makepkg.sh.in | 26 +++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) mode change 100644 => 100755 scripts/makepkg.sh.in diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 31a2ef7..e266e96 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -203,6 +203,8 @@ Options (Passed to pacman) Prevent pacman from displaying a progress bar; useful if you are redirecting makepkg output to file. +*\--printproducts*:: + Instead of building, list packages that would be produced, without PKGEXT. Additional Features ------------------- diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in old mode 100644 new mode 100755 index 168f334..a69f8bc --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2834,6 +2834,19 @@ run_split_packaging() { pkgname=${pkgname_backup[@]} } +print_all_package_names() { + local version=$(get_full_version) + local architecture=$(get_pkg_arch) + for pkg in ${pkgname[@]}; do + architecture=$(get_pkg_arch "$pkg") + printf "%s-%s-%s\n" "$pkg" "$version" "$architecture" + pkgbuild_get_attribute $pkg 'options' 1 opts + if in_opt_array "debug" ${opts[@]} && in_opt_array "strip" ${opts[@]}; then + printf "%s-%s-%s-%s\n" "$pkg" "@DEBUGSUFFIX@" "$pkgver" "$architecture" + fi + done +} + # Canonicalize a directory path if it exists canonicalize_path() { local path="$1"; @@ -2894,6 +2907,7 @@ usage() { printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" + printf -- "$(gettext " --printproducts Only list packages that would be produced, without PKGEXT")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" printf -- "$(gettext " --skipinteg Do not perform any verification checks on source files")\n" @@ -2938,9 +2952,9 @@ ARGLIST=("$@") OPT_SHORT="AcCdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'check' 'clean' 'cleanbuild' 'config:' 'force' 'geninteg' 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'noarchive' 'nobuild' - 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' 'repackage' - 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'source' 'syncdeps' - 'verifysource' 'version') + 'nocolor' 'nocheck' 'nodeps' 'noextract' 'noprepare' 'nosign' 'pkg:' + 'printproducts' 'repackage' 'rmdeps' 'sign' 'skipchecksums' 'skipinteg' + 'skippgpcheck' 'source' 'syncdeps' 'verifysource' 'version') # Pacman Options OPT_LONG+=('asdeps' 'noconfirm' 'needed' 'noprogressbar') @@ -2983,6 +2997,7 @@ while true; do -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; + --printproducts) PRINTPRODUCTS=1; IGNOREARCH=1; NOEXTRACT=1; NOBUILD=1; SKIPCHECKSUMS=1; SKIPPGPCHECK=1; FORCE=1 ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --sign) SIGNPKG='y' ;; @@ -3268,6 +3283,11 @@ if (( ! PKGVERFUNC )); then check_build_status fi +if (( PRINTPRODUCTS )); then + print_all_package_names + exit 0 +fi + # Run the bare minimum in fakeroot if (( INFAKEROOT )); then if (( SOURCEONLY )); then -- 2.3.3

6 16

[pacman-dev] [PATCH 1/1] fix source package signing with SRCPKGDIR set
by Christian Hesse 25 Mar '15

25 Mar '15

From: Christian Hesse <mail(a)eworm.de> Signed-off-by: Christian Hesse <mail(a)eworm.de> --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 168f334..f5d0870 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2106,8 +2106,8 @@ create_srcpackage() { ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" ret=$? if [[ -f $pkg_file.sig ]]; then - rm -f "${pkg_file/$PKGDEST/$startdir}.sig" - ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" + rm -f "${pkg_file/$SRCPKGDEST/$startdir}.sig" + ln -s "$pkg_file.sig" "${pkg_file/$SRCPKGDEST/$startdir}.sig" fi fi -- 2.3.4

1 0

[pacman-dev] [PATCH] close stdin before running install scripts
by Andrew Gregory 25 Mar '15

25 Mar '15

libalpm does not guarantee that script output will be presented to the user or that stdin will be connected to a terminal. Close stdin so that scripts do not attempt to use it for user interaction. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- https://bbs.archlinux.org/viewtopic.php?id=194200 lib/libalpm/util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 4d85132..26d091b 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -536,6 +536,7 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) if(pid == 0) { /* this code runs for the child only (the actual chroot/exec) */ + close(0); close(1); close(2); while(dup2(pipefd[1], 1) == -1 && errno == EINTR); -- 2.3.4

1 0

[pacman-dev] [PATCH] Update PKGBUILD-split.proto allowed overrides
by Allan McRae 25 Mar '15

25 Mar '15

Commit 8a02abcf194 disallowed overridding pkgver/pkgrel/epoch. Update the split package prototype to refelct this change. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- proto/PKGBUILD-split.proto | 3 --- 1 file changed, 3 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 6dae704..9898ef8 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -49,9 +49,6 @@ check() { package_pkg1() { # options and directives that can be overridden - pkgver= - pkgrel= - epoch= pkgdesc="" arch=() url="" -- 2.3.4

1 0

[pacman-dev] [PATCH] Adding support for sudo when user is not root and root privileges are required
by Lorenzo Mureu 22 Mar '15

22 Mar '15

This patch adds support for sudo in pacman. Now, when you run some unharmful (informative) command with pacman all is fine, but if you try some potentially harmful command (like installing or removing packages, or syncing) it stops telling you that you must be root. While this behaviour is perfectly fine, and that can be what most users want, I'd prefere that when root previleges are needed pacman acquired them directly with sudo. This is accomplished this way: 1) A new configuration file option is provided: UseSudo. If it is not set pacman will behave normally, as always (i.e. prints an error) It is set than it will use sudo if needed 2) As a direct consequence of 1) the configuration structure defined in config.h and config.c has a new field: usesudo. == 1 means "use sudo" == 0 means "never use sudo" Its value is set according to the configuration file. That is: if user set UseSudo in pacman.conf then usesudo=1 else usesudo=0 3) In pacman.c I created a copy of argv (because getopt re-arranges the array) and extended it so that, when passed as a parameter to execvp, it will run as if it was ` exec sudo pacman "$@" ` in bash There ARE some problems, but I could eventually fix them, if needed, if the patch was to be accepted. 1) sargv, the "sudo"-execvp-copy of argv is always created and populated. It wouldn't be necessary if getopt didn't re-order argv's elements I could put its allocation and initialization inside an if that checks usesudo, but I don't know if that is OK with pacman's main() flow. Anyway, I hope this patch isn't too ugly (this is the first I cooperate to a big program). If it is, please tell me and I'll fix it. Greetings, Lorenzo Mureu. Signed-off-by: Lorenzo Mureu <mureulor(a)gmail.com> --- src/pacman/conf.c | 7 +++++++ src/pacman/conf.h | 3 +++ src/pacman/pacman.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index ccf8183..52941b9 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -119,6 +119,8 @@ config_t *config_new(void) newconfig->colstr.warn = ""; newconfig->colstr.err = ""; newconfig->colstr.nocolor = ""; + newconfig->usesudo = 0; /* if set to 1: enable using sudo to acquire root privileges + if set to 0: default behaviour */ return newconfig; } @@ -496,6 +498,11 @@ static int _parse_options(const char *key, char *value, config->color = isatty(fileno(stdout)) ? PM_COLOR_ON : PM_COLOR_OFF; enable_colors(config->color); } + /* + * If the UseSudo is specified in the configuration file enable sudo (see above) + */ + } else if(strcmp(key, "UseSudo") == 0) { + config->usesudo=1; } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), diff --git a/src/pacman/conf.h b/src/pacman/conf.h index d6feb7a..623c338 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -128,6 +128,9 @@ typedef struct __config_t { colstr_t colstr; alpm_list_t *repos; + + unsigned short usesudo; /* controls whether to use sudo to acquire root privileges. + see config.c and pacman.c */ } config_t; /* Operations */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index fce0131..0b568e3 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1041,6 +1041,43 @@ static void cl_to_log(int argc, char *argv[]) free(cl_text); } +/* + * This function increases argv's size by two elements. + * The first element of the "new" argv is "sudo" + * The following elements are copied from argv + * The last element of the "new" argv is a NULL pointer + * + * The "new" argv can be passed to execvp to re-run pacman + * via sudo, with the same arguments. + */ +void sudo_argv(int argc, char ***argv) +{ + int i; + char **sargv; /* the "new" argv */ + + sargv = calloc(2 + argc, sizeof(char*)); /* Allocate a bigger array */ + sargv[0] = calloc(5, sizeof(char)); /* Allocate space for the string "sudo" */ + strcpy(sargv[0], "sudo"); + + for (i = 1; i < 1 + argc; i++) { + sargv[i]=(*argv)[i-1]; /* Copy elements from argv to sargv */ + } + sargv[argc+1] = NULL; /* The last element is a NULL pointer */ + *argv=sargv; /* sargv then replaces argv */ +} + +/* + * copy argv (whose size is argc) to nargv (whose space is already allocated) + */ +void array_copy(int argc, char **argv, char **nargv) +{ + int i; + for (i = 0; i < argc; i++) { + nargv[i] = calloc(1 + strlen(argv[i]), sizeof(char)); + strcpy(nargv[i], argv[i]); + } +} + /** Main function. * @param argc * @param argv @@ -1053,13 +1090,23 @@ int main(int argc, char *argv[]) struct sigaction new_action, old_action; const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV, SIGWINCH }; uid_t myuid = getuid(); + + /* + * an array which can be used with execvp to re-run pacman with the same options, with sudo (if the user configured so) + * it must be initialized and populated here (even if it won't be used) because getopt reorders argv, so argv can't be used + */ + char **sargv; + sargv=calloc(argc, sizeof(char*)); + array_copy(argc, argv, sargv); /* create a copy of argv */ + sudo_argv(argc, &sargv); /* increase argv's size by 2. First element is sudo, followed by argv's content, then a null pointer, as required by execvp */ /* Set signal handlers */ /* Set up the structure to specify the new action. */ new_action.sa_handler = handler; sigemptyset(&new_action.sa_mask); new_action.sa_flags = SA_RESTART; - + + /* assign our handler to any signals we care about */ for(i = 0; i < sizeof(signals) / sizeof(signals[0]); i++) { int signal = signals[i]; @@ -1185,6 +1232,10 @@ int main(int argc, char *argv[]) /* check if we have sufficient permission for the requested operation */ if(myuid > 0 && needs_root()) { + /* if UseSudo option is set, re-exec with sudo */ + if (config->usesudo == 1 ) { + execvp("sudo", sargv); + } pm_printf(ALPM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n")); cleanup(EXIT_FAILURE); } -- 2.3.3

2 1