- Pacman-dev - lists.archlinux.org

[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

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

04 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> --- scripts/makepkg.sh.in | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 6ededa3..1fd3ff1 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,21 @@ 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" + + local pkglist=($(run_pacman -Q | sed "s# #-#")) + printf "installed = %s\n" "${pkglist[@]}" + + printf "cppflags = %s\n" "$cppflags" + printf "cflags = %s\n" "$cflags" + printf "cxxflags = %s\n" "$cxxflags" + printf "ldflags = %s\n" "$ldflags" + + printf "buildenv = %s\n" "${BUILDENV[@]}" + printf "options = %s\n" "${OPTIONS[@]}" } create_package() { @@ -1172,8 +1174,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 +1961,13 @@ GPGKEY=${_GPGKEY:-$GPGKEY} PACKAGER=${_PACKAGER:-$PACKAGER} CARCH=${_CARCH:-$CARCH} +# record initial build environment +cppflags="$CPPFLAGS" +cflags="$CFLAGS" +cxxflags="$CXXFLAGS" +ldflags="$LDFLAGS" + + if (( ! INFAKEROOT )); then if (( EUID == 0 )); then error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\ -- 2.5.3

3 4

Re: [pacman-dev] [PATCH] makepkg: remove ability to build individual packages
by Que Quotion 22 Sep '15

22 Sep '15

>there can silently exist package order dependencies between package functions I find it hilarious that Dave Reisner points this out, because it is his packages that are full of this problem: one package function putting files in place for another, such that all the functions have to be done, and be done in the order he expects them to be done or packging will fail. Anyway it looks like the issue is settled... On Tue, Sep 22, 2015 at 11:57 PM, Que Quotion <quequotion(a)gmail.com> wrote: > Case in point, I had some trouble pakaging several packages today. > > One was libsystemd, which I've already submitted a patch for. > https://bugs.archlinux.org/task/46382 > > Another was libutil-lnux, which will need a little more help. > https://bugs.archlinux.org/task/46383 > > In both cases $pkgname was used where $pkgbase should be (fixed in an > earlier report for systemd) and then both packages use one > package_something() function to put files in place for another > package_somethingelse() function--both by moving files from $pkgdir into > $srcdir. This seems like bad practice to me, isn't necessary, and could be > done better: My proposal for systemd shortens the PKGBUILD by a few lines > and doesn't touch $srcdir. > > Removing the "--pkg" feature of makepkg will only allow more bad practice > that will be harder to undo should we change our minds down the line. > > On Tue, Sep 22, 2015 at 11:40 PM, Que Quotion <quequotion(a)gmail.com> > wrote: > >> In other words, rather than fix the packages to be safer and more >> logical, go ahead and let people write sloppy PKGBUILDs? >> >> For what it's worth, I think this is a bad idea. >> >> The changes needed to fix the packages are small, and this would reduce >> the ability of users to automate upgrading from ABS. >> >> On Tue, Sep 22, 2015 at 11:33 PM, Allan McRae <allan(a)archlinux.org> >> wrote: >> >>> On 23/09/15 00:20, Pierre Neidhardt wrote: >>> > I might have missed something in the previous messages, but is there >>> any >>> > rationale on this, beside debatable worthiness? >>> > >>> >>> Many packages break when using this. >>> >>> Some are because assumptions made on build() about the value of $pkgname >>> which changes when --pkg was used. These should use $pkgbase anyway... >>> >>> Also, there are quite a few split packages that rely on the first first >>> split-package being packaged for the rest of the package functions to >>> work. This will become more prevalent when a way to do a "make >>> install" followed by moving files into different packages becomes >>> available (i.e. rpm packaging style - I am working on this). >>> >>> So... essentially, it is (debatably) broken and will become more broken >>> in the future >>> >> >> >

1 0

[pacman-dev] [PATCH v2] makepkg: remove ability to build individual packages
by Allan McRae 22 Sep '15

22 Sep '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- v2: forgot about documentation. doc/makepkg.8.txt | 4 ---- scripts/makepkg.sh.in | 8 -------- 2 files changed, 12 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 4323fd3..faf3e19 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -156,10 +156,6 @@ Options such as a chroot or remote builder. It will also satisfy requirements of the GPL when distributing binary packages. -*\--pkg* <list>:: - Only build listed packages from a split package. Multiple packages should - be comma separated in the list. This option can be specified multiple times. - *\--check*:: Run the check() function in the PKGBUILD, overriding the setting in linkman:makepkg.conf[5]. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 793d42c..6ededa3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -76,7 +76,6 @@ NOBUILD=0 NODEPS=0 NOEXTRACT=0 PKGFUNC=0 -PKGLIST=() PKGVERFUNC=0 PREPAREFUNC=0 REPKG=0 @@ -1718,7 +1717,6 @@ usage() { printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n" - printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" @@ -1808,7 +1806,6 @@ while true; do --nosign) SIGNPKG='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; - --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; --printsrcinfo) PRINTSRCINFO=1 ;; -r|--rmdeps) RMDEPS=1 ;; @@ -2060,11 +2057,6 @@ elif [[ $SPLITPKG -eq 0 ]] && have_function package_${pkgname}; then SPLITPKG=1 fi -if [[ -n "${PKGLIST[@]}" ]]; then - unset pkgname - pkgname=("${PKGLIST[@]}") -fi - # check if gpg signature is to be created and if signing key is valid if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]]; then SIGNPKG='y' -- 2.5.3

1 0

[pacman-dev] [PATCH] makepkg: remove ability to build individual packages
by Allan McRae 22 Sep '15

22 Sep '15

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 793d42c..6ededa3 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -76,7 +76,6 @@ NOBUILD=0 NODEPS=0 NOEXTRACT=0 PKGFUNC=0 -PKGLIST=() PKGVERFUNC=0 PREPAREFUNC=0 REPKG=0 @@ -1718,7 +1717,6 @@ usage() { printf -- "$(gettext " --noprepare Do not run the %s function in the %s")\n" "prepare()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" printf -- "$(gettext " --packagelist Only list packages that would be produced, without PKGEXT")\n" - printf -- "$(gettext " --pkg <list> Only build listed packages from a split package")\n" printf -- "$(gettext " --printsrcinfo Print the generated SRCINFO and exit")\n" printf -- "$(gettext " --sign Sign the resulting package with %s")\n" "gpg" printf -- "$(gettext " --skipchecksums Do not verify checksums of the source files")\n" @@ -1808,7 +1806,6 @@ while true; do --nosign) SIGNPKG='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; - --pkg) shift; IFS=, read -ra p <<<"$1"; PKGLIST+=("${p[@]}"); unset p ;; --packagelist) PACKAGELIST=1 IGNOREARCH=1;; --printsrcinfo) PRINTSRCINFO=1 ;; -r|--rmdeps) RMDEPS=1 ;; @@ -2060,11 +2057,6 @@ elif [[ $SPLITPKG -eq 0 ]] && have_function package_${pkgname}; then SPLITPKG=1 fi -if [[ -n "${PKGLIST[@]}" ]]; then - unset pkgname - pkgname=("${PKGLIST[@]}") -fi - # check if gpg signature is to be created and if signing key is valid if { [[ -z $SIGNPKG ]] && check_buildenv "sign" "y"; } || [[ $SIGNPKG == 'y' ]]; then SIGNPKG='y' -- 2.5.3

4 6

[pacman-dev] [PATCH 1/2] libmakepkg: return 1 on error in arch array
by Allan McRae 22 Sep '15

22 Sep '15

The return value was being assigned when an error was found in a PKGBUILD's arch array but it never was returned. Also remove error message explaining about adding the arch array to a PKGBUILD. That was added a long time ago when the arch array first became compulsory. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in index 547d5fc..b8a8c30 100644 --- a/scripts/libmakepkg/lint_pkgbuild/arch.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/arch.sh.in @@ -47,8 +47,6 @@ lint_arch() { if (( ! IGNOREARCH )) && ! in_array "$CARCH" "${arch[@]}"; then error "$(gettext "%s is not available for the '%s' architecture.")" "$pkgbase" "$CARCH" - plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT" - plain "$(gettext "such as %s.")" "arch=('$CARCH')" return 1 fi @@ -61,4 +59,6 @@ lint_arch() { fi fi done + + return $ret } -- 2.5.3

1 1

[pacman-dev] [PATCH] makepkg: remove FORCE_VER variable
by Allan McRae 22 Sep '15

22 Sep '15

This variable is no longer in VCS building. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ec8218f..793d42c 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -88,10 +88,6 @@ SPLITPKG=0 SOURCEONLY=0 VERIFYSOURCE=0 -# Forces the pkgver of the current PKGBUILD. Used by the fakeroot call -# when dealing with svn/cvs/etc PKGBUILDs. -FORCE_VER="" - PACMAN_OPTS= shopt -s extglob -- 2.5.3

1 0

[pacman-dev] [PATCH] sortbydeps: skip local packages being updated
by Andrew Gregory 19 Sep '15

19 Sep '15

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/deps.c | 11 ++++++-- test/pacman/tests/TESTS | 1 + .../tests/dependency-cycle-fixed-by-upgrade.py | 32 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 test/pacman/tests/dependency-cycle-fixed-by-upgrade.py diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index daab9c3..34ac8d3 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -105,7 +105,13 @@ static alpm_list_t *dep_graph_init(alpm_handle_t *handle, alpm_list_t *i, *j; alpm_list_t *vertices = NULL; alpm_list_t *localpkgs = alpm_list_diff( - alpm_db_get_pkgcache(handle->db_local), ignore, _alpm_pkg_cmp); + alpm_db_get_pkgcache(handle->db_local), targets, _alpm_pkg_cmp); + + if(ignore) { + alpm_list_t *oldlocal = localpkgs; + localpkgs = alpm_list_diff(oldlocal, ignore, _alpm_pkg_cmp); + alpm_list_free(oldlocal); + } /* We create the vertices */ for(i = targets; i; i = i->next) { @@ -137,8 +143,7 @@ static alpm_list_t *dep_graph_init(alpm_handle_t *handle, alpm_graph_t *vertex_j = _alpm_graph_new(); vertex_j->data = (void *)j->data; vertices = alpm_list_add(vertices, vertex_j); - vertex_i->children = - alpm_list_add(vertex_i->children, vertex_j); + vertex_i->children = alpm_list_add(vertex_i->children, vertex_j); localpkgs = alpm_list_remove_item(localpkgs, j); free(j); } diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 3ff0b0c..cce0d58 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -14,6 +14,7 @@ TESTS += test/pacman/tests/depconflict100.py TESTS += test/pacman/tests/depconflict110.py TESTS += test/pacman/tests/depconflict111.py TESTS += test/pacman/tests/depconflict120.py +TESTS += test/pacman/tests/dependency-cycle-fixed-by-upgrade.py TESTS += test/pacman/tests/deptest001.py TESTS += test/pacman/tests/dummy001.py TESTS += test/pacman/tests/epoch001.py diff --git a/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py b/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py new file mode 100644 index 0000000..dc042e5 --- /dev/null +++ b/test/pacman/tests/dependency-cycle-fixed-by-upgrade.py @@ -0,0 +1,32 @@ +self.description = "Circular dependency fixed by removed dependency" + +lp1 = pmpkg("pkg1", "1-1") +lp1.depends = ["pkg2"] + +lp2 = pmpkg("pkg2", "1-1") +lp2.depends = ["pkg3"] + +lp3 = pmpkg("pkg3", "1-1") +lp3.depends = ["pkg1"] + +for p in lp1, lp2, lp3: + self.addpkg2db("local", p); + +sp1 = pmpkg("pkg1", "1-2") +sp1.depends = ["pkg2"] + +sp2 = pmpkg("pkg2", "1-2") + +sp3 = pmpkg("pkg3", "1-2") +sp3.depends = ["pkg1"] + +for p in sp1, sp2, sp3: + self.addpkg2db("sync", p); + +self.args = "-S %s %s %s" % (sp1.name, sp2.name, sp3.name) + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1-2") +self.addrule("PKG_VERSION=pkg2|1-2") +self.addrule("PKG_VERSION=pkg3|1-2") +self.addrule("!PACMAN_OUTPUT=dependency cycle detected") -- 2.5.2

2 1

[pacman-dev] (no subject)
by Andrew Gregory 14 Sep '15

14 Sep '15

>From b3065d8c0a132c4c52707533014e7bc953d501ae Mon Sep 17 00:00:00 2001 Message-Id: <b3065d8c0a132c4c52707533014e7bc953d501ae.1442270088.git.andrew.gregory.8(a)gmail.com> In-Reply-To: <cover.1442270088.git.andrew.gregory.8(a)gmail.com> References: <1436003967-4737-1-git-send-email-andrew.gregory.8(a)gmail.com> <cover.1442270088.git.andrew.gregory.8(a)gmail.com> From: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat, 4 Jul 2015 03:35:59 -0400 Subject: [PATCH v2 4/7] wip add hooks --- lib/libalpm/Makefile.am | 2 + lib/libalpm/alpm.c | 7 +- lib/libalpm/alpm.h | 10 ++ lib/libalpm/handle.c | 59 +++++++ lib/libalpm/handle.h | 1 + lib/libalpm/hook.c | 443 ++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/hook.h | 34 ++++ lib/libalpm/trans.c | 6 + 8 files changed, 561 insertions(+), 1 deletion(-) create mode 100644 lib/libalpm/hook.c create mode 100644 lib/libalpm/hook.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index f66daed..77e68a4 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -42,6 +42,8 @@ libalpm_la_SOURCES = \ graph.h graph.c \ group.h group.c \ handle.h handle.c \ + hook.h hook.c \ + ini.h ini.c \ libarchive-compat.h \ log.h log.c \ package.h package.c \ diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index d77b43a..b3f0734 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -49,7 +49,8 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, alpm_errno_t *err) { alpm_errno_t myerr; - const char *lf = "db.lck"; + const char *lf = "db.lck", *syshookdir = "usr/share/alpm/hooks/"; + char *hookdir; size_t lockfilelen; alpm_handle_t *myhandle = _alpm_handle_new(); @@ -64,6 +65,10 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, goto cleanup; } + MALLOC(hookdir, strlen(myhandle->root) + strlen(syshookdir) + 1, goto cleanup); + sprintf(hookdir, "%s%s", myhandle->root, syshookdir); + myhandle->hookdirs = alpm_list_add(NULL, hookdir); + /* set default database extension */ STRDUP(myhandle->dbext, ".db", goto cleanup); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 594f0b6..3049f2f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -87,6 +87,7 @@ typedef enum _alpm_errno_t { ALPM_ERR_TRANS_ABORT, ALPM_ERR_TRANS_TYPE, ALPM_ERR_TRANS_NOT_LOCKED, + ALPM_ERR_TRANS_HOOK_FAILED, /* Packages */ ALPM_ERR_PKG_NOT_FOUND, ALPM_ERR_PKG_IGNORED, @@ -775,6 +776,15 @@ int alpm_option_add_cachedir(alpm_handle_t *handle, const char *cachedir); int alpm_option_remove_cachedir(alpm_handle_t *handle, const char *cachedir); /** @} */ +/** @name Accessors to the list of package hook directories. + * @{ + */ +alpm_list_t *alpm_option_get_hookdirs(alpm_handle_t *handle); +int alpm_option_set_hookdirs(alpm_handle_t *handle, alpm_list_t *hookdirs); +int alpm_option_add_hookdir(alpm_handle_t *handle, const char *hookdir); +int alpm_option_remove_hookdir(alpm_handle_t *handle, const char *hookdir); +/** @} */ + /** Returns the logfile name. */ const char *alpm_option_get_logfile(alpm_handle_t *handle); /** Sets the logfile name. */ diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index a12ac50..98420b0 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -83,6 +83,7 @@ void _alpm_handle_free(alpm_handle_t *handle) FREE(handle->dbpath); FREE(handle->dbext); FREELIST(handle->cachedirs); + FREELIST(handle->hookdirs); FREE(handle->logfile); FREE(handle->lockfile); FREE(handle->arch); @@ -207,6 +208,12 @@ const char SYMEXPORT *alpm_option_get_dbpath(alpm_handle_t *handle) return handle->dbpath; } +alpm_list_t SYMEXPORT *alpm_option_get_hookdirs(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return NULL); + return handle->hookdirs; +} + alpm_list_t SYMEXPORT *alpm_option_get_cachedirs(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -387,6 +394,58 @@ alpm_errno_t _alpm_set_directory_option(const char *value, return 0; } +int SYMEXPORT alpm_option_add_hookdir(alpm_handle_t *handle, const char *hookdir) +{ + char *newhookdir; + + CHECK_HANDLE(handle, return -1); + ASSERT(hookdir != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); + + newhookdir = canonicalize_path(hookdir); + if(!newhookdir) { + RET_ERR(handle, ALPM_ERR_MEMORY, -1); + } + handle->hookdirs = alpm_list_add(handle->hookdirs, newhookdir); + _alpm_log(handle, ALPM_LOG_DEBUG, "option 'hookdir' = %s\n", newhookdir); + return 0; +} + +int SYMEXPORT alpm_option_set_hookdirs(alpm_handle_t *handle, alpm_list_t *hookdirs) +{ + alpm_list_t *i; + CHECK_HANDLE(handle, return -1); + if(handle->hookdirs) { + FREELIST(handle->hookdirs); + } + for(i = hookdirs; i; i = i->next) { + int ret = alpm_option_add_hookdir(handle, i->data); + if(ret) { + return ret; + } + } + return 0; +} + +int SYMEXPORT alpm_option_remove_hookdir(alpm_handle_t *handle, const char *hookdir) +{ + char *vdata = NULL; + char *newhookdir; + CHECK_HANDLE(handle, return -1); + ASSERT(hookdir != NULL, RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1)); + + newhookdir = canonicalize_path(hookdir); + if(!newhookdir) { + RET_ERR(handle, ALPM_ERR_MEMORY, -1); + } + handle->hookdirs = alpm_list_remove_str(handle->hookdirs, newhookdir, &vdata); + FREE(newhookdir); + if(vdata != NULL) { + FREE(vdata); + return 1; + } + return 0; +} + int SYMEXPORT alpm_option_add_cachedir(alpm_handle_t *handle, const char *cachedir) { char *newcachedir; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 315d987..e252fbf 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -82,6 +82,7 @@ struct __alpm_handle_t { char *lockfile; /* Name of the lock file */ char *gpgdir; /* Directory where GnuPG files are stored */ alpm_list_t *cachedirs; /* Paths to pacman cache directories */ + alpm_list_t *hookdirs; /* Paths to hook directories */ /* package lists */ alpm_list_t *noupgrade; /* List of packages NOT to be upgraded */ diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c new file mode 100644 index 0000000..66cedaa --- /dev/null +++ b/lib/libalpm/hook.c @@ -0,0 +1,443 @@ +/* + * hook.c + * + * Copyright (c) 2015 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <string.h> +#include <errno.h> +#include <dirent.h> +#include <fcntl.h> + +#include "alpm.h" +#include "handle.h" +#include "hook.h" +#include "ini.h" +#include "util.h" +#include "trans.h" +#include "log.h" + +enum alpm_hook_op_t { + ALPM_HOOK_OP_SYNC = 1, + ALPM_HOOK_OP_REMOVE, +}; + +enum alpm_hook_type_t { + ALPM_HOOK_TYPE_PACKAGE = 1, + ALPM_HOOK_TYPE_FILE, +}; + +struct alpm_trigger_t { + enum alpm_hook_op_t op; + enum alpm_hook_type_t type; + alpm_list_t *targets; +}; + +struct alpm_hook_t { + char *name; + alpm_list_t *triggers; + alpm_list_t *depends; + char *cmd; + enum _alpm_hook_when_t when; + int abort_on_fail; +}; + +struct _alpm_hook_cb_ctx { + alpm_handle_t *handle; + struct alpm_hook_t *hook; +}; + +static void _alpm_trigger_free(struct alpm_trigger_t *trigger) +{ + if(trigger) { + FREELIST(trigger->targets); + free(trigger); + } +} + +static void _alpm_hook_free(struct alpm_hook_t *hook) +{ + if(hook) { + free(hook->name); + free(hook->cmd); + alpm_list_free_inner(hook->triggers, (alpm_list_fn_free) _alpm_trigger_free); + alpm_list_free(hook->triggers); + FREELIST(hook->depends); + free(hook); + } +} + +static int _alpm_trigger_validate(alpm_handle_t *handle, + struct alpm_trigger_t *trigger, const char *file) +{ + int ret = 0; + + if(trigger->targets == NULL) { + ret = -1; + _alpm_log(handle, ALPM_LOG_ERROR, + _("Missing trigger targets in hook: %s\n"), file); + } + + if(trigger->type == 0) { + ret = -1; + _alpm_log(handle, ALPM_LOG_ERROR, + _("Missing trigger type in hook: %s\n"), file); + } + + if(trigger->op == 0) { + ret = -1; + _alpm_log(handle, ALPM_LOG_ERROR, + _("Missing trigger operation in hook: %s\n"), file); + } + + return ret; +} + +static int _alpm_hook_validate(alpm_handle_t *handle, + struct alpm_hook_t *hook, const char *file) +{ + alpm_list_t *i; + int ret = 0; + + if(hook->triggers == NULL) { + /* special case: empty trigger section */ + return 0; + } + + for(i = hook->triggers; i; i = i->next) { + if(_alpm_trigger_validate(handle, i->data, file) != 0) { + ret = -1; + } + } + + if(hook->cmd == NULL) { + ret = -1; + _alpm_log(handle, ALPM_LOG_ERROR, + _("Missing Exec option in hook: %s\n"), file); + } + + if(hook->when == 0) { + ret = -1; + _alpm_log(handle, ALPM_LOG_ERROR, + _("Missing When option in hook: %s\n"), file); + } else if(hook->when != ALPM_HOOK_PRE_TRANSACTION && hook->abort_on_fail) { + _alpm_log(handle, ALPM_LOG_WARNING, + _("AbortOnFail set for PostTransaction hook: %s\n"), file); + } + + return ret; +} + +static int _alpm_hook_parse_cb(const char *file, UNUSED int line, + const char *section, char *key, char *value, void *data) +{ + struct _alpm_hook_cb_ctx *ctx = data; + alpm_handle_t *handle = ctx->handle; + struct alpm_hook_t *hook = ctx->hook; + +#define error(...) _alpm_log(handle, ALPM_LOG_ERROR, __VA_ARGS__); return 1; + + if(!section && !key) { + error(_("error while reading file %s: %s\n"), file, strerror(errno)); + } else if(!section) { + error(_("error parsing hook file %s: invalid option %s\n"), file, key); + } else if(!key) { + /* beginning a new section */ + if(strcmp(section, "Trigger") == 0) { + struct alpm_trigger_t *t; + CALLOC(t, sizeof(struct alpm_trigger_t), 1, return 1); + hook->triggers = alpm_list_add(hook->triggers, t); + } else if(strcmp(section, "Action") == 0) { + /* no special processing required */ + } else { + error(_("error parsing hook file %s: invalid section %s\n"), file, section); + } + } else if(strcmp(section, "Trigger") == 0) { + struct alpm_trigger_t *t = hook->triggers->prev->data; + if(strcmp(key, "Operation") == 0) { + if(strcmp(value, "Sync") == 0) { + t->op = ALPM_HOOK_OP_SYNC; + } else if(strcmp(value, "Remove") == 0) { + t->op = ALPM_HOOK_OP_REMOVE; + } else { + error(_("error parsing hook file %s: invalid value %s\n"), file, value); + } + } else if(strcmp(key, "Type") == 0) { + if(strcmp(value, "Package") == 0) { + t->type = ALPM_HOOK_TYPE_PACKAGE; + } else if(strcmp(value, "File") == 0) { + t->type = ALPM_HOOK_TYPE_FILE; + } else { + error(_("error parsing hook file %s: invalid value %s\n"), file, value); + } + } else if(strcmp(key, "Target") == 0) { + char *val; + STRDUP(val, value, return 1); + t->targets = alpm_list_add(t->targets, val); + } else { + error(_("error parsing hook file %s: invalid option %s\n"), file, key); + } + } else if(strcmp(section, "Action") == 0) { + if(strcmp(key, "When") == 0) { + if(strcmp(value, "PreTransaction") == 0) { + hook->when = ALPM_HOOK_PRE_TRANSACTION; + } else if(strcmp(value, "PostTransaction") == 0) { + hook->when = ALPM_HOOK_POST_TRANSACTION; + } else { + error(_("error parsing hook file %s: invalid value %s\n"), file, value); + } + } else if(strcmp(key, "Depends") == 0) { + char *val; + STRDUP(val, value, return 1); + hook->depends = alpm_list_add(hook->depends, val); + } else if(strcmp(key, "AbortOnFail") == 0) { + hook->abort_on_fail = 1; + } else if(strcmp(key, "Exec") == 0) { + STRDUP(hook->cmd, value, return 1); + } else { + error(_("error parsing hook file %s: invalid option %s\n"), file, value); + } + } + +#undef error + + return 0; +} + +static int _alpm_hook_trigger_match_file(alpm_handle_t *handle, struct alpm_trigger_t *t) +{ + alpm_list_t *i; + alpm_db_t *localdb = handle->db_local; + + for(i = handle->trans->add; i; i = i->next) { + alpm_pkg_t *pkg = i->data; + alpm_filelist_t filelist = pkg->files; + size_t j; + for(j = 0; j < filelist.count; j++) { + if(alpm_option_match_noextract(handle, filelist.files[j].name) == 0) { + continue; + } + if(_alpm_fnmatch_patterns(t->targets, filelist.files[j].name) == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "matched file %s\n", + filelist.files[j].name); + return t->op == ALPM_HOOK_OP_SYNC ? 1 : 0; + } + } + } + + if(t->op == ALPM_HOOK_OP_REMOVE) { + for(i = handle->trans->add; i; i = i->next) { + alpm_pkg_t *spkg = i->data; + alpm_pkg_t *pkg = alpm_db_get_pkg(localdb, spkg->name); + alpm_filelist_t filelist = pkg->files; + size_t j; + for(j = 0; j < filelist.count; j++) { + if(_alpm_fnmatch_patterns(t->targets, filelist.files[j].name) == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "matched file %s\n", + filelist.files[j].name); + return 1; + } + } + } + for(i = handle->trans->remove; i; i = i->next) { + alpm_pkg_t *pkg = i->data; + alpm_filelist_t filelist = pkg->files; + size_t j; + for(j = 0; j < filelist.count; j++) { + if(_alpm_fnmatch_patterns(t->targets, filelist.files[j].name) == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "matched file %s\n", + filelist.files[j].name); + return 1; + } + } + } + } + + return 0; +} + +static int _alpm_hook_trigger_match_pkg(alpm_handle_t *handle, struct alpm_trigger_t *t) +{ + alpm_list_t *i; + + for(i = handle->trans->add; i; i = i->next) { + alpm_pkg_t *pkg = i->data; + if(_alpm_fnmatch_patterns(t->targets, pkg->name) == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "matched package %s\n", pkg->name); + return t->op == ALPM_HOOK_OP_SYNC ? 1 : 0; + } + } + + if(t->op == ALPM_HOOK_OP_REMOVE) { + for(i = handle->trans->remove; i; i = i->next) { + alpm_pkg_t *pkg = i->data; + if(pkg && _alpm_fnmatch_patterns(t->targets, pkg->name) == 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "matched package %s\n", pkg->name); + return 1; + } + } + } + + return 0; +} + +static int _alpm_hook_trigger_match(alpm_handle_t *handle, struct alpm_trigger_t *t) +{ + return t->type == ALPM_HOOK_TYPE_PACKAGE + ? _alpm_hook_trigger_match_pkg(handle, t) + : _alpm_hook_trigger_match_file(handle, t); +} + +static int _alpm_hook_triggered(alpm_handle_t *handle, struct alpm_hook_t *hook) +{ + alpm_list_t *i; + for(i = hook->triggers; i; i = i->next) { + if(_alpm_hook_trigger_match(handle, i->data)) { + return 1; + } + } + return 0; +} + +static alpm_list_t *find_hook(alpm_list_t *haystack, const void *needle) +{ + while(haystack) { + struct alpm_hook_t *h = haystack->data; + if(h && strcmp(h->name, needle) == 0) { + return haystack; + } + haystack = haystack->next; + } + return NULL; +} + +static int _alpm_hook_run_hook(alpm_handle_t *handle, struct alpm_hook_t *hook) +{ + alpm_list_t *i, *pkgs = _alpm_db_get_pkgcache(handle->db_local); + char *const argv[] = { hook->cmd, NULL }; + + for(i = hook->depends; i; i = i->next) { + if(!alpm_find_satisfier(pkgs, i->data)) { + _alpm_log(handle, ALPM_LOG_ERROR, _("unable to run hook %s: %s\n"), + hook->name, _("could not satisfy dependencies")); + return -1; + } + } + + return _alpm_run_chroot(handle, hook->cmd, argv); +} + +int _alpm_hook_run(alpm_handle_t *handle, enum _alpm_hook_when_t when) +{ + alpm_list_t *i, *hooks = NULL; + const char *suffix = ".hook"; + size_t suflen = strlen(suffix); + int ret = 0; + + for(i = alpm_list_last(handle->hookdirs); i; i = alpm_list_previous(i)) { + int err; + char path[PATH_MAX]; + size_t dirlen; + struct dirent entry, *result; + DIR *d; + + if(!(d = opendir(i->data))) { + if(errno == ENOENT) { + continue; + } else { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not open directory: %s: %s\n"), + (char *)i->data, strerror(errno)); + ret = -1; + continue; + } + } + + strncpy(path, i->data, PATH_MAX); + dirlen = strlen(i->data); + + while((err = readdir_r(d, &entry, &result)) == 0 && result) { + struct _alpm_hook_cb_ctx ctx = { handle, NULL }; + struct stat buf; + size_t name_len = strlen(entry.d_name); + + strncpy(path + dirlen, entry.d_name, PATH_MAX - dirlen); + + if(name_len < suflen + || strcmp(entry.d_name + name_len - suflen, suffix) != 0) { + _alpm_log(handle, ALPM_LOG_DEBUG, "skipping non-hook file %s\n", path); + continue; + } + + if(find_hook(hooks, entry.d_name)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "skipping overridden hook %s\n", path); + continue; + } + + if(fstatat(dirfd(d), entry.d_name, &buf, 0) != 0) { + _alpm_log(handle, ALPM_LOG_ERROR, + _("could not stat file %s: %s\n"), path, strerror(errno)); + ret = -1; + continue; + } + + if(S_ISDIR(buf.st_mode)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "skipping directory %s\n", path); + continue; + } + + CALLOC(ctx.hook, sizeof(struct alpm_hook_t), 1, + ret = -1; closedir(d); goto cleanup); + + _alpm_log(handle, ALPM_LOG_DEBUG, "parsing hook file %s\n", path); + if(parse_ini(path, _alpm_hook_parse_cb, &ctx) != 0 + || _alpm_hook_validate(handle, ctx.hook, path)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "parsing hook file %s failed\n", path); + _alpm_hook_free(ctx.hook); + ret = -1; + continue; + } + + STRDUP(ctx.hook->name, entry.d_name, ret = -1; closedir(d); goto cleanup); + hooks = alpm_list_add(hooks, ctx.hook); + } + + if(err != 0) { + _alpm_log(handle, ALPM_LOG_ERROR, _("could not read directory: %s: %s\n"), + (char *) i->data, strerror(errno)); + ret = -1; + } + + closedir(d); + } + + for(i = hooks; i; i = i->next) { + struct alpm_hook_t *hook = i->data; + if(hook && hook->when == when && _alpm_hook_triggered(handle, hook)) { + _alpm_log(handle, ALPM_LOG_DEBUG, "running hook %s\n", hook->name); + if(_alpm_hook_run_hook(handle, hook) != 0 && hook->abort_on_fail) { + ret = -1; + } + } + } + +cleanup: + alpm_list_free_inner(hooks, (alpm_list_fn_free) _alpm_hook_free); + alpm_list_free(hooks); + + return ret; +} + +/* vim: set noet: */ diff --git a/lib/libalpm/hook.h b/lib/libalpm/hook.h new file mode 100644 index 0000000..4894a19 --- /dev/null +++ b/lib/libalpm/hook.h @@ -0,0 +1,34 @@ +/* + * hook.h + * + * Copyright (c) 2015 Pacman Development Team <pacman-dev(a)archlinux.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _ALPM_HOOK_H +#define _ALPM_HOOK_H + +#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); + +#endif /* _ALPM_HOOK_H */ + +/* vim: set noet: */ diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index ed073c0..a6b1aef 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -40,6 +40,7 @@ #include "sync.h" #include "alpm.h" #include "deps.h" +#include "hook.h" /** \addtogroup alpm_trans Transaction Functions * @brief Functions to manipulate libalpm transactions @@ -189,6 +190,10 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) } } + if(_alpm_hook_run(handle, ALPM_HOOK_PRE_TRANSACTION) != 0) { + RET_ERR(handle, ALPM_ERR_TRANS_HOOK_FAILED, -1); + } + trans->state = STATE_COMMITING; alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction started\n"); @@ -215,6 +220,7 @@ int SYMEXPORT alpm_trans_commit(alpm_handle_t *handle, alpm_list_t **data) alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction interrupted\n"); } else { alpm_logaction(handle, ALPM_CALLER_PREFIX, "transaction completed\n"); + _alpm_hook_run(handle, ALPM_HOOK_POST_TRANSACTION); } trans->state = STATE_COMMITED; -- 2.5.2

1 0

[pacman-dev] makepkg.1: install script not called during upgrade?
by Pierre Neidhardt 07 Sep '15

07 Sep '15

According to the makepkg(1), "Note that during an upgrade operation, none of the install or remove scripts will be called." Is this a mistake in the manual? I believe "functions" was meant instead of "scripts". -- Pierre Neidhardt Security check: INTRUDER ALERT!

2 4