- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 02/11] pactest: only snapshot needed files
by Andrew Gregory 01 Aug '14

01 Aug '14

Only a few of our tests need file snapshots at all and most of them only need a few files. Taking snapshots of the entire test environment for every single test is a massive waste. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pmrule.py | 6 ++++++ test/pacman/pmtest.py | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/test/pacman/pmrule.py b/test/pacman/pmrule.py index a91741b..0eec8ea 100644 --- a/test/pacman/pmrule.py +++ b/test/pacman/pmrule.py @@ -32,6 +32,12 @@ def __init__(self, rule): def __str__(self): return self.rule + def snapshots_needed(self): + (testname, args) = self.rule.split("=") + if testname == "FILE_MODIFIED" or testname == "!FILE_MODIFIED": + return [args] + return [] + def check(self, test): """ """ diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py index 7079b78..78b9e2d 100644 --- a/test/pacman/pmtest.py +++ b/test/pacman/pmtest.py @@ -183,12 +183,17 @@ def generate(self, pacman): # Done. vprint(" Taking a snapshot of the file system") - for roots, dirs, files in os.walk(self.root): - for i in files: - filename = os.path.join(roots, i) - f = pmfile.PacmanFile(self.root, filename.replace(self.root + "/", "")) - self.files.append(f) - vprint("\t%s" % f.name) + for filename in self.snapshots_needed(): + f = pmfile.PacmanFile(self.root, filename) + self.files.append(f) + vprint("\t%s" % f.name) + + + def snapshots_needed(self): + files = set() + for r in self.rules: + files.update(r.snapshots_needed()) + return files def run(self, pacman): if os.path.isfile(util.PM_LOCK): -- 2.0.2

1 0

[pacman-dev] [PATCH] handle arch specific attributes
by Dave Reisner 31 Jul '14

31 Jul '14

This introduces support for architecutre-specific conflicts, depends, and optdepends by appending "_$CARCH" to the array name. For example, in the global section: arch=('i686' 'x86_64') depends=('foo') depends_x86_64=('bar') This will generate depends of 'foo' and 'bar' on x86_64, but only 'foo' on i686. Moreover, this is supported in the package functions with the same heuristics as the generic names, e.g. ... arch=('i686' 'x86_64') depends=('foo') ... package_somepkg() { depends_x86_64=('bar') ... } Again, will cause x86_64 to have depends of 'foo' and 'bar', but only 'foo' for i686. --- So, what it *doesn't* yet support is arch-specific sources. This is strictly an optimization and only applies to packaging of binary blobs so, personally, I'm okay with this lingering for another patch. If we're okay with the syntax and the way this operates, I can follow up with the documentation side of things. scripts/makepkg.sh.in | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e20b707..06c7374 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1487,6 +1487,22 @@ source_safe() { shopt -s extglob } +merge_arch_attrs() { + local attr supported_attrs=(conflicts depends optdepends) + + for attr in "${supported_attrs[@]}"; do + eval "$attr+=(\"\${${attr}_$CARCH[@]}\")" + done + + # ensure that calling this function is idempotent. + unset -v "${supported_attrs[@]/%/_$CARCH}" +} + +source_buildfile() { + source_safe "$@" + merge_arch_attrs +} + run_function_safe() { local restoretrap @@ -1905,6 +1921,8 @@ write_pkginfo() { local size="$(@DUPATH@ @DUFLAGS@)" size="$(( ${size%%[^0-9]*} * 1024 ))" + merge_arch_attrs + msg2 "$(gettext "Generating %s file...")" ".PKGINFO" printf "# Generated by makepkg %s\n" "$makepkg_version" printf "# using %s\n" "$(fakeroot -v)" @@ -2914,7 +2932,7 @@ else if [[ ${BUILDFILE:0:1} != "/" ]]; then BUILDFILE="$startdir/$BUILDFILE" fi - source_safe "$BUILDFILE" + source_buildfile "$BUILDFILE" fi # set defaults if they weren't specified in buildfile -- 2.0.3

2 1

[pacman-dev] [PATCH] alpm: Fix wrong xferred/total sizes when resuming downloads
by Olivier Brunel 31 Jul '14

31 Jul '14

When a package is already partially downloaded in the cache, its download size will only be of what's left to be downloaded. Since pkg->download_size is what's used when calculating the total download size for the totaldl callback, same thing apply. However, the download progress callback was including this initial size, which would thus lead to invalid values (and percentage) used in frontends. That is, the progress bar could e.g. go further than 100% In the case of pacman, there is a sanity check for different historical reason (44a57c89), so before the possible "overflow" was noticed, the total download size/progress reported was wrong. Once caught, the TotalDownload option was ignored and it would use individual file download values as fallback instead. Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- Including the initial size during the dl progress cb was added in 283bf7e8, which clearly states the goal of having the progress bar bumped when resuming a download. I'm not sure if this is really the best thing to do anyway though, since the download size announced by pacman prior is that of what's left to be downloaded only, but the progress bar is then of the package size instead, which is a bit wrong/misleading, not to mention totally bogus when it comes to TotalDownload, since the package size might be greater than the actual total download size. With this fix, the progress bar will simply go from 0% to 100% and only refer to the download size, and everything remains correct with TotalDownload. lib/libalpm/dload.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 88ea427..3e72bd4 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -131,7 +131,9 @@ static int dload_progress_cb(void *file, double dltotal, double dlnow, payload->handle->dlcb(payload->remote_name, 0, (off_t)dltotal); } - payload->handle->dlcb(payload->remote_name, current_size, total_size); + /* do NOT include initial_size since it wasn't part of the package's + * download_size (nor included in the total download size callback) */ + payload->handle->dlcb(payload->remote_name, (off_t)dlnow, (off_t)dltotal); payload->prevprogress = current_size; -- 2.0.3

2 2

[pacman-dev] [PATCH] makepkg: improve check and error message for buildfile location
by Dave Reisner 28 Jul '14

28 Jul '14

The documentation very clearly states that the buildfile has to be in $PWD, but the error thrown by makepkg reference some mysterious "build directory". Simplify this check so that we more directly check that the file being referred to is in fact in our $PWD. Revise the error message when the check fails to more plainly point out the problem. --- scripts/makepkg.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index eed047c..726df8f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2919,8 +2919,8 @@ else exit 1 fi - if [[ ${BUILDFILE##*/} != "${BUILDFILE}" && ${BUILDFILE} != "${startdir}/${BUILDFILE##*/}" ]]; then - error "$(gettext "%s must be in the build directory.")" "$BUILDFILE" + if [[ ! $BUILDFILE -ef $PWD/${BUILDFILE##*/} ]]; then + error "$(gettext "%s must be in the current working directory.")" "$BUILDFILE" exit 1 fi -- 2.0.3

2 1

[pacman-dev] [PATCH] add support for PIE to makepkg
by Daniel Micay 22 Jul '14

22 Jul '14

A `pie` option is added for wrapping C and C++ compilers and passing the correct options for building position independent executables. PIE is required for full address space layout optimization (ASLR) and there is little to no benefit from ASLR without it since global ELF tables (GOT/PLT) and application code are at known locations. A wrapper script is required in order to pass the correct flags for executables without changing the flags for libraries. It adds `-pie` when linking (no `-c` switch) if `-static` or `-shared` are not passed, and `-fPIE` whenever `-fPIC` is not already there. This technique comes from the Debian hardening wrappers. Position independent code is expensive on i686, so it's only enabled by default on x86_64 where the cost is negligible. It can be enabled on a package-by-package basis on i686. The same cost already exists for any code in a dynamic library. Signed-off-by: Daniel Micay <danielmicay(a)gmail.com> --- configure.ac | 4 ++++ doc/makepkg.conf.5.txt | 4 ++++ etc/Makefile.am | 1 + etc/makepkg.conf.in | 3 ++- scripts/Makefile.am | 32 ++++++++++++++++++++++++++++++++ scripts/cc-pie.sh | 28 ++++++++++++++++++++++++++++ scripts/makepkg.sh.in | 7 ++++++- 7 files changed, 77 insertions(+), 2 deletions(-) create mode 100755 scripts/cc-pie.sh diff --git a/configure.ac b/configure.ac index 45f40f0..a4378b7 100644 --- a/configure.ac +++ b/configure.ac @@ -322,6 +322,7 @@ INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" SEDINPLACE="sed --follow-symlinks -i" DUFLAGS="-sk --apparent-size" +PIE="!pie" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" @@ -344,12 +345,15 @@ case "${host_os}" in ;; esac +[[ $host_cpu == x86_64 ]] && PIE=pie + AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) AC_SUBST(DUFLAGS) +AC_SUBST(PIE) AC_SUBST(STRIP_BINARIES) AC_SUBST(STRIP_SHARED) AC_SUBST(STRIP_STATIC) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index b15f026..48d5b9d 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -180,6 +180,10 @@ Options DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate package containing the debug symbols when used with `strip'. + *pie*;; + Build position independent executables with C and C++ compilers. This + will wrap `clang` and `gcc` and pass in the correct switches. + **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this affects both generation and checking. The current valid options are: diff --git a/etc/Makefile.am b/etc/Makefile.am index 5363f42..c1ab91b 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -12,6 +12,7 @@ SED_PROCESS = \ -e 's|@prefix[@]|$(prefix)|g' \ -e 's|@PACKAGE_VERSION[@]|$(PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ + -e 's|@PIE[@]|$(PIE)|g' \ -e 's|@PKGEXT[@]|$(PKGEXT)|g' \ -e 's|@SRCEXT[@]|$(SRCEXT)|g' \ -e 's|@STRIP_BINARIES[@]|$(STRIP_BINARIES)|g' \ diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 712ca60..9d3925d 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -76,8 +76,9 @@ BUILDENV=(!distcc color !ccache check !sign) #-- purge: Remove files specified by PURGE_TARGETS #-- upx: Compress binary executable files using UPX #-- debug: Add debugging flags as specified in DEBUG_* variables +#-- pie: Build position independent executables with C and C++ compilers # -OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug) +OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug @PIE@) #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 INTEGRITY_CHECK=(md5) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 0b756ad..605601c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -157,6 +157,38 @@ install-exec-hook: ( $(LN_S) repo-add repo-remove || \ ln repo-add repo-remove || \ cp repo-add repo-remove ) + $(INSTALL) -Dm755 cc-pie.sh $(DESTDIR)$(libdir)/pacman/cc-pie.sh + $(MKDIR_P) $(DESTDIR)$(libdir)/pacman/cc-wrappers + cd $(DESTDIR)$(libdir)/pacman/cc-wrappers && \ + $(RM) cc && \ + ( $(LN_S) ../cc-pie.sh cc || \ + ln ../cc-pie.sh cc || \ + cp ../cc-pie.sh cc ) + cd $(DESTDIR)$(libdir)/pacman/cc-wrappers && \ + $(RM) c++ && \ + ( $(LN_S) ../cc-pie.sh c++ || \ + ln ../cc-pie.sh c++ || \ + cp ../cc-pie.sh c++ ) + cd $(DESTDIR)$(libdir)/pacman/cc-wrappers && \ + $(RM) clang && \ + ( $(LN_S) ../cc-pie.sh clang || \ + ln ../cc-pie.sh clang || \ + cp ../cc-pie.sh clang ) + cd $(DESTDIR)$(libdir)/pacman/cc-wrappers && \ + $(RM) clang++ && \ + ( $(LN_S) ../cc-pie.sh clang++ || \ + ln ../cc-pie.sh clang++ || \ + cp ../cc-pie.sh clang++ ) + cd $(DESTDIR)$(libdir)/pacman/cc-wrappers && \ + $(RM) gcc && \ + ( $(LN_S) ../cc-pie.sh gcc || \ + ln ../cc-pie.sh gcc || \ + cp ../cc-pie.sh gcc ) + cd $(DESTDIR)$(libdir)/pacman/cc-wrappers && \ + $(RM) g++ && \ + ( $(LN_S) ../cc-pie.sh g++ || \ + ln ../cc-pie.sh g++ || \ + cp ../cc-pie.sh g++ ) uninstall-hook: cd $(DESTDIR)$(bindir) && \ diff --git a/scripts/cc-pie.sh b/scripts/cc-pie.sh new file mode 100755 index 0000000..6bb79d2 --- /dev/null +++ b/scripts/cc-pie.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +force_fPIE=1 +force_pie=1 + +for opt; do + case "$opt" in + -fno-PIC|-fno-pic|-fno-PIE|-fno-pie|-nopie|-static|-shared|-D__KERNEL__|-nostdlib|-nostartfiles) + force_fPIE=0 + force_pie=0 + ;; + -fPIC|-fpic) + force_fPIE=0 + ;; + -c) + force_pie=0 + ;; + esac +done + +arguments=() +(( $force_fPIE )) && arguments+=(-fPIE) +(( $force_pie )) && arguments+=(-pie) + +command="${BASH_SOURCE##*/}" +absolute="$(realpath -s "$BASH_SOURCE")" +unwrapped=$(which -a "$command" | grep -m1 -v -x "$absolute") +exec "$unwrapped" "${arguments[@]}" "$@" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e20b707..a6710c8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -50,7 +50,7 @@ LIBRARY=${LIBRARY:-'@libmakepkgdir@'} packaging_options=('strip' 'docs' 'libtool' 'staticlibs' 'emptydirs' 'zipman' \ 'purge' 'upx' 'debug') -other_options=('ccache' 'distcc' 'buildflags' 'makeflags') +other_options=('ccache' 'distcc' 'buildflags' 'makeflags' 'pie') splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ 'replaces' 'backup' 'options' 'install' 'changelog') @@ -1582,6 +1582,11 @@ run_build() { [[ -d /usr/lib/ccache/bin ]] && export PATH="/usr/lib/ccache/bin:$PATH" fi + # use PIE if it is requested + if check_option "pie" "y"; then + export PATH="/usr/lib/pacman/cc-wrappers:$PATH" + fi + run_function_safe "build" } -- 2.0.2

2 3

[pacman-dev] [PATCH libalpm] filecache_find_url: dereference the 'filebase' pointer
by Ryo Munakata 15 Jul '14

15 Jul '14

Signed-off-by: Ryo Munakata <ryomnktml(a)gmail.com> --- lib/libalpm/dload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 88ea427..c5a56b5 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -652,7 +652,7 @@ static char *filecache_find_url(alpm_handle_t *handle, const char *url) } filebase++; - if(filebase == '\0') { + if(*filebase == '\0') { return NULL; } -- 2.0.1

1 1

[pacman-dev] [PATCH] makepkg: ensure vcs download tool are installed when required
by Allan McRae 14 Jul '14

14 Jul '14

Add an array VCSCLIENTS to makepkg.conf that matches vcs source protocols to the package containing the software needed for handling the source. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/makepkg.conf.5.txt | 5 ++++ scripts/makepkg.sh.in | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index b15f026..c589db6 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -46,6 +46,11 @@ Options be replaced with the local file name, plus a ``.part'' extension, which allows makepkg to handle resuming file downloads. +**VCSCLIENTS=(**\'protocol::package' ...**)**:: + Sets the packages required to fetch version controlled source files. When + required, makepkg will check that these packages are installed or are included + in the `depends` or `makedepends` arrays in the PKGBUILD. + **CARCH=**"carch":: Specifies your computer architecture; possible values include such things as ``i686'', ``x86_64'', ``ppc'', etc. This should be automatically set on diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 779ebcb..94dd98a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2402,6 +2402,69 @@ check_pkgver() { return $ret } +get_vcsclient() { + local proto=${1%%+*} + + local i + for i in "${VCSCLIENT[@]}"; do + local handler="${i%%::*}" + if [[ $proto = "$handler" ]]; then + local client="${i##*::}" + break + fi + done + + # if we didn't find an client, return an error + if [[ -z $client ]]; then + error "$(gettext "Unknown download protocol: %s")" "$proto" + plain "$(gettext "Aborting...")" + exit 1 # $E_CONFIG_ERROR + fi + + printf "%s\n" "$client" +} + +check_vcs_software() { + local ret=0 + + if (( SOURCEONLY == 1 )); then + # we will not download VCS sources + return $ret + fi + + if [[ -z $PACMAN_PATH ]]; then + warning "$(gettext "Cannot find the %s binary needed to check VCS source requirements.")" "$PACMAN" + return $ret + fi + + for netfile in ${source[@]}; do + local proto=$(get_protocol "$netfile") + + case $proto in + bzr*|git*|hg*|svn*) + local client + client=$(get_vcsclient "$proto") || exit $? + # ensure specified program is installed + local uninstalled + uninstalled="$(set +E; check_deps $client)" || exit 1 + # if not installed, check presence in depends or makedepends + if [[ -n "$uninstalled" ]] && (( ! NODEPS )); then + if ! in_array "$client" "${depends[@]} ${makedepends}"; then + error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ + "$client" "${proto%%+*}" + ret=1 + fi + fi + ;; + *) + # non VCS source + ;; + esac + done + + return $ret +} + check_software() { # check for needed software local ret=0 @@ -2493,6 +2556,11 @@ check_software() { fi fi + # tools to download vcs sources + if ! check_vcs_software; then + ret=1 + fi + return $ret } -- 2.0.1

2 3

[pacman-dev] [PATCH v2] makepkg: Respect XDG_CONFIG_HOME
by Johannes Löthberg 13 Jul '14

13 Jul '14

Add support for following the XDG Base Directory Specification when reading the user-specific configuration file. If no $XDG_CONFIG_HOME/pacman/makepkg.conf file exists we fall back to sourcing $HOME/.makepkg.conf Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- Was unsure if you wanted me to remove the variable or not, but it looked quite messy when I removed it so kept it in. Can re-send if you do want me to remove it. doc/makepkg.conf.5.txt | 4 ++-- scripts/makepkg.sh.in | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index b15f026..dade39a 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -11,7 +11,7 @@ makepkg.conf - makepkg configuration file Synopsis -------- -{sysconfdir}/makepkg.conf, ~/.makepkg.conf +{sysconfdir}/makepkg.conf, $XDG_CONFIG_HOME/pacman/makepkg.conf, ~/.makepkg.conf Description @@ -27,7 +27,7 @@ variables. Some of them are non-standard. The system-wide configuration file is found in {sysconfdir}/makepkg.conf. Individual options can be overridden (or added to) on a per-user basis in -~/.makepkg.conf. +$XDG_CONFIG_HOME/pacman/makepkg.conf or ~/.makepkg.conf. The default file is fairly well commented, so it may be easiest to simply follow directions given there for customization. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index e20b707..089e92d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2788,8 +2788,13 @@ fi # Source user-specific makepkg.conf overrides, but only if no override config # file was specified -if [[ $MAKEPKG_CONF = "$confdir/makepkg.conf" && -r ~/.makepkg.conf ]]; then - source_safe ~/.makepkg.conf +XDG_PACMAN_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/pacman" +if [[ "$MAKEPKG_CONF" = "$confdir/makepkg.conf" ]]; then + if [[ -r "$XDG_PACMAN_DIR/makepkg.conf" ]]; then + source_safe "$XDG_PACMAN_DIR/makepkg.conf" + elif [[ -r "$HOME/.makepkg.conf" ]]; then + source_safe "$HOME/.makepkg.conf" + fi fi # set pacman command if not already defined -- 2.0.1

3 3

[pacman-dev] [PATCH] filelist_intersection: manually compare paths
by Andrew Gregory 13 Jul '14

13 Jul '14

Prevents the need to modify paths, removing strndup as an unchecked point of failure, and lengths only need to be calculated if the paths match. Also removed an old comment regarding directory/symlink compatibility. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/filelist.c | 56 ++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c index 2d2426c..c41989c 100644 --- a/lib/libalpm/filelist.c +++ b/lib/libalpm/filelist.c @@ -61,6 +61,23 @@ alpm_list_t *_alpm_filelist_difference(alpm_filelist_t *filesA, return ret; } +static int _alpm_filelist_pathcmp(const char *p1, const char *p2) +{ + while(*p1 && *p1 == *p2) { + p1++; + p2++; + } + + /* skip trailing '/' */ + if(*p1 == '\0' && *p2 == '/') { + p2++; + } else if(*p2 == '\0' && *p1 == '/') { + p1++; + } + + return *p1 - *p2; +} + /* Returns the intersection of the provided two lists of files. * Pre-condition: both lists are sorted! * When done, free the list but NOT the contained data. @@ -70,52 +87,23 @@ alpm_list_t *_alpm_filelist_intersection(alpm_filelist_t *filesA, { alpm_list_t *ret = NULL; size_t ctrA = 0, ctrB = 0; + alpm_file_t *arrA = filesA->files, *arrB = filesB->files; while(ctrA < filesA->count && ctrB < filesB->count) { - int cmp, isdirA, isdirB; - char *strA, *strB; - - isdirA = 0; - strA = filesA->files[ctrA].name; - if(strA[strlen(strA)-1] == '/') { - isdirA = 1; - strA = strndup(strA, strlen(strA)-1); - } - - isdirB = 0; - strB = filesB->files[ctrB].name; - if(strB[strlen(strB)-1] == '/') { - isdirB = 1; - strB = strndup(strB, strlen(strB)-1); - } - - cmp = strcmp(strA, strB); + const char *strA = arrA[ctrA].name, *strB = arrB[ctrB].name; + int cmp = _alpm_filelist_pathcmp(strA, strB); if(cmp < 0) { ctrA++; } else if(cmp > 0) { ctrB++; } else { - /* TODO: this creates conflicts between a symlink to a directory in - * one package and a real directory in the other. For example, - * lib -> /usr/lib in pkg1 and /lib in pkg2. This would be allowed - * when installing one package at a time _provided_ pkg1 is installed - * first. This will need adjusted if the order of package install can - * be guaranteed to install the symlink first */ - /* when not directories, item in both qualifies as an intersect */ - if(! (isdirA && isdirB)) { - ret = alpm_list_add(ret, filesA->files[ctrA].name); + if(strA[strlen(strA) - 1] != '/' || strB[strlen(strB) - 1] != '/') { + ret = alpm_list_add(ret, arrA[ctrA].name); } ctrA++; ctrB++; } - - if(isdirA) { - free(strA); - } - if(isdirB) { - free(strB); - } } return ret; -- 2.0.1

2 1

[pacman-dev] [PATCH 1/3] pactest: parse options before environment setup
by Andrew Gregory 04 Jul '14

04 Jul '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pactest.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/pacman/pactest.py b/test/pacman/pactest.py index 0e06f17..b2b9c28 100755 --- a/test/pacman/pactest.py +++ b/test/pacman/pactest.py @@ -82,12 +82,14 @@ def create_parser(): tap.bail("Python versions before 2.7 are not supported.") sys.exit(1) - # instantiate env and parser objects - root_path = tempfile.mkdtemp(prefix='pactest-') - env = pmenv.pmenv(root=root_path) + # parse options opt_parser = create_parser() (opts, args) = opt_parser.parse_args() + # instantiate env + root_path = tempfile.mkdtemp(prefix='pactest-') + env = pmenv.pmenv(root=root_path) + # add parsed options to env object util.verbose = opts.verbose env.pacman["debug"] = opts.debug -- 2.0.1

1 2