- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] pactest: conflict between directory and a file
by Allan McRae 16 Jul '12

16 Jul '12

Note failure to detect a conflict between a directory in one package and a file in the other when the directory is not currently on the filesystem. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- test/pacman/tests/fileconflict015.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 test/pacman/tests/fileconflict015.py diff --git a/test/pacman/tests/fileconflict015.py b/test/pacman/tests/fileconflict015.py new file mode 100644 index 0000000..78634d7 --- /dev/null +++ b/test/pacman/tests/fileconflict015.py @@ -0,0 +1,17 @@ +self.description = "conflict between a directory and a file" + +p1 = pmpkg("pkg1") +p1.files = ["foo/"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2") +p2.files = ["foo"] +self.addpkg2db("sync", p2) + +self.args = "-S pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") + +self.expectfailure = True -- 1.7.11.2

1 0

[pacman-dev] [PATCH] lib/conflict: avoid conflict with unchanged effective path
by Dave Reisner 16 Jul '12

16 Jul '12

This applies to a case such as when /lib is a symlink to /usr/lib. If a package is installed which contains /lib/libfoo.so, pacman will complain if this package is then "fixed" to contain /usr/lib/libfoo.so. Since these have the same effective path and it exists within the same package, ignore the conflict. Fixes FS#30681. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Written against maint. lib/libalpm/conflict.c | 34 ++++++++++++++++++++++++++++++++++ test/pacman/tests/fileconflict013.py | 20 ++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 test/pacman/tests/fileconflict013.py diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index d6e5d8c..64dd5b0 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -314,6 +314,28 @@ void _alpm_fileconflict_free(alpm_fileconflict_t *conflict) FREE(conflict); } +static const alpm_file_t *_alpm_filelist_contains_resolved(alpm_filelist_t *filelist, + const char *name, const char *root, size_t rootlen) +{ + size_t i; + const alpm_file_t *file; + + if(!filelist) { + return NULL; + } + + for(file = filelist->files, i = 0; i < filelist->count; file++, i++) { + char fullpath[PATH_MAX], abspath[PATH_MAX]; + snprintf(fullpath, sizeof(fullpath), "%s%s", root, file->name); + if(realpath(fullpath, abspath)) { + if(strcmp(&abspath[rootlen], name) == 0) { + return file; + } + } + } + return NULL; +} + const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist, const char *name) { @@ -579,6 +601,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, free(rpath); } + /* check if any of the package's own files resolve to the conflict to + * prevent problems with, e.g. /lib/liba.so moving to /usr/lib/liba.so + * when /lib is a symlink to usr/lib */ + if(!resolved_conflict && dbpkg && !S_ISDIR(lsbuf.st_mode)) { + if(_alpm_filelist_contains_resolved(alpm_pkg_get_files(dbpkg), + relative_path, handle->root, rootlen)) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "package contained a realpath resolved to a package file\n"); + resolved_conflict = 1; + } + } + /* is the file unowned and in the backup list of the new package? */ if(!resolved_conflict && _alpm_needbackup(filestr, p1)) { alpm_list_t *local_pkgs = _alpm_db_get_pkgcache(handle->db_local); diff --git a/test/pacman/tests/fileconflict013.py b/test/pacman/tests/fileconflict013.py new file mode 100644 index 0000000..a83923c --- /dev/null +++ b/test/pacman/tests/fileconflict013.py @@ -0,0 +1,20 @@ +self.description = "file->file path change with same effective path (/lib as symlink)" + +lp1 = pmpkg("filesystem", "1.0-1") +lp1.files = ["usr/", + "usr/lib/", + "lib -> usr/lib/"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg1", "1.0-1") +lp2.files = ["lib/libfoo.so"] +self.addpkg2db("local", lp2) + +sp1 = pmpkg("pkg1", "1.0-2") +sp1.files = ["usr/lib/libfoo.so"] +self.addpkg2db("sync", sp1) + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") -- 1.7.11.2

3 2

[pacman-dev] [PATCH] makepkg: always build when pkgver function used
by Allan McRae 16 Jul '12

16 Jul '12

If a pkgver() function is specified, always build the package even if a package with the current pkgver is found as this pkgver may change. The only exception is when installing with -i. If a new build is required then, -f must be used. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I thought this was a reasonable compromise in terms of complexity and what I would expect makepkg to do. Having makepkg download all the sources, update pkgver, then check if a package with the same pkgver is already built did not seem the right approach to me. scripts/makepkg.sh.in | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ed14577..d7d40de 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -74,6 +74,7 @@ IGNOREARCH=0 BUILDFUNC=0 CHECKFUNC=0 PKGFUNC=0 +PKGVERFUNC=0 SPLITPKG=0 PKGLIST=() SIGNPKG='' @@ -545,7 +546,7 @@ download_sources() { esac done - if declare -f pkgver >/dev/null && (( GET_VCS )); then + if (( PKGVERFUNC && GET_VCS )); then update_pkgver check_pkgver || exit 1 fi @@ -1807,7 +1808,7 @@ check_sanity() { ret=1 fi - if ! declare -f pkgver >/dev/null; then + if (( ! PKGVERFUNC )) ; then check_pkgver || ret=1 fi @@ -2406,6 +2407,10 @@ if (( GENINTEG )); then exit 0 # $E_OK fi +if declare -f pkgver >/dev/null; then + PKGVERFUNC=1 +fi + # check the PKGBUILD for some basic requirements check_sanity || exit 1 @@ -2482,12 +2487,12 @@ else warning "$(gettext "The package group has already been built, installing existing packages...")" install_package exit $? - else + elif (( ! PKGVERFUNC )); then error "$(gettext "The package group has already been built. (use %s to overwrite)")" "-f" exit 1 fi fi - if (( somepkgbuilt )); then + if (( somepkgbuilt && ! PKGVERFUNC )); then error "$(gettext "Part of the package group has already been built. (use %s to overwrite)")" "-f" exit 1 fi -- 1.7.11.2

1 0

[pacman-dev] [PATCH] makepkg: check pkgver validity after updating
by Allan McRae 16 Jul '12

16 Jul '12

If a PKGBUILD has a pkgver() function, skip checking the pkgver validity until it has been updated. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8f14418..ed14577 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -547,6 +547,7 @@ download_sources() { if declare -f pkgver >/dev/null && (( GET_VCS )); then update_pkgver + check_pkgver || exit 1 fi popd &>/dev/null @@ -1782,7 +1783,7 @@ check_sanity() { # check for no-no's in the build script local i local ret=0 - for i in 'pkgname' 'pkgrel' 'pkgver'; do + for i in 'pkgname' 'pkgrel'; do if [[ -z ${!i} ]]; then error "$(gettext "%s is not allowed to be empty.")" "$i" ret=1 @@ -1806,14 +1807,9 @@ check_sanity() { ret=1 fi - awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | - while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" - if [[ $i = *[[:space:]:-]* ]]; then - error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" - return 1 - fi - done || ret=1 + if ! declare -f pkgver >/dev/null; then + check_pkgver || ret=1 + fi awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do @@ -1943,6 +1939,26 @@ check_sanity() { return $ret } +check_pkgver() { + local ret=0 + + if [[ -z ${pkgver} ]]; then + error "$(gettext "%s is not allowed to be empty.")" "$i" + ret=1 + fi + + awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | + while IFS='=' read -r _ i; do + eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" + if [[ $i = *[[:space:]:-]* ]]; then + error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" + return 1 + fi + done || ret=1 + + return $ret +} + check_software() { # check for needed software local ret=0 -- 1.7.11.2

1 0

[pacman-dev] [PATCH] Do not enable _FORTIFY_SOURCE without optimization
by Allan McRae 16 Jul '12

16 Jul '12

With glibc-2.16, using -D_FORTIFY_SOURCE requires that optimization (-O) be used or it will prodice a warning message. Enable -Werror in our test for _FORTIFY_SOURCE support to catch when a users specifies CFLAGS without optimization. The line to set CFLAGS="" when no CFLAGS are specified (either due to being unset or geniunely empty) is required as autoconf will use "-O2 -g" for its tests by defult when CFLAGS is unset, but will not add them to the CFLAGS used... Signed-off-by: Allan McRae <allan(a)archlinux.org> --- configure.ac | 5 +++++ m4/acinclude.m4 | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6f53c72..d37d978 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,11 @@ LT_INIT LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age" +# Respect empty CFLAGS during compiler tests +if test "x$CFLAGS" != "x"; then + CFLAGS="" +fi + # Set subsitution values for version stuff in Makefiles and anywhere else, # and put LIB_VERSION in config.h AC_SUBST(LIB_VERSION) diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 index 4455d26..f57a515 100644 --- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -40,11 +40,15 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[ dnl GCC_FORTIFY_SOURCE_CC dnl checks -D_FORTIFY_SOURCE with the C compiler, if it exists then updates -dnl CFLAGS +dnl CPPFLAGS AC_DEFUN([GCC_FORTIFY_SOURCE_CC],[ AC_LANG_ASSERT(C) if test "X$CC" != "X"; then AC_MSG_CHECKING(for FORTIFY_SOURCE support) + fs_old_cppflags="$CPPFLAGS" + fs_old_cflags="$CFLAGS" + CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + CFLAGS="$CFLAGS -Werror" AC_TRY_COMPILE([#include <features.h>], [ int main() { #if !(__GNUC_PREREQ (4, 1) ) @@ -54,10 +58,12 @@ AC_DEFUN([GCC_FORTIFY_SOURCE_CC],[ } ], [ AC_MSG_RESULT(yes) - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + CFLAGS="$df_old_cflags" ], [ AC_MSG_RESULT(no) - ]) + CPPFLAGS="$df_old_cppflags" + CFLAGS="$df_old_cflags" + ]) fi ]) -- 1.7.11.2

1 0

[pacman-dev] build failure: _FORTIFY_SOURCE requires compiling with optimization
by Clemens Buchacher 16 Jul '12

16 Jul '12

I am trying to build like this: ./autogen.sh ./configure --enable-debug --enable-git-version --prefix=$HOME/.local/pacman CFLAGS=-g And I get during make: In file included from /usr/include/stdlib.h:24:0, from add.c:21: /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] cc1: all warnings being treated as errors Autoconf checks if FORTIFY_SOURCE works, but it does so without -Werror which is later used for compiling: # configure.ac if test "x$debug" = "xyes" ; then GCC_FORTIFY_SOURCE_CC WARNING_CFLAGS="-g -Wall -Werror" I attempted to fix this by considering WARNING_CFLAGS in GCC_FORTIFY_SOURCE_CC, but Autoconf is a mystery to me. In any case, it seems strange that _FORTIFY_SOURCE would be used only with debugging while the standard library warns about its use without optimization. Clemens

2 1

[pacman-dev] [PATCH 1/3] Use execvp for running programs in chroot
by Allan McRae 16 Jul '12

16 Jul '12

This makes us more robust to utilities changing paths. There is no functional change when a full path is specified. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index c2b5d44..bdb9e56 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -549,9 +549,9 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) exit(1); } umask(0022); - execv(cmd, argv); - /* execv only returns if there was an error */ - fprintf(stderr, _("call to execv failed (%s)\n"), strerror(errno)); + execvp(cmd, argv); + /* execvp only returns if there was an error */ + fprintf(stderr, _("call to execvp failed (%s)\n"), strerror(errno)); exit(1); } else { /* this code runs for the parent only (wait on the child) */ -- 1.7.11.2

1 2

[pacman-dev] [PATCH] makepkg: remove unnecessary formatting
by Allan McRae 15 Jul '12

15 Jul '12

This extra newline leaves a gap that looks strange in of itself, but is highlighted when piping -g output to a PKGBUILD. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3b28112..bc141f2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -642,7 +642,6 @@ get_integlist() { generate_checksums() { msg "$(gettext "Generating checksums for source files...")" - plain "" if ! type -p openssl >/dev/null; then error "$(gettext "Cannot find the %s binary required for generating sourcefile checksums.")" "openssl" -- 1.7.11.2

1 0

[pacman-dev] [PATCH] makepkg: only update pkgver when all sources are available
by Allan McRae 15 Jul '12

15 Jul '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 46496fa..2bda5f1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -544,7 +544,7 @@ download_sources() { esac done - if declare -f pkgver >/dev/null; then + if declare -f pkgver >/dev/null && (( GET_VCS )); then update_pkgver fi -- 1.7.11.2

1 0

[pacman-dev] [PATCH] makepkg: add --holdver to control VCS source updating
by Allan McRae 15 Jul '12

15 Jul '12

Do not update VCS sources if --holdver is used. If the VCS checkout is not present, it will still be downloaded. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8ab621a..46496fa 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -59,6 +59,7 @@ DEP_BIN=0 FORCE=0 INFAKEROOT=0 GENINTEG=0 +HOLDVER=0 SKIPCHECKSUMS=0 SKIPPGPCHECK=0 INSTALL=0 @@ -399,7 +400,7 @@ download_git() { plain "$(gettext "Aborting...")" exit 1 fi - else + elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" cd_safe "$folder" if ! git fetch --all -p; then @@ -474,7 +475,7 @@ download_svn() { plain "$(gettext "Aborting...")" exit 1 fi - else + elif (( ! HOLDVER )); then msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn" cd_safe "$folder" if ! svn update; then @@ -2106,6 +2107,7 @@ usage() { printf -- "$(gettext " --asroot Allow %s to run as root user")\n" "makepkg" printf -- "$(gettext " --check Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --config <file> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf" + printf -- "$(gettext " --holdver Do not update VCS sources")\n" printf -- "$(gettext " --key <key> Specify a key to use for %s signing instead of the default")\n" "gpg" printf -- "$(gettext " --nocheck Do not run the %s function in the %s")\n" "check()" "$BUILDSCRIPT" printf -- "$(gettext " --nosign Do not create a signature for the package")\n" @@ -2148,7 +2150,7 @@ ARGLIST=("$@") # Parse Command Line Options. OPT_SHORT="AcdefFghiLmop:rRsSV" OPT_LONG=('allsource' 'asroot' 'check' 'clean' 'config:' 'force' 'geninteg' - 'help' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' + 'help' 'holdver' 'ignorearch' 'install' 'key:' 'log' 'nobuild' 'nocolor' 'nocheck' 'nodeps' 'noextract' 'nosign' 'pkg:' 'repackage' 'rmdeps' 'skipchecksums' 'skipinteg' 'skippgpcheck' 'skippgpcheck' 'sign' 'source' 'syncdeps' 'version') @@ -2181,6 +2183,7 @@ while true; do -f|--force) FORCE=1 ;; -F) INFAKEROOT=1 ;; -g|--geninteg) GENINTEG=1 ;; + --holdver) HOLDVER=1 ;; -i|--install) INSTALL=1 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; -- 1.7.11.2

1 0