- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Output full URL in case of download failure
by Florian Pritz 14 Dec '15

14 Dec '15

Most entries in $sources contain variables so finding out why a URL fails to download is hard because one has to manually replace the variables when looking at the PKGBUILD. Simply output the full URL here so that it can be easily seen what is wrong. Old: ==> ERROR: Failure while downloading example-1.2.4.tar.gz New: ==> ERROR: Failure while downloading http://example.org/releases/1.1/example-1.2.4.tar.gz With the new format it is much more obvious that the directory name is the culprint (1.1 vs 1.2) while the old one would not display that information. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/libmakepkg/source/file.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/libmakepkg/source/file.sh.in b/scripts/libmakepkg/source/file.sh.in index 03dabe6..53b983e 100644 --- a/scripts/libmakepkg/source/file.sh.in +++ b/scripts/libmakepkg/source/file.sh.in @@ -71,7 +71,7 @@ download_file() { if ! command -- "${cmdline[@]}" >&2; then [[ ! -s $dlfile ]] && rm -f -- "$dlfile" - error "$(gettext "Failure while downloading %s")" "$filename" + error "$(gettext "Failure while downloading %s")" "$url" plain "$(gettext "Aborting...")" exit 1 fi -- 2.6.4

1 0

[pacman-dev] [PATCH] Add events ALPM_EVENT_HOOK_{START,DONE}
by Olivier Brunel 14 Dec '15

14 Dec '15

Add events to let frontends know when hooks are being processed (and when it's done), as that might be useful to update the UI. It can also be useful to know when ALPM_EVENT_SCRIPTLET_INFO might be happening in that regard (There's no specific event for running scriptlets, but they do happen at specific times after/before ALPM_EVENT_PACKAGE_OPERATION_{START,DONE}). Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- On a not-quite-related topic, I wonder whether a flag should be added to skip hook processing, much like ALPM_TRANS_FLAG_NOSCRIPTLET ? I guess it might not be necessary, since frontends can simply set the hookdirs to NULL to disable them. Thoughts? I also wondered about the same in the POV of pacman, i.e. an option --nohooks, because it seems currently one can only add hookdirs, and therefore only replace the pacman default (/etc/pacman.d/hooks) (I assume setting it to /dev/null might work to disable things?) but not the system/ALPM one (/usr/share/libalpm/hooks)? Also unless I missed it, the documentation doesn't mention that last directory anywhere? lib/libalpm/alpm.h | 24 +++++++++++++++++++++++- lib/libalpm/hook.c | 11 +++++++++-- lib/libalpm/hook.h | 7 +------ src/pacman/callback.c | 6 ++++++ 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 6cbcd24..f8e1f25 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -337,6 +337,16 @@ typedef struct _alpm_siglist_t { alpm_sigresult_t *results; } alpm_siglist_t; + +/* + * Hooks + */ + +typedef enum _alpm_hook_when_t { + ALPM_HOOK_PRE_TRANSACTION = 1, + ALPM_HOOK_POST_TRANSACTION +} alpm_hook_when_t; + /* * Logging facilities */ @@ -443,7 +453,11 @@ typedef enum _alpm_event_type_t { ALPM_EVENT_PACNEW_CREATED, /** A .pacsave file was created; See alpm_event_pacsave_created_t for * arguments */ - ALPM_EVENT_PACSAVE_CREATED + ALPM_EVENT_PACSAVE_CREATED, + /** Processing hooks will be started. */ + ALPM_EVENT_HOOK_START, + /** Processing hooks is finished. */ + ALPM_EVENT_HOOK_DONE } alpm_event_type_t; typedef struct _alpm_event_any_t { @@ -534,6 +548,13 @@ typedef struct _alpm_event_pacsave_created_t { const char *file; } alpm_event_pacsave_created_t; +typedef struct _alpm_event_hook_t { + /** Type of event.*/ + alpm_event_type_t type; + /** Type of hooks. */ + alpm_hook_when_t when; +} alpm_event_hook_t; + /** Events. * This is an union passed to the callback, that allows the frontend to know * which type of event was triggered (via type). It is then possible to @@ -550,6 +571,7 @@ typedef union _alpm_event_t { alpm_event_pkgdownload_t pkgdownload; alpm_event_pacnew_created_t pacnew_created; alpm_event_pacsave_created_t pacsave_created; + alpm_event_hook_t hook; } alpm_event_t; /** Event callback. */ diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index f5627af..09f7028 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -52,7 +52,7 @@ struct _alpm_hook_t { alpm_list_t *depends; char **cmd; alpm_list_t *matches; - enum _alpm_hook_when_t when; + alpm_hook_when_t when; int abort_on_fail, needs_targets; }; @@ -608,13 +608,17 @@ static int _alpm_hook_run_hook(alpm_handle_t *handle, struct _alpm_hook_t *hook) } } -int _alpm_hook_run(alpm_handle_t *handle, enum _alpm_hook_when_t when) +int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when) { + alpm_event_hook_t event = { .when = when }; alpm_list_t *i, *hooks = NULL; const char *suffix = ".hook"; size_t suflen = strlen(suffix); int ret = 0; + event.type = ALPM_EVENT_HOOK_START; + EVENT(handle, &event); + for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) { int err; char path[PATH_MAX]; @@ -723,6 +727,9 @@ cleanup: alpm_list_free_inner(hooks, (alpm_list_fn_free) _alpm_hook_free); alpm_list_free(hooks); + event.type = ALPM_EVENT_HOOK_DONE; + EVENT(handle, &event); + return ret; } diff --git a/lib/libalpm/hook.h b/lib/libalpm/hook.h index 4894a19..3f05b31 100644 --- a/lib/libalpm/hook.h +++ b/lib/libalpm/hook.h @@ -22,12 +22,7 @@ #include "alpm.h" -enum _alpm_hook_when_t { - ALPM_HOOK_PRE_TRANSACTION = 1, - ALPM_HOOK_POST_TRANSACTION -}; - -int _alpm_hook_run(alpm_handle_t *handle, enum _alpm_hook_when_t when); +int _alpm_hook_run(alpm_handle_t *handle, alpm_hook_when_t when); #endif /* _ALPM_HOOK_H */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 7a21b22..d59de73 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -167,6 +167,11 @@ void cb_event(alpm_event_t *event) return; } switch(event->type) { + case ALPM_EVENT_HOOK_START: + printf(_("running %s hooks...\n"), + event->hook.when == ALPM_HOOK_PRE_TRANSACTION + ? _("pre-transaction") : _("post-transaction")); + break; case ALPM_EVENT_CHECKDEPS_START: printf(_("checking dependencies...\n")); break; @@ -329,6 +334,7 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_DISKSPACE_DONE: case ALPM_EVENT_RETRIEVE_DONE: case ALPM_EVENT_RETRIEVE_FAILED: + case ALPM_EVENT_HOOK_DONE: /* we can safely ignore those as well */ case ALPM_EVENT_PKGDOWNLOAD_START: case ALPM_EVENT_PKGDOWNLOAD_DONE: -- 2.6.3

3 4

Re: [pacman-dev] Segmentation fault in Arch Linux when updating ghc [SOLVED]
by David Grayson 12 Dec '15

12 Dec '15

Oops, never mind! The segmentation fault went away when I cleaned up some artifacts left over from when I was developing a patch for pacman. I removed pacman-related files from /usr/local/bin and /usr/local/lib and the problem went away. --David On Sat, Dec 12, 2015 at 9:52 AM, David Grayson <davidegrayson(a)gmail.com> wrote: > Hello. I am not sure if this is the right place to report this. I > encountered a segmentation fault when running Pacman in x86_64 Arch > Linux. To reproduce the problem, I ran:

1 0

[pacman-dev] Segmentation fault in Arch Linux when updating ghc
by David Grayson 12 Dec '15

12 Dec '15

Hello. I am not sure if this is the right place to report this. I encountered a segmentation fault when running Pacman in x86_64 Arch Linux. To reproduce the problem, I ran: sudo pacman -S ghc --debug &> pacman_ghc_segfault.txt The full output is attached to this email. The part of the output right before the segmentation fault looks like this: ==== debug: checking dependencies debug: checkdeps: package ghc-7.10.3-1 debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-data-default' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-data-default-class' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-data-default-instances-base' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-data-default-instances-containers' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-data-default-instances-dlist' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-data-default-instances-old-locale' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-dlist' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-extensible-exceptions' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-mtl' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-old-locale' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-utf8-string' debug: checkdeps: transaction would break 'ghc=7.10.2' dependency of 'haskell-x11' error: failed to prepare transaction (could not satisfy dependencies) error: segmentation fault Please submit a full bug report with --debug if appropriate. ==== The reason I tried to update the ghc package by itself is because I got this strange error when running "pacman -Syu". I have seen file conflict errors before, but this one did not list any file names on the path, so I didn't know how to fix it. (I removed the progress bar from the output.) ==== (23/23) checking for file conflicts error: failed to commit transaction (conflicting files) Errors occurred, no packages were upgraded. ==== I could probably fix my system by uninstalling ghc and the haskell packages, but don't worry about that. The point of this report is not to get help, but to report a bug and give the pacman developers any information that is needed to fix it. Please let me know if you want me to provide any more information. --David Grayson

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-289-gf985414
by allan＠archlinux.org 09 Dec '15

09 Dec '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via f98541400b7ede2d4a99de5f2f6a25257b545a98 (commit) from 2015f0d1d9370e16e895ff51dce291a94570e056 (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 f98541400b7ede2d4a99de5f2f6a25257b545a98 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 9 16:02:55 2015 +1000 Pull translations from Transifex and prepare for next release Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/LINGUAS | 3 + lib/libalpm/po/ar.po | 277 ++-- lib/libalpm/po/ast.po | 17 +- lib/libalpm/po/bg.po | 28 +- lib/libalpm/po/br.po | 852 ++++++++++++ lib/libalpm/po/ca.po | 407 +++--- lib/libalpm/po/cs.po | 254 ++-- lib/libalpm/po/da.po | 252 ++-- lib/libalpm/po/de.po | 252 ++-- lib/libalpm/po/el.po | 252 ++-- lib/libalpm/po/en_GB.po | 252 ++-- lib/libalpm/po/{hr.po => eo.po} | 595 ++++---- lib/libalpm/po/es.po | 258 ++-- lib/libalpm/po/es_419.po | 258 ++-- lib/libalpm/po/eu.po | 2 +- lib/libalpm/po/fi.po | 252 ++-- lib/libalpm/po/fr.po | 253 ++-- lib/libalpm/po/gl.po | 254 ++-- lib/libalpm/po/hr.po | 249 ++-- lib/libalpm/po/hu.po | 252 ++-- lib/libalpm/po/id.po | 260 ++-- lib/libalpm/po/it.po | 266 ++-- lib/libalpm/po/ja.po | 261 ++-- lib/libalpm/po/{uz.po => ka.po} | 290 ++-- lib/libalpm/po/kk.po | 252 ++-- lib/libalpm/po/ko.po | 252 ++-- lib/libalpm/po/libalpm.pot | 245 ++-- lib/libalpm/po/lt.po | 252 ++-- lib/libalpm/po/nb.po | 252 ++-- lib/libalpm/po/nl.po | 252 ++-- lib/libalpm/po/pl.po | 252 ++-- lib/libalpm/po/pt.po | 253 ++-- lib/libalpm/po/pt_BR.po | 259 ++-- lib/libalpm/po/ro.po | 410 +++--- lib/libalpm/po/ru.po | 282 ++-- lib/libalpm/po/sk.po | 262 ++-- lib/libalpm/po/sl.po | 256 ++-- lib/libalpm/po/sr.po | 278 ++-- lib%2Flibalpm%2Fpo%2Fsr(a)latin.po | 281 ++-- lib/libalpm/po/sv.po | 267 ++-- lib/libalpm/po/tr.po | 252 ++-- lib/libalpm/po/uk.po | 252 ++-- lib/libalpm/po/ur.po | 2 +- lib/libalpm/po/uz.po | 2 +- lib/libalpm/po/vi.po | 2 +- lib/libalpm/po/zh_CN.po | 254 ++-- lib/libalpm/po/zh_TW.po | 418 +++--- scripts/po/LINGUAS | 4 + scripts/po/ar.po | 1237 +++++++++-------- scripts/po/ast.po | 2 +- scripts/po/{pacman-scripts.pot => az_AZ.po} | 1098 ++++++++------- scripts/po/bg.po | 378 +++--- scripts/po/br.po | 1943 ++++++++++++++++++++++++++ scripts/po/ca.po | 1645 ++++++++++++----------- scripts/po/cs.po | 1133 +++++++++------- scripts/po/da.po | 1127 +++++++++------- scripts/po/de.po | 1131 +++++++++------- scripts/po/el.po | 1124 +++++++++------- scripts/po/en_GB.po | 1124 +++++++++------- scripts/po/eo.po | 1944 +++++++++++++++++++++++++++ scripts/po/es.po | 1256 +++++++++-------- scripts/po/es_419.po | 1249 +++++++++-------- scripts/po/eu.po | 10 +- scripts/po/fi.po | 1133 +++++++++------- scripts/po/fr.po | 1197 +++++++++-------- scripts/po/gl.po | 1437 +++++++++++--------- scripts/po/hr.po | 1112 +++++++-------- scripts/po/hu.po | 1126 +++++++++------- scripts/po/id.po | 1136 ++++++++-------- scripts/po/it.po | 1195 ++++++++-------- scripts/po/ja.po | 1127 +++++++++------- scripts/po/{pacman-scripts.pot => ka.po} | 1101 +++++++-------- scripts/po/kk.po | 1121 ++++++++------- scripts/po/ko.po | 1124 +++++++++------- scripts/po/lt.po | 1133 +++++++++------- scripts/po/nb.po | 1146 ++++++++-------- scripts/po/nl.po | 1324 +++++++++--------- scripts/po/pacman-scripts.pot | 1075 ++++++++------- scripts/po/pl.po | 1138 ++++++++-------- scripts/po/pt.po | 1135 ++++++++-------- scripts/po/pt_BR.po | 1135 +++++++++------- scripts/po/ro.po | 1507 +++++++++++---------- scripts/po/ru.po | 1795 +++++++++++++------------ scripts/po/sk.po | 1150 ++++++++-------- scripts/po/sl.po | 1126 +++++++++------- scripts/po/sr.po | 1424 +++++++++++--------- scripts%2Fpo%2Fsr(a)latin.po | 1441 +++++++++++--------- scripts/po/sv.po | 1134 +++++++++------- scripts/po/tr.po | 1137 ++++++++-------- scripts/po/uk.po | 1137 ++++++++-------- scripts/po/uz.po | 2 +- scripts/po/zh_CN.po | 1188 ++++++++-------- scripts/po/zh_TW.po | 1159 ++++++++-------- src/pacman/po/LINGUAS | 4 + src/pacman/po/ar.po | 1204 +++++++++-------- src/pacman/po/ast.po | 23 +- src/pacman/po/{vi.po => az_AZ.po} | 936 +++++++------ src/pacman/po/bg.po | 38 +- src/pacman/po/br.po | 1772 ++++++++++++++++++++++++ src/pacman/po/ca.po | 1202 +++++++++-------- src/pacman/po/cs.po | 885 ++++++------ src/pacman/po/da.po | 877 ++++++------ src/pacman/po/de.po | 877 ++++++------ src/pacman/po/el.po | 875 ++++++------ src/pacman/po/en_GB.po | 876 ++++++------ src/pacman/po/eo.po | 1255 +++++++++-------- src/pacman/po/es.po | 1001 +++++++------- src/pacman/po/es_419.po | 937 +++++++------ src/pacman/po/eu.po | 2 +- src/pacman/po/fa.po | 813 +++++------ src/pacman/po/fi.po | 875 ++++++------ src/pacman/po/fr.po | 880 ++++++------ src/pacman/po/gl.po | 991 ++++++++------ src/pacman/po/hr.po | 878 ++++++------ src/pacman/po/hu.po | 878 ++++++------ src/pacman/po/id.po | 880 ++++++------ src/pacman/po/it.po | 898 +++++++------ src/pacman/po/ja.po | 875 ++++++------ src/pacman/po/ka.po | 1712 +++++++++++++++++++++++ src/pacman/po/kk.po | 872 ++++++------ src/pacman/po/ko.po | 935 +++++++------ src/pacman/po/lt.po | 869 ++++++------ src/pacman/po/nb.po | 909 +++++++------ src/pacman/po/nl.po | 890 ++++++------ src/pacman/po/pacman.pot | 705 +++++----- src/pacman/po/pl.po | 881 ++++++------ src/pacman/po/pt.po | 885 ++++++------ src/pacman/po/pt_BR.po | 893 ++++++------ src/pacman/po/ro.po | 1089 ++++++++------- src/pacman/po/ru.po | 997 +++++++------- src/pacman/po/sk.po | 897 ++++++------ src/pacman/po/sl.po | 882 ++++++------ src/pacman/po/sr.po | 1043 +++++++------- src%2Fpacman%2Fpo%2Fsr(a)latin.po | 1045 +++++++------- src/pacman/po/sv.po | 899 +++++++------ src/pacman/po/{vi.po => th.po} | 758 ++++++----- src/pacman/po/tr.po | 876 ++++++------ src/pacman/po/uk.po | 894 ++++++------ src/pacman/po/ur.po | 2 +- src/pacman/po/uz.po | 2 +- src/pacman/po/vi.po | 705 +++++----- src/pacman/po/zh_CN.po | 872 ++++++------ src/pacman/po/zh_TW.po | 1044 +++++++------- 143 files changed, 60820 insertions(+), 44751 deletions(-) create mode 100644 lib/libalpm/po/br.po copy lib/libalpm/po/{hr.po => eo.po} (50%) copy lib/libalpm/po/{uz.po => ka.po} (73%) copy scripts/po/{pacman-scripts.pot => az_AZ.po} (68%) create mode 100644 scripts/po/br.po create mode 100644 scripts/po/eo.po copy scripts/po/{pacman-scripts.pot => ka.po} (67%) copy src/pacman/po/{vi.po => az_AZ.po} (65%) create mode 100644 src/pacman/po/br.po create mode 100644 src/pacman/po/ka.po copy src/pacman/po/{vi.po => th.po} (69%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.1-288-g2015f0d
by allan＠archlinux.org 09 Dec '15

09 Dec '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 2015f0d1d9370e16e895ff51dce291a94570e056 (commit) via 137ea39fa11c321a9c33000ff1b5c6cc3c59b47d (commit) via 9cdfd18739cc4b0e2b2efeb9a92a3ea612c8505f (commit) via 71f9de64c6eaf11e22551de56d4e9233dddfe238 (commit) via 8ee084dbb33a9a9fee77376f5fac07f331a24ef8 (commit) via d069d9714af61749666ca4caa31ef66cfa35ee86 (commit) from a8e2578febbb71d1b788c7270c2be57ca1e64dec (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 2015f0d1d9370e16e895ff51dce291a94570e056 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 5 11:31:43 2015 -0500 alpm_run_chroot: remove dead code Removes a leftover error message from when fdopen and fgets were used to read from the pipe. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 137ea39fa11c321a9c33000ff1b5c6cc3c59b47d Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 17 00:57:12 2015 +0000 makepkg: record build information in .BUILDINFO This information can be used to reproduce build conditions, which can then be used to determine if a package builds reproducibly. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9cdfd18739cc4b0e2b2efeb9a92a3ea612c8505f Author: Luke <gaming4jc2(a)yahoo.com> Date: Sun Dec 6 10:11:33 2015 +1000 makepkg: add whirlpool to the list of hashing algorithms Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 71f9de64c6eaf11e22551de56d4e9233dddfe238 Author: David Macek <david.macek.0(a)gmail.com> Date: Sun Nov 29 14:55:15 2015 +0100 alpm_initialize: Fix double slash in sys hook dir path The path of the default system hook directory was created by concatenating `myhandle->root` (usually "/"), and SYSHOOKDIR (usually "/usr/share/libalpm/hooks/"), resulting in "//usr/share/libalpm/hooks/". Fix this by skipping the initial slash from SYSHOOKDIR. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8ee084dbb33a9a9fee77376f5fac07f331a24ef8 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 5 05:46:08 2015 -0500 db_update: always clear db flags after update Signature downloading and DB validation was being based on the most recent download status for the DB. If a DB successfully downloaded but a signature did not, db_update would move to the next server. If the next server tried does not have a more recent copy of the DB, db_update would not download the DB again and would forget that the DB had previously been updated. In this case it would skip validation entirely, leaving an updated DB with the original validation status. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d069d9714af61749666ca4caa31ef66cfa35ee86 Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Fri Dec 4 19:47:08 2015 +1300 Updated the documentation for makepkg's -L option. At some point back in 2009, logging was expanded to cover all of the packaging functions, but the man page was not updated to reflect that. Fix that! Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 10 +++++----- lib/libalpm/alpm.c | 7 +++++-- lib/libalpm/be_sync.c | 45 +++++++++++++++++++++++---------------------- lib/libalpm/util.c | 5 ----- scripts/makepkg.sh.in | 35 ++++++++++++++++++++--------------- 5 files changed, 53 insertions(+), 49 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Source Package Repositories
by Allan McRae 06 Dec '15

06 Dec '15

Now we have .SRCINFO in source packages, it would be easy to add the source packages to a repository and have pacman be able to access them. This will kill ABS in Arch! There are two ideas on how this should be handled: 1) Add source package information in the .db file if it is there when a package is added or 2) Have a separate .source repository I have listed the pros/cons of each approach here: https://wiki.archlinux.org/index.php/User:Allan/Pacman_Source_Repositories I personally like #2, because adding them to .db files is a major increase in size. Currently, signatures take up ~55% of the average sync database size. With the source package also having a signature, that increases the db by slightly more than that much again. Any other comments to add to the debate before I make a final decision and implement this? Cheers, Allan

2 8

[pacman-dev] [PATCH v3] makepkg: record build information in .BUILDINFO
by Allan McRae 06 Dec '15

06 Dec '15

This information can be used to reproduce build conditions, which can then be used to determine if a package builds reproducibly. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v3: Remove recording of environmental variables - that was a failure. This should not be controversial now. It records: - buildpath - PKGBUILD hash - installed package list The buildenv and options arrays are moved from .PKGINFO to .BUILDINFO scripts/makepkg.sh.in | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 43584c3..42ec297 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -223,7 +223,7 @@ run_pacman() { else cmd=("$PACMAN_PATH" "$@") fi - if [[ $1 != -@(T|Qq) ]]; then + if [[ $1 != -@(T|Qq|Q) ]]; then if type -p sudo >/dev/null; then cmd=(sudo "${cmd[@]}") else @@ -1147,19 +1147,23 @@ write_pkginfo() { [[ $optdepends ]] && printf "optdepend = %s\n" "${optdepends[@]//+([[:space:]])/ }" [[ $makedepends ]] && printf "makedepend = %s\n" "${makedepends[@]}" [[ $checkdepends ]] && printf "checkdepend = %s\n" "${checkdepends[@]}" +} - local it - for it in "${packaging_options[@]}"; do - check_option "$it" "y" - case $? in - 0) - printf "makepkgopt = %s\n" "$it" - ;; - 1) - printf "makepkgopt = %s\n" "!$it" - ;; - esac - done +write_buildinfo() { + msg2 "$(gettext "Generating %s file...")" ".BUILDINFO" + + printf "builddir = %s\n" "${BUILDDIR}" + + local sum="$(openssl dgst -sha256 "${BUILDFILE}")" + sum=${sum##* } + + printf "pkgbuild_sha256sum = %s\n" $sum + + printf "buildenv = %s\n" "${BUILDENV[@]}" + printf "options = %s\n" "${OPTIONS[@]}" + + local pkglist=($(run_pacman -Q | sed "s# #-#")) + printf "installed = %s\n" "${pkglist[@]}" } create_package() { @@ -1176,8 +1180,9 @@ create_package() { pkgarch=$(get_pkg_arch) write_pkginfo > .PKGINFO + write_buildinfo > .BUILDINFO - local comp_files=('.PKGINFO') + local comp_files=('.PKGINFO' '.BUILDINFO') # check for changelog/install files for i in 'changelog/.CHANGELOG' 'install/.INSTALL'; do @@ -1962,6 +1967,15 @@ GPGKEY=${_GPGKEY:-$GPGKEY} PACKAGER=${_PACKAGER:-$PACKAGER} CARCH=${_CARCH:-$CARCH} +# record initial build environment +cppflags="$CPPFLAGS" +cflags="$CFLAGS" +cxxflags="$CXXFLAGS" +ldflags="$LDFLAGS" +debug_cflags="$DEBUG_CFLAGS" +debug_cxxflags="$DEBUG_CXXFLAGS" + + if (( ! INFAKEROOT )); then if (( EUID == 0 )); then error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ -- 2.6.3

1 1

[pacman-dev] [PATCH] alpm_run_chroot: remove dead code
by Andrew Gregory 05 Dec '15

05 Dec '15

Removes a leftover error message from when fdopen and fgets were used to read from the pipe. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/util.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 7e8f85e..3824d13 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -705,11 +705,6 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[], } } - /* report error from above after the child has exited */ - if(retval != 0) { - _alpm_log(handle, ALPM_LOG_ERROR, _("could not open pipe (%s)\n"), strerror(errno)); - goto cleanup; - } /* check the return status, make sure it is 0 (success) */ if(WIFEXITED(status)) { _alpm_log(handle, ALPM_LOG_DEBUG, "call to waitpid succeeded\n"); -- 2.6.3

1 0

[pacman-dev] [PATCH] Updated the documentation for makepkg's -L option.
by Alastair Hughes 05 Dec '15

05 Dec '15

At some point back in 2009, logging was expanded to cover all of the packaging functions, but the man page was not updated to reflect that. Fix that! Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> --- doc/makepkg.8.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index faf3e19..bfb0cee 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -103,11 +103,11 @@ Options linkman:pacman[8]. *-L, \--log*:: - Enable makepkg build logging. This will use the *tee* program to send - output of the `build()` function to both the console and to a text file in - the build directory named `pkgname-pkgver-pkgrel-arch.log`. As mentioned - above, the build log will be localized so you may want to set your locale - accordingly if sharing the log output with others. + Enable logging. This will use the *tee* program to send the output of each + of the package functions to both the console and to a text file in the + build directory named `pkgbase-pkgver-pkgrel-arch-pkgfunc.log`. + As mentioned above, the logs will be localized so you may want to set your + locale accordingly if sharing the log output with others. *-m, \--nocolor*:: Disable color in output messages. -- 2.6.3

2 1