March 2015 - Pacman-dev - lists.archlinux.org

[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

[pacman-dev] [PATCH] 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> --- doc/PKGBUILD.5.txt | 10 +++++----- scripts/repo-add.sh.in | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 9 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. diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index c7923ec..013fce5 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -465,6 +465,27 @@ db_write_entry() { return 0 } # end db_write_entry +db_write_source() { + # blank out all variables + local sourcefile=$1 + local -a _licenses _source _noextract _md5sums _sha1sums _sha256sums \ + _sha384sums, _sha512sums, _groups _arch _backup _depends _makedepends \ + _checkdepends _optdepends _conflicts _provides _replaces _options + local pkgbase pkgver pkgrel pkgdesc epoch url install changelog \ + md5sum sha256sum pgpsig pgpsigsize + + # read info from the zipped package + local line var val + while read -r line; do + [[ ${line:0:1} = '#' ]] && continue + IFS=' =' read -r var val < <(printf '%s\n' "$line") + + + done< <(bsdtar -xOqf "$pkgfile" .PKGINFO) + + return 0 +} + # remove existing entries from the DB # arg1 - package name db_remove_entry() { @@ -484,6 +505,10 @@ db_remove_entry() { local filesentry=$(echo "$pkgentry" | sed 's/$.*$\/db\//\1\/files\//') rm -rf "$filesentry" + # remove entries in "files" database + local sourceentry=$(echo "$pkgentry" | sed 's/$.*$\/db\//\1\/sourceq\//') + rm -rf "$sourceentry" + pkgentry=$(find_pkgentry "$pkgname") done return $notfound @@ -524,7 +549,7 @@ prepare_repo_db() { exit 1 fi - for repo in "db" "files"; do + for repo in "db" "files" "source"; do dbfile=${repodir}/$REPO_DB_PREFIX.$repo.$REPO_DB_SUFFIX if [[ -f $dbfile ]]; then @@ -579,6 +604,14 @@ add() { fi fi + if [[ $1 == *.db.tar* ]]; then + srcfile=$1 + msg "$(gettext "Adding source package '%s'")" "$srcfile" + if db_write_source "$srcfile"; then + return 0 + else + return 1 + pkgfile=$1 if ! bsdtar -tqf "$pkgfile" .PKGINFO >/dev/null 2>&1; then error "$(gettext "'%s' is not a package file, skipping")" "$pkgfile" @@ -619,7 +652,7 @@ rotate_db() { pushd $dirname >/dev/null - for repo in "db" "files"; do + for repo in "db" "files" "source"; do filename=${REPO_DB_PREFIX}.${repo}.${REPO_DB_SUFFIX} tempname=$dirname/.tmp.$filename @@ -663,7 +696,7 @@ create_db() { # $LOCKFILE is already guaranteed to be absolute so this is safe dirname=${LOCKFILE%/*} - for repo in "db" "files"; do + for repo in "db" "files" "source"; do filename=${REPO_DB_PREFIX}.${repo}.${REPO_DB_SUFFIX} # this ensures we create it on the same filesystem, making moves atomic tempname=$dirname/.tmp.$filename @@ -734,7 +767,7 @@ tmpdir=$(mktemp -d "${TMPDIR:-/tmp}/repo-tools.XXXXXXXXXX") || (\ error "$(gettext "Cannot create temp directory for database building.")"; \ exit 1) -for repo in "db" "files"; do +for repo in "db" "files" "source"; do mkdir "$tmpdir/$repo" done -- 2.3.3

1 0

[pacman-dev] Db pkgcache invalidation
by Fabien Bourigault 19 Mar '15

19 Mar '15

I'm the current maintainer of PackageKit alpm backend and I need to invalidate localdb pkgcache when user run pacman by hand and packagekitd is running. I already added an inotify watch on the localdb directory but now I need to refresh the backend libalpm state. Is there any existing way to achieve this ? If not, is the behavior I need could be achieved by unsetting the DB_STATUS_PKGCACHE ?

2 1

[pacman-dev] [PATCH 1/3] makepkg: Do not provide $pkgdir to build()
by David Macek 19 Mar '15

19 Mar '15

--- scripts/makepkg.sh.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 168f334..9843efe 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3198,9 +3198,6 @@ else fi -# set pkgdir to something "sensible" for (not recommended) use during build() -pkgdir="$pkgdirbase/$pkgbase" - if (( GENINTEG )); then mkdir -p "$srcdir" chmod a-s "$srcdir" -- 1.9.4.msysgit.2 -- David Macek

2 3

[pacman-dev] [PATCH 2/3] makepkg: Create $pkgdirbase after build(), before package()
by David Macek 17 Mar '15

17 Mar '15

--- scripts/makepkg.sh.in | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9843efe..6ca678e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3388,13 +3388,6 @@ if (( NOBUILD )); then msg "$(gettext "Sources are ready.")" exit 0 #E_OK else - # 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" cd_safe "$startdir" if (( ! REPKG )); then @@ -3403,6 +3396,14 @@ 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" + enter_fakeroot fi -- 1.9.4.msysgit.2 -- David Macek

1 0