- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Fix warnings with strict-overflow in gcc-4.9
by Allan McRae 23 Feb '14

23 Feb '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/sync.c | 3 ++- src/pacman/sync.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 96db50a..718f9af 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -685,7 +685,8 @@ static int endswith(const char *filename, const char *extension) static int apply_deltas(alpm_handle_t *handle) { alpm_list_t *i; - int deltas_found = 0, ret = 0; + size_t deltas_found = 0; + int ret = 0; const char *cachedir = _alpm_filecache_setup(handle); alpm_trans_t *trans = handle->trans; alpm_event_delta_patch_t event; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index e0a1e42..fc4baaf 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -370,7 +370,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets) int ret = 0; if(targets) { - int found; + size_t found; for(i = targets; i; i = alpm_list_next(i)) { found = 0; const char *grpname = i->data; -- 1.9.0

1 0

[pacman-dev] [PATCHv4 1/6] pacsearch: removed useless comment
by Pierre Neidhardt 18 Feb '14

18 Feb '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 21043d4..71e0107 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -138,7 +138,6 @@ if ($#querypkgs >= 0) { foreach $_ (@querypkgs) { # we grab the following fields: repo, name, ver, group, installed, and desc my @pkgfields = /^(.*?)\/(.*?) (.*?) ?($.*?$)? ?(\[.*\])?\n(.*)$/s; - # my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; # skip any non-matching line next if not defined $pkgfields[1]; # check if the package was listed in the sync out -- 1.8.5.4

2 7

[pacman-dev] [PATCH 0/8] Events
by Olivier Brunel 16 Feb '14

16 Feb '14

The first three patches are just small changes, then goes the update to the different structs instead of the two void* arguments, and making the log stuff into an event as well. Then adding events about creation of the pac* files as originally discussed; And I've also included a few new events, as mentioned before, that could be useful to frontends, even though pacman just ignores them (for now). A couple of other things : - Andrew mentioned FS#37711, which could be addressed now that those (creation of pacnew/pacorig files) are fully handled by pacman, but for now I've simply let those as warnings, much like they were before. Since the color issue has been fixed (i.e. such messages didn't have colors applied when they were delayed due to a progress operation) I'm not sure if anything else is really needed anyways. - I don't think addressing FS#36504 was right. This was about moving the log messages about a package being installed/upgraded/etc before the scriptlet messages, and not after as they were. I think this might have been a mistake: I guess it all depends on when you consider the operation to be completed, once pacman's extraction reached 100%, or after the scriptlet have run. I feel the later is right, since they are part of the process of installing/upgrading/etc a package; Of course, you may disagree. Either way, the current situation is wrong, because right now ALPM does : 1. add log message about the operation being done 2. run scriptlet 3. signal frontend (via event) that operation is done IOW if a frontend was to actually use the event to present its output to the user, it wouldn't match the order in the log, which is wrong. This was done because pacman ignores that event, only showing the progress of the extraction, and thus people feel that it goes 1. install done; then 2. scriptlet. In fact, pacman doesn't really ignore the event, and uses it to show (new) optdep. Should this be done before or after the scriptlet? One could also ask, when using --noprogressbar pacman doesn't say anything at the end of the operation (save for optdep), imagine it would: should it be before or after the scriptlet? As I said, I think the logging should be moved after the scriptlet have run, as this is when the operation is really done. If you were to disagree though, then the event should be moved before the scriptlet run, to keep consistency between the frontend and the log (which is broken ATM), but this just feels wrong to me, since then a frontend would consider a package upgrade/etc done, when in fact the scriptlet have yet to run (and produce new output relating to the operation supposedly done). Olivier Brunel (8): pacman: Make sure delayed warnings/errors are shown the same Rename ALPM_EVENT_OPTDEP_REQUIRED to _OPTDEP_REMOVED alpm: Rename a variable for clarity Update the event callback Remove log_cb, add ALPM_EVENT_LOG instead Add events on pacnew/pacsave/pacorig file creation Add events ALPM_EVENT_RETRIEVE_{DONE,FAILED} Add events _PKGDOWNLOAD_{START,DONE,FAILED} lib/libalpm/add.c | 86 +++++++++++------ lib/libalpm/alpm.h | 248 ++++++++++++++++++++++++++++++++---------------- lib/libalpm/be_sync.c | 6 +- lib/libalpm/handle.c | 13 --- lib/libalpm/handle.h | 5 +- lib/libalpm/log.c | 14 ++- lib/libalpm/remove.c | 32 +++++-- lib/libalpm/sync.c | 94 +++++++++++++----- lib/libalpm/util.c | 6 +- src/pacman/callback.c | 181 ++++++++++++++++++++++++----------- src/pacman/callback.h | 6 +- src/pacman/conf.c | 1 - src/pacman/util.c | 19 +++- src/pacman/util.h | 1 + src/util/cleanupdelta.c | 14 +-- src/util/testdb.c | 14 +-- src/util/testpkg.c | 14 +-- 17 files changed, 510 insertions(+), 244 deletions(-) -- 1.8.4.2

4 35

[pacman-dev] [PATCH 1/5] Check if a file is in the package's file list before extracting
by Florian Pritz 14 Feb '14

14 Feb '14

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- lib/libalpm/add.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 5f1a953..7930117 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -178,6 +178,11 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, archive_read_data_skip(archive); return 0; } else { + if (!alpm_filelist_contains(&newpkg->files, entryname)) { + _alpm_log(handle, ALPM_LOG_WARNING, _("file not found in file list for package %s. skipping extraction of %s\n"), + newpkg->name, entryname); + return 0; + } /* build the new entryname relative to handle->root */ snprintf(filename, PATH_MAX, "%s%s", handle->root, entryname); } -- 1.8.5.3

5 36

[pacman-dev] [PATCH v3] makepkg: implement support for stripping kernel modules
by Steven Noonan 12 Feb '14

12 Feb '14

I noticed when I built a kernel package with options 'strip' and 'debug' that the debug package was missing the debug information for the kernel modules. This patch adds kernel modules to the targets for 'strip' and is compatible with the split-out debug information packages. v2: Correct logic error -- did a 'continue' after the 2nd-level case statement instead of in the default case. v3: Oops, forgot to terminate outer case. Ran this version through the test suite and all tests passed. Signed-off-by: Steven Noonan <steven(a)uplinklabs.net> --- scripts/makepkg.sh.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 940e947..027fcc3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1659,6 +1659,13 @@ tidy_install() { 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 strip_flags="$STRIP_BINARIES";; *) -- 1.8.5.4

4 9

[pacman-dev] [PATCHv3 1/7] pacsearch: removed useless comment
by Pierre Neidhardt 11 Feb '14

11 Feb '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 21043d4..71e0107 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -138,7 +138,6 @@ if ($#querypkgs >= 0) { foreach $_ (@querypkgs) { # we grab the following fields: repo, name, ver, group, installed, and desc my @pkgfields = /^(.*?)\/(.*?) (.*?) ?($.*?$)? ?(\[.*\])?\n(.*)$/s; - # my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; # skip any non-matching line next if not defined $pkgfields[1]; # check if the package was listed in the sync out -- 1.8.5.4

3 19

[pacman-dev] [PATCH] makepkg: implement support for stripping kernel modules
by Steven Noonan 10 Feb '14

10 Feb '14

I noticed when I built a kernel package with options 'strip' and 'debug' that the debug package was missing the debug information for the kernel modules. This patch adds kernel modules to the targets for 'strip' and is compatible with the split-out debug information packages. Signed-off-by: Steven Noonan <steven(a)uplinklabs.net> --- scripts/makepkg.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 940e947..4981595 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1659,6 +1659,12 @@ tidy_install() { 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";; + esac + continue;; *application/x-executable*) # Binaries strip_flags="$STRIP_BINARIES";; *) -- 1.8.5.4

2 2

[pacman-dev] [PATCH] alpm_logaction: Unopenable logfile is an error only when not using syslog
by Zachary Cook 10 Feb '14

10 Feb '14

This allows syslog to act as a fallback or a standalone logging destination. Fixes FS#38584. Signed-off-by: Zachary Cook <zachary.cook(a)uoit.net> --- lib/libalpm/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index d232bcc..19650dd 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -57,8 +57,8 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, if(fd >= 0) { handle->logstream = fdopen(fd, "a"); } - /* if we couldn't open it, we have an issue */ - if(fd < 0 || handle->logstream == NULL) { + /* if we couldn't open it, we have an issue when not using sylog */ + if((fd < 0 || handle->logstream == NULL) && !handle->usesyslog) { if(errno == EACCES) { handle->pm_errno = ALPM_ERR_BADPERMS; } else if(errno == ENOENT) { -- 1.8.5.3

1 1

[pacman-dev] [PATCH v2] makepkg: implement support for stripping kernel modules
by Steven Noonan 09 Feb '14

09 Feb '14

I noticed when I built a kernel package with options 'strip' and 'debug' that the debug package was missing the debug information for the kernel modules. This patch adds kernel modules to the targets for 'strip' and is compatible with the split-out debug information packages. v2: Correct logic error -- did a 'continue' after the 2nd-level case statement instead of in the default case. Signed-off-by: Steven Noonan <steven(a)uplinklabs.net> --- scripts/makepkg.sh.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 940e947..76471dc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1659,6 +1659,13 @@ tidy_install() { 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 strip_flags="$STRIP_BINARIES";; *) -- 1.8.5.4

1 0

[pacman-dev] [PATCH v2 1/6] pacsearch: removed useless comment
by Pierre Neidhardt 09 Feb '14

09 Feb '14

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- contrib/pacsearch.in | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/pacsearch.in b/contrib/pacsearch.in index 21043d4..71e0107 100644 --- a/contrib/pacsearch.in +++ b/contrib/pacsearch.in @@ -138,7 +138,6 @@ if ($#querypkgs >= 0) { foreach $_ (@querypkgs) { # we grab the following fields: repo, name, ver, group, installed, and desc my @pkgfields = /^(.*?)\/(.*?) (.*?) ?($.*?$)? ?(\[.*\])?\n(.*)$/s; - # my @pkgfields = /^(.*?)\/(.*?) ?(\[.*\])?\n(.*)$/s; # skip any non-matching line next if not defined $pkgfields[1]; # check if the package was listed in the sync out -- 1.8.5.3

3 21