- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [RFC] repo-add: merge desc and depends files
by Allan McRae 19 Mar '15

19 Mar '15

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> --- Reading sync dbs from the tarball was introduced in pacman-3.5 (2011-03-16). That also introduced the combined handling of depends and desc files (commit a44c7b8956). So this change (and indeed the preceeding patch moving REPLACES and CONFLICTS into desc) will result in pacman-3.4 being unable to read databases created by repo-add-5.0. Is this acceptable? scripts/repo-add.sh.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index fb04b3f..3ece8d5 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -420,16 +420,12 @@ db_write_entry() { format_entry "REPLACES" "${_replaces[@]}" format_entry "CONFLICTS" "${_conflicts[@]}" format_entry "PROVIDES" "${_provides[@]}" - } >'desc' - # create depends entry - msg2 "$(gettext "Creating '%s' db entry...")" 'depends' - { format_entry "DEPENDS" "${_depends[@]}" format_entry "OPTDEPENDS" "${_optdepends[@]}" format_entry "MAKEDEPENDS" "${_makedepends[@]}" format_entry "CHECKDEPENDS" "${_checkdepends[@]}" - } >'depends' + } >'desc' popd >/dev/null popd >/dev/null -- 2.3.3

1 0

[pacman-dev] [PATCH] repo-add: put conflicts/provides in desc file
by Allan McRae 19 Mar '15

19 Mar '15

It does not make sense for these fields to be in the "depends" file. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/repo-add.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c7923ec..fb04b3f 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -418,14 +418,14 @@ db_write_entry() { format_entry "BUILDDATE" "$builddate" format_entry "PACKAGER" "$packager" format_entry "REPLACES" "${_replaces[@]}" + format_entry "CONFLICTS" "${_conflicts[@]}" + format_entry "PROVIDES" "${_provides[@]}" } >'desc' # create depends entry msg2 "$(gettext "Creating '%s' db entry...")" 'depends' { format_entry "DEPENDS" "${_depends[@]}" - format_entry "CONFLICTS" "${_conflicts[@]}" - format_entry "PROVIDES" "${_provides[@]}" format_entry "OPTDEPENDS" "${_optdepends[@]}" format_entry "MAKEDEPENDS" "${_makedepends[@]}" format_entry "CHECKDEPENDS" "${_checkdepends[@]}" -- 2.3.3

1 0

[pacman-dev] [PATCH] makepkg: write validpgpkeys to .SRCINFO
by Allan McRae 19 Mar '15

19 Mar '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 168f334..4ff45e8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1794,7 +1794,7 @@ srcinfo_write_global() { local multivalued=(arch groups license checkdepends makedepends depends optdepends provides conflicts replaces noextract options backup - source {md5,sha{1,224,256,384,512}}sums) + source validpgpkeys {md5,sha{1,224,256,384,512}}sums) srcinfo_open_section 'pkgbase' "${pkgbase:-$pkgname}" srcinfo_write_section_details '' -- 2.3.3

1 0

[pacman-dev] [PATCH v2] PKGBUILD.5: have epoch directly following pkgver/pkgrel
by Allan McRae 19 Mar '15

19 Mar '15

These three fields should be grouped together. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This time with only the changes I wanted to commit! doc/PKGBUILD.5.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index a1d42fd..bc278f2 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -64,11 +64,6 @@ below). software release and incremented for intermediate PKGBUILD updates. The variable is not allowed to contain hyphens. -*pkgdesc*:: - This should be a brief description of the package and its functionality. - Try to keep the description to one line of text and to not use the package's - name. - *epoch*:: Used to force the package to be seen as newer than any previous versions with a lower epoch, even if the version number would normally not trigger @@ -78,6 +73,11 @@ below). version comparison logic. See linkman:pacman[8] for more information on version comparisons. +*pkgdesc*:: + This should be a brief description of the package and its functionality. + Try to keep the description to one line of text and to not use the package's + name. + *url*:: This field contains a URL that is associated with the software being packaged. This is typically the project's web site. -- 2.3.3

1 0