- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 0/4] hooks
by Andrew Gregory 18 Oct '15

18 Oct '15

= TODO = * documentation * run PreTransaction hooks *after* conflict checks * hook/trigger validation * masking hooks with an empty file or symlink to /dev/null * tests = Hook Directories = ALPM handles keep a list of hook directories to scan. Initially, this list is populated with a single directory: /usr/share/alpm/hooks/. This directory is intended for packages to be able to place hooks in a front-end agnostic manner. Front-ends may specify any number of additional directories to search, with later directories overriding earlier ones. Front-ends can disable hooks altogether by setting an empty list. = Parsing Hooks = Configured directories are scanned for files matching '*.hook'. Hook files must be in pacman-style INI format with the following available options: [Trigger] (multiple Trigger sections allowed) Operation = Sync|Remove (Required) Type = File|Package (Required) Target = <Path|PkgName> (Required, multiple allowed) [Action] (only one Action section allowed) When = PreTransaction|PostTransaction (Required) Exec = <Command> (Required) Depends = <PkgName> (Optional) AbortOnFail (Optional, PreTransaction only) Unlike pacman.conf multiple values are *not* allowed on a single line. Exec is currently limited to the path of the executable to run, arguments are not allowed. This is intended to be a temporary limitation until I decide the best way to go about splitting the arguments, which depends in part on whether we want to try to provide hooks with the packages/files that triggered them. Targets are matched the same as IgnorePkg in pacman.conf, meaning multiple targets can be specified and targets can be negated with a leading '!'. If multiple Trigger sections are specified the hook will run if any of them match the transaction. = Running Hooks = Hooks are not cached after running. Directories are rescanned and hooks reloaded each time. This is to make sure that any hooks added/removed during a transaction are appropriately accounted for. Hooks are run exactly the same as install scriptlets (chroot, output passed to the front-end, etc.). They do *not* have access to which package/file triggered the hook. For the time being, run order is officially undefined. apg Andrew Gregory (4): move strtim to util-common move ini parser into common wip add hooks add example hooks hooks/checkboot.hook | 17 +++ hooks/checkmount | 13 ++ hooks/checkmount.conf | 1 + hooks/checkmount.hook | 17 +++ hooks/sync.hook | 16 +++ lib/libalpm/Makefile.am | 2 + lib/libalpm/alpm.c | 1 + lib/libalpm/alpm.h | 10 ++ lib/libalpm/handle.c | 59 ++++++++ lib/libalpm/handle.h | 1 + lib/libalpm/hook.c | 354 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/hook.h | 34 +++++ lib/libalpm/trans.c | 6 + src/common/ini.c | 116 ++++++++++++++++ src/common/ini.h | 30 ++++ src/common/util-common.c | 39 ++++++ src/common/util-common.h | 2 + src/pacman/ini.c | 117 +--------------- src/pacman/ini.h | 31 +---- src/pacman/util.c | 39 ------ src/pacman/util.h | 1 - src/util/pactree.c | 36 ----- 22 files changed, 720 insertions(+), 222 deletions(-) create mode 100644 hooks/checkboot.hook create mode 100644 hooks/checkmount create mode 100644 hooks/checkmount.conf create mode 100644 hooks/checkmount.hook create mode 100644 hooks/sync.hook create mode 100644 lib/libalpm/hook.c create mode 100644 lib/libalpm/hook.h create mode 100644 src/common/ini.c create mode 100644 src/common/ini.h mode change 100644 => 120000 src/pacman/ini.c mode change 100644 => 120000 src/pacman/ini.h -- 2.4.5

3 49

[pacman-dev] [PATCH] contrib/checkupdates: separate fakeroot call and command
by Allan McRae 18 Oct '15

18 Oct '15

Separating the fakeroot command and the pacman call with "--" prevents weird interactions with some locales. See FS#46405. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/checkupdates.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index e8a8198..ff62891 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -51,7 +51,7 @@ eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' @sysconfdir@/pacman.con mkdir -p "$CHECKUPDATES_DB" ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null -fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null +fakeroot -- pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null pacman -Qu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]' exit 0 -- 2.6.1

1 0

[pacman-dev] [PATCH] Do not print any root prefix in files database operations
by Allan McRae 18 Oct '15

18 Oct '15

Combining with the --root flag and outputing a consistent root prefix leads to many situations that make no sense. Instead, do not print any prefix for any --files operations. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/files.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index ceec342..31ce9e0 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -61,7 +61,7 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) { if(alpm_filelist_contains(files, f)) { if(!config->quiet) { - printf(_("%s is owned by %s/%s %s\n"), filename, + printf(_("%s is owned by %s/%s %s\n"), f, alpm_db_get_name(repo), alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { @@ -166,6 +166,28 @@ notfound: return 0; } +static void dump_file_list(alpm_pkg_t *pkg) { + const char *pkgname; + alpm_filelist_t *pkgfiles; + size_t i; + + pkgname = alpm_pkg_get_name(pkg); + pkgfiles = alpm_pkg_get_files(pkg); + + for(i = 0; i < pkgfiles->count; i++) { + const alpm_file_t *file = pkgfiles->files + i; + /* Regular: '<pkgname> <filepath>\n' + * Quiet : '<filepath>\n' + */ + if(!config->quiet) { + printf("%s%s%s ", config->colstr.title, pkgname, config->colstr.nocolor); + } + printf("%s\n", file->name); + } + + fflush(stdout); +} + static int files_list(alpm_list_t *syncs, alpm_list_t *targets) { alpm_list_t *i, *j; int ret = 0, found = 0; @@ -200,7 +222,7 @@ static int files_list(alpm_list_t *syncs, alpm_list_t *targets) { if((pkg = alpm_db_get_pkg(db, targ)) != NULL) { found = 1; - dump_pkg_files(pkg, config->quiet); + dump_file_list(pkg); break; } } @@ -218,7 +240,7 @@ static int files_list(alpm_list_t *syncs, alpm_list_t *targets) { for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) { alpm_pkg_t *pkg = j->data; - dump_pkg_files(pkg, config->quiet); + dump_file_list(pkg); } } } -- 2.6.1

1 0

[pacman-dev] [PATCH] Consistently add leading slash for the output of files operations
by Allan McRae 18 Oct '15

18 Oct '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/files.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pacman/files.c b/src/pacman/files.c index ceec342..feda75d 100644 --- a/src/pacman/files.c +++ b/src/pacman/files.c @@ -61,7 +61,7 @@ static int files_fileowner(alpm_list_t *syncs, alpm_list_t *targets) { if(alpm_filelist_contains(files, f)) { if(!config->quiet) { - printf(_("%s is owned by %s/%s %s\n"), filename, + printf(_("/%s is owned by %s/%s %s\n"), f, alpm_db_get_name(repo), alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { @@ -147,7 +147,7 @@ static int files_search(alpm_list_t *syncs, alpm_list_t *targets, int regex) { for(ml = match; ml; ml = alpm_list_next(ml)) { c = ml->data; - printf(" %s\n", c); + printf(" /%s\n", c); } FREELIST(match); } -- 2.6.1

2 2

[pacman-dev] [PATCH 1/3] package.c: Remove obsolete param from doc
by Pierre Neidhardt 17 Oct '15

17 Oct '15

Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> --- src/pacman/package.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pacman/package.c b/src/pacman/package.c index 2fd0a9c..0e4977f 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -79,7 +79,6 @@ static void optdeplist_display(alpm_pkg_t *pkg, unsigned short cols) * Extra information entails 'required by' info for sync packages and backup * files info for local packages. * @param pkg package to display information for - * @param from the type of package we are dealing with * @param extra should we show extra information */ void dump_pkg_full(alpm_pkg_t *pkg, int extra) -- 2.6.1

2 11

[pacman-dev] [PATCH v2] makepkg: record build information in .BUILDINFO
by Allan McRae 17 Oct '15

17 Oct '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> --- v2: Add build directory, PKGBUILD sha256sum and debug packaging flags. scripts/makepkg.sh.in | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6ededa3..db96a30 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 @@ -1143,19 +1143,30 @@ 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[@]}" + + printf "cppflags = %s\n" "$cppflags" + printf "cflags = %s\n" "$cflags" + printf "cxxflags = %s\n" "$cxxflags" + printf "ldflags = %s\n" "$ldflags" + printf "debug_cflags = %s\n" "$debug_cflags" + printf "debug_cxxflags = %s\n" "$debug_cxxflags" + + local pkglist=($(run_pacman -Q | sed "s# #-#")) + printf "installed = %s\n" "${pkglist[@]}" } create_package() { @@ -1172,8 +1183,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 @@ -1958,6 +1970,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.1

3 3

[pacman-dev] [PATCH] Fixed wrong alignment in the italian translation.
by David Barchiesi 17 Oct '15

17 Oct '15

Added missing blank spaces in 'Dimensione :' string. Signed-off-by: David Barchiesi <david(a)barchie.si> --- src/pacman/po/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/po/it.po b/src/pacman/po/it.po index bb4fff9..67724a0 100644 --- a/src/pacman/po/it.po +++ b/src/pacman/po/it.po @@ -624,7 +624,7 @@ msgstr "Sostituisce :" #: src/pacman/package.c:170 #, c-format msgid "Download Size :" -msgstr "Dimensione :" +msgstr "Dimensione :" #: src/pacman/package.c:173 #, c-format -- 2.6.1

3 7

[pacman-dev] [PATCH] PKGBUILD.5: post_*() are functions, not scripts
by Pierre Neidhardt 17 Oct '15

17 Oct '15

--- doc/PKGBUILD.5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 770bd97..4ff3b02 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -421,7 +421,7 @@ itself after installation and perform an opposite action upon removal. The exact time the script is run varies with each operation, and should be self-explanatory. Note that during an upgrade operation, none of the install -or remove scripts will be called. +or remove functions will be called. Scripts are passed either one or two ``full version strings'', where a full version string is either 'pkgver-pkgrel' or 'epoch:pkgver-pkgrel', if epoch is -- 2.6.1

2 2

[pacman-dev] pacman files database operations
by Allan McRae 17 Oct '15

17 Oct '15

Hi all, On my "files" branch I have implemented some operations on the .files databases. (remember these are unconditionally created with the repo-add in git now) Download .files databases: $ pacman -Fy :: Synchronizing package databases... ... List files in packages: $ pacman -Fl abs abs /etc/ abs /etc/abs.conf ... Check file ownership using sync databases: $ pacman -Fo /usr/bin/pacman /usr/bin/pacman is owned by pacman 4.2.1-1 Search file lists: $ pacman -Fs libpng.so libpng 1.6.16-1: /usr/lib/libpng.so darktable 1.6.7-1: /usr/lib/darktable/plugins/imageio/format/libpng.so lib32-libpng 1.6.16-1: /usr/lib32/libpng.so Search with regexes: $ pacman -Fsx kcm.*print.*\.so print-manager 15.04.2-1: /usr/lib/qt/plugins/kcm_printer_manager.so kmymoney 4.7.2-1: /usr/lib/kde4/kcm_kmm_printcheck.so Anything else that is worth implementing before I do the much needed rebase on that branch? A

2 6

[pacman-dev] [PATCH] Add support for setting git-clone options to be used by makepkg (e.g. allowing user to set options like --depth=1)
by Clayton Craft 09 Oct '15

09 Oct '15

Signed-off-by: Clayton Craft <craftyguy(a)gmail.com> --- etc/makepkg.conf.in | 3 +++ scripts/libmakepkg/source/git.sh.in | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 71ec624..4520318 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -19,6 +19,9 @@ DLAGENTS=('ftp::/usr/bin/curl -qfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o # /usr/bin/lftpget -c # /usr/bin/wget +#-- Git-clone options +GITCLONEOPTS="" + #-- The package required by makepkg to download VCS sources # Format: 'protocol::package' VCSCLIENTS=('bzr::bzr' diff --git a/scripts/libmakepkg/source/git.sh.in b/scripts/libmakepkg/source/git.sh.in index 4d2f2d7..b1c7c38 100644 --- a/scripts/libmakepkg/source/git.sh.in +++ b/scripts/libmakepkg/source/git.sh.in @@ -42,7 +42,7 @@ download_git() { if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git" - if ! git clone --mirror "$url" "$dir"; then + if ! git clone ${GITCLONEOPTS} --mirror "$url" "$dir"; then error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 -- 2.6.1

3 2