From allan at archlinux.org  Mon Dec  2 03:49:54 2019
From: allan at archlinux.org (Allan McRae)
Date: Mon, 2 Dec 2019 13:49:54 +1000
Subject: [pacman-dev] [PATCH v2] pacman: print error when -Fx is given
 invalid regex
In-Reply-To: <20191127174519.267931-1-morganamilo@archlinux.org>
References: <20191127174519.267931-1-morganamilo@archlinux.org>
Message-ID: <1e5a1776-09bb-19e2-a67e-f1a6a08b62f1@archlinux.org>

On 28/11/19 3:45 am, morganamilo wrote:
>     When processing the targets for -Fx, compile all the regex ahead of
>     time, printing an error for each that failed to compile. Then, if they all
>     compiled successfully, continue with printing files.
> 
>     Signed-off-by: morganamilo <morganamilo at archlinux.org>
> 
>     ---
> 
>     v2:
>             Add comment about why we don't free targ
>             Fix whitespace error
> 
>     I have vim set to display trialing whitespace so normally I catch it.
>     Not sure why I didn't this time.
> 
>     Also I agree that running all the regex against each target before
>     moving on to the next is a good improvement. This patch is already kinda
>     long though, so I'll do it another time.
> 
> diff --git a/src/pacman/files.c b/src/pacman/files.c
> index 3b6dc23b..6fcc6e9b 100644
> --- a/src/pacman/files.c
> +++ b/src/pacman/files.c
> @@ -94,17 +94,27 @@ static void print_match(alpm_list_t *match, alpm_db_t *repo, alpm_pkg_t *pkg, in
>  	}
>  }
>  
> +struct filetarget {
> +	char *targ;
> +	int exact_file;
> +	regex_t reg;
> +};
> +
> +static void filetarget_free(struct filetarget *ftarg) {
> +	regfree(&ftarg->reg);
> +	/* we don't own ftarg->targ so don't free it */

Patch looks good.

I changed that comment to:

do not free ftarg->targ as it is owned by the caller of files_search

This does a few useful things:
1) gets the "do not free" right at the start of the comment
2) specifies where the memory is owned
3) does not use contractions - apparently the use of "not" make the
negative clearer for non-native speakers, although I am not sure what
sort of evidence is behind that is claim...

Allan

From allan at archlinux.org  Mon Dec  2 04:08:44 2019
From: allan at archlinux.org (Allan McRae)
Date: Mon, 2 Dec 2019 14:08:44 +1000
Subject: [pacman-dev] [PATCH 1/3] libmakepkg: use extraction commands
 instead of file to find archive type
In-Reply-To: <20191126212957.29031-1-e5ten.arch@gmail.com>
References: <20191126212957.29031-1-e5ten.arch@gmail.com>
Message-ID: <939f4cf7-cee3-68e8-2aa5-5ad5567f672d@archlinux.org>

On 27/11/19 7:29 am, Ethan Sommer wrote:
> Previously, to determine which command we should use to extract an
> archive, we would run file and match the output against our list of
> possible extraction commands
> 
> Instead, run the archive through each extraction command's -t (--test)
> flag, if this succeeds then we know that the command is able to extract
> the file and is the one to use
> 


Apart from the issues Eli brought up, there is a large performance
regression on large source files.


$ time file -bizL libreoffice-6.3.4.1.tar.xz
application/x-tar; charset=binary compressed-encoding=application/x-xz;
charset=binary

real	0m0.034s
user	0m0.031s
sys	0m0.004s


$ time xz -t libreoffice-6.3.4.1.tar.xz

real	0m11.970s
user	0m11.898s
sys	0m0.057s


Allan

From allan at archlinux.org  Mon Dec  2 05:44:07 2019
From: allan at archlinux.org (Allan McRae)
Date: Mon, 2 Dec 2019 15:44:07 +1000
Subject: [pacman-dev] [PATCH 2/2] remove: Don't follow symlinks in
 checking if a file can be removed
In-Reply-To: <20191127204051.782-2-rymg19@gmail.com>
References: <20191127204051.782-1-rymg19@gmail.com>
 <20191127204051.782-2-rymg19@gmail.com>
Message-ID: <20f09ed1-3088-7e0a-84ad-5fb6efbc7f64@archlinux.org>

On 28/11/19 6:40 am, Ryan Gonzalez wrote:
> Otherwise, symlinks to non-removable files will be logged as unable to
> be removed.
> 
> Signed-off-by: Ryan Gonzalez <rymg19 at gmail.com>
> ---
>  lib/libalpm/remove.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
> index 9030bfee..bb980e7d 100644
> --- a/lib/libalpm/remove.c
> +++ b/lib/libalpm/remove.c
> @@ -339,7 +339,7 @@ static int can_remove_file(alpm_handle_t *handle, const alpm_file_t *file)
>  
>  	/* If we fail write permissions due to a read-only filesystem, abort.
>  	 * Assume all other possible failures are covered somewhere else */
> -	if(_alpm_access(handle, NULL, filepath, W_OK) == -1) {
> +	if(_alpm_access_flags(handle, NULL, filepath, W_OK, AT_SYMLINK_NOFOLLOW) == -1) {

AT_SYMLINK_NOFOLLOW is available on Linux and MSYS2 (which are the
largest users of pacman), but not BSD/OSX and we do have some users there.

>  		if(errno != EACCES && errno != ETXTBSY && access(filepath, F_OK) == 0) {
>  			/* only return failure if the file ACTUALLY exists and we can't write to
>  			 * it - ignore "chmod -w" simple permission failures */
> 

From allan at archlinux.org  Wed Dec 11 00:22:22 2019
From: allan at archlinux.org (Allan McRae)
Date: Wed, 11 Dec 2019 00:22:22 +0000 (UTC)
Subject: [pacman-dev] [GIT] The official pacman repository branch, master,
 updated. v5.2.1-26-gb7f61aa5
Message-ID: <20191211002222.B3A5D2B78F@luna.archlinux.org>

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  b7f61aa55755d95d2e3a6dd7058971c68276c369 (commit)
      from  0428f6213bcb5586d4ec9feb18af9a883c463793 (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 b7f61aa55755d95d2e3a6dd7058971c68276c369
Author: morganamilo <morganamilo at archlinux.org>
Date:   Wed Nov 27 17:45:20 2019 +0000

    pacman: print error when -Fx is given invalid regex
    
    When processing the targets for -Fx, compile all the regex ahead of
    time, printing an error for each that failed to compile. Then, if they all
    compiled successfully, continue with printing files.
    
    Signed-off-by: morganamilo <morganamilo at archlinux.org>
    Signed-off-by: Allan McRae <allan at archlinux.org>

-----------------------------------------------------------------------

Summary of changes:
 src/pacman/files.c | 57 +++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
The official pacman repository

From allan at archlinux.org  Wed Dec 11 00:22:38 2019
From: allan at archlinux.org (Allan McRae)
Date: Wed, 11 Dec 2019 10:22:38 +1000
Subject: [pacman-dev] [PATCH v2] pacman+libalpm: print version names for
 conflicting packages
In-Reply-To: <20191127204045.501505-1-morganamilo@archlinux.org>
References: <20191127204045.501505-1-morganamilo@archlinux.org>
Message-ID: <fb1fabe9-fed2-38b4-8b6d-c07b68e31476@archlinux.org>

On 28/11/19 6:40 am, morganamilo wrote:
> When ever pacman prints a conflict, it now prints pkgname-version,
> instead of just pkgname.
> 
> alpm_conflict_t now carries pointers to alpm_pkg_t instead of just the
> names of each package.
> 
> Fixes FS#12536 (point 2)
> 
> ---
> 
> v2: dupe each alpm_pkg_t

One typo spotted, and a suggestion for improving output.

Allan

> 
> diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
> index 956284bd..b0aa0671 100644
> --- a/lib/libalpm/alpm.h
> +++ b/lib/libalpm/alpm.h
> @@ -247,10 +247,8 @@ typedef struct _alpm_depmissing_t {
>  
>  /** Conflict */
>  typedef struct _alpm_conflict_t {
> -	unsigned long package1_hash;
> -	unsigned long package2_hash;
> -	char *package1;
> -	char *package2;
> +	alpm_pkg_t *package1;
> +	alpm_pkg_t *package2;
>  	alpm_depend_t *reason;
>  } alpm_conflict_t;
>  

OK

> diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
> index 80827ed6..08ae86cb 100644
> --- a/lib/libalpm/conflict.c
> +++ b/lib/libalpm/conflict.c
> @@ -49,11 +49,8 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2,
>  	alpm_conflict_t *conflict;
>  
>  	CALLOC(conflict, 1, sizeof(alpm_conflict_t), return NULL);
> -
> -	conflict->package1_hash = pkg1->name_hash;
> -	conflict->package2_hash = pkg2->name_hash;
> -	STRDUP(conflict->package1, pkg1->name, goto error);
> -	STRDUP(conflict->package2, pkg2->name, goto error);
> +	ASSERT(_alpm_pkg_dup(pkg1, &conflict->package1) == 0, goto error);
> +	ASSERT(_alpm_pkg_dup(pkg2, &conflict->package2) == 0, goto error);
>  	conflict->reason = reason;
>  

OK

>  	return conflict;
> @@ -69,8 +66,8 @@ error:
>  void SYMEXPORT alpm_conflict_free(alpm_conflict_t *conflict)
>  {
>  	ASSERT(conflict != NULL, return);
> -	FREE(conflict->package2);
> -	FREE(conflict->package1);
> +	_alpm_pkg_free(conflict->package1);
> +	_alpm_pkg_free(conflict->package2);
>  	FREE(conflict);
>  }
>  

OK

> @@ -79,20 +76,7 @@ void SYMEXPORT alpm_conflict_free(alpm_conflict_t *conflict)
>   */
>  alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict)
>  {
> -	alpm_conflict_t *newconflict;
> -	CALLOC(newconflict, 1, sizeof(alpm_conflict_t), return NULL);
> -
> -	newconflict->package1_hash = conflict->package1_hash;
> -	newconflict->package2_hash = conflict->package2_hash;
> -	STRDUP(newconflict->package1, conflict->package1, goto error);
> -	STRDUP(newconflict->package2, conflict->package2, goto error);
> -	newconflict->reason = conflict->reason;
> -
> -	return newconflict;
> -
> -error:
> -	alpm_conflict_free(newconflict);
> -	return NULL;
> +	return conflict_new(conflict->package1, conflict->package2, conflict->reason);

OK - now a one line function!

>  }
>  
>  /**
> @@ -108,10 +92,10 @@ static int conflict_isin(alpm_conflict_t *needle, alpm_list_t *haystack)
>  	alpm_list_t *i;
>  	for(i = haystack; i; i = i->next) {
>  		alpm_conflict_t *conflict = i->data;
> -		if(needle->package1_hash == conflict->package1_hash
> -				&& needle->package2_hash == conflict->package2_hash
> -				&& strcmp(needle->package1, conflict->package1) == 0
> -				&& strcmp(needle->package2, conflict->package2) == 0) {
> +		if(needle->package1->name_hash == conflict->package2->name_hash

conflict->package1->name_hash

> +				&& needle->package2->name_hash == conflict->package2->name_hash
> +				&& strcmp(needle->package1->name, conflict->package1->name) == 0
> +				&& strcmp(needle->package2->name, conflict->package2->name) == 0) {
>  			return 1;
>  		}
>  	}
> diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
> index 97a351fe..d26a1323 100644
> --- a/lib/libalpm/sync.c
> +++ b/lib/libalpm/sync.c
> @@ -510,21 +510,23 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
>  
>  		for(i = deps; i; i = i->next) {
>  			alpm_conflict_t *conflict = i->data;
> +			const char *name1 = conflict->package1->name;
> +			const char *name2 = conflict->package2->name;
>  			alpm_pkg_t *rsync, *sync, *sync1, *sync2;
>  
>  			/* have we already removed one of the conflicting targets? */
> -			sync1 = alpm_pkg_find(trans->add, conflict->package1);
> -			sync2 = alpm_pkg_find(trans->add, conflict->package2);
> +			sync1 = alpm_pkg_find(trans->add, name1);
> +			sync2 = alpm_pkg_find(trans->add, name2);
>  			if(!sync1 || !sync2) {
>  				continue;
>  			}
>  
>  			_alpm_log(handle, ALPM_LOG_DEBUG, "conflicting packages in the sync list: '%s' <-> '%s'\n",
> -					conflict->package1, conflict->package2);
> +					name1, name2);
>  
>  			/* if sync1 provides sync2, we remove sync2 from the targets, and vice versa */
> -			alpm_depend_t *dep1 = alpm_dep_from_string(conflict->package1);
> -			alpm_depend_t *dep2 = alpm_dep_from_string(conflict->package2);
> +			alpm_depend_t *dep1 = alpm_dep_from_string(name1);
> +			alpm_depend_t *dep2 = alpm_dep_from_string(name2);
>  			if(_alpm_depcmp(sync1, dep2)) {
>  				rsync = sync2;
>  				sync = sync1;

OK

> @@ -552,8 +554,8 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
>  
>  			/* Prints warning */
>  			_alpm_log(handle, ALPM_LOG_WARNING,
> -					_("removing '%s' from target list because it conflicts with '%s'\n"),
> -					rsync->name, sync->name);
> +					_("removing '%s-%s' from target list because it conflicts with '%s-%s'\n"),
> +					rsync->name, rsync->version, sync->name, sync->version);
>  			trans->add = alpm_list_remove(trans->add, rsync, _alpm_pkg_cmp, NULL);
>  			/* rsync is not a transaction target anymore */
>  			trans->unresolvable = alpm_list_add(trans->unresolvable, rsync);

OK

> @@ -574,16 +576,18 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
>  				.conflict = i->data
>  			};
>  			alpm_conflict_t *conflict = i->data;
> +			const char *name1 = conflict->package1->name;
> +			const char *name2 = conflict->package2->name;
>  			int found = 0;
>  
> -			/* if conflict->package2 (the local package) is not elected for removal,
> +			/* if name2 (the local package) is not elected for removal,
>  			   we ask the user */
> -			if(alpm_pkg_find(trans->remove, conflict->package2)) {
> +			if(alpm_pkg_find(trans->remove, name2)) {
>  				found = 1;
>  			}
>  			for(j = trans->add; j && !found; j = j->next) {
>  				alpm_pkg_t *spkg = j->data;
> -				if(alpm_pkg_find(spkg->removes, conflict->package2)) {
> +				if(alpm_pkg_find(spkg->removes, name2)) {
>  					found = 1;
>  				}
>  			}

OK

> @@ -592,14 +596,14 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data)
>  			}
>  
>  			_alpm_log(handle, ALPM_LOG_DEBUG, "package '%s' conflicts with '%s'\n",
> -					conflict->package1, conflict->package2);
> +					name1, name2);
>  
>  			QUESTION(handle, &question);
>  			if(question.remove) {
>  				/* append to the removes list */
> -				alpm_pkg_t *sync = alpm_pkg_find(trans->add, conflict->package1);
> -				alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, conflict->package2);
> -				_alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", conflict->package2);
> +				alpm_pkg_t *sync = alpm_pkg_find(trans->add, name1);
> +				alpm_pkg_t *local = _alpm_db_get_pkgfromcache(handle->db_local, name2);
> +				_alpm_log(handle, ALPM_LOG_DEBUG, "electing '%s' for removal\n", name2);
>  				sync->removes = alpm_list_add(sync->removes, local);
>  			} else { /* abort */
>  				_alpm_log(handle, ALPM_LOG_ERROR, _("unresolvable package conflicts detected\n"));

OK

> diff --git a/src/pacman/callback.c b/src/pacman/callback.c
> index 08da4bb7..812b64e3 100644
> --- a/src/pacman/callback.c
> +++ b/src/pacman/callback.c
> @@ -393,18 +393,22 @@ void cb_question(alpm_question_t *question)
>  			{
>  				alpm_question_conflict_t *q = &question->conflict;
>  				/* print conflict only if it contains new information */
> -				if(strcmp(q->conflict->package1, q->conflict->reason->name) == 0
> -						|| strcmp(q->conflict->package2, q->conflict->reason->name) == 0) {
> -					q->remove = noyes(_("%s and %s are in conflict. Remove %s?"),
> -							q->conflict->package1,
> -							q->conflict->package2,
> -							q->conflict->package2);
> +				if(strcmp(alpm_pkg_get_name(q->conflict->package1), q->conflict->reason->name) == 0
> +						|| strcmp(alpm_pkg_get_name(q->conflict->package2), q->conflict->reason->name) == 0) {
> +					q->remove = noyes(_("%s-%s and %s-%s are in conflict. Remove %s?"),
> +							alpm_pkg_get_name(q->conflict->package1),
> +							alpm_pkg_get_version(q->conflict->package1),
> +							alpm_pkg_get_name(q->conflict->package2),
> +							alpm_pkg_get_version(q->conflict->package2),
> +							alpm_pkg_get_name(q->conflict->package2));

I had a look at this and the line is getting too long with the extra
information.   How about splitting the line like this:

colon_printf(_("%s-%s and %s-%s are in conflict\n"),
	alpm_pkg_get_name(q->conflict->package1),
	alpm_pkg_get_version(q->conflict->package1),
	alpm_pkg_get_name(q->conflict->package2),
	alpm_pkg_get_version(q->conflict->package2));
q->remove = noyes(_("Remove %s?"),
	alpm_pkg_get_name(q->conflict->package2));


>  				} else {
> -					q->remove = noyes(_("%s and %s are in conflict (%s). Remove %s?"),
> -							q->conflict->package1,
> -							q->conflict->package2,
> +					q->remove = noyes(_("%s-%s and %s-%s are in conflict (%s). Remove %s?"),
> +							alpm_pkg_get_name(q->conflict->package1),
> +							alpm_pkg_get_version(q->conflict->package1),
> +							alpm_pkg_get_name(q->conflict->package2),
> +							alpm_pkg_get_version(q->conflict->package2),
>  							q->conflict->reason->name,
> -							q->conflict->package2);
> +							alpm_pkg_get_name(q->conflict->package2));
>  				}
>  			}
>  			break;
> diff --git a/src/pacman/database.c b/src/pacman/database.c
> index 378edc8c..db8ed2de 100644
> --- a/src/pacman/database.c
> +++ b/src/pacman/database.c
> @@ -157,7 +157,7 @@ static int check_db_local_package_conflicts(alpm_list_t *pkglist)
>  	for(i = data; i; i = i->next) {
>  		alpm_conflict_t *conflict = i->data;
>  		pm_printf(ALPM_LOG_ERROR, "'%s' conflicts with '%s'\n",
> -				conflict->package1, conflict->package2);
> +				alpm_pkg_get_name(conflict->package1), alpm_pkg_get_name(conflict->package2));
>  		ret++;
>  	}
>  	alpm_list_free_inner(data, (alpm_list_fn_free)alpm_conflict_free);

OK

> diff --git a/src/pacman/sync.c b/src/pacman/sync.c
> index 4bdeff7b..73e0496e 100644
> --- a/src/pacman/sync.c
> +++ b/src/pacman/sync.c
> @@ -777,12 +777,19 @@ int sync_prepare_execute(void)
>  					alpm_conflict_t *conflict = i->data;
>  					/* only print reason if it contains new information */
>  					if(conflict->reason->mod == ALPM_DEP_MOD_ANY) {
> -						colon_printf(_("%s and %s are in conflict\n"),
> -								conflict->package1, conflict->package2);
> +						colon_printf(_("%s-%s and %s-%s are in conflict\n"),
> +								alpm_pkg_get_name(conflict->package1),
> +								alpm_pkg_get_version(conflict->package1),
> +								alpm_pkg_get_name(conflict->package2),
> +								alpm_pkg_get_version(conflict->package2));
>  					} else {
>  						char *reason = alpm_dep_compute_string(conflict->reason);
> -						colon_printf(_("%s and %s are in conflict (%s)\n"),
> -								conflict->package1, conflict->package2, reason);
> +						colon_printf(_("%s-%s and %s-%s are in conflict (%s)\n"),
> +								alpm_pkg_get_name(conflict->package1),
> +								alpm_pkg_get_version(conflict->package1),
> +								alpm_pkg_get_name(conflict->package2),
> +								alpm_pkg_get_version(conflict->package2),
> +								reason);

OK

From allan at archlinux.org  Wed Dec 11 01:02:02 2019
From: allan at archlinux.org (Allan McRae)
Date: Wed, 11 Dec 2019 11:02:02 +1000
Subject: [pacman-dev] [PATCH 2/3] libmakepkg: use readelf instead of
 file for finding ELF file types
In-Reply-To: <20191126212957.29031-2-e5ten.arch@gmail.com>
References: <20191126212957.29031-1-e5ten.arch@gmail.com>
 <20191126212957.29031-2-e5ten.arch@gmail.com>
Message-ID: <6916628c-5ef2-120c-d9b4-368eff332f56@archlinux.org>

On 27/11/19 7:29 am, Ethan Sommer wrote:
> Signed-off-by: Ethan Sommer <e5ten.arch at gmail.com>
> ---
>  scripts/libmakepkg/tidy/strip.sh.in | 26 ++++++++++++--------------
>  1 file changed, 12 insertions(+), 14 deletions(-)
> 

This diff is an absolute pain to read!

I went through all files on my system, and confirmed this change does
what it is supposed to.  Files are all stripped the same way.

Onto the issues Eli brought up:

1) Hiding errors from readelf.   If readelf errors in any way, we are
not going to be stripping the file anyway.  So I am fine with that.

2) Format of output.  I am OK with this given multiple implementations
use the same format, and we already rely on parsing the readelf output
when making debug packages.

In summmary.  Ack.

A

> diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
> index 1bd810f0..301d1989 100644
> --- a/scripts/libmakepkg/tidy/strip.sh.in
> +++ b/scripts/libmakepkg/tidy/strip.sh.in
> @@ -111,22 +111,20 @@ tidy_strip() {
>  
>  		local binary strip_flags
>  		find . -type f -perm -u+w -print0 2>/dev/null | while IFS= read -rd '' binary ; do
> -			case "$(file -bi "$binary")" in
> -				*application/x-sharedlib*)  # Libraries (.so)
> +			case "$(LC_ALL=C readelf -h "$binary" 2>/dev/null)" in
> +				*Type:*'DYN (Shared object file)'*) # Libraries (.so) or Relocatable binaries
>  					strip_flags="$STRIP_SHARED";;
> -				*application/x-archive*)    # Libraries (.a)
> -					strip_flags="$STRIP_STATIC";;
> -				*application/x-object*)
> -					case "$binary" in
> -						*.ko)                   # Kernel module
> -							strip_flags="$STRIP_SHARED";;
> -						*)
> -							continue;;
> -					esac;;
> -				*application/x-executable*) # Binaries
> +				*Type:*'EXEC (Executable file)'*) # Binaries
>  					strip_flags="$STRIP_BINARIES";;
> -				*application/x-pie-executable*)  # Relocatable binaries
> -					strip_flags="$STRIP_SHARED";;
> +				*Type:*'REL (Relocatable file)'*) # Libraries (.a) or objects
> +					if ar t "$binary" &>/dev/null; then # Libraries (.a)
> +						strip_flags="$STRIP_STATIC"
> +					elif [[ $binary = *'.ko' ]]; then # Kernel module
> +						strip_flags="$STRIP_SHARED"
> +					else
> +						continue
> +					fi
> +					;;
>  				*)
>  					continue ;;
>  			esac
> 

From allan at archlinux.org  Fri Dec 13 11:32:44 2019
From: allan at archlinux.org (Allan McRae)
Date: Fri, 13 Dec 2019 21:32:44 +1000
Subject: [pacman-dev] [PATCH 2/2] Read RepoExpiry from config file
In-Reply-To: <20191213113244.25477-1-allan@archlinux.org>
References: <20191213113244.25477-1-allan@archlinux.org>
Message-ID: <20191213113244.25477-2-allan@archlinux.org>

RepoExpiry is an integer value representing the number of days after creation
that a repo is expired.  This can be set globally, and per repo.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 src/pacman/conf.c | 41 ++++++++++++++++++++++++++++++++++++++++-
 src/pacman/conf.h |  3 +++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 3b475151..5137bd41 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -110,6 +110,7 @@ config_t *config_new(void)
 		newconfig->localfilesiglevel = ALPM_SIG_USE_DEFAULT;
 		newconfig->remotefilesiglevel = ALPM_SIG_USE_DEFAULT;
 	}
+	newconfig->repoexpiry = -1;
 
 	newconfig->colstr.colon   = ":: ";
 	newconfig->colstr.title   = "";
@@ -677,6 +678,22 @@ static int _parse_options(const char *key, char *value,
 				return 1;
 			}
 			FREELIST(values);
+		} else if(strcmp(key, "RepoExpiry") == 0) {
+			char *end = NULL;
+			long expiry = strtol(value, &end, 10);
+			if(*end) {
+				pm_printf(ALPM_LOG_ERROR,
+					_("config file %s, line %d: '%s' value '%s' not recognized\n"),
+					file, linenum, "RepoExpiry", value);
+				return 1;
+			}
+			if(expiry > INT_MAX) {
+				pm_printf(ALPM_LOG_ERROR,
+					_("config file %s, line %d: '%s' value '%s' is too large\n"),
+					file, linenum, "RepoExpiry", value);
+				return 1;
+			}
+			config->repoexpiry = (int)expiry;
 		} else {
 			pm_printf(ALPM_LOG_WARNING,
 					_("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"),
@@ -745,6 +762,11 @@ static int register_repo(config_repo_t *repo)
 		}
 	}
 
+	int expiry = ( repo->expiry != -1 ? repo->expiry : config->repoexpiry);
+	pm_printf(ALPM_LOG_DEBUG, "setting expiry of %d for %s repository\n",
+			expiry, repo->name);
+	alpm_db_set_expiry(db, expiry);
+
 	return 0;
 }
 
@@ -908,7 +930,6 @@ static int process_usage(alpm_list_t *values, int *usage,
 	return ret;
 }
 
-
 static int _parse_repo(const char *key, char *value, const char *file,
 		int line, struct section_t *section)
 {
@@ -946,6 +967,23 @@ static int _parse_repo(const char *key, char *value, const char *file,
 			}
 			FREELIST(values);
 		}
+	} else if(strcmp(key, "RepoExpiry") == 0) {
+		CHECK_VALUE(value);
+		char *end = NULL;
+		long expiry = strtol(value, &end, 10);
+		if(*end) {
+			pm_printf(ALPM_LOG_ERROR,
+				_("config file %s, line %d: '%s' value '%s' not recognized\n"),
+				file, line, "RepoExpiry", value);
+			return 1;
+		}
+		if(expiry > INT_MAX) {
+			pm_printf(ALPM_LOG_ERROR,
+				_("config file %s, line %d: '%s' value '%s' is too large\n"),
+				file, line, "RepoExpiry", value);
+			return 1;
+		}
+		repo->expiry = (int)expiry;
 	} else {
 		pm_printf(ALPM_LOG_WARNING,
 				_("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"),
@@ -1038,6 +1076,7 @@ static int _parse_directive(const char *file, int linenum, const char *name,
 			section->repo->name = strdup(name);
 			section->repo->siglevel = ALPM_SIG_USE_DEFAULT;
 			section->repo->usage = 0;
+			section->repo->expiry = -1;
 			config->repos = alpm_list_add(config->repos, section->repo);
 		}
 		return 0;
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 03a15a48..91f1c797 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -40,6 +40,7 @@ typedef struct __config_repo_t {
 	int usage;
 	int siglevel;
 	int siglevel_mask;
+	int expiry;
 } config_repo_t;
 
 typedef struct __config_t {
@@ -107,6 +108,8 @@ typedef struct __config_t {
 	int localfilesiglevel_mask;
 	int remotefilesiglevel_mask;
 
+	int repoexpiry;
+
 	/* conf file options */
 	/* I Love Candy! */
 	unsigned short chomp;
-- 
2.24.1

From allan at archlinux.org  Fri Dec 13 11:32:43 2019
From: allan at archlinux.org (Allan McRae)
Date: Fri, 13 Dec 2019 21:32:43 +1000
Subject: [pacman-dev] [PATCH 1/2] Add function to set and get expiry time
 for a repo database
Message-ID: <20191213113244.25477-1-allan@archlinux.org>

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 lib/libalpm/alpm.h | 14 ++++++++++++++
 lib/libalpm/db.c   | 14 ++++++++++++++
 lib/libalpm/db.h   |  2 ++
 3 files changed, 30 insertions(+)

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 956284bd..0a4d7fe7 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -1026,6 +1026,20 @@ int alpm_db_set_usage(alpm_db_t *db, int usage);
  */
 int alpm_db_get_usage(alpm_db_t *db, int *usage);
 
+
+/** Sets the expiry time of a database.
+ * @param db pointer to the package database to set the status for
+ * @param expiry number of days old a database can be before expiry
+ * @return 0 on success, or -1 on error
+ */
+int alpm_db_set_expiry(alpm_db_t *db, int expiry);
+
+/** Gets the expiry time of a database.
+ * @param db pointer to the package database to get the status of
+ * @return expiry time
+ */
+int alpm_db_get_expiry(alpm_db_t *db);
+
 /** @} */
 
 /** @addtogroup alpm_api_packages Package Functions
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 43ca1fc8..a4fd4353 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -325,6 +325,20 @@ int SYMEXPORT alpm_db_get_usage(alpm_db_t *db, int *usage)
 	return 0;
 }
 
+/** Sets the expiry time for a repo */
+int SYMEXPORT alpm_db_set_expiry(alpm_db_t *db, int expiry)
+{
+	ASSERT(db != NULL, return -1);
+	db->expiry = expiry;
+	return 0;
+}
+
+/** Gets the expiry time for a repo */
+int SYMEXPORT alpm_db_get_expiry(alpm_db_t *db)
+{
+	ASSERT(db != NULL, return -1);
+	return db->expiry;
+}
 
 /** @} */
 
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index e7ad98f5..76947247 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -79,6 +79,8 @@ struct __alpm_db_t {
 	int siglevel;
 	/* alpm_db_usage_t */
 	int usage;
+
+	int expiry;
 };
 
 
-- 
2.24.1

From allan at archlinux.org  Fri Dec 13 11:39:30 2019
From: allan at archlinux.org (Allan McRae)
Date: Fri, 13 Dec 2019 21:39:30 +1000
Subject: [pacman-dev] Adding an expiry time to repo databases
Message-ID: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>

Hi all,

I have made a start at adding an expiry time to repo databases.   See
the three patches here:

https://patchwork.archlinux.org/bundle/Allan/repo_timestamp/

My question is, what should we do once a database is determined to be
expired?  Follow the example of a bad signature, and refuse to load it
at all?  Just refuse to install anything from it, but still enable
searching etc?

Just deciding "bad repo, don't use" will be much easier to implement...

Comments?

A

From grazzolini at archlinux.org  Fri Dec 13 12:54:33 2019
From: grazzolini at archlinux.org (Giancarlo Razzolini)
Date: Fri, 13 Dec 2019 09:54:33 -0300
Subject: [pacman-dev] Adding an expiry time to repo databases
In-Reply-To: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
References: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
Message-ID: <1576241604.qjkoqdvsrw.astroid@arch.razzolini.com.br.none>

Em dezembro 13, 2019 8:39 Allan McRae escreveu:
> Hi all,
> 
> I have made a start at adding an expiry time to repo databases.   See
> the three patches here:
> 
> https://patchwork.archlinux.org/bundle/Allan/repo_timestamp/
> 
> My question is, what should we do once a database is determined to be
> expired?  Follow the example of a bad signature, and refuse to load it
> at all?  Just refuse to install anything from it, but still enable
> searching etc?
> 
> Just deciding "bad repo, don't use" will be much easier to implement...
> 
> Comments?
> 

I'd go with, if expired, don't touch it *at all*. Even searching from then
should not be allowed.

Regards,
Giancarlo Razzolini
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.archlinux.org/pipermail/pacman-dev/attachments/20191213/fca83c19/attachment.sig>

From eschwartz at archlinux.org  Fri Dec 13 12:59:42 2019
From: eschwartz at archlinux.org (Eli Schwartz)
Date: Fri, 13 Dec 2019 07:59:42 -0500
Subject: [pacman-dev] Adding an expiry time to repo databases
In-Reply-To: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
References: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
Message-ID: <96a198f9-df9e-b83b-9276-ac68dea4bda0@archlinux.org>

On 12/13/19 6:39 AM, Allan McRae wrote:
> Hi all,
> 
> I have made a start at adding an expiry time to repo databases.   See
> the three patches here:
> 
> https://patchwork.archlinux.org/bundle/Allan/repo_timestamp/
> 
> My question is, what should we do once a database is determined to be
> expired?  Follow the example of a bad signature, and refuse to load it
> at all?  Just refuse to install anything from it, but still enable
> searching etc?
> 
> Just deciding "bad repo, don't use" will be much easier to implement...
> 
> Comments?

Offering to search a repo that you cannot then use, seems quite
inconsistent. And people who configured a repo timestamp are
implementing the same role as people configuring a gpg signature check
-- they don't consider the repository to be valid or trusted without it,
that repository is probably an MiTM if it cannot be refreshed.

Let's mark it as so bad we don't even want to load it.

-- 
Eli Schwartz
Bug Wrangler and Trusted User

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1601 bytes
Desc: OpenPGP digital signature
URL: <https://lists.archlinux.org/pipermail/pacman-dev/attachments/20191213/5affb93a/attachment.sig>

From arch at eckner.net  Fri Dec 13 13:00:17 2019
From: arch at eckner.net (Erich Eckner)
Date: Fri, 13 Dec 2019 14:00:17 +0100 (CET)
Subject: [pacman-dev] Adding an expiry time to repo databases
In-Reply-To: <1576241604.qjkoqdvsrw.astroid@arch.razzolini.com.br.none>
References: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
 <1576241604.qjkoqdvsrw.astroid@arch.razzolini.com.br.none>
Message-ID: <alpine.LNX.2.21.99999.378.1912131357450.1850766@nlopc43.ioq.uni-jena.de>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On Fri, 13 Dec 2019, Giancarlo Razzolini wrote:

> Em dezembro 13, 2019 8:39 Allan McRae escreveu:
>> Hi all,
>> 
>> I have made a start at adding an expiry time to repo databases.   See
>> the three patches here:
>> 
>> https://patchwork.archlinux.org/bundle/Allan/repo_timestamp/
>> 
>> My question is, what should we do once a database is determined to be
>> expired?  Follow the example of a bad signature, and refuse to load it
>> at all?  Just refuse to install anything from it, but still enable
>> searching etc?
>> 
>> Just deciding "bad repo, don't use" will be much easier to implement...
>> 
>> Comments?
>> 
>
> I'd go with, if expired, don't touch it *at all*. Even searching from then
> should not be allowed.

I'm also in favour of this approach. We need some possibility to ignore 
the expiration anyways (e.g. change config option or more convenient: some 
command line flag to override the value from the config file), because 
otherwise it becomes impossible to install from an archived repository.

>
> Regards,
> Giancarlo Razzolini

Regards,
Erich

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEE3p92iMrPBP64GmxZCu7JB1Xae1oFAl3zi2MACgkQCu7JB1Xa
e1o4Dg//fQpcgXZlD5v3zSyEX3Nd6/CUQhpODypFK0F8Wzt/zi/LONoR9R/Z41Ww
JZsrbDbkjux/8N1Ef2/rvR43TTVkNouiaEUQ5nPvTICdF/OT5ZD0Rsxxiv3ihAU/
csHB8ZPtzRbBIPDrtdvFD2O2sRzE7jQA8enm3tm74nI5XgWOgs0n36PAj23nA/Q8
H+OC2QHvhRPVL1KL4jJehBHA4c6sL21Kao8KWMbqiCloP5smTwtwQpwKgDZBPLu8
htFf2BLftJlqrI5TrbLbmrPsU+5sqqTxOvE6YP9fPfbFU4asnIZ5CrbJq7H9CvFI
LuomryLYv9SS4xEHznCVOAU7WGajD6Squ2L7Naz+eWv5oBBeV7c1aibmb17CvFFd
S3UYNli4S1X//L3FojTAnGoQHXQgBgCKWj3prowZjw9fHtTQyruwiMkdRs7KdyJG
iwokGdYJg3xwK5Cz+HOY7vlfPQQ5fXX6U/r3FAKaEBx4SMSwPL5+JpD7HYA7BpFs
L4vfbjKm+xijOwsQ5wzep7PbEBkHh63wWySPqNzcxHs5v2JY1/+HsvcXjnO7dHDe
uYDofgslLOB8dvaAIEdhX/5NAwNXGmQwHZZs2vxcBahGV9a9m9oJ0cKu2TkI7TOE
xLDFEjy/0Uwj/BtPKWw4UbO4ArPF/VB7cXTu9DNWCJ/AD3AyWA4=
=S1BH
-----END PGP SIGNATURE-----

From allan at archlinux.org  Fri Dec 13 13:16:52 2019
From: allan at archlinux.org (Allan McRae)
Date: Fri, 13 Dec 2019 23:16:52 +1000
Subject: [pacman-dev] Adding an expiry time to repo databases
In-Reply-To: <alpine.LNX.2.21.99999.378.1912131357450.1850766@nlopc43.ioq.uni-jena.de>
References: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
 <1576241604.qjkoqdvsrw.astroid@arch.razzolini.com.br.none>
 <alpine.LNX.2.21.99999.378.1912131357450.1850766@nlopc43.ioq.uni-jena.de>
Message-ID: <56f6803f-d6f2-2621-4e8a-70e96d8fc2f1@archlinux.org>

On 13/12/19 11:00 pm, Erich Eckner wrote:
> On Fri, 13 Dec 2019, Giancarlo Razzolini wrote:
> 
>> Em dezembro 13, 2019 8:39 Allan McRae escreveu:
>>> Hi all,
>>>
>>> I have made a start at adding an expiry time to repo databases.   See
>>> the three patches here:
>>>
>>> https://patchwork.archlinux.org/bundle/Allan/repo_timestamp/
>>>
>>> My question is, what should we do once a database is determined to be
>>> expired?  Follow the example of a bad signature, and refuse to load it
>>> at all?  Just refuse to install anything from it, but still enable
>>> searching etc?
>>>
>>> Just deciding "bad repo, don't use" will be much easier to implement...
>>>
>>> Comments?
>>>
> 
>> I'd go with, if expired, don't touch it *at all*. Even searching from
>> then
>> should not be allowed.
> 
> I'm also in favour of this approach. We need some possibility to ignore
> the expiration anyways (e.g. change config option or more convenient:
> some command line flag to override the value from the config file),
> because otherwise it becomes impossible to install from an archived
> repository.
> 

If you want to install from an archived repository, set the timeout to
be super large, or just unset it...

With my current patch, there is no way to unset a single repo with a
global config value.  I'll need to think about how to handle that.  But
you can have no global value and set all repos apart from the one you
don't want to expire.

Allan

From diabonas at archlinux.org  Fri Dec 13 13:39:01 2019
From: diabonas at archlinux.org (Jonas Witschel)
Date: Fri, 13 Dec 2019 14:39:01 +0100
Subject: [pacman-dev] Adding an expiry time to repo databases
In-Reply-To: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
References: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
Message-ID: <8d2a087d-179d-5c5c-2b41-8ccb35dc5e73@archlinux.org>

On 2019-12-13 12:39, Allan McRae wrote:
> I have made a start at adding an expiry time to repo databases.   See
> the three patches here:
> 
> https://patchwork.archlinux.org/bundle/Allan/repo_timestamp/
> 
> My question is, what should we do once a database is determined to be
> expired?  Follow the example of a bad signature, and refuse to load it
> at all?  Just refuse to install anything from it, but still enable
> searching etc?

In my opinion the timestamp only needs to be checked during a database
refresh: in combination with signed database files, this provides
security against a MITM serving an outdated database to withhold
security updates, while leaving the timing of database updates under the
user's control. As an example, air-gapped computers are expected to have
an outdated database, while it would still be completely fine to install
packages from the cache.



In case the freshly downloaded database is expired, it shall not be
copied and unpacked to /var/lib/pacman at all, instead the next
available mirror should be tried to download a more recent copy. This
also provides a bit of a usability improvement w.r.t. stale mirrors.



Best,

Jonas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.archlinux.org/pipermail/pacman-dev/attachments/20191213/2b5c9ed2/attachment-0001.sig>

From eschwartz at archlinux.org  Fri Dec 13 14:08:41 2019
From: eschwartz at archlinux.org (Eli Schwartz)
Date: Fri, 13 Dec 2019 09:08:41 -0500
Subject: [pacman-dev] Adding an expiry time to repo databases
In-Reply-To: <8d2a087d-179d-5c5c-2b41-8ccb35dc5e73@archlinux.org>
References: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
 <8d2a087d-179d-5c5c-2b41-8ccb35dc5e73@archlinux.org>
Message-ID: <bdcea447-87d3-6c33-83e9-6434eb9a5068@archlinux.org>

On 12/13/19 8:39 AM, Jonas Witschel wrote:
> As an example, air-gapped computers are expected to have
> an outdated database, while it would still be completely fine to install
> packages from the cache.

Wouldn't an airgapped computer also be updating (if it does update) from
a known trusted database communicated via e.g. USB? So there is no need
to specify an expiry time on the airgapped computer. The computer which
generates updates will specify an expiry time, and if its database
passes validity checks including the expiry timestamp, it rsyncs the
*.db and pacman cache to some trusted external storage media, and then
the airgapped system assumes that it was valid at the time it was created.

> In case the freshly downloaded database is expired, it shall not be
> copied and unpacked to /var/lib/pacman at all, instead the next
> available mirror should be tried to download a more recent copy. This
> also provides a bit of a usability improvement w.r.t. stale mirrors.

That sounds like an additional useful thing to do, but I'm not sure we
do that currently if PGP signatures fail...

-- 
Eli Schwartz
Bug Wrangler and Trusted User

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1601 bytes
Desc: OpenPGP digital signature
URL: <https://lists.archlinux.org/pipermail/pacman-dev/attachments/20191213/abc5536c/attachment.sig>

From diabonas at archlinux.org  Fri Dec 13 14:40:08 2019
From: diabonas at archlinux.org (Jonas Witschel)
Date: Fri, 13 Dec 2019 15:40:08 +0100
Subject: [pacman-dev] Adding an expiry time to repo databases
In-Reply-To: <bdcea447-87d3-6c33-83e9-6434eb9a5068@archlinux.org>
References: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
 <8d2a087d-179d-5c5c-2b41-8ccb35dc5e73@archlinux.org>
 <bdcea447-87d3-6c33-83e9-6434eb9a5068@archlinux.org>
Message-ID: <389ffde0-5b7e-b09f-b86c-08cee3af2800@archlinux.org>

On 2019-12-13 15:08, Eli Schwartz wrote:
> Wouldn't an airgapped computer also be updating (if it does update) from
> a known trusted database communicated via e.g. USB? So there is no need
> to specify an expiry time on the airgapped computer. The computer which
> generates updates will specify an expiry time, and if its database
> passes validity checks including the expiry timestamp, it rsyncs the
> *.db and pacman cache to some trusted external storage media, and then
> the airgapped system assumes that it was valid at the time it was created.

I agree, for complete system updates you ought to have access to a
recent database. My use case was more directed to something like
reinstalling a previously removed package that is still in the cache.
Certainly not a very important case, and it could be worked around by
specifying a very long expiry time, but I don't know why that should be
necessary:

I fail to see the point in checking the timestamp of the local database
every time it is used. It is not necessary for the "MITM serving
outdated databases to withhold critical updates" scenario, but it forces
users to refresh their databases from time to time.
While it can be argued that this is actually a good thing when combined
with a system upgrade, my worry is that people will start using "-Sy"
even more if they only want to install a new package, potentially
leading to partial upgrades. In contrast, you currently at least have a
chance to install packages without a system upgrade using "-S
packagename" if they are still available on the mirrors.

It is certainly possible that I am missing some attack scenario that
makes it necessary to check the local database every time. If so, that
should be brought up here and documented in the threat model. Otherwise
I don't really see the point in an additional check and at least a
slight decrease in usability.

Cheers,
Jonas

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.archlinux.org/pipermail/pacman-dev/attachments/20191213/9940975a/attachment.sig>

From allan at archlinux.org  Fri Dec 13 14:46:47 2019
From: allan at archlinux.org (Allan McRae)
Date: Sat, 14 Dec 2019 00:46:47 +1000
Subject: [pacman-dev] Adding an expiry time to repo databases
In-Reply-To: <bdcea447-87d3-6c33-83e9-6434eb9a5068@archlinux.org>
References: <c0d69f1d-8b48-5a8d-16f9-189c76151c69@archlinux.org>
 <8d2a087d-179d-5c5c-2b41-8ccb35dc5e73@archlinux.org>
 <bdcea447-87d3-6c33-83e9-6434eb9a5068@archlinux.org>
Message-ID: <f565a2b3-c132-abfe-15d5-38c8063704e4@archlinux.org>

On 14/12/19 12:08 am, Eli Schwartz wrote:
>> In case the freshly downloaded database is expired, it shall not be
>> copied and unpacked to /var/lib/pacman at all, instead the next
>> available mirror should be tried to download a more recent copy. This
>> also provides a bit of a usability improvement w.r.t. stale mirrors.
>
> That sounds like an additional useful thing to do, but I'm not sure we
> do that currently if PGP signatures fail...

I have a WIP patch for that.  Was just looking at it!

A

From allan at archlinux.org  Mon Dec 16 15:04:59 2019
From: allan at archlinux.org (Allan McRae)
Date: Tue, 17 Dec 2019 01:04:59 +1000
Subject: [pacman-dev] [PATCH 1/2] Attempted to free lock on failure in
 alpm_db_update()
Message-ID: <20191216150500.213552-1-allan@archlinux.org>

Also fixes a memory leak under an error condition.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 lib/libalpm/be_sync.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 041b2266..5502d92d 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -215,7 +215,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 		RET_ERR(handle, ALPM_ERR_HANDLE_LOCK, -1);
 	}
 
-	dbext = db->handle->dbext;
+	dbext = handle->dbext;
 
 	for(i = db->servers; i; i = i->next) {
 		const char *server = i->data, *final_db_url = NULL;
@@ -232,9 +232,9 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 		len = strlen(server) + strlen(db->treename) + strlen(dbext) + 2;
 		MALLOC(payload.fileurl, len,
 			{
-				free(syncpath);
-				umask(oldmask);
-				RET_ERR(handle, ALPM_ERR_MEMORY, -1);
+				handle->pm_errno = ALPM_ERR_MEMORY;
+				ret = -1;
+				goto cleanup;
 			}
 		);
 		snprintf(payload.fileurl, len, "%s/%s%s", server, db->treename, dbext);
@@ -250,8 +250,9 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 			/* an existing sig file is no good at this point */
 			char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db));
 			if(!sigpath) {
+				/* pm_errno should be set */
 				ret = -1;
-				break;
+				goto cleanup;
 			}
 			unlink(sigpath);
 			free(sigpath);
@@ -277,9 +278,9 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 
 			MALLOC(payload.fileurl, len,
 				{
-					free(syncpath);
-					umask(oldmask);
-					RET_ERR(handle, ALPM_ERR_MEMORY, -1);
+					handle->pm_errno = ALPM_ERR_MEMORY;
+					ret = -1;
+					goto cleanup;
 				}
 			);
 
@@ -324,6 +325,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 		}
 	}
 
+cleanup:
 	if(ret == -1) {
 		/* pm_errno was set by the download code */
 		_alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n",
-- 
2.24.1

From allan at archlinux.org  Mon Dec 16 15:05:00 2019
From: allan at archlinux.org (Allan McRae)
Date: Tue, 17 Dec 2019 01:05:00 +1000
Subject: [pacman-dev] [PATCH 2/2] Backup old database before updating and
 restore on failure
In-Reply-To: <20191216150500.213552-1-allan@archlinux.org>
References: <20191216150500.213552-1-allan@archlinux.org>
Message-ID: <20191216150500.213552-2-allan@archlinux.org>

If alpm_db_update() fails due to an invalid signature, then the system
is left with an unusable repo database.  Instead, backup the currently
working database before performing the update, and restore on error.

Note that the calls rename and unlink are not checked for errors. If these
fail, there is nothing to be done anyway.  It also allows for less complex
flow, as these function fail gracefully when passed NULL arguments.

Signed-off-by: Allan McRae <allan at archlinux.org>
---

That is a lot of teduim for adding ".bak" to the end of a string...

I'd appreciate more eyes on these changes.

 lib/libalpm/be_sync.c | 58 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 5502d92d..ae46c120 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -136,6 +136,7 @@ valid:
 	return 0;
 }
 
+
 /** Update a package database
  *
  * An update of the package database \a db will be attempted. Unless
@@ -173,14 +174,15 @@ valid:
  */
 int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 {
-	char *syncpath;
-	const char *dbext;
+	char *syncpath, *dbsig = NULL, *dbfilebak = NULL, *dbsigbak = NULL;
+	const char *dbext, *dbfile;
 	alpm_list_t *i;
 	int updated = 0;
 	int ret = -1;
 	mode_t oldmask;
 	alpm_handle_t *handle;
 	int siglevel;
+	size_t len;
 
 	/* Sanity checks */
 	ASSERT(db != NULL, return -1);
@@ -217,10 +219,39 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 
 	dbext = handle->dbext;
 
+	/* create backup of current database version */
+	dbfile = _alpm_db_path(db);
+	len = strlen(dbfile) + 5;
+	MALLOC(dbfilebak, len,
+		{
+			handle->pm_errno = ALPM_ERR_MEMORY;
+			ret = -1;
+			goto cleanup;
+		}
+	);
+	snprintf(dbfilebak, len, "%s.bak", dbfile);
+
+
+	dbsig = _alpm_sigpath(db->handle, dbfile);
+	len = strlen(dbsig) + 5;
+	MALLOC(dbsigbak, len,
+		{
+			handle->pm_errno = ALPM_ERR_MEMORY;
+			ret = -1;
+			goto cleanup;
+		}
+	);
+	snprintf(dbsigbak, len, "%s.bak", dbsig);
+
+	/* remove any old backup files to prevent potential sig mismatch */
+	unlink(dbfilebak);
+	unlink(dbsigbak);
+	_alpm_copyfile(dbfile, dbfilebak);
+	_alpm_copyfile(dbsig, dbsigbak);
+
 	for(i = db->servers; i; i = i->next) {
 		const char *server = i->data, *final_db_url = NULL;
 		struct dload_payload payload;
-		size_t len;
 		int sig_ret = 0;
 
 		memset(&payload, 0, sizeof(struct dload_payload));
@@ -247,17 +278,6 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 		updated = (updated || ret == 0);
 
 		if(ret != -1 && updated && (siglevel & ALPM_SIG_DATABASE)) {
-			/* an existing sig file is no good at this point */
-			char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db));
-			if(!sigpath) {
-				/* pm_errno should be set */
-				ret = -1;
-				goto cleanup;
-			}
-			unlink(sigpath);
-			free(sigpath);
-
-
 			/* check if the final URL from internal downloader looks reasonable */
 			if(final_db_url != NULL) {
 				if(strlen(final_db_url) < 3
@@ -327,13 +347,23 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 
 cleanup:
 	if(ret == -1) {
+		rename(dbfilebak, dbfile);
+		rename(dbsigbak, dbsig);
+
 		/* pm_errno was set by the download code */
 		_alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n",
 				alpm_strerror(handle->pm_errno));
 	} else {
+		unlink(dbfilebak);
+		unlink(dbsigbak);
+
 		handle->pm_errno = ALPM_ERR_OK;
 	}
 
+	free(dbfilebak);
+	free(dbsig);
+	free(dbsigbak);
+
 	_alpm_handle_unlock(handle);
 	free(syncpath);
 	umask(oldmask);
-- 
2.24.1

From eschwartz at archlinux.org  Mon Dec 16 15:21:19 2019
From: eschwartz at archlinux.org (Eli Schwartz)
Date: Mon, 16 Dec 2019 10:21:19 -0500
Subject: [pacman-dev] [PATCH 2/2] Backup old database before updating
 and restore on failure
In-Reply-To: <20191216150500.213552-2-allan@archlinux.org>
References: <20191216150500.213552-1-allan@archlinux.org>
 <20191216150500.213552-2-allan@archlinux.org>
Message-ID: <1eefb615-6399-c5b1-f754-99108faa7e34@archlinux.org>

On 12/16/19 10:05 AM, Allan McRae wrote:
> If alpm_db_update() fails due to an invalid signature, then the system
> is left with an unusable repo database.  Instead, backup the currently
> working database before performing the update, and restore on error.
> 
> Note that the calls rename and unlink are not checked for errors. If these
> fail, there is nothing to be done anyway.  It also allows for less complex
> flow, as these function fail gracefully when passed NULL arguments.
> 
> Signed-off-by: Allan McRae <allan at archlinux.org>
> ---
> 
> That is a lot of teduim for adding ".bak" to the end of a string...
> 
> I'd appreciate more eyes on these changes.

Cool!

Would it help to download the db to a temporary file, and rename it on
success?

>  lib/libalpm/be_sync.c | 58 ++++++++++++++++++++++++++++++++-----------
>  1 file changed, 44 insertions(+), 14 deletions(-)
> 
> diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
> index 5502d92d..ae46c120 100644
> --- a/lib/libalpm/be_sync.c
> +++ b/lib/libalpm/be_sync.c
> @@ -136,6 +136,7 @@ valid:
>  	return 0;
>  }
>  
> +
>  /** Update a package database
>   *
>   * An update of the package database \a db will be attempted. Unless
> @@ -173,14 +174,15 @@ valid:
>   */
>  int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  {
> -	char *syncpath;
> -	const char *dbext;
> +	char *syncpath, *dbsig = NULL, *dbfilebak = NULL, *dbsigbak = NULL;
> +	const char *dbext, *dbfile;
>  	alpm_list_t *i;
>  	int updated = 0;
>  	int ret = -1;
>  	mode_t oldmask;
>  	alpm_handle_t *handle;
>  	int siglevel;
> +	size_t len;
>  
>  	/* Sanity checks */
>  	ASSERT(db != NULL, return -1);
> @@ -217,10 +219,39 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  
>  	dbext = handle->dbext;
>  
> +	/* create backup of current database version */
> +	dbfile = _alpm_db_path(db);
> +	len = strlen(dbfile) + 5;
> +	MALLOC(dbfilebak, len,
> +		{
> +			handle->pm_errno = ALPM_ERR_MEMORY;
> +			ret = -1;
> +			goto cleanup;
> +		}
> +	);
> +	snprintf(dbfilebak, len, "%s.bak", dbfile);
> +
> +
> +	dbsig = _alpm_sigpath(db->handle, dbfile);
> +	len = strlen(dbsig) + 5;
> +	MALLOC(dbsigbak, len,
> +		{
> +			handle->pm_errno = ALPM_ERR_MEMORY;
> +			ret = -1;
> +			goto cleanup;
> +		}
> +	);
> +	snprintf(dbsigbak, len, "%s.bak", dbsig);
> +
> +	/* remove any old backup files to prevent potential sig mismatch */
> +	unlink(dbfilebak);
> +	unlink(dbsigbak);
> +	_alpm_copyfile(dbfile, dbfilebak);
> +	_alpm_copyfile(dbsig, dbsigbak);
> +
>  	for(i = db->servers; i; i = i->next) {
>  		const char *server = i->data, *final_db_url = NULL;
>  		struct dload_payload payload;
> -		size_t len;
>  		int sig_ret = 0;
>  
>  		memset(&payload, 0, sizeof(struct dload_payload));
> @@ -247,17 +278,6 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  		updated = (updated || ret == 0);
>  
>  		if(ret != -1 && updated && (siglevel & ALPM_SIG_DATABASE)) {
> -			/* an existing sig file is no good at this point */
> -			char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db));
> -			if(!sigpath) {
> -				/* pm_errno should be set */
> -				ret = -1;
> -				goto cleanup;
> -			}
> -			unlink(sigpath);
> -			free(sigpath);
> -
> -
>  			/* check if the final URL from internal downloader looks reasonable */
>  			if(final_db_url != NULL) {
>  				if(strlen(final_db_url) < 3
> @@ -327,13 +347,23 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  
>  cleanup:
>  	if(ret == -1) {
> +		rename(dbfilebak, dbfile);
> +		rename(dbsigbak, dbsig);
> +
>  		/* pm_errno was set by the download code */
>  		_alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n",
>  				alpm_strerror(handle->pm_errno));
>  	} else {
> +		unlink(dbfilebak);
> +		unlink(dbsigbak);
> +
>  		handle->pm_errno = ALPM_ERR_OK;
>  	}
>  
> +	free(dbfilebak);
> +	free(dbsig);
> +	free(dbsigbak);
> +
>  	_alpm_handle_unlock(handle);
>  	free(syncpath);
>  	umask(oldmask);
> 


-- 
Eli Schwartz
Bug Wrangler and Trusted User

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1601 bytes
Desc: OpenPGP digital signature
URL: <https://lists.archlinux.org/pipermail/pacman-dev/attachments/20191216/ad328601/attachment.sig>

From allan at archlinux.org  Mon Dec 16 23:30:33 2019
From: allan at archlinux.org (Allan McRae)
Date: Tue, 17 Dec 2019 09:30:33 +1000
Subject: [pacman-dev] [PATCH 2/2] Backup old database before updating
 and restore on failure
In-Reply-To: <1eefb615-6399-c5b1-f754-99108faa7e34@archlinux.org>
References: <20191216150500.213552-1-allan@archlinux.org>
 <20191216150500.213552-2-allan@archlinux.org>
 <1eefb615-6399-c5b1-f754-99108faa7e34@archlinux.org>
Message-ID: <5151543a-1af6-3fca-1e81-b16a43c9dada@archlinux.org>

On 17/12/19 1:21 am, Eli Schwartz wrote:
> On 12/16/19 10:05 AM, Allan McRae wrote:
>> If alpm_db_update() fails due to an invalid signature, then the system
>> is left with an unusable repo database.  Instead, backup the currently
>> working database before performing the update, and restore on error.
>>
>> Note that the calls rename and unlink are not checked for errors. If these
>> fail, there is nothing to be done anyway.  It also allows for less complex
>> flow, as these function fail gracefully when passed NULL arguments.
>>
>> Signed-off-by: Allan McRae <allan at archlinux.org>
>> ---
>>
>> That is a lot of teduim for adding ".bak" to the end of a string...
>>
>> I'd appreciate more eyes on these changes.
> 
> Cool!
> 
> Would it help to download the db to a temporary file, and rename it on
> success?
> 

I looked at that approach quite some time ago.  The issue is things like
alpm_db_validate take a db pointer and construct paths using that.  It
could be worked around by creating a temporary sync directory and
setting that in the handle, but I thought this way was easier/cleaner.

Allan

From andrew.gregory.8 at gmail.com  Tue Dec 17 07:13:34 2019
From: andrew.gregory.8 at gmail.com (Andrew Gregory)
Date: Mon, 16 Dec 2019 23:13:34 -0800
Subject: [pacman-dev] [PATCH 1/2] Attempted to free lock on failure in
 alpm_db_update()
In-Reply-To: <20191216150500.213552-1-allan@archlinux.org>
References: <20191216150500.213552-1-allan@archlinux.org>
Message-ID: <20191217071334.GA8022@b42-desktop.localdomain>

s/Attempted to//?

On 12/17/19 at 01:04am, Allan McRae wrote:
> Also fixes a memory leak under an error condition.
> 
> Signed-off-by: Allan McRae <allan at archlinux.org>
> ---
>  lib/libalpm/be_sync.c | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
> index 041b2266..5502d92d 100644
> --- a/lib/libalpm/be_sync.c
> +++ b/lib/libalpm/be_sync.c
...
> @@ -324,6 +325,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  		}
>  	}
>  
> +cleanup:

Shouldn't this be before the previous if(updated){...} block?

>  	if(ret == -1) {
>  		/* pm_errno was set by the download code */
>  		_alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n",

From allan at archlinux.org  Thu Dec 19 01:17:38 2019
From: allan at archlinux.org (Allan McRae)
Date: Thu, 19 Dec 2019 11:17:38 +1000
Subject: [pacman-dev] [PATCH 1/2] Attempted to free lock on failure in
 alpm_db_update()
In-Reply-To: <20191217071334.GA8022@b42-desktop.localdomain>
References: <20191216150500.213552-1-allan@archlinux.org>
 <20191217071334.GA8022@b42-desktop.localdomain>
Message-ID: <ef3b36fc-dba9-4ca5-6679-2b75ed28b875@archlinux.org>

On 17/12/19 5:13 pm, Andrew Gregory wrote:
> s/Attempted to//?
> 
> On 12/17/19 at 01:04am, Allan McRae wrote:
>> Also fixes a memory leak under an error condition.
>>
>> Signed-off-by: Allan McRae <allan at archlinux.org>
>> ---
>>  lib/libalpm/be_sync.c | 18 ++++++++++--------
>>  1 file changed, 10 insertions(+), 8 deletions(-)
>>
>> diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
>> index 041b2266..5502d92d 100644
>> --- a/lib/libalpm/be_sync.c
>> +++ b/lib/libalpm/be_sync.c
> ...
>> @@ -324,6 +325,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>>  		}
>>  	}
>>  
>> +cleanup:
> 
> Shouldn't this be before the previous if(updated){...} block?

It could be...   No need to drop the cache and reset validation if we
are restoring the old database, but it does not hurt.

>>  	if(ret == -1) {
>>  		/* pm_errno was set by the download code */
>>  		_alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n",
> .
> 

From andrew.gregory.8 at gmail.com  Thu Dec 19 03:23:29 2019
From: andrew.gregory.8 at gmail.com (Andrew Gregory)
Date: Wed, 18 Dec 2019 19:23:29 -0800
Subject: [pacman-dev] [PATCH 1/2] Attempted to free lock on failure in
 alpm_db_update()
In-Reply-To: <ef3b36fc-dba9-4ca5-6679-2b75ed28b875@archlinux.org>
References: <20191216150500.213552-1-allan@archlinux.org>
 <20191217071334.GA8022@b42-desktop.localdomain>
 <ef3b36fc-dba9-4ca5-6679-2b75ed28b875@archlinux.org>
Message-ID: <20191219032329.GA11281@b42-desktop.localdomain>

On 12/19/19 at 11:17am, Allan McRae wrote:
> On 17/12/19 5:13 pm, Andrew Gregory wrote:
> > s/Attempted to//?
> > 
> > On 12/17/19 at 01:04am, Allan McRae wrote:
> >> Also fixes a memory leak under an error condition.
> >>
> >> Signed-off-by: Allan McRae <allan at archlinux.org>
> >> ---
> >>  lib/libalpm/be_sync.c | 18 ++++++++++--------
> >>  1 file changed, 10 insertions(+), 8 deletions(-)
> >>
> >> diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
> >> index 041b2266..5502d92d 100644
> >> --- a/lib/libalpm/be_sync.c
> >> +++ b/lib/libalpm/be_sync.c
> > ...
> >> @@ -324,6 +325,7 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
> >>  		}
> >>  	}
> >>  
> >> +cleanup:
> > 
> > Shouldn't this be before the previous if(updated){...} block?
> 
> It could be...   No need to drop the cache and reset validation if we
> are restoring the old database, but it does not hurt.

That doesn't happen until patch 2 though.  If they're going to be
split into separate patches, this patch should be able to stand on its
own.  It's unlikely, but the restoration could also fail, causing
a package list to be loaded from an invalid database.

From andrew.gregory.8 at gmail.com  Thu Dec 19 03:23:38 2019
From: andrew.gregory.8 at gmail.com (Andrew Gregory)
Date: Wed, 18 Dec 2019 19:23:38 -0800
Subject: [pacman-dev] [PATCH 2/2] Backup old database before updating
 and restore on failure
In-Reply-To: <20191216150500.213552-2-allan@archlinux.org>
References: <20191216150500.213552-1-allan@archlinux.org>
 <20191216150500.213552-2-allan@archlinux.org>
Message-ID: <20191219032338.GA6396@b42-desktop.localdomain>

On 12/17/19 at 01:05am, Allan McRae wrote:
> If alpm_db_update() fails due to an invalid signature, then the system
> is left with an unusable repo database.  Instead, backup the currently
> working database before performing the update, and restore on error.
> 
> Note that the calls rename and unlink are not checked for errors. If these
> fail, there is nothing to be done anyway.  It also allows for less complex
> flow, as these function fail gracefully when passed NULL arguments.
> 
> Signed-off-by: Allan McRae <allan at archlinux.org>
> ---

I really don't like the backup/restore method and would much prefer to
download to a new file and rotate it in once verified, but this is at
least a step in the right direction.

> That is a lot of teduim for adding ".bak" to the end of a string...

Sounds like a great excuse to start using asprintf.

> 
> I'd appreciate more eyes on these changes.
> 
>  lib/libalpm/be_sync.c | 58 ++++++++++++++++++++++++++++++++-----------
>  1 file changed, 44 insertions(+), 14 deletions(-)
> 
> diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
> index 5502d92d..ae46c120 100644
> --- a/lib/libalpm/be_sync.c
> +++ b/lib/libalpm/be_sync.c
> @@ -136,6 +136,7 @@ valid:
>  	return 0;
>  }
>  
> +

Extra whitespace change.

>  /** Update a package database
>   *
>   * An update of the package database \a db will be attempted. Unless
> @@ -173,14 +174,15 @@ valid:
>   */
>  int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  {
> -	char *syncpath;
> -	const char *dbext;
> +	char *syncpath, *dbsig = NULL, *dbfilebak = NULL, *dbsigbak = NULL;
> +	const char *dbext, *dbfile;
>  	alpm_list_t *i;
>  	int updated = 0;
>  	int ret = -1;
>  	mode_t oldmask;
>  	alpm_handle_t *handle;
>  	int siglevel;
> +	size_t len;
>  
>  	/* Sanity checks */
>  	ASSERT(db != NULL, return -1);
> @@ -217,10 +219,39 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  
>  	dbext = handle->dbext;
>  
> +	/* create backup of current database version */
> +	dbfile = _alpm_db_path(db);
> +	len = strlen(dbfile) + 5;
> +	MALLOC(dbfilebak, len,
> +		{
> +			handle->pm_errno = ALPM_ERR_MEMORY;
> +			ret = -1;
> +			goto cleanup;
> +		}
> +	);
> +	snprintf(dbfilebak, len, "%s.bak", dbfile);
> +
> +
> +	dbsig = _alpm_sigpath(db->handle, dbfile);
> +	len = strlen(dbsig) + 5;
> +	MALLOC(dbsigbak, len,
> +		{
> +			handle->pm_errno = ALPM_ERR_MEMORY;
> +			ret = -1;
> +			goto cleanup;
> +		}
> +	);
> +	snprintf(dbsigbak, len, "%s.bak", dbsig);
> +
> +	/* remove any old backup files to prevent potential sig mismatch */
> +	unlink(dbfilebak);
> +	unlink(dbsigbak);
> +	_alpm_copyfile(dbfile, dbfilebak);
> +	_alpm_copyfile(dbsig, dbsigbak);

_alpm_copyfile doesn't currently use either O_EXCL or O_TRUNC when it
opens the destination, so if the unlink fails, this could result in
thoroughly broken backup files.

>  	for(i = db->servers; i; i = i->next) {
>  		const char *server = i->data, *final_db_url = NULL;
>  		struct dload_payload payload;
> -		size_t len;
>  		int sig_ret = 0;
>  
>  		memset(&payload, 0, sizeof(struct dload_payload));
> @@ -247,17 +278,6 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  		updated = (updated || ret == 0);
>  
>  		if(ret != -1 && updated && (siglevel & ALPM_SIG_DATABASE)) {
> -			/* an existing sig file is no good at this point */
> -			char *sigpath = _alpm_sigpath(handle, _alpm_db_path(db));
> -			if(!sigpath) {
> -				/* pm_errno should be set */
> -				ret = -1;
> -				goto cleanup;
> -			}
> -			unlink(sigpath);
> -			free(sigpath);
> -
> -
>  			/* check if the final URL from internal downloader looks reasonable */
>  			if(final_db_url != NULL) {
>  				if(strlen(final_db_url) < 3
> @@ -327,13 +347,23 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  
>  cleanup:
>  	if(ret == -1) {
> +		rename(dbfilebak, dbfile);
> +		rename(dbsigbak, dbsig);

This obliterates the invalid file, making troubleshooting impossible.

We really need to be sure that either this restoration succeeds or the
validity and cache were reset.

> +
>  		/* pm_errno was set by the download code */
>  		_alpm_log(handle, ALPM_LOG_DEBUG, "failed to sync db: %s\n",
>  				alpm_strerror(handle->pm_errno));
>  	} else {
> +		unlink(dbfilebak);
> +		unlink(dbsigbak);
> +
>  		handle->pm_errno = ALPM_ERR_OK;
>  	}
>  
> +	free(dbfilebak);
> +	free(dbsig);
> +	free(dbsigbak);
> +
>  	_alpm_handle_unlock(handle);
>  	free(syncpath);
>  	umask(oldmask);
> -- 
> 2.24.1

From eschwartz at archlinux.org  Sun Dec 22 15:57:53 2019
From: eschwartz at archlinux.org (Eli Schwartz)
Date: Sun, 22 Dec 2019 10:57:53 -0500
Subject: [pacman-dev] [PATCH] makepkg: make source tarballs work with
 per-package files containing '$pkgname'
Message-ID: <20191222155753.12736-1-eschwartz@archlinux.org>

Extracting function variables containing arbitrarily scoped variables of
arbitrary nature is a disaster, but let's at least cover the common case
of using the actual '$pkgname' in an install/changelog file. It's the
odd case of actually being basically justified use of disambiguating
between the same variable used in multiple different split packages and
is even recommended in the PKGBUILD(5) documentation...

... and also, --printsrcinfo already uses and overwrites the variable
'pkgname' in pkgbuild_extract_to_srcinfo, so this "works" in .SRCINFO
but doesn't work in .src.tar.gz

Fixes FS#64932

Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
---
 scripts/makepkg.sh.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index ca3e7459..674e0d87 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -784,13 +784,14 @@ create_srcpackage() {
 		fi
 	done
 
-	local i
+	local pkgname_backup=(${pkgname[@]})
+	local i pkgname
 	for i in 'changelog' 'install'; do
 		local file files
 
 		[[ ${!i} ]] && files+=("${!i}")
-		for name in "${pkgname[@]}"; do
-			if extract_function_variable "package_$name" "$i" 0 file; then
+		for pkgname in "${pkgname_backup[@]}"; do
+			if extract_function_variable "package_$pkgname" "$i" 0 file; then
 				files+=("$file")
 			fi
 		done
@@ -802,6 +803,7 @@ create_srcpackage() {
 			fi
 		done
 	done
+	pkgname=(${pkgname_backup[@]})
 
 	local fullver=$(get_full_version)
 	local pkg_file="$SRCPKGDEST/${pkgbase}-${fullver}${SRCEXT}"
-- 
2.24.1

From dreisner at archlinux.org  Tue Dec 24 12:45:19 2019
From: dreisner at archlinux.org (Dave Reisner)
Date: Tue, 24 Dec 2019 07:45:19 -0500
Subject: [pacman-dev] [PATCH] Ensure regex object is always initialized
Message-ID: <20191224124519.1302055-1-dreisner@archlinux.org>

This avoids a crash in filetarget_free() when regex support isn't
requested in files_search().
---
 src/pacman/files.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pacman/files.c b/src/pacman/files.c
index 7b0c884b..29b593be 100644
--- a/src/pacman/files.c
+++ b/src/pacman/files.c
@@ -114,7 +114,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
 		char *targ = t->data;
 		size_t len = strlen(targ);
 		int exact_file = strchr(targ, '/') != NULL;
-		regex_t reg;
+		regex_t reg = {};
 
 		if(exact_file) {
 			while(len > 1 && targ[0] == '/') {
-- 
2.24.1

From dreisner at archlinux.org  Tue Dec 24 23:17:47 2019
From: dreisner at archlinux.org (Dave Reisner)
Date: Tue, 24 Dec 2019 18:17:47 -0500
Subject: [pacman-dev] [PATCHv2 1/2] Ensure regex object is always initialized
Message-ID: <20191224231748.1327058-1-dreisner@archlinux.org>

This avoids a crash in filetarget_free() when regex support isn't
requested in files_search().
---
v2: Use {0} instead of {}. The former is c99, the latter is a GNU
extension.

 src/pacman/files.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pacman/files.c b/src/pacman/files.c
index 7b0c884b..cae7130d 100644
--- a/src/pacman/files.c
+++ b/src/pacman/files.c
@@ -114,7 +114,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) {
 		char *targ = t->data;
 		size_t len = strlen(targ);
 		int exact_file = strchr(targ, '/') != NULL;
-		regex_t reg;
+		regex_t reg = {0};
 
 		if(exact_file) {
 			while(len > 1 && targ[0] == '/') {
-- 
2.24.1

From dreisner at archlinux.org  Tue Dec 24 23:17:48 2019
From: dreisner at archlinux.org (Dave Reisner)
Date: Tue, 24 Dec 2019 18:17:48 -0500
Subject: [pacman-dev] [PATCH 2/2] Use c99 struct initialization to avoid
 memset calls
In-Reply-To: <20191224231748.1327058-1-dreisner@archlinux.org>
References: <20191224231748.1327058-1-dreisner@archlinux.org>
Message-ID: <20191224231748.1327058-2-dreisner@archlinux.org>

This is guaranteed less error prone than calling memset and hoping the
human gets the argument order correct.
---
 lib/libalpm/be_local.c   |  5 +----
 lib/libalpm/be_package.c |  7 ++-----
 lib/libalpm/be_sync.c    |  7 ++-----
 lib/libalpm/dload.c      | 13 ++++++-------
 lib/libalpm/signing.c    | 23 +++++++----------------
 lib/libalpm/util.c       |  2 +-
 src/pacman/conf.c        |  3 +--
 7 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index b89acf05..78e32a24 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -694,7 +694,7 @@ char *_alpm_local_db_pkgpath(alpm_db_t *db, alpm_pkg_t *info,
 static int local_db_read(alpm_pkg_t *info, int inforeq)
 {
 	FILE *fp = NULL;
-	char line[1024];
+	char line[1024] = {0};
 	alpm_db_t *db = info->origin_data.db;
 
 	/* bitmask logic here:
@@ -717,9 +717,6 @@ static int local_db_read(alpm_pkg_t *info, int inforeq)
 			"loading package data for %s : level=0x%x\n",
 			info->name, inforeq);
 
-	/* clear out 'line', to be certain - and to make valgrind happy */
-	memset(line, 0, sizeof(line));
-
 	/* DESC */
 	if(inforeq & INFRQ_DESC && !(info->infolevel & INFRQ_DESC)) {
 		char *path = _alpm_local_db_pkgpath(db, info, "desc");
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index 5ffea875..9a8b4410 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -164,9 +164,8 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t *
 	char *ptr = NULL;
 	char *key = NULL;
 	int ret, linenum = 0;
-	struct archive_read_buffer buf;
+	struct archive_read_buffer buf = {0};
 
-	memset(&buf, 0, sizeof(buf));
 	/* 512K for a line length seems reasonable */
 	buf.max_line_size = 512 * 1024;
 
@@ -448,13 +447,11 @@ static int build_filelist_from_mtree(alpm_handle_t *handle, alpm_pkg_t *pkg, str
 	char *mtree_data = NULL;
 	struct archive *mtree;
 	struct archive_entry *mtree_entry = NULL;
-	alpm_filelist_t filelist;
+	alpm_filelist_t filelist = {0};
 
 	_alpm_log(handle, ALPM_LOG_DEBUG,
 			"found mtree for package %s, getting file list\n", pkg->filename);
 
-	memset(&filelist, 0, sizeof(alpm_filelist_t));
-
 	/* create a new archive to parse the mtree and load it from archive into memory */
 	/* TODO: split this into a function */
 	if((mtree = archive_read_new()) == NULL) {
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 2c76fe83..4614610c 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -219,12 +219,10 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
 
 	for(i = db->servers; i; i = i->next) {
 		const char *server = i->data, *final_db_url = NULL;
-		struct dload_payload payload;
+		struct dload_payload payload = {};
 		size_t len;
 		int sig_ret = 0;
 
-		memset(&payload, 0, sizeof(struct dload_payload));
-
 		/* set hard upper limit of 25MiB */
 		payload.max_size = 25 * 1024 * 1024;
 
@@ -601,7 +599,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,
 {
 	const char *entryname, *filename;
 	alpm_pkg_t *pkg;
-	struct archive_read_buffer buf;
+	struct archive_read_buffer buf = {0};
 
 	entryname = archive_entry_pathname(entry);
 	if(entryname == NULL) {
@@ -613,7 +611,6 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,
 	_alpm_log(db->handle, ALPM_LOG_FUNCTION, "loading package data from archive entry %s\n",
 			entryname);
 
-	memset(&buf, 0, sizeof(buf));
 	/* 512K for a line length seems reasonable */
 	buf.max_line_size = 512 * 1024;
 
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index 40a1d07d..b3e6a411 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -195,9 +195,10 @@ static int curl_gethost(const char *url, char *buffer, size_t buf_len)
 static int utimes_long(const char *path, long seconds)
 {
 	if(seconds != -1) {
-		struct timeval tv[2];
-		memset(&tv, 0, sizeof(tv));
-		tv[0].tv_sec = tv[1].tv_sec = seconds;
+		struct timeval tv[2] = {
+			{ .tv_sec = seconds, },
+			{ .tv_sec = seconds, },
+		};
 		return utimes(path, tv);
 	}
 	return 0;
@@ -657,7 +658,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url)
 	char *filepath;
 	const char *cachedir, *final_pkg_url = NULL;
 	char *final_file = NULL;
-	struct dload_payload payload;
+	struct dload_payload payload = {0};
 	int ret = 0;
 
 	CHECK_HANDLE(handle, return NULL);
@@ -666,8 +667,6 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url)
 	/* find a valid cache dir to download to */
 	cachedir = _alpm_filecache_setup(handle);
 
-	memset(&payload, 0, sizeof(struct dload_payload));
-
 	/* attempt to find the file in our pkgcache */
 	filepath = filecache_find_url(handle, url);
 	if(filepath == NULL) {
@@ -740,7 +739,7 @@ void _alpm_dload_payload_reset(struct dload_payload *payload)
 	FREE(payload->destfile_name);
 	FREE(payload->content_disp_name);
 	FREE(payload->fileurl);
-	memset(payload, '\0', sizeof(*payload));
+	*payload = (struct dload_payload){0};
 }
 
 void _alpm_dload_payload_reset_for_retry(struct dload_payload *payload)
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 3c4f883f..257a287f 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -217,7 +217,7 @@ gpg_error:
 int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr)
 {
 	gpgme_error_t gpg_err;
-	gpgme_ctx_t ctx;
+	gpgme_ctx_t ctx = {0};
 	gpgme_key_t key;
 	int ret = -1;
 
@@ -231,7 +231,6 @@ int _alpm_key_in_keychain(alpm_handle_t *handle, const char *fpr)
 		goto error;
 	}
 
-	memset(&ctx, 0, sizeof(ctx));
 	gpg_err = gpgme_new(&ctx);
 	CHECK_ERR();
 
@@ -267,12 +266,11 @@ error:
 static int key_import_wkd(alpm_handle_t *handle, const char *email)
 {
 	gpgme_error_t gpg_err;
-	gpgme_ctx_t ctx;
+	gpgme_ctx_t ctx = {0};
 	gpgme_keylist_mode_t mode;
 	gpgme_key_t key;
 	int ret = -1;
 
-	memset(&ctx, 0, sizeof(ctx));
 	gpg_err = gpgme_new(&ctx);
 	CHECK_ERR();
 
@@ -309,7 +307,7 @@ static int key_search_keyserver(alpm_handle_t *handle, const char *fpr,
 		alpm_pgpkey_t *pgpkey)
 {
 	gpgme_error_t gpg_err;
-	gpgme_ctx_t ctx;
+	gpgme_ctx_t ctx = {0};
 	gpgme_keylist_mode_t mode;
 	gpgme_key_t key;
 	int ret = -1;
@@ -322,7 +320,6 @@ static int key_search_keyserver(alpm_handle_t *handle, const char *fpr,
 	MALLOC(full_fpr, fpr_len + 3, RET_ERR(handle, ALPM_ERR_MEMORY, -1));
 	sprintf(full_fpr, "0x%s", fpr);
 
-	memset(&ctx, 0, sizeof(ctx));
 	gpg_err = gpgme_new(&ctx);
 	CHECK_ERR();
 
@@ -431,7 +428,7 @@ gpg_error:
 static int key_import_keyserver(alpm_handle_t *handle, alpm_pgpkey_t *key)
 {
 	gpgme_error_t gpg_err;
-	gpgme_ctx_t ctx;
+	gpgme_ctx_t ctx = {0};
 	gpgme_key_t keys[2];
 	gpgme_import_result_t result;
 	int ret = -1;
@@ -442,7 +439,6 @@ static int key_import_keyserver(alpm_handle_t *handle, alpm_pgpkey_t *key)
 		return -1;
 	}
 
-	memset(&ctx, 0, sizeof(ctx));
 	gpg_err = gpgme_new(&ctx);
 	CHECK_ERR();
 
@@ -507,7 +503,7 @@ static int email_from_uid(const char *uid, char **email)
 int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
 {
 	int ret = -1;
-	alpm_pgpkey_t fetch_key;
+	alpm_pgpkey_t fetch_key = {0};
 	char *email;
 
 	if(_alpm_access(handle, handle->gpgdir, "pubring.gpg", W_OK)) {
@@ -516,7 +512,6 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
 		return -1;
 	}
 
-	memset(&fetch_key, 0, sizeof(fetch_key));
 	STRDUP(fetch_key.uid, uid, return -1);
 	STRDUP(fetch_key.fingerprint, fpr, return -1);
 
@@ -576,8 +571,8 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 {
 	int ret = -1, sigcount;
 	gpgme_error_t gpg_err = 0;
-	gpgme_ctx_t ctx;
-	gpgme_data_t filedata, sigdata;
+	gpgme_ctx_t ctx = {0};
+	gpgme_data_t filedata = {0}, sigdata = {0};
 	gpgme_verify_result_t verify_result;
 	gpgme_signature_t gpgsig;
 	char *sigpath = NULL;
@@ -618,10 +613,6 @@ int _alpm_gpgme_checksig(alpm_handle_t *handle, const char *path,
 
 	_alpm_log(handle, ALPM_LOG_DEBUG, "checking signature for %s\n", path);
 
-	memset(&ctx, 0, sizeof(ctx));
-	memset(&sigdata, 0, sizeof(sigdata));
-	memset(&filedata, 0, sizeof(filedata));
-
 	gpg_err = gpgme_new(&ctx);
 	CHECK_ERR();
 
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index a4d62c7c..d12a4403 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -1191,7 +1191,7 @@ cleanup:
 	{
 		int ret = b->ret;
 		FREE(b->line);
-		memset(b, 0, sizeof(struct archive_read_buffer));
+		*b = (struct archive_read_buffer){0};
 		return ret;
 	}
 }
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 3b475151..fe6d6971 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -1117,8 +1117,7 @@ int setdefaults(config_t *c)
 
 int parseconfigfile(const char *file)
 {
-	struct section_t section;
-	memset(&section, 0, sizeof(struct section_t));
+	struct section_t section = {0};
 	pm_printf(ALPM_LOG_DEBUG, "config: attempting to read file %s\n", file);
 	return parse_ini(file, _parse_directive, &section);
 }
-- 
2.24.1

From eschwartz at archlinux.org  Wed Dec 25 02:59:57 2019
From: eschwartz at archlinux.org (Eli Schwartz)
Date: Tue, 24 Dec 2019 21:59:57 -0500
Subject: [pacman-dev] [PATCH 1/2] doc: clarify the format of a PKGBUILD
 source fragment
Message-ID: <20191225025958.908461-1-eschwartz@archlinux.org>

Currently, it could be misread to say that a fragment is literally
'commit', rather than 'commit=somehash'. Anecdotally this does not seem
to be obvious to everyone, and rewording it certainly doesn't hurt.

Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
---
 doc/PKGBUILD.5.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc
index bc5aa011..27d56a67 100644
--- a/doc/PKGBUILD.5.asciidoc
+++ b/doc/PKGBUILD.5.asciidoc
@@ -496,9 +496,9 @@ The source URL is divided into four components:
 
 *fragment*::
 	(optional) Allows specifying a revision number or branch for makepkg to checkout
-	from the VCS. For example, to checkout a given revision, the source line would
-	have the format `source=(url#revision=123)`. The available fragments depends on
-	the VCS being used:
+	from the VCS. A fragment has the form `type=value`, for example to checkout a
+	given revision the source line would be `source=(url#revision=123)`. The
+	available types depends on the VCS being used:
 
 	*bzr*;;
 		revision (see `'bzr help revisionspec'` for details)
-- 
2.24.1

From eschwartz at archlinux.org  Wed Dec 25 02:59:58 2019
From: eschwartz at archlinux.org (Eli Schwartz)
Date: Tue, 24 Dec 2019 21:59:58 -0500
Subject: [pacman-dev] [PATCH 2/2] doc: reformat intro to VCS sources to
 distinguish the grammar
In-Reply-To: <20191225025958.908461-1-eschwartz@archlinux.org>
References: <20191225025958.908461-1-eschwartz@archlinux.org>
Message-ID: <20191225025958.908461-2-eschwartz@archlinux.org>

It's difficult to find it embedded inside a prose paragraph.

Signed-off-by: Eli Schwartz <eschwartz at archlinux.org>
---
 doc/PKGBUILD.5.asciidoc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/PKGBUILD.5.asciidoc b/doc/PKGBUILD.5.asciidoc
index 27d56a67..b170a812 100644
--- a/doc/PKGBUILD.5.asciidoc
+++ b/doc/PKGBUILD.5.asciidoc
@@ -474,11 +474,13 @@ reference with all of the available functions defined.
 Using VCS Sources[[VCS]]
 ------------------------
 Building a developmental version of a package using sources from a version
-control system (VCS) is enabled by specifying the source in the form
-`source=('directory::url#fragment?query')`. Currently makepkg supports the
-Bazaar, Git, Subversion, and Mercurial version control systems. For other
-version control systems, manual cloning of upstream repositories must be done
-in the `prepare()` function.
+control system (VCS) is enabled by specifying the source in the form:
+
+	source=('directory::url#fragment?query')
+
+Currently makepkg supports the Bazaar, Git, Subversion, and Mercurial version
+control systems. For other version control systems, manual cloning of upstream
+repositories must be done in the `prepare()` function.
 
 The source URL is divided into four components:
 
-- 
2.24.1

From brainpower at mailbox.org  Fri Dec 27 14:06:24 2019
From: brainpower at mailbox.org (brainpower)
Date: Fri, 27 Dec 2019 15:06:24 +0100
Subject: [pacman-dev] [PATCH 2/2] Use c99 struct initialization to avoid
 memset calls
In-Reply-To: <20191224231748.1327058-2-dreisner@archlinux.org>
References: <20191224231748.1327058-1-dreisner@archlinux.org>
 <20191224231748.1327058-2-dreisner@archlinux.org>
Message-ID: <e7594202-0fbc-1a4d-596b-fc9e2be5ecfc@mailbox.org>

Am 25.12.19 um 00:17 schrieb Dave Reisner:
> diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
> index 2c76fe83..4614610c 100644
> --- a/lib/libalpm/be_sync.c
> +++ b/lib/libalpm/be_sync.c
> @@ -219,12 +219,10 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db)
>  
>  	for(i = db->servers; i; i = i->next) {
>  		const char *server = i->data, *final_db_url = NULL;
> -		struct dload_payload payload;
> +		struct dload_payload payload = {};

Hi,
you seem to have missed a 0 to make it {0} here, right?

>  		size_t len;
>  		int sig_ret = 0;
>  
> -		memset(&payload, 0, sizeof(struct dload_payload));
> -
>  		/* set hard upper limit of 25MiB */
>  		payload.max_size = 25 * 1024 * 1024;
>  
> @@ -601,7 +599,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,


-- 
regards,
brainpower

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.archlinux.org/pipermail/pacman-dev/attachments/20191227/df97209d/attachment.sig>