October 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] alpm_list regex matching
by leslie.polzer＠gmx.net 11 Apr '09

11 Apr '09

Hello, inlined diff (p0, hope that's not a problem) adds regex matching to alpm_list; useful for regular expressions in IgnorePkg etc. I'll leave the actual usage up to you and hope it helps somehow :) Leslie -- NEW homepage: https://viridian.dnsalias.net/~sky/homepage/ gpg --keyserver pgp.mit.edu --recv-keys DD4EBF83 Index: lib/libalpm/alpm_list.c =================================================================== RCS file: /home/cvs-pacman/pacman-lib/lib/libalpm/alpm_list.c,v retrieving revision 1.11 diff -a -p -u -r1.11 alpm_list.c --- lib/libalpm/alpm_list.c 11 Mar 2007 21:10:03 -0000 1.11 +++ lib/libalpm/alpm_list.c 14 Apr 2007 19:18:15 -0000 @@ -24,9 +24,11 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> +#include <regex.h> /* libalpm */ #include "alpm_list.h" +#include "error.h" #include "util.h" /** \defgroup alpm_list functions */ @@ -458,6 +460,39 @@ int SYMEXPORT alpm_list_find_str(alpm_li return(0); } +/* Test for existence of a string in an alpm_list_t, treating the list + * elements as regular expressions +*/ +/** Is a _string_ in the list (optimization of alpm_list_find for strings) + * @param needle the string to compare + * @param haystack the list to search + * @return 1 if `needle` is found, 0 otherwise + */ + +int SYMEXPORT alpm_list_find_str_regex(alpm_list_t *haystack, const char *needle) +{ + alpm_list_t *lp = haystack; + + while(lp) { + if(lp->data) { + char* targ = lp->data; + regex_t reg; + + _alpm_log(PM_LOG_DEBUG, "matching needle '%s' against haystack item '%s'", + needle, lp->data); + + if(regcomp(&reg, targ, REG_EXTENDED | REG_NOSUB | REG_ICASE | REG_NEWLINE) != 0) { + RET_ERR(PM_ERR_INVALID_REGEX, NULL); + } + + if (regexec(&reg, needle, 0, 0, 0) == 0) { + return(1); + } + } + lp = lp->next; + } + return(0); +} /** * Calculate the items in list `lhs` that are not present in list `rhs` * @note Entries are not duplicated

3 2

[pacman-dev] [patch] add support for scriptlets functions embedded in $BUILDSCRIPT
by Alessio 'mOLOk' Bolognino 25 Feb '08

25 Feb '08

Hi, I think there isn't a real need to split PKGBUILD and $pkgname.install, this patch allows you to put the scriptlets functions into the PKGBUILD. This IMHO follows the KISS philosophy. If at least a {post,pre}_{install,upgrade,remove} function is found in the PKGBUILD, then the install file (if it exists) is ignored; otherwise, if there isn't any scriptlet function in the PKGBUILD the install file is included, as usually. Enjoy: From e206a96ebe1e9a11f85de1502fc46e75321ba192 Mon Sep 17 00:00:00 2001 From: Alessio 'mOLOk' Bolognino <themolok(a)gmail.com> Date: Sat, 21 Jul 2007 06:15:34 +0200 Subject: [PATCH] Added support for scriptlets functions embedded in $BUILDSCRIPT --- scripts/makepkg.sh.in | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a3e4d9c..fb931a7 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -831,9 +831,18 @@ create_package() { local comp_files=".PKGINFO .FILELIST" - # check for an install script + # check for scriptlets fuctions or an install script # TODO: should we include ${pkgname}.install if it exists and $install is unset? - if [ "$install" != "" ]; then + scriptlet=$(declare -f {post,pre}_{install,remove,upgrade} || return 0) + if [ "$scriptlet" != "" ]; then + msg2 "$(gettext "Adding scriptlet functions (install script will be ignored)...")" + ( echo "$scriptlet" + echo 'op=$1' + echo 'shift' + echo '[ "$(type -t "$op")" = "function" ] && $op "$@"' + ) > .INSTALL + comp_files="$comp_files .INSTALL" + elif [ "$install" != "" ]; then msg2 "$(gettext "Adding install script...")" cp "$startdir/$install" .INSTALL comp_files="$comp_files .INSTALL" @@ -1175,6 +1184,7 @@ fi unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force unset replaces depends conflicts backup source install build makedepends unset options noextract +unset {post,pre}_{install,remove,upgrade} if [ ! -f "$BUILDSCRIPT" ]; then error "$(gettext "%s does not exist.")" "$BUILDSCRIPT" -- 1.5.2.4 -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User Please send personal email to themolok(a)gmail.com Public Key http://pgp.mit.edu:11371/pks/lookup?op=get&search=0xFE0270FB GPG Key ID = 1024D / FE0270FB 2007-04-11 Key Fingerprint = 9AF8 9011 F271 450D 59CF 2D7D 96C9 8F2A FE02 70FB

9 20

[pacman-dev] -Sp is broken?
by Nagy Gabor 19 Nov '07

19 Nov '07

-Sp simply seems to be broken. If I do pacman -Sp evince, I get the following error: 'error: evince': transaction not initialized error: failed to release transaction (transaction not initialized) Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

5 12

[pacman-dev] [PATCH] New -Ru option
by Nagy Gabor 06 Nov '07

06 Nov '07

Hi! The most difficult thing was: to find out good names for the option and the newly introduced stuffs. So feel free to rename them. And if you like and apply the patch, please update pacman's manual and bash-completion. Note: If user wants to remove pkg1 and pkg2 with the same "prov" provision, then only one of them should be removed from the list. That's why inducer is not checked by depmiss_isin. But if there is many multiple provision in the original target list, human may be able to compute fewer package to remove from the target list, but I don't care (pathological case):-P Enjoy it, ngaba ---------------------- From d8a7ab05ba50197386b25e7fd879f342384370d4 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri, 26 Oct 2007 18:33:20 +0200 Subject: [PATCH] New -Ru option With --unneeded option 'pacman -R' doesn't stop in case of dependency error; it removes the needed-dependency targets from the target-list instead. See also: http://archlinux.org/pipermail/pacman-dev/2007-October/009653.html The patch also adds a new inducer field to pmdepmissing_t which indicates the to-be-removed package which would cause a dependency break. This is needed, because miss->depend.name may be a provision. miss->depend will be useful in -R dependency error messages too. A new _alpm_pkgname_pkg_cmp(pkgname, pkg) function is also added, which retruns true iff pkg's name is pkgname. This is useful if you want to remove a package from pmpkg_t* list, and you want to search for package name. remove049.py tests -Ru. --- lib/libalpm/alpm.h | 4 +++- lib/libalpm/conflict.c | 2 +- lib/libalpm/deps.c | 41 ++++++++++++++++++++++++++++------------- lib/libalpm/deps.h | 3 ++- lib/libalpm/package.c | 5 +++++ lib/libalpm/package.h | 1 + lib/libalpm/remove.c | 15 +++++++++++++++ src/pacman/pacman.c | 3 +++ 8 files changed, 58 insertions(+), 16 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2000db4..99dcd24 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -275,7 +275,8 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, - PM_TRANS_FLAG_PRINTURIS = 0x1000 + PM_TRANS_FLAG_PRINTURIS = 0x1000, + PM_TRANS_FLAG_UNNEEDED = 0x2000, } pmtransflag_t; /* Transaction Events */ @@ -375,6 +376,7 @@ alpm_list_t *alpm_checkdeps(pmdb_t *db, pmtranstype_t op, const char *alpm_miss_get_target(pmdepmissing_t *miss); pmdeptype_t alpm_miss_get_type(pmdepmissing_t *miss); pmdepend_t *alpm_miss_get_dep(pmdepmissing_t *miss); +const char *alpm_miss_get_inducer(pmdepmissing_t *miss); pmdepmod_t alpm_dep_get_mod(pmdepend_t *dep); const char *alpm_dep_get_name(pmdepend_t *dep); diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index d09c996..bf8aa80 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -76,7 +76,7 @@ static void add_conflict(alpm_list_t **baddeps, const char *pkg1, const char *pkg2) { pmdepmissing_t *miss = _alpm_depmiss_new(pkg1, PM_DEP_TYPE_CONFLICT, - PM_DEP_MOD_ANY, pkg2, NULL); + PM_DEP_MOD_ANY, pkg2, NULL, ""); if(miss && !_alpm_depmiss_isin(miss, *baddeps)) { *baddeps = alpm_list_add(*baddeps, miss); } else { diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 7f4fb0b..f8109d8 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -65,7 +65,7 @@ static void _alpm_graph_free(void *data) pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, pmdepmod_t depmod, const char *depname, - const char *depversion) + const char *depversion, const char *inducer) { pmdepmissing_t *miss; @@ -86,6 +86,7 @@ pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, } else { miss->depend.version[0] = 0; } + strncpy(miss->inducer, inducer, PKG_NAME_LEN); return(miss); } @@ -333,7 +335,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, _alpm_log(PM_LOG_DEBUG, "checkdeps: updated '%s' won't satisfy a dependency of '%s'\n", alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(p)); miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_DEPEND, depend->mod, - depend->name, depend->version); + depend->name, depend->version, ""); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -382,7 +384,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, _alpm_log(PM_LOG_DEBUG, "missing dependency '%s' for package '%s'\n", depend->name, alpm_pkg_get_name(tp)); miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, depend->mod, - depend->name, depend->version); + depend->name, depend->version, ""); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -437,7 +439,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, alpm_pkg_get_name(p), alpm_pkg_get_name(rmpkg)); miss = _alpm_depmiss_new(alpm_pkg_get_name(p), PM_DEP_TYPE_DEPEND, depend->mod, depend->name, - depend->version); + depend->version, alpm_pkg_get_name(rmpkg)); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -772,7 +774,19 @@ error: return(-1); } -const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) + +pmdeptype_t SYMEXPORT alpm_miss_get_type(pmdepmissing_t *miss) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, return(-1)); + ASSERT(miss != NULL, return(-1)); + + return miss->type; +} + +pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) { ALPM_LOG_FUNC; @@ -780,21 +794,21 @@ const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) ASSERT(handle != NULL, return(NULL)); ASSERT(miss != NULL, return(NULL)); - return miss->target; + return &miss->depend; } -pmdeptype_t SYMEXPORT alpm_miss_get_type(pmdepmissing_t *miss) +const char SYMEXPORT *alpm_miss_get_inducer(pmdepmissing_t *miss) { ALPM_LOG_FUNC; /* Sanity checks */ - ASSERT(handle != NULL, return(-1)); - ASSERT(miss != NULL, return(-1)); + ASSERT(handle != NULL, return(NULL)); + ASSERT(miss != NULL, return(NULL)); - return miss->type; + return miss->inducer; } -pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) +const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) { ALPM_LOG_FUNC; @@ -802,9 +816,10 @@ pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) ASSERT(handle != NULL, return(NULL)); ASSERT(miss != NULL, return(NULL)); - return &miss->depend; + return miss->target; } + pmdepmod_t SYMEXPORT alpm_dep_get_mod(pmdepend_t *dep) { ALPM_LOG_FUNC; diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 59b2630..6f01593 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -40,6 +40,7 @@ struct __pmdepmissing_t { char target[PKG_NAME_LEN]; pmdeptype_t type; pmdepend_t depend; + char inducer[PKG_NAME_LEN]; /* this is used in case of remove dependency error only */ }; /* Graphs */ @@ -53,7 +54,7 @@ struct __pmgraph_t { pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, pmdepmod_t depmod, const char *depname, - const char *depversion); + const char *depversion, const char *inducer); int _alpm_depmiss_isin(pmdepmissing_t *needle, alpm_list_t *haystack); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode); alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4f6f5a9..00e8332 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -803,6 +803,11 @@ int _alpm_pkg_cmp(const void *p1, const void *p2) return(strcmp(alpm_pkg_get_name(pk1), alpm_pkg_get_name(pk2))); } +int _alpm_pkgname_pkg_cmp(const void *pkgname, const void *package) +{ + return(strcmp(alpm_pkg_get_name((pmpkg_t *) package), (char *) pkgname)); +} + /* Parses the package description file for the current package * TODO: this should ALL be in a backend interface (be_files), we should * be dealing with the abstracted concepts only in this file diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index daaeb36..d7032e6 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -94,6 +94,7 @@ pmpkg_t* _alpm_pkg_new(const char *name, const char *version); pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg); void _alpm_pkg_free(pmpkg_t *pkg); int _alpm_pkg_cmp(const void *p1, const void *p2); +int _alpm_pkgname_pkg_cmp(const void *pkgname, const void *package); int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg); pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full); pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack); diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0ed4dd0..3904a36 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -126,6 +126,21 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) FREELIST(lp); lp = _alpm_checkdeps(db, trans->type, trans->packages); } + } else if (trans->flags & PM_TRANS_FLAG_UNNEEDED) { + while(lp != NULL) { + alpm_list_t *i; + for(i = lp; i; i = i->next) { + pmdepmissing_t *miss = (pmdepmissing_t *)i->data; + pmpkg_t *unneeded; + trans->packages = alpm_list_remove(trans->packages, miss->inducer, _alpm_pkgname_pkg_cmp, &unneeded); + if(unneeded) { + _alpm_log(PM_LOG_WARNING, "removing %s from the target-list\n", alpm_pkg_get_name(unneeded)); + alpm_pkg_free(unneeded); + } + } + FREELIST(lp); + lp = _alpm_checkdeps(db, trans->type, trans->packages); + } } else { if(data) { *data = lp; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 705edaf..199878f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -95,6 +95,7 @@ static void usage(int op, char *myname) printf(_(" -k, --dbonly only remove database entry, do not remove files\n")); printf(_(" -n, --nosave remove configuration files as well\n")); printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n")); + printf(_(" -u, --unneeded remove only unneeded packages (that won't break packages)\n")); } else if(op == PM_OP_UPGRADE) { if(config->flags & PM_TRANS_FLAG_FRESHEN) { printf("%s: %s {-F --freshen} [%s] <%s>\n", str_usg, myname, str_opt, str_file); @@ -277,6 +278,7 @@ static int parseargs(int argc, char *argv[]) {"orphans", no_argument, 0, 't'}, {"upgrades", no_argument, 0, 'u'}, {"sysupgrade", no_argument, 0, 'u'}, + {"unneeded", no_argument, 0, 'u'}, {"verbose", no_argument, 0, 'v'}, {"downloadonly", no_argument, 0, 'w'}, {"refresh", no_argument, 0, 'y'}, @@ -413,6 +415,7 @@ static int parseargs(int argc, char *argv[]) case 'u': config->op_s_upgrade = 1; config->op_q_upgrade = 1; + config->flags |= PM_TRANS_FLAG_UNNEEDED; break; case 'v': (config->verbose)++; break; case 'w': diff --git a/pactest/tests/remove049.py b/pactest/tests/remove049.py new file mode 100644 index 0000000..724f8da --- /dev/null +++ b/pactest/tests/remove049.py @@ -0,0 +1,19 @@ +self.description = "-Ru test" + +lp1 = pmpkg("pkg1") +lp1.requiredby = [ "pkg3" ] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +self.addpkg2db("local", lp2) + +lp3 = pmpkg("pkg3") +lp3.depends = [ "pkg1" ] +self.addpkg2db("local", lp3) + +self.args = "-Ru pkg1 pkg2" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") +self.addrule("PKG_EXIST=pkg3") \ No newline at end of file -- 1.5.3.4

4 13

[pacman-dev] scritplet output logging removed?
by Xavier 05 Nov '07

05 Nov '07

I just saw this was removed by commit ad691001e : "Remove scriptlet START and DONE commands that we don't use" Since the comment doesn't mention the logging, I just want to make sure this was intended and not overlooked.

5 14

[pacman-dev] [PATCH] Integrate versionpkg into makepkg
by Scott Horowitz 05 Nov '07

05 Nov '07

I personally found it silly to have separate scripts for makepkg and versionpkg. I've seen countless messages on AUR where people ask for -svn PKGBUILDS to be updated because their pkgver is out of date, etc. Many people don't know about versionpkg and, even if you do, it makes sense to have a single script that handles both. Please look at the patch carefully because I am by no means a shell scripting expert. I tested it with mpd-svn and mpd PKGBUILDS; both worked fine but that hardly means everything is perfect. Also, this removes the --check-only and --modify-only arguments that the standalone versionpkg script accepted. I guess there's no reason these can't be added back in, but they seem a little useless to me (and their short arguments, -c and -m, are already used by makepkg for other purposes). Scott --- /usr/bin/makepkg 2007-09-16 16:33:23.000000000 -0600 +++ /usr/bin/makepkg2 2007-10-26 13:07:52.000000000 -0600 @@ -34,6 +34,8 @@ source "/etc/abs/abs.conf" SRCROOT="$ABSROOT" +FORCE_VER="" + # Options CLEANUP=0 CLEANCACHE=0 @@ -106,6 +108,10 @@ echo "$1" | sed 's|^.*://.*/||g' } +update_pb() { + sed -i "1,11 s/pkgver=[^ ]*/pkgver=$1/" ./$BUILDSCRIPT +} + # checks to see if options are present in makepkg.conf or PKGBUILD; # PKGBUILD options always take precedence check_option() { @@ -457,7 +463,7 @@ exit 1 ;; -*) - while getopts "bcCdefghiLmop:rRsS-" opt; do + while getopts "bcCdefghiLmopz:rRsS-" opt; do case $opt in b) DEP_SRC=1 ;; c) CLEANUP=1 ;; @@ -479,6 +485,7 @@ R) REPKG=1 ;; s) DEP_BIN=1 ;; S) SUDO=1 ;; + z) FORCE_VER=$OPTARG ;; -) OPTIND=0 break @@ -592,6 +599,67 @@ fi fi +newpkgver="" +if [ "$FORCE_VER" = "" ]; then + # Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so. + # This will only be used on the first call to makepkg; subsequent + # calls to makepkg via fakeroot will explicitly pass the version + # number to avoid having to determine the version number twice. + oldpkgver=$pkgver + if [ ! -z ${_darcstrunk} ] && [ ! -z ${_darcsmod} ] ; then + msg "determining latest darcs revision... \c" + newpkgver=$(date +%Y%m%d) + echo $newpkgver + elif [ ! -z ${_cvsroot} ] && [ ! -z ${_cvsmod} ] ; then + msg "determining latest cvs revision... \c" + newpkgver=$(date +%Y%m%d) + echo $newpkgver + elif [ ! -z ${_gitroot} ] && [ ! -z ${_gitname} ] ; then + msg "determining latest git revision... \c" + newpkgver=$(date +%Y%m%d) + echo $newpkgver + elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then + msg "retrieving latest revision number from svn... \c" + newpkgver=$(svn log $_svntrunk --limit 1 | sed -n 's/^r$[^ ]*$ .*$/\1/p') + echo "$newpkgver" + elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then + msg "retrieving latest revision number from bzr... \c" + newpkgver=$(bzr revno ${_bzrtrunk}) + echo "$newpkgver" + elif [ ! -z ${_hgroot} ] && [ ! -z ${_hgrepo} ] ; then + if [ -d ./src/$_hgrepo ] ; then + msg "retrieving latest revision number from hg... \c" + cd ./src/$_hgrepo + make clean + hg pull + hg update + else + msg "determining latest hg revision... \c" + [[ ! -d ./src/$_hgrepo ]] && mkdir -p ./src/$_hgrepo + hg clone $_hgroot/$_hgrepo ./src/$_hgrepo + cd ./src/$_hgrepo + fi + newpkgver=$(hg tip | sed -n '1s/[^0-9]*$[^:]*$:.*$/\1/p') + echo "$newpkgver" + cd ../../ + fi + + if [ "$newpkgver" != "$oldpkgver" ]; then + msg "newer revision detected: $newpkgver" + elif [ "$newpkgver" != "" ]; then + warning "PKGBUILD pkgver is $oldpkgver, no newer revision available" + if [ "$FORCE" = "1" ]; then + msg "forcing pkgver to $newpkgver... " + else + error "exiting now, use makepkg -f to force update" + exit 1 + fi + fi +else + # Version number retrieved from fakeroot->makepkg argument + newpkgver=$FORCE_VER +fi + # Enter the fakeroot environment if necessary. This will call the makepkg # script again as the fake root user. We detect this by passing a sentinel # option (-F) to makepkg. @@ -599,7 +667,11 @@ if [ "$(check_buildenv fakeroot)" = "y" ]; then if [ $(type -p fakeroot) ]; then msg "Entering fakeroot environment" - fakeroot -- $0 -F $ARGLIST + if [ "$newpkgver" != "" ]; then + fakeroot -- $0 -F $ARGLIST -z $newpkgver + else + fakeroot -- $0 -F $ARGLIST + fi exit $? else warning "Fakeroot is not installed. Building as an unprivileged user" @@ -617,6 +689,18 @@ fi fi +# This is lame, but if we're wanting to use an updated pkgver for +# retrieving svn/cvs/etc sources, we'll update the PKGBUILD, re-source +# it, and then revert it +if [ "$newpkgver" != "" ]; then + if [ "newpkgver" != "$pkgver" ]; then + oldpkgver=$pkgver + update_pb $newpkgver + source $BUILDSCRIPT + update_pb $oldpkgver + fi +fi + msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" # fix flyspray bug #5973

7 23

[pacman-dev] libalpm data structures
by Nagy Gabor 01 Nov '07

01 Nov '07

Hi! This is discussion-only (==no-patch) e-mail, mainly about code clean-up, so if you don't like that type of e-mails, please skip this. Xavier's compute_requiredby catch was the motivation of this e-mail: I never liked the following method: pmdepend_t *dep = alpm_splitdep(depend) /* char -> pmdepend_t conversion */ ...alpm_depcmp(pkg, dep)... FREE(dep) /* usually forgotten */ So I asked myself: Do we really need pmdepend_t struct? Why don't we use it in alpm_depcmp only ("internally")? So the depend-input of alpm_depcmp could be char* (and pmdepend_t should be disappear from libalpm API). Then I read the .h files of libalpm. My impressions: 1. We don't need pmdepend_t => pmdepmod_t. See above. This is mainly used in pmdepmissing_t which is used to collect missing dependencies (pmdepmissing_t is not needed here neither), and to print error/log messages (usually pmdepend_t -> char conversion is done here, too); where we could also use char. 2. We have pmconflict_t. Nice. So we don't need pmdeptype_t (in pmdepmissing_t). As we discussed with Xavier, pmconflict_t should be a symmetric structure: {target,ctarget} set [<=> alpm_strcmp ordered (target, ctarget) pair] instead of (target,ctarget) ordered pair) <- this is a pmconflict_t-helper-function problem only. Future plans: 3. I still want to kill pmsyncpkg_t => pmsynctype_t (the ugliest data struct of libalpm) 4. If my preferred universal transaction becomes true, we won't need pmtranstype_t. And of course, if we rip off some unneeded structures, we also rip off tons of unneeded associated helper functions. Personally, I want to make a patch for 1. and 2. So if you don't like the idea, let me know. However, I'm a bit unsure in 2.: should I keep target and ctarget as char, or I should use pmpkg_t* instead <- faster but more "dangerous". Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

5 24

[pacman-dev] [PATCH] Add support for arch='all' to makepkg
by Roman Kyrylych 31 Oct '07

31 Oct '07

Hi! Today I have started adding support for noarch packages. This is the first step. The attached patch adds support for arch='all' to makepkg. It's very simple because it just sets CARCH to all and then everything else goes as usual. When we'll add support for subpackages - we'll have to make additional checks to be sure we can build -i686/-x86_64 package and -all package from one PKGBUILD. This depends on a way we implement subpackages and can be modified later. So far, pacman-git is able to install packages built with the modified makepkg, and shows "Architecture: all" on -Qi. I'll post patches for other scripts soon. How to test it: 1) get any font/cursor/etc PKGBUILD from AUR, 2) replace arch=('i686' 'x86_64') with arch='all' 3) use the patched makepkg to build the package 4) use pacman -U (git version, 3.0.x fails) to install the package 5) do pacman -Qi -- Roman Kyrylych (Роман Кирилич)

4 12

[pacman-dev] Conflicts handling
by Xavier 31 Oct '07

31 Oct '07

The pending patch [1] from Nagy for conflicts handling broke the following pactests : sync040, sync041, sync990 These pactests are "target vs target" conflicts that pacman doesn't try to resolve, and just stops. Nagy's patch tried to resolve these conflicts by removing one of the two conflicting targets. So that broke the 3 pactests above. When trying to change the code slightly to make pacman fail in this target-target case, the 3 pactests above now succeed, but it breaks 5 others : sync893, sync897, sync898, sync992, sync999 These pactests are actually other kinds of target vs target conflicts. So finally, pacman tries to auto-resolve these conflicts more often than not, instead of just failing. That's what I failed to see earlier, that there were different cases to consider. Now I see at least 4 kinds of target-target conflicts. I'm attaching 4 pactests to illustrate that. In my opinion, pacman could always fail with these target-target conflicts. This kind of conlicts is very rare (it doesn't make any sense to install two conflicting targets). However it can happen in an odd situation (see bug 7415), where a group is splitted across several repos. But pacman's behavior in this case is very odd anyway.. So I think it wouldn't be worse if pacman just failed, and so it would be left to the user to fix it manually, by removing the conflicting package from the targets, for example using --ignore. So this would give both a more coherent behavior, and cleaner code. If that's alright, I will try to edit (correctly this time) Nagy's patch to behave like that. But the 5 pactests listed above will then have to be edited accordingly (mostly changing PACMAN_RETCODE from 0 to 1). [1] http://www.archlinux.org/pipermail/pacman-dev/2007-August/009078.html

2 2

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-505-gccdf29f
by Dan McGee 31 Oct '07

31 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via ccdf29ffa8436d3cd5409b0d02287207716cf397 (commit) via ac79135b94b1cd2c3fc4818bdfbe8ec63a6166b6 (commit) via 6aeda5fbff1969befa322ef7b79664f13dea1d18 (commit) via be387148c95ee5ed4e45dc841cd12fee010b998a (commit) via 6af7dbcf72b0e95f7c36b17fac88fd2658c2a8e4 (commit) via aea45a8b20c786358cfe782b4e3ac37c7d9dbe37 (commit) via dede5371e7c11ceb6ea36ba770672d61aa9b9002 (commit) via 74aa54a1f6db109311e9bdc8cae64a2a26a2b860 (commit) via 014306eb99c90c5c5c6d19d50aa47e29c25e8e14 (commit) via c50a7c6026e491771f0607d5e3fed737b3b5e8f3 (commit) via 6cf8a5137e9e0a8fcdf5287187935ffc505a2132 (commit) via cc754bc6e3be0f37ca0eaca4b6b90f033433fb1a (commit) via fe3a461703a5d90937c0c6f1ce0c3d802c0f8630 (commit) from 671224b64c9478644125deec1496a27e8f579da9 (commit) - Log ----------------------------------------------------------------- commit ccdf29ffa8436d3cd5409b0d02287207716cf397 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 30 08:12:09 2007 -0500 abs: prefer csup to cvsup Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ac79135b94b1cd2c3fc4818bdfbe8ec63a6166b6 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 30 00:20:18 2007 -0500 Pick best python program available for 'make check' Use an autoconf macro to find us a python executable, preferring python2.5 if we can find it. From there, fall back to python2.4 and then python. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6aeda5fbff1969befa322ef7b79664f13dea1d18 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 23:32:58 2007 -0500 When printing size_t, use %zd %d was used, which worked for Linux and FreeBSD. Not so for Darwin. The warning was probably spat out when compiling on x68_64 as well, but no developers use this architecture as their primary one. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit be387148c95ee5ed4e45dc841cd12fee010b998a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 23:12:37 2007 -0500 libalpm/handle.c: make realpath() call portable BSD didn't support the NULL second argument GNU extension, so do it the old fashioned way. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6af7dbcf72b0e95f7c36b17fac88fd2658c2a8e4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 23:11:49 2007 -0500 pacman/query.c: add missing free() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aea45a8b20c786358cfe782b4e3ac37c7d9dbe37 Author: Scott Horowitz <stonecrest(a)gmail.com> Date: Mon Oct 29 21:25:30 2007 -0600 Small updates to documentation. Signed-off-by: Scott Horowitz <stonecrest(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dede5371e7c11ceb6ea36ba770672d61aa9b9002 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 21:06:13 2007 -0500 Copy pmdelta_t objects in _alpm_pkg_dup() This was forgotten in the original set of patches. CC: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 74aa54a1f6db109311e9bdc8cae64a2a26a2b860 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 21:03:41 2007 -0500 Make general list copy function Package dup needs to copy all members. Nathan had his implementation, but I generalized it to this new alpm_list function (and will use it in the next commit). CC: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 014306eb99c90c5c5c6d19d50aa47e29c25e8e14 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Oct 28 13:39:12 2007 +0100 simple pactest renaming : split conflict* into depconflict* and fileconflict*. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c50a7c6026e491771f0607d5e3fed737b3b5e8f3 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 07:13:58 2007 -0500 doxygen: preprocess SYMHIDDEN/SYMEXPORT macros so they don't show in docs Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6cf8a5137e9e0a8fcdf5287187935ffc505a2132 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 01:28:13 2007 -0500 libalpm/delta: add const to most methods Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cc754bc6e3be0f37ca0eaca4b6b90f033433fb1a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 01:00:52 2007 -0500 libalpm: introduce MALLOC and CALLOC macros These macros take the place of the common 4 or 5 line blocks of code we had in most places that called malloc or calloc. This should reduce some code duplication and make memory allocation more standard in libalpm. Highlights: * Note that the MALLOC macro actually uses calloc, this is just for safety so that memory is initialized to 0. This can be easily changed in one place. * One malloc call was completely eliminated- it made more sense to do it on the stack. * The use of RET_ERR in public functions (mainly the alpm_*_new functions) was standardized, this makes sense so pm_errno is set. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fe3a461703a5d90937c0c6f1ce0c3d802c0f8630 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 00:01:17 2007 -0500 Add some more debugging output to dep checking code Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: Makefile.am | 2 +- configure.ac | 3 +- doc/Doxyfile | 6 +- doc/PKGBUILD.5.txt | 76 +++++++++++++++++-- doc/makepkg.8.txt | 18 ++++-- lib/libalpm/alpm.h | 8 +- lib/libalpm/alpm_list.c | 26 ++++++- lib/libalpm/alpm_list.h | 1 + lib/libalpm/conflict.c | 9 +-- lib/libalpm/db.c | 13 +--- lib/libalpm/delta.c | 11 ++-- lib/libalpm/deps.c | 33 ++++----- lib/libalpm/group.c | 7 +-- lib/libalpm/handle.c | 14 +--- lib/libalpm/package.c | 21 ++---- lib/libalpm/server.c | 12 +--- lib/libalpm/sync.c | 20 +++--- lib/libalpm/trans.c | 5 +- lib/libalpm/util.h | 7 ++- .../tests/{conflict004.py => depconflict100.py} | 0 .../tests/{conflict002.py => depconflict110.py} | 0 .../tests/{conflict003.py => depconflict111.py} | 2 +- .../tests/{conflict001.py => depconflict120.py} | 0 .../tests/{conflict005.py => fileconflict001.py} | 0 .../tests/{conflict006.py => fileconflict002.py} | 1 - scripts/abs.sh.in | 10 ++-- src/pacman/callback.c | 3 +- src/pacman/conf.c | 3 +- src/pacman/query.c | 3 +- 29 files changed, 182 insertions(+), 132 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 671224b64c9478644125deec1496a27e8f579da9 \ ccdf29ffa8436d3cd5409b0d02287207716cf397

1 0

[pacman-dev] [PATCH] Copy pmdelta_t objects in _alpm_pkg_dup().
by Nathan Jones 30 Oct '07

30 Oct '07

_alpm_pkg_dup() should create copies of all objects inside the pmpkg_t struct. I missed this function when adding the delta list to pmpkg_t. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- lib/libalpm/package.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4f6f5a9..7829d48 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -49,6 +49,7 @@ #include "provide.h" #include "handle.h" #include "alpm.h" +#include "delta.h" /** \addtogroup alpm_packages Package Functions * @brief Functions to manipulate libalpm packages @@ -689,6 +690,7 @@ pmpkg_t *_alpm_pkg_new(const char *name, const char *version) pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) { pmpkg_t* newpkg; + alpm_list_t *deltas; ALPM_LOG_FUNC; @@ -708,6 +710,23 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) newpkg->groups = alpm_list_strdup(alpm_pkg_get_groups(pkg)); newpkg->provides = alpm_list_strdup(alpm_pkg_get_provides(pkg)); newpkg->replaces = alpm_list_strdup(alpm_pkg_get_replaces(pkg)); + + /* copy all the delta objects */ + newpkg->deltas = NULL; + deltas = alpm_pkg_get_deltas(pkg); + while(deltas) { + pmdelta_t *d = malloc(sizeof(pmdelta_t)); + + if(d == NULL) { + _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes\n"), sizeof(pmdelta_t)); + RET_ERR(PM_ERR_MEMORY, NULL); + } + + memcpy(d, alpm_list_getdata(deltas), sizeof(pmdelta_t)); + newpkg->deltas = alpm_list_add(newpkg->deltas, d); + deltas = alpm_list_next(deltas); + } + /* internal */ if(newpkg->origin == PKG_FROM_FILE) { newpkg->origin_data.file = strdup(pkg->origin_data.file); -- 1.5.3.4

3 5

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.0.1 now at v3.0.0-16-gef578e7
by Aaron Griffin 29 Oct '07

29 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating annotated tag, v3.0.1, to 23789e0c4ef99bf81235864b287c8ba7f3ec2090 (tag) replaces v3.0.0-15 tagged by Dan McGee <dan(a)archlinux.org> on 2007-10-28 23:48 -0400 - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/update --- Git Source Code Management System hooks/update refs/tags/v3.0.1 \ 0000000000000000000000000000000000000000 \ 23789e0c4ef99bf81235864b287c8ba7f3ec2090

3 2

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.0.2 now at v3.0.1-17-g75b2001
by Dan McGee 29 Oct '07

29 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating annotated tag, v3.0.2, to 705aa06553481fb8ec452ca0a7c520fdbc8ef345 (tag) replaces v3.0.1-16 tagged by Dan McGee <dan(a)archlinux.org> on 2007-10-28 23:48 -0400 - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/update --- Git Source Code Management System hooks/update refs/tags/v3.0.2 \ 0000000000000000000000000000000000000000 \ 705aa06553481fb8ec452ca0a7c520fdbc8ef345

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.0.3 now at v3.0.2-4-gafec5e4
by Dan McGee 29 Oct '07

29 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating annotated tag, v3.0.3, to 1d4251d2ad645bf319b27d8d16db70474fffff93 (tag) replaces v3.0.2-3 tagged by Dan McGee <dan(a)archlinux.org> on 2007-10-28 23:50 -0400 - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/update --- Git Source Code Management System hooks/update refs/tags/v3.0.3 \ 0000000000000000000000000000000000000000 \ 1d4251d2ad645bf319b27d8d16db70474fffff93

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.0.4 now at v3.0.3-4-g8be3f1f
by Aaron Griffin 29 Oct '07

29 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating annotated tag, v3.0.4, to 7bc12516cd16636dbdeef222b453f72b1706b0e9 (tag) replaces v3.0.3-3 tagged by Dan McGee <dan(a)archlinux.org> on 2007-10-28 23:50 -0400 - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/update --- Git Source Code Management System hooks/update refs/tags/v3.0.4 \ 0000000000000000000000000000000000000000 \ 7bc12516cd16636dbdeef222b453f72b1706b0e9

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.0.5 now at v3.0.4-5-g0cfb412
by Dan McGee 29 Oct '07

29 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating annotated tag, v3.0.5, to 77fa42dd001ecf309af7f72faeccd101f0d7c9f4 (tag) replaces v3.0.4-4 tagged by Dan McGee <dan(a)archlinux.org> on 2007-10-28 23:50 -0400 - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/update --- Git Source Code Management System hooks/update refs/tags/v3.0.5 \ 0000000000000000000000000000000000000000 \ 77fa42dd001ecf309af7f72faeccd101f0d7c9f4

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.0.6 now at v3.0.5-7-ga06d91f
by Dan McGee 29 Oct '07

29 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating annotated tag, v3.0.6, to 723b37f6fac724405d9fe5abf75b46d0e7a0adda (tag) replaces v3.0.5-6 tagged by Dan McGee <dan(a)archlinux.org> on 2007-10-28 23:51 -0400 - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/update --- Git Source Code Management System hooks/update refs/tags/v3.0.6 \ 0000000000000000000000000000000000000000 \ 723b37f6fac724405d9fe5abf75b46d0e7a0adda

1 0

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-492-g671224b
by Dan McGee 29 Oct '07

29 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 671224b64c9478644125deec1496a27e8f579da9 (commit) via 0dc34f496dca3d916eae85a0357049b8b9d711bb (commit) via 3e3e7a97a629cc86a53044766039c66d85cf67cb (commit) via 8a9c83dd4bffff575a21207248e7acaae5a0d6f9 (commit) via 3e1b72f4f2b3f8766f9ad3493ad736d81263c9c1 (commit) via a8731ff2f7be564b745a4447df9c2157c5ee0777 (commit) via b38e046621e173a1194eb354e6b8d2525fa60242 (commit) via 17f99a0f0042efeb4c5822a6446918f1ac852e32 (commit) via d903fc607ee2aa2527202f1e54a44be325eabe48 (commit) via b609cb0a5dfe595318975dfe4c6c37a168b7d979 (commit) from 0cff7c6bdf5461c3286edc940aabb88d63345381 (commit) - Log ----------------------------------------------------------------- commit 671224b64c9478644125deec1496a27e8f579da9 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 28 22:24:11 2007 -0500 pactest: generate the filelist the correct way Actually use python commands to generate the filelist instead of os.system calls that don't necessarily work everywhere. Noticed when running "make check" on FreeBSD where the tar program is actually bsdtar. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0dc34f496dca3d916eae85a0357049b8b9d711bb Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Oct 28 13:37:49 2007 +0100 extend type001 pactest with a symlink. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 3e3e7a97a629cc86a53044766039c66d85cf67cb Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 28 21:18:39 2007 -0500 makepkg: add explicit dir to find calls Some of the find calls did not have a path, which isn't valid in some versions of the find utility. Add a . for compatibility. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8a9c83dd4bffff575a21207248e7acaae5a0d6f9 Author: Scott Horowitz <stonecrest(a)gmail.com> Date: Fri Oct 26 20:32:09 2007 -0600 Integrate versionpkg into makepkg If PKGBUILDs use the correct svn/cvs/etc variables, determine the latest revision number and force this as the pkgver for building. Signed-off-by: Scott Horowitz <stonecrest(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3e1b72f4f2b3f8766f9ad3493ad736d81263c9c1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 26 20:40:20 2007 -0500 Clean up LDADD usage We had a lot of unnecessary overstatements of libraries to include on linking, and autoconf/automake takes care of this for us. This also helps some compilation issues on other platforms. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a8731ff2f7be564b745a4447df9c2157c5ee0777 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 26 20:31:25 2007 -0500 Fix mcheck detection and usage Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b38e046621e173a1194eb354e6b8d2525fa60242 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 26 19:09:21 2007 -0500 Explicitly cast void* to char* during printf call If we don't have an explicit cast, make fails during -Wall -Werror. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 17f99a0f0042efeb4c5822a6446918f1ac852e32 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Oct 26 16:37:47 2007 +0200 dependency error message fix in libalpm/remove.c Normally you must never see that error message. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d903fc607ee2aa2527202f1e54a44be325eabe48 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Oct 27 01:14:35 2007 +0200 Dependency error/log messages fix The old code used only the depend.name in messages, which might have not been informative. The new code uses the whole dependency string in %DEPENDS% format. (Dan: slight English clarification in one of the messages) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b609cb0a5dfe595318975dfe4c6c37a168b7d979 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 26 18:36:08 2007 -0500 makepkg: readd -p option that was lost in getopt conversion The -p option was accidentally dropped in commit 54b71f0427e87e6d525423df06f8a06f2b71c518. Readd it. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: configure.ac | 12 +++-- lib/libalpm/Makefile.am | 1 - lib/libalpm/deps.c | 18 +++++--- lib/libalpm/remove.c | 2 +- lib/libalpm/sync.c | 4 +- pactest/pmpkg.py | 22 ++++++++--- pactest/tests/type001.py | 14 ++++-- scripts/makepkg.sh.in | 97 ++++++++++++++++++++++++++++++++++++++++++--- src/pacman/Makefile.am | 6 +-- src/pacman/pacman.c | 4 +- src/util/testdb.c | 4 +- 11 files changed, 144 insertions(+), 40 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 0cff7c6bdf5461c3286edc940aabb88d63345381 \ 671224b64c9478644125deec1496a27e8f579da9

1 0

Re: [pacman-dev] [tur-users] A Note about Groups
by Jeff 'codemac' Mickey 28 Oct '07

28 Oct '07

* On Sunday, October 28 2007, Alessio 'mOLOk' Bolognino wrote: >On Mon 2007-10-22 11:21 , Aaron Griffin wrote: >> This is just a note for all of you guys. >> Please DO NOT stick community packages in official groups. This is >> ESPECIALLY important for the base and base-devel groups. >> [...] > >So we can't use, say "vim-plugins' ? That's exactly what I was thinking... I think the stance should be DO NOT put community packages in official groups unless we developers know about it. There are some very "crucial" groups that should not be messed with as the selinux packages make proof of, but why can't packages in [community] be part of something like vim-pulgins? I think this is actually a design flaw in how pacman handles repositories. I think groups should not span repositories. But maybe this is a discussion for the pacman-dev list. Cc'd! // jeff -- .: [ + carpe diem totus tuus + ] :.

1 0

[pacman-dev] dbs should be locked between _alpm_db_open and _alpm_db_close
by Nagy Gabor 27 Oct '07

27 Oct '07

Hi! The problem bellow doesn't appear with the current dummy front-end, but if you want to design a flexible alpm lib, you have to deal with it. The main problem, that the whole pkgcache concept _assumes_ that the db won't be modified by other processes. However, pacman locks db iff he modifies it, so he cannot trust his assumption. Let me explain. Imagine a nice pacman GUI which starts with alpm_initialize, opens the databases and let user do multiple operations. pacman_gui can run all the day, without unregistering the databases, alpm_release etc. etc. The main problem, that if pacman_gui (== libalpm) let an other pacman instance to modify the local db, he should always reload the pkgcache, because it may be outdated! So the following situation can happen: pacman_gui loaded the pkgcache to list the available local packages to the user, and now he is waiting. During this an other pacman instance removed lot of packages (he could lock anf unlock the db, since pacman_gui didn't lock anything yet) and exited. pacman_gui didn't detect anything from this. Now the user ask pacman_gui to install some packages: now he locks the dbs, but he trust its outdated pkgcache: for example its depchecks will use this outdated information... So _alpm_db_open should lock database, and _alpm_db_close should unlock it. The problem here, that now a non-root user cannot write /var/lib/pacman/local/db.lck, but we can solve this somehow. (Note, that I'm suggesting a lock-per-db method here.) Another (not-so-strict but slower) possible solution a .lastupdate-like method to detect if the database was modified or not after pkgcache load, and reload if needed. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 2

[pacman-dev] testdb
by Nagy Gabor 27 Oct '07

27 Oct '07

Hi! First of all, many thanks to Xavier for this cool stuff. Some suggestions/feature requests: -you don't free() anything in testpkg.c; this is not a big problem, but rigorous c-programmers frees everything in even helloworld.c;-) -conflict checking also would be nice and easy to implement -a small speedup suggestion (however, speed is not important here): line 176: data = alpm_checkdeps(db, PM_TRANS_TYPE_ADD, alpm_db_getpkgcache(db)); here you could use a fake_empty_db as a first parameter: -O(n^2) operation -my biggest feature request: an option to fix the problems instead of just listing them (at least rewrite wrong requiredby fields, and a suggestion "pacman -S --asdeps [missingdeps]") I will share my results with you, this is a nice database-breaker-bug history: -testdb found many duplicated requiredby fields; I had to fix them with db-fix.sh + re-pacman + pacman -U (I have no net at home at the moment; see my biggest feature request ;-) -testdb found 4 other wrong requiredby fields (however, extra requiredby field doesn't cause an error now: see remove048.py): this is the category of the REMOVEUPGRADE transaction: requiredby004.py -and an other old bug (fixed): sysvinit needs awk, gawk provides awk; and sysvinit wasn't listed in requiredby field of gawk. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

5 18

[pacman-dev] pacman doesn't realize about letter package versioning when doing upgrades
by Mateusz Jedrasik 27 Oct '07

27 Oct '07

Simply put: pacman -Syu <snip> warning: openssh: local (4.7p1-3) is newer than core (4.7p1-2) warning: openssl: local (0.9.8g-1) is newer than core (0.9.8f-1) <snip> :: openssh requires openssl>=0.9.8g :-) It simply does not realize that 0.9.8f-1 is newer than 0.9.8g-1. Cheers! //m. -- Mateusz Jędrasik <m.jedrasik(a)gmail.com> tel. +48(79)022-9393, +48(51)69-444-90 http://imachine.szklo.eu.org

3 5

[pacman-dev] small bug in libalpm/remove.c
by Nagy Gabor 27 Oct '07

27 Oct '07

Hi! Look at line 122-123: _alpm_log(PM_LOG_ERROR, _("could not find %s in database -- skipping\n"), miss->depend.name); Probably you want to say miss->target here. You can treat this mail as a patch, since it is very easy to fix it (now I'm working on removing pmdepend_t and I don't want to create a new branch;-) Bye, ngaba

4 9

[pacman-dev] [PATCH] Dependency error/log messages fix
by Nagy Gabor 26 Oct '07

26 Oct '07

From 4ee4c412b7ce0a688a81b1f856ef6462c8ee269d Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat, 27 Oct 2007 01:14:35 +0200 Subject: [PATCH] Dependency error/log messages fix The old code used only the depend.name in messages, which might have not been informative. The new code uses the whole dependency string in %DEPENDS% format. --- lib/libalpm/deps.c | 18 +++++++++++------- lib/libalpm/sync.c | 4 +++- src/util/testdb.c | 4 +++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 7f4fb0b..4beaf70 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -306,7 +306,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, if(alpm_depcmp(pkg, depend)) { _alpm_log(PM_LOG_DEBUG, "checkdeps: dependency '%s' has moved from '%s' to '%s'\n", - depend->name, alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(pkg)); + k->data, alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(pkg)); satisfied = 1; break; } @@ -322,7 +322,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, /* we ignore packages that will be updated because we know * that the updated ones don't satisfy depend */ _alpm_log(PM_LOG_DEBUG, "checkdeps: dependency '%s' satisfied by installed package '%s'\n", - depend->name, alpm_pkg_get_name(pkg)); + k->data, alpm_pkg_get_name(pkg)); satisfied = 1; break; } @@ -380,7 +380,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, /* else if still not found... */ if(!found) { _alpm_log(PM_LOG_DEBUG, "missing dependency '%s' for package '%s'\n", - depend->name, alpm_pkg_get_name(tp)); + j->data, alpm_pkg_get_name(tp)); miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, depend->mod, depend->name, depend->version); if(!_alpm_depmiss_isin(miss, baddeps)) { @@ -426,7 +426,7 @@ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, pmpkg_t *pkg = l->data; if(alpm_depcmp(pkg, depend) && !_alpm_pkg_find(alpm_pkg_get_name(pkg), packages)) { _alpm_log(PM_LOG_DEBUG, "checkdeps: dependency '%s' satisfied by installed package '%s'\n", - depend->name, alpm_pkg_get_name(pkg)); + k->data, alpm_pkg_get_name(pkg)); satisfied = 1; break; } @@ -686,8 +686,10 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, for(j = *list; j && !found; j = j->next) { pmpkg_t *sp = j->data; if(alpm_depcmp(sp, missdep)) { + char *missdepstring = alpm_dep_get_string(missdep); _alpm_log(PM_LOG_DEBUG, "%s satisfies dependency %s -- skipping\n", - alpm_pkg_get_name(sp), missdep->name); + alpm_pkg_get_name(sp), missdepstring); + free(missdepstring); found = 1; } } @@ -713,8 +715,10 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, } if(!found) { - _alpm_log(PM_LOG_ERROR, _("cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)\n"), - miss->target, missdep->name); + char *missdepstring = alpm_dep_get_string(missdep); + _alpm_log(PM_LOG_ERROR, _("cannot resolve \"%s\" dependency of \"%s\"\n"), + missdepstring, miss->target); + free(missdepstring); if(data) { if((miss = malloc(sizeof(pmdepmissing_t))) == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes\n"), sizeof(pmdepmissing_t)); diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3e12ffb..f4ed6dd 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -674,8 +674,10 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync pmsyncpkg_t *sp = l->data; pmpkg_t *sppkg = sp->pkg; if(alpm_depcmp(sppkg, &(miss->depend))) { + char *missdepstring = alpm_dep_get_string(&(miss->depend)); _alpm_log(PM_LOG_DEBUG, "sync: dependency '%s' satisfied by package '%s'\n", - miss->depend.name, alpm_pkg_get_name(sppkg)); + missdepstring, alpm_pkg_get_name(sppkg)); + free(missdepstring); satisfied = 1; } } diff --git a/src/util/testdb.c b/src/util/testdb.c index 1331f2c..a06456a 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -178,8 +178,10 @@ int main(int argc, char **argv) for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); pmdepend_t *dep = alpm_miss_get_dep(miss); + char *depstring = alpm_dep_get_string(dep); printf("missing dependency for %s : %s\n", alpm_miss_get_target(miss), - alpm_dep_get_name(dep)); + depstring); + free(depstring); } /* check requiredby */ -- 1.5.3.4

2 1

[pacman-dev] alpm_list_remove is buggy
by Nagy Gabor 26 Oct '07

26 Oct '07

Hi! That function seems totally odd. /* TODO I modified this to remove ALL matching items. Do we need a remove_first? */ <- this is partly true: *data contains only the last found "i->data", and the function doesn't return with an alpm_list. MEMLEAK!! Bye, ngaba PS: I don't create a patch, because I dunno want do you want: remove the matching _list_ or remove the first matching _item_'s data. My vote: 2nd. (Because then I don't have to resubmit my -Ru patch ;-)

2 2

[pacman-dev] Pacman maint branch (was: [GIT] The official pacman repository branch, maint now at v3.0.0-54-g09253b4)
by Dan McGee 26 Oct '07

26 Oct '07

On 10/25/07, Dan McGee <dan(a)archlinux.org> wrote: > Hello, > > This is an automated email from the git hooks/update script, it was > generated because a ref change was pushed to the repository. > > Updating branch, maint, > as a new branch > to 09253b48d60589d42d9486dd361eaaf30e364e59 (commit) So, as you can maybe tell from the above commit, I decided to see if I could import our CVS history post-3.0.0 into GIT. Long story short, I figured it out and did just that. Down with CVS! (or to Aaron- we really don't need the pacman CVS repo anymore as all that history has been imported into GIT.) If we do need another 3.0.X release, we can do it from the maint branch. Once we make a 3.1 release, the maint branch will probably move to the 3.1.1 tag and be based off of there, so be aware of that. Until then, it will be stuck to the 3.0.X series. -Dan

3 2

[pacman-dev] [GIT] The official pacman repository branch, maint now at v3.0.0-54-g09253b4
by Dan McGee 26 Oct '07

26 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, maint, as a new branch to 09253b48d60589d42d9486dd361eaaf30e364e59 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/update --- Git Source Code Management System hooks/update refs/heads/maint \ 0000000000000000000000000000000000000000 \ 09253b48d60589d42d9486dd361eaaf30e364e59

1 0

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-482-g0cff7c6
by Dan McGee 25 Oct '07

25 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 0cff7c6bdf5461c3286edc940aabb88d63345381 (commit) via 89ac8aa9c45486aa4f4b9599bb094f1d54ff1b66 (commit) via 581769b72d882fdc05bdbdc588db97187329e5b5 (commit) via aa545f6798e526dfd23779b488a86296d1f52d12 (commit) via 616668fb71db5045ae727586031ce32fd18e92cc (commit) via bd15c23e1690d0c85632d7950cd79d17c65a4e17 (commit) via 8b1fb61df26649e1dec626ef9120fc787a831fcc (commit) via 0c4f7d821c1cd4ce559476595e2108f75b3dde7c (commit) via 46eaa5c54200bfda402412e2f5b7df0eddc0230a (commit) from f5b77eb9894ea92a08fac586ddf03e9ba70c3de8 (commit) - Log ----------------------------------------------------------------- commit 0cff7c6bdf5461c3286edc940aabb88d63345381 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu Oct 25 02:31:28 2007 +0200 Add alpm_dep_get_string method Public alpm_dep_get_string function is introduced, which converts a pmdepend_t structure to printable string in %DEPENDS% format. This function is now used in pacman to print dependency error messages. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89ac8aa9c45486aa4f4b9599bb094f1d54ff1b66 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Wed Oct 24 22:58:34 2007 +0200 _alpm_depmiss_isin fix The old code used memcmp, which is not good for comparing strings: "pkgname"'\0''\0' should be equal to "pkgname"'\0''a' for example. The new code uses strcmp. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 581769b72d882fdc05bdbdc588db97187329e5b5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 24 00:37:50 2007 -0500 Add strndup implemention for environments that are missing it Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aa545f6798e526dfd23779b488a86296d1f52d12 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 23 23:27:03 2007 -0500 One more added include to help compilation elsewhere Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 616668fb71db5045ae727586031ce32fd18e92cc Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 23 19:24:39 2007 -0500 Replace UK mirror with a new updated one Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bd15c23e1690d0c85632d7950cd79d17c65a4e17 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 23 00:35:42 2007 -0500 Print and typecast time_t correctly The recommended C99 way to print the value of a time_t is to cast it to uintmax_t or intmax_t. Do this to ensure compatability with all platforms. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8b1fb61df26649e1dec626ef9120fc787a831fcc Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 22 23:52:55 2007 -0500 Ensure all localization stuff is correctly guarded Anything dealing with libintl and localization should be correctly guarded inside an ENABLE_NLS block on both the pacman and libalpm sides. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0c4f7d821c1cd4ce559476595e2108f75b3dde7c Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 22 21:33:47 2007 -0700 Fix broken or missing includes Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 46eaa5c54200bfda402412e2f5b7df0eddc0230a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 22 01:43:34 2007 -0700 Fix invalid static scoping of strverscmp Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: etc/pacman.d/mirrorlist.in | 2 +- lib/libalpm/alpm.c | 3 +++ lib/libalpm/alpm.h | 1 + lib/libalpm/be_files.c | 7 +++---- lib/libalpm/deps.c | 41 +++++++++++++++++++++++++++++++++++++++-- lib/libalpm/server.c | 5 +++-- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 16 +++++++++------- src/pacman/add.c | 18 +++--------------- src/pacman/pacman.c | 5 ++++- src/pacman/remove.c | 4 +++- src/pacman/sync.c | 19 ++++--------------- src/pacman/util.c | 23 +++++++++++++++++++++++ src/pacman/util.h | 14 +++++++++----- src/util/testdb.c | 1 + 15 files changed, 107 insertions(+), 54 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ f5b77eb9894ea92a08fac586ddf03e9ba70c3de8 \ 0cff7c6bdf5461c3286edc940aabb88d63345381

1 0

[pacman-dev] [PATCH] alpm_dep_get_string
by Nagy Gabor 25 Oct '07

25 Oct '07

Hi! If you look into libalpm code, you will realize that usually only depend->name is used in log/error messages; which can be confusing in some context (sometimes, alpm assumes that the missing dependency is a canonical package name). See my note here, for example: http://www.archlinux.org/pipermail/pacman-dev/2007-October/009671.html So I started to work on this. Most cases dependency is "created" with alpm_splitdep from a string; in these cases we can use that string in error messages. However, in few cases dependency "comes from" pmdepmissing_t, so we have to convert pmdepend_t to string. As a first step, I coded this converter-function; which is going to be used in resolvedeps only (in libalpm). ---------------------------- From 074e80216543c631f51079b4c27efbf8dcefff16 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba@@bibl..u-szeged..hu> Date: Thu, 25 Oct 2007 02:16:48 +0200 Subject: [PATCH] alpm_dep_get_string Public alpm_dep_get_string function is introduced, which converts a pmdepend_t structure to printable string in %DEPENDS% format. This function is now used in pacman to print dependency error messages. --- lib/libalpm/alpm.h | 1 + lib/libalpm/deps.c | 34 ++++++++++++++++++++++++++++++++++ src/pacman/add.c | 18 +++--------------- src/pacman/remove.c | 4 +++- src/pacman/sync.c | 18 +++--------------- 5 files changed, 44 insertions(+), 31 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 880bbeb..2000db4 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -379,6 +379,7 @@ pmdepend_t *alpm_miss_get_dep(pmdepmissing_t *miss); pmdepmod_t alpm_dep_get_mod(pmdepend_t *dep); const char *alpm_dep_get_name(pmdepend_t *dep); const char *alpm_dep_get_version(pmdepend_t *dep); +char *alpm_dep_get_string(pmdepend_t *dep); /* * File conflicts diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index b7e49be..55d3ee7 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -835,4 +835,38 @@ const char SYMEXPORT *alpm_dep_get_version(pmdepend_t *dep) return dep->version; } +/* the return-string must be freed! */ +char SYMEXPORT *alpm_dep_get_string(pmdepend_t *dep) +{ + ALPM_LOG_FUNC; + + /* Sanity checks */ + ASSERT(handle != NULL, return(NULL)); + ASSERT(dep != NULL, return(NULL)); + + char *ptr; + char *depstring = malloc(sizeof(pmdepend_t)); + if(depstring == NULL) { + _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes\n"), sizeof(pmdepend_t)); + return NULL; + } + + strcpy(depstring, dep->name); + ptr = depstring + strlen(depstring); + switch(dep->mod) { + case PM_DEP_MOD_ANY: + break; + case PM_DEP_MOD_EQ: + sprintf(ptr, "=%s", dep->version); + break; + case PM_DEP_MOD_GE: + sprintf(ptr, ">=%s", dep->version); + break; + case PM_DEP_MOD_LE: + sprintf(ptr, "<=%s", dep->version); + break; + } + + return(depstring); +} /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/add.c b/src/pacman/add.c index 0b59a23..f883a6b 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -137,26 +137,14 @@ int pacman_add(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); pmdepend_t *dep = alpm_miss_get_dep(miss); + char *depstring = alpm_dep_get_string(dep); /* TODO indicate if the error was a virtual package or not: * :: %s: requires %s, provided by %s */ printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), - alpm_dep_get_name(dep)); - switch(alpm_dep_get_mod(dep)) { - case PM_DEP_MOD_ANY: - break; - case PM_DEP_MOD_EQ: - printf("=%s", alpm_dep_get_version(dep)); - break; - case PM_DEP_MOD_GE: - printf(">=%s", alpm_dep_get_version(dep)); - break; - case PM_DEP_MOD_LE: - printf("<=%s", alpm_dep_get_version(dep)); - break; - } - printf("\n"); + depstring); + free(depstring); } break; case PM_ERR_CONFLICTING_DEPS: diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 860bf49..dce479e 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -129,8 +129,10 @@ int pacman_remove(alpm_list_t *targets) for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); pmdepend_t *dep = alpm_miss_get_dep(miss); + char *depstring = alpm_dep_get_string(dep); printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), - alpm_dep_get_name(dep)); + depstring); + free(depstring); } alpm_list_free(data); break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index bf6eed1..2da7f55 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -558,22 +558,10 @@ int sync_trans(alpm_list_t *targets, int sync_only) for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); pmdepend_t *dep = alpm_miss_get_dep(miss); + char *depstring = alpm_dep_get_string(dep); printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), - alpm_dep_get_name(dep)); - switch(alpm_dep_get_mod(dep)) { - case PM_DEP_MOD_ANY: - break; - case PM_DEP_MOD_EQ: - printf("=%s", alpm_dep_get_version(dep)); - break; - case PM_DEP_MOD_GE: - printf(">=%s", alpm_dep_get_version(dep)); - break; - case PM_DEP_MOD_LE: - printf("<=%s", alpm_dep_get_version(dep)); - break; - } - printf("\n"); + depstring); + free(depstring); } break; case PM_ERR_CONFLICTING_DEPS: -- 1.5.3.4

3 2

[pacman-dev] _alpm_depmiss_isin is wrong
by Nagy Gabor 24 Oct '07

24 Oct '07

Hi! It is not a good idea to compare strings with memcmp: (abc'\0'd should be equivalent with abc'\0') Bye, ngaba

4 9

[pacman-dev] bsd port?
by Xavier 24 Oct '07

24 Oct '07

On Tue, Oct 23, 2007 at 04:03:34PM -0500, Aaron Griffin wrote: > The above applies here as well, BUT, I wanted to know where this was > being discussed. If pacman was ported to BSD, I've never seen, nor > heard of, patches for it. This would be valuable information for us. > Not only would it save us work, but Dan is doing this _right now_. > I just read the above on arch-dev-public. A while ago, someone came on IRC while no one was around to report the status of getting pacman running on freebsd : "got pacman to compile on libfetch and libdownload that are in FreeBSD 6.2 1. cut out with that damn bashism and linux non-posix crap 2. check the makefiles, they're full of bugs but all this du -cb and cp -a crap... and then the "source" syntax instead of "." and there's also chown root.root, which should be root:root, or even better 0:0" I just noted it because I thought it could be interesting, but I don't know anything about this stuff. And I thought no one else cared. But if Dan is interested in doing this, I just thought he should know about the last 3 lines of this report. If that doesn't help at all, sorry, just ignore this mail :)

5 7

[pacman-dev] Submitting Patches
by Aaron Griffin 24 Oct '07

24 Oct '07

I want to bring this up a little bit. There's lots of ideas thrown around on this list, but more often than not, no code, or cryptic patches. This does nothing. All it does is waste both mine and Dan's time. On 10/24/07, Xavier <shiningxc(a)gmail.com> wrote: > But if your patch is rejected, then you should probably also provide one > separate patch with only the small bug fixes. This should ALWAYS be the case. Submitting a patch with 5 different changes is NOT acceptable. "One feature per patch" is the way this works. This is not just pacman either. Most other open source projects do it this way. Think of it this way: if you submit a patch with 5 changes, and one change is rejected, then you need to resubmit the whole thing. If you submit 5 patches, and 4 get merged, you only need to resubmit one small patch AND you get listed in the SCM history 4 times. Yay. Secondly, if a patch is submitted, and it's broken, resubmit the patch. Don't say "oh change this". If you'd like a shining example of how this process works, take a look at Nathan's recent patches. He submitted them, in git format, they were commented on, he changed them, resubmitted, and they were merged. It's really that simple. Dan and I do not need all this extra work. What Nathan did is EXACTLY how this process should work (PS Thanks a lot Nathan) Going forward, I think we're going to have to do the following: If you want a change made, a patch MUST be sent in git format. Otherwise it will simply be rejected, not for lack of effort but for the simple fact that it's a waste of our time to have to deal with.

3 6

[pacman-dev] feature request: -Sug
by Nagy Gabor 22 Oct '07

22 Oct '07

Hi! We discussed here, that after "pacman -S group" you have to answer tons of annoying questions (even if your 'foo' package is up-to-date, you are asked if you want to install it or not) or install needless packages. Usually I want to _upgrade_ my whole _installed_ group (when my net is slow, and -Su would download hundreds of MBs); then I must do pacman -S `pacman -Qg group|awk ...` magic. Or in more general: we may add a new option to -S: upgrade-only -- not add. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 3

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-473-gf5b77eb
by Dan McGee 20 Oct '07

20 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via f5b77eb9894ea92a08fac586ddf03e9ba70c3de8 (commit) via e472e80c084c5e94fdc15d2f6565c50e65854372 (commit) via 520db578daf4dfe4863f9c32026460ada9131b78 (commit) via 0c2cc108d332837de4a33ca9cabe717bd414c407 (commit) via 1118e00fe91125e464e8c3487f58f6000e0036b2 (commit) via b8dba7a6faac9c44a1eda5a38b6452852e3c79be (commit) via 12e134625286be8d86f824ce2f73d1a96ac0b547 (commit) via 0ff02995f169d460d60a9512d7fa8257c74ed8f4 (commit) via 619bf56e6613333f319fb1add22fa989060e208d (commit) from 128b288ca7f396d3cbb6c9620807075274bdbe8e (commit) - Log ----------------------------------------------------------------- commit f5b77eb9894ea92a08fac586ddf03e9ba70c3de8 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:54 2007 -0400 Add download size to target list. This displays the download size, taking into account delta files and cached files. This closes FS#4182. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e472e80c084c5e94fdc15d2f6565c50e65854372 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:53 2007 -0400 Download delta files if UseDelta is set. Delta files will be used if the size is smaller than a percent (MAX_DELTA_RATIO) of the package size. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 520db578daf4dfe4863f9c32026460ada9131b78 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:52 2007 -0400 Refactor md5sum checking. This will allow deltas and packages to share the md5sum checking code. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0c2cc108d332837de4a33ca9cabe717bd414c407 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:51 2007 -0400 Add pmdelta_t structure and functions to libalpm. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1118e00fe91125e464e8c3487f58f6000e0036b2 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Oct 19 13:17:50 2007 -0400 Add delta information to the repository database. (Dan: cleaned up one if statement) Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b8dba7a6faac9c44a1eda5a38b6452852e3c79be Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 18 19:32:30 2007 -0500 Add Hungarian mirror Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 12e134625286be8d86f824ce2f73d1a96ac0b547 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Fri Oct 19 01:18:01 2007 +0100 scripts/makepkg.sh.in: Strip bins/libs in all {bin, sbin, lib} directories. In one of the original clean up patches[1] I changed the search path for stripping binaries and libraries. This resulted in only usr/{bin,sbin,lib} being searched. This patch reverts that change. [1] 721ceee1e2c9b18425d84cf39f6541b2f04072b3 Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 0ff02995f169d460d60a9512d7fa8257c74ed8f4 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Oct 18 13:26:04 2007 +0200 libalpm/package.c : fix requiredby with multiple providers. The code didn't match the following comment : "A depends on B through n depends <=> A listed in B's requiredby n times" It stopped at n=1 with a break. I was surprised to see this case happens in real, that's how I noticed the bug: wine depends on both freeglut and glut, while freeglut provides glut. So when installing wine, the update_depends function listed wine twice in freeglut's requiredby. But the compute_requiredby function (used when installing freeglut, and used by testdb) listed wine only once in freeglut's requiredby. That made testdb unhappy. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 619bf56e6613333f319fb1add22fa989060e208d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 16 08:41:37 2007 -0500 Remove rounding on package size totals We print the total to two decimal places, so there is no real need for rounding of the values. Remove the rounding and switch all output to two decimal places. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: doc/pacman.conf.5.txt | 4 + etc/pacman.d/mirrorlist.in | 2 + lib/libalpm/Makefile.am | 1 + lib/libalpm/alpm.h | 25 ++ lib/libalpm/alpm_list.c | 18 ++ lib/libalpm/alpm_list.h | 1 + lib/libalpm/be_files.c | 19 ++ lib/libalpm/db.h | 3 +- lib/libalpm/delta.c | 265 ++++++++++++++++++++++ lib/libalpm/{conflict.h => delta.h} | 33 ++-- lib/libalpm/error.c | 5 + lib/libalpm/handle.c | 6 + lib/libalpm/handle.h | 1 + lib/libalpm/package.c | 22 ++- lib/libalpm/package.h | 1 + lib/libalpm/po/POTFILES.in | 1 + lib/libalpm/sync.c | 415 +++++++++++++++++++++++++++++++---- lib/libalpm/util.h | 3 + scripts/makepkg.sh.in | 2 +- scripts/repo-add.sh.in | 56 +++++- src/pacman/callback.c | 23 ++- src/pacman/pacman.c | 3 + src/pacman/query.c | 2 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 28 +-- src/pacman/util.h | 2 +- 26 files changed, 851 insertions(+), 92 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 128b288ca7f396d3cbb6c9620807075274bdbe8e \ f5b77eb9894ea92a08fac586ddf03e9ba70c3de8

1 0

[pacman-dev] fglrx-utils preferred over libgl-dri
by Alexander Baldeck 19 Oct '07

19 Oct '07

Hey all, I was just about to upgrade oxine and it used to only depend on xine-lib. xine-lib pulls a great deal of xorg stuff but then one strange thing happened. pacman felt like fglrx-utils would be the right package to pull to fulfill the requirement of 'libgl' on the system. Now I would like to not have that, what would happen if I were to go and change pkgname of libgl-dri to just libgl since Jan dropped libgl-mesa long ago? Pacman should prefer the real pkgname over provides, right? Cheers, -J

5 12

[pacman-dev] Round 2: Add delta information to libalpm.
by Nathan Jones 19 Oct '07

19 Oct '07

Here are the updated patches for adding delta downloading to libalpm. I had originally thought that if a delta could not be downloaded (due to md5sum or file deleted on the server), the package file should be downloaded instead. I decided not to do this because some users may be annoyed at seeing a 7MB download size but end up downloading 100MB openoffice package. If the md5sum is not correct, the output is mangled a bit. I am not sure what causes this. Proceed with installation? [Y/n] y :: Retrieving packages from test... wbox-3-1_to_4-1-i686... 7.9K 17.1M/s 00:00:00 [#####################] 100% wbox-4-1_to_4-2-i686... 0.4K 1087.1K/s 00:00:00 [#####################] 100% :: File wbox-4-1_to_4-2-i686.delta is corrupted. Do you want to delete it? [Y/n] checking delta integrity... error: failed to commit transaction (corrupted delta) Errors occurred, no packages were upgraded. Also, is it just me, or do 78% of the pactests fail?

3 8

[pacman-dev] [PATCH] scripts/makepkg.sh.in: Strip bins/libs in all {bin, sbin, lib} directories.
by Andrew Fyfe 19 Oct '07

19 Oct '07

In one of the original clean up patches[1] I changed the search path for stripping binaries and libraries. This resulted in only usr/{bin,sbin,lib} being searched. This patch reverts that change. [1] 721ceee1e2c9b18425d84cf39f6541b2f04072b3 Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4399076..df6c92e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -736,7 +736,7 @@ tidy_install() { if [ "$(check_option strip)" = "y" ]; then msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")" - for file in $(find {,*/}{bin,lib,sbin} -type f 2>/dev/null || true); do + for file in $(find {,usr/{,local/},opt/}{bin,lib,sbin} -type f 2>/dev/null || true); do case "$(file -biz "$file")" in *application/x-sharedlib*) # Libraries /usr/bin/strip --strip-debug "$file";; -- 1.5.3.4-dirty

2 1

[pacman-dev] [PATCH] libalpm/package.c : fix requiredby with multiple providers.
by Chantry Xavier 18 Oct '07

18 Oct '07

The code didn't match the following comment : "A depends on B through n depends <=> A listed in B's requiredby n times" Because of the usage of break instead of continue, it stopped at n=1. I was surprised to see this case happens in real, that's how I noticed the bug: wine depends on both freeglut and glut, while freeglut provides glut. So when installing wine, the update_depends function listed wine twice in freeglut's requiredby. But the compute_requiredby function (used when installing freeglut, and used by testdb) listed wine only once in freeglut's requiredby. That made testdb unhappy. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 38e6e4c..cd33ca2 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -543,7 +543,7 @@ alpm_list_t SYMEXPORT *alpm_pkg_compute_requiredby(pmpkg_t *pkg) _alpm_log(PM_LOG_DEBUG, "adding '%s' in requiredby field for '%s'\n", cachepkgname, pkg->name); reqs = alpm_list_add(reqs, strdup(cachepkgname)); - break; + continue; } } } -- 1.5.3.4

4 3

[pacman-dev] Add delta information to libalpm.
by Nathan Jones 18 Oct '07

18 Oct '07

This patchset adds delta information to repository databases and libalpm, allowing libalpm to download multiple delta files when upgrading a package. I still have some work to do, but I thought I would post this now to get any suggestions and criticisms that anyone has. Some things I still need to do: Add error checking/md5sum to the download function. Remove some hardcoded stuff (like ".pkg.tar.gz"). Run through valgrind to make sure everything is freed. Delete delta files and intermediate packages after they are not needed. Test... The patches in action: $ ls -lh wbox*.pkg.tar.gz wbox*.delta -rw-r--r-- 1 nathanj users 55K 2007-10-15 17:11 wbox-3-1-i686.pkg.tar.gz -rw-r--r-- 1 nathanj users 7.9K 2007-10-15 17:11 wbox-3-1_to_4-1-i686.delta -rw-r--r-- 1 nathanj users 56K 2007-10-15 17:11 wbox-4-1-i686.pkg.tar.gz -rw-r--r-- 1 nathanj users 398 2007-10-15 17:11 wbox-4-1_to_4-2-i686.delta -rw-r--r-- 1 nathanj users 56K 2007-10-15 17:11 wbox-4-2-i686.pkg.tar.gz $ repo-add test.db.tar.gz wbox-4-2-i686.pkg.tar.gz ==> Extracting database to a temporary location... ==> Adding package 'wbox-4-2-i686.pkg.tar.gz' -> Removing existing package 'wbox-3-1'... -> Creating 'desc' db entry... -> Computing md5 checksums... -> Creating 'depends' db entry... -> Creating 'deltas' db entry... -> Added delta 'wbox-3-1_to_4-1-i686.delta' -> Added delta 'wbox-4-1_to_4-2-i686.delta' ==> Creating updated database file /home/nathanj/pkgs/pkgs/test.db.tar.gz $ pacman -Q wbox wbox 3-1 $ sudo pacman -Sy wbox :: Synchronizing package databases... test 3.4K 8.2M/s 00:00:00 [#####################] 100% resolving dependencies... done. looking for inter-conflicts... done. Targets: wbox-4-2 Total Package Size: 0.05 MB Total Download Size 0.01 MB Total Installed Size: 0.08 MB Proceed with installation? [Y/n] :: Retrieving packages from test... wbox-3-1_to_4-1-i686... 7.9K 23.3M/s 00:00:00 [#####################] 100% wbox-4-1_to_4-2-i686... 0.4K 5.3M/s 00:00:00 [#####################] 100% Generating wbox-4-1-i686.pkg.tar.gz with wbox-3-1_to_4-1-i686.delta... done. Generating wbox-4-2-i686.pkg.tar.gz with wbox-4-1_to_4-2-i686.delta... done. checking package integrity... done. (1/1) checking for file conflicts [#####################] 100% (1/1) upgrading wbox [#####################] 100%

7 22

[pacman-dev] RootDir using symlinks -> problem
by Xavier 16 Oct '07

16 Oct '07

I use the following options for using an alternate rootdir and testing stuff: RootDir = /home/xav/pacman/pacman/foo DBPath = /home/xav/pacman/pacman/foo/var/lib/pacman CacheDir = /home/xav/pacman/pacman/foo/var/cache/pacman/pkg with the following symlink : /home/xav/pacman -> /data/share/devel/pacman/ Running pacman -v with this config gives the following : Root : /data/share/devel/pacman/pacman/foo/ DB Path : /home/xav/pacman/pacman/foo/var/lib/pacman/ This makes the scriptlets handling in libalpm/trans.c break : 570 strncpy(scriptfn, installfn, PATH_MAX); 571 /* chop off the root so we can find the tmpdir in the chroot */ 572 scriptpath = scriptfn + strlen(root) - 1; Because for example: scriptfn = /home/xav/pacman/pacman/foo/var/lib/pacman/local/slocate-3.1-3/install root = /data/share/devel/pacman/pacman/foo/ so scriptpath result in /pacman/local/slocate-3.1-3/install, instead of /var/lib/pacman/local/slocate-3.1-3/install

4 19

[pacman-dev] pacman and maintainers
by Mateusz Jedrasik 16 Oct '07

16 Oct '07

Hi, I think it should be/would be nice if pacman could show who is the current maintainer of a particular package. It would make it a lot easier to contact them in case something is broken, not updated, or so. Currently one has to go to the lenghts of seeing cvsweb, downloading PKGBUILD, and searching for the maintainer in there, often (sometimes at least) ones who are no longer active. Cheers -- Mateusz Jędrasik <m.jedrasik(a)gmail.com> tel. +48(79)022-9393, +48(51)69-444-90 http://imachine.szklo.eu.org

5 10

[pacman-dev] pacman doesn't remove lockfile after -Sy failure
by Nagy Gabor 16 Oct '07

16 Oct '07

Hi! I said everything in the subject. You can test with /etc/rc.d/network stop pacman -Sy pacman -Sy Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 3

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-464-g128b288
by Dan McGee 15 Oct '07

15 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 128b288ca7f396d3cbb6c9620807075274bdbe8e (commit) via 3d7e06f204d7f94aa9d22cd4e4a895d2780025e8 (commit) via 4e6a03c4f6d413aa9f1c98d255c370c442ce55eb (commit) via 5d30c5c0b76e76b336abd2486ac6d24dd972fcc3 (commit) via abce73de4cc124da946a4da2d413b784332d91db (commit) via 0adedc536fe372b4def5954f3b24ca63ff86aecf (commit) via 5adb8d4b5ac6928ba1a0736d96ca6c533d8cbc76 (commit) via 3c4e98f7b56c17590965be9dbae25fe1915b75cb (commit) from 7f3adc3936ca66d86ff18e06e77da66bcef843ff (commit) - Log ----------------------------------------------------------------- commit 128b288ca7f396d3cbb6c9620807075274bdbe8e Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 14 18:52:17 2007 -0500 Fix scriptlet pactest cases so they 'succeed' again Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d7e06f204d7f94aa9d22cd4e4a895d2780025e8 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Oct 14 10:17:48 2007 +0200 libalpm/trans.c : fix a recently introduced breakage in scriptlets handling. Commit 4853a4aad97fe36f9237ffb7356201adab507a1c used the tmpdir variable for checking the existence of /bin/sh, without resetting it. This caused /bin/sh to be deleted during the cleanup part, as soon as a scriptlet other than pre_upgrade or pre_install was executed. For example, on the first post_upgrade during a -Su. I introduced two variables : clean_tmpdir and restore_cwd, for deciding what should be done in the cleanup part. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 4e6a03c4f6d413aa9f1c98d255c370c442ce55eb Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Oct 5 18:09:49 2007 +0200 libalpm/trans.c : remove the DBPath <-> RootDir dependence in runscriptlet. This code assumed that DBPath was under RootDir, while this is not necessarily the case : pacman doesn't enforce anymore than DBPath is under RootDir. So now, all scriptlets will be put somewhere in RootDir/tmp/, so that when it chroots in RootDir, the scriptlets are still available inside the chroot. This also removes the need of normalizing both dbpath and rootdir, in order to do computation on the paths. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 5d30c5c0b76e76b336abd2486ac6d24dd972fcc3 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Oct 5 17:10:51 2007 +0200 pacman/pacman.c : put back root check even if -r is specified. Root is needed for most install / remove operation, because it's needed for chrooting, for running scriptlets. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit abce73de4cc124da946a4da2d413b784332d91db Author: Nathan Jones <nathanj(a)insightbb.com> Date: Sun Oct 14 11:59:38 2007 -0400 Manually check xdelta exit codes. This is needed because 'xdelta delta' returns 1 even when the delta creation succeeds. This was causing makepkg to exit after the command due to bash's -e option. Some information from the xdelta man page: The delta command exits with status 0 to indicate that no differences were found, with status 1 to indicate that some differences were found, and with status 2 to indicate an error of some kind. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0adedc536fe372b4def5954f3b24ca63ff86aecf Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 14 17:29:32 2007 -0500 Updates to fix Doxygen documentation generation We had way too much going on with the Doxygen manpage generation. Clean it up quite a bit by removing directory manpages, using relative paths, not having a manpage for every single alpm function, and ensuring internal functions are not documented publicly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5adb8d4b5ac6928ba1a0736d96ca6c533d8cbc76 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 10 06:57:42 2007 -0500 util/testdb: fix up function naming We shouldn't use the _alpm prefix (copy-paste issue, no big deal). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3c4e98f7b56c17590965be9dbae25fe1915b75cb Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Oct 9 13:27:08 2007 -0500 Add two new pactests to check symlink behavior Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: doc/Doxyfile | 6 ++-- doc/Makefile.am | 2 +- lib/libalpm/alpm.h | 4 +- lib/libalpm/alpm_list.h | 6 +--- lib/libalpm/md5.h | 6 ++-- lib/libalpm/trans.c | 52 ++++++++++++++++++++++++---------------- pactest/tests/conflict005.py | 20 +++++++++++++++ pactest/tests/conflict006.py | 17 +++++++++++++ pactest/tests/scriptlet001.py | 5 ++++ pactest/tests/scriptlet002.py | 5 ++++ scripts/makepkg.sh.in | 29 +++++++++++++++------- src/pacman/pacman.c | 4 +-- src/util/testdb.c | 8 +++--- 13 files changed, 114 insertions(+), 50 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 7f3adc3936ca66d86ff18e06e77da66bcef843ff \ 128b288ca7f396d3cbb6c9620807075274bdbe8e

1 0

[pacman-dev] [PATCH] Manually check xdelta exit codes.
by Nathan Jones 14 Oct '07

14 Oct '07

This is needed because 'xdelta delta' returns 1 even when the delta creation succeeds. This was causing makepkg to exit after the command due to bash's -e option. Some information from the xdelta man page: The delta command exits with status 0 to indicate that no differences were found, with status 1 to indicate that some differences were found, and with status 2 to indicate an error of some kind. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- scripts/makepkg.sh.in | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4a68c84..193afe4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -900,17 +900,33 @@ create_xdelta() { msg "$(gettext "Making delta from version %s...")" "$latest_version" local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$CARCH.delta" + # 'xdelta delta' returns 1 even on success, so manually check exit codes + # bash's exit on error option must first be unset + set +e + # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if # TMP_DIR is unset) then perform the delta on the resulting tars xdelta delta "$base_file" "$pkg_file" "$delta_file" - # Generate the final gz using xdelta for compression. xdelta will be our - # common denominator compression utility between the packager and the users - # makepkg and pacman must use the same compression algorithm or the delta - # generated package may not match, producing md5 checksum errors. - msg2 "$(gettext "Recreating package tarball from delta to match md5 signatures")" - msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" - xdelta patch "$delta_file" "$base_file" "$pkg_file" + if [ $? = 0 -o $? = 1 ]; then + # Generate the final gz using xdelta for compression. xdelta will be our + # common denominator compression utility between the packager and the + # users. makepkg and pacman must use the same compression algorithm or + # the delta generated package may not match, producing md5 checksum + # errors. + msg2 "$(gettext "Recreating package tarball from delta to match md5 signatures")" + msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" + xdelta patch "$delta_file" "$base_file" "$pkg_file" + if [ $? != 0 ]; then + error "$(gettext "Could not generate the package from the delta.")" + exit 1 + fi + else + warning "$(gettext "Delta was not able to be created.")" + fi + + # turn exit on error back on + set -e else warning "$(gettext "No previous version found, skipping xdelta.")" fi -- 1.5.3.4

2 3

[pacman-dev] [PATCH 3/3] libalpm/trans.c : fix a recently introduced breakage in scriptlets handling.
by Chantry Xavier 14 Oct '07

14 Oct '07

Commit 4853a4aad97fe36f9237ffb7356201adab507a1c used the tmpdir variable for checking the existence of /bin/sh, without resetting it. This caused /bin/sh to be deleted during the cleanup part, as soon as a scriptlet other than pre_upgrade or pre_install was executed. For example, on the first post_upgrade during a -Su. I introduced two variables : clean_tmpdir and restore_cwd, for deciding what should be done in the cleanup part. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/trans.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)

1 0

[pacman-dev] [PATCH 2/3] libalpm/trans.c : remove the DBPath <-> RootDir dependence in runscriptlet.
by Chantry Xavier 14 Oct '07

14 Oct '07

This code assumed that DBPath was under RootDir, while this is not necessarily the case : pacman doesn't enforce anymore than DBPath is under RootDir. So now, all scriptlets will be put somewhere in RootDir/tmp/, so that when it chroots in RootDir, the scriptlets are still available inside the chroot. This also removes the need of normalizing both dbpath and rootdir, in order to do computation on the paths. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/trans.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-)

1 0

[pacman-dev] [PATCH 1/3] pacman/pacman.c : put back root check even if -r is specified.
by Chantry Xavier 14 Oct '07

14 Oct '07

Root is needed for most install / remove operation, because it's needed for chrooting, for running scriptlets. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- src/pacman/pacman.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)

1 0

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-456-g7f3adc3
by Dan McGee 09 Oct '07

09 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 7f3adc3936ca66d86ff18e06e77da66bcef843ff (commit) from 5e3a1bdec625412f07d99a56152959fcb10d6b04 (commit) - Log ----------------------------------------------------------------- commit 7f3adc3936ca66d86ff18e06e77da66bcef843ff Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 9 12:38:23 2007 -0500 Add new French Arch mirror Fix Aaron's busted-a** commit. :P Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: etc/pacman.d/mirrorlist.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 5e3a1bdec625412f07d99a56152959fcb10d6b04 \ 7f3adc3936ca66d86ff18e06e77da66bcef843ff

2 1

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-455-g5e3a1bd
by Aaron Griffin 09 Oct '07

09 Oct '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 5e3a1bdec625412f07d99a56152959fcb10d6b04 (commit) from 6db0562b8d3cda777650521f1205a541d0e0aa93 (commit) - Log ----------------------------------------------------------------- commit 5e3a1bdec625412f07d99a56152959fcb10d6b04 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Tue Oct 9 12:41:05 2007 -0500 New French mirror at ftp.free.fr Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> ----------------------------------------------------------------------- Diffstat: etc/pacman.d/mirrorlist.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 6db0562b8d3cda777650521f1205a541d0e0aa93 \ 5e3a1bdec625412f07d99a56152959fcb10d6b04

1 0

[pacman-dev] Future pacman development (3.2/4.0)
by Dan McGee 09 Oct '07

09 Oct '07

Here is a little email to get ideas flowing on what will follow the 3.1 release in pacman development. I might as well start it off with a bang by saying I think pacman (and especially libalpm) would be best if it got a full cleansing and rewrite. This is one of those things that is just tough to do, but I think all of us can see the benefits in doing it. We've seen where our current interface is a bit lacking, and we could find many ways to improve on that. There would also be the ability to rewrite pacman to be much more efficient in some of the operations that are currently the bottlenecks (namely lists). Lists could be replaced by hash tables in a few places (package caches?), and in other places we could simply use better list structures in order to navigate them more efficiently. I really like the idea of using a kernel list implementation to do this, as it would enforce typing. However, the details of that may need to be reasonably well hidden inside the library. If we were to do a rewrite, I think the best way would be to do it slowly and one piece at a time. Start with the backend interface and slowly build from there, setting interfaces at each level. Much of the code could be gleaned from the existing codebase, but scrutinized a bit to ensure it is of good quality and doing things the way we want to. Other code would end up in some burning inferno somewhere never to be seen again, which would make me more than happy. If we don't do a full rewrite, something that really needs looking at is the list data structures we use. alpm_list_last (called by alpm_list_add) is a huge bottleneck, consuming 40% of the time in a pacman -Su operation from start to when you are presented with the package list to install. That is pretty pathetic. A pacman -Qo operation is another great example of the inefficiency of the existing list structure. Thoughts and comments welcome. -Dan

8 31