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

[pacman-dev] CVS update of pacman-lib/lib/libalpm (deps.c versioncmp.c)
by Aaron Griffin 18 Feb '07

18 Feb '07

Date: Sunday, February 18, 2007 @ 13:29:29 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: deps.c (1.66 -> 1.67) versioncmp.c (1.13 -> 1.14) * Fix version comparisons when one pkgrel doesn't exist (this ony fails on an == operation, technically, as 1.1.2-1 >= 1.1.2 is true. --------------+ deps.c | 6 +++--- versioncmp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.66 pacman-lib/lib/libalpm/deps.c:1.67 --- pacman-lib/lib/libalpm/deps.c:1.66 Fri Feb 16 17:41:51 2007 +++ pacman-lib/lib/libalpm/deps.c Sun Feb 18 13:29:28 2007 @@ -328,7 +328,7 @@ } /* else if still not found... */ if(!found) { - _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as a dependency for %s"), + _alpm_log(PM_LOG_DEBUG, _("missing dependency '%s' for package '%s'"), depend.name, tp->name); miss = _alpm_depmiss_new(tp->name, PM_DEP_TYPE_DEPEND, depend.mod, depend.name, depend.version); @@ -397,8 +397,7 @@ int _alpm_splitdep(char *depstr, pmdepend_t *depend) { - char *str = NULL; - char *ptr = NULL; + char *str = NULL, *ptr = NULL; if(depstr == NULL || depend == NULL) { return(-1); @@ -432,6 +431,7 @@ if(depend->mod != PM_DEP_MOD_EQ) { ptr++; } + STRNCPY(depend->version, ptr, PKG_VERSION_LEN); FREE(str); Index: pacman-lib/lib/libalpm/versioncmp.c diff -u pacman-lib/lib/libalpm/versioncmp.c:1.13 pacman-lib/lib/libalpm/versioncmp.c:1.14 --- pacman-lib/lib/libalpm/versioncmp.c:1.13 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/versioncmp.c Sun Feb 18 13:29:29 2007 @@ -238,7 +238,7 @@ if((!*one) && (!*two)) { /* compare release numbers */ - if(rel1 && rel2) return(_alpm_versioncmp(rel1, rel2)); + if(rel1 && rel2 && strlen(rel1) && strlen(rel2)) return(_alpm_versioncmp(rel1, rel2)); return(0); }

1 0

[pacman-dev] New Italian libalpm it.po
by Giovanni Scafora 18 Feb '07

18 Feb '07

Hi guys, can someone update my latest libalpm it.po file? Thanks again. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] CVS update of pacman-lib (14 files)
by Aaron Griffin 17 Feb '07

17 Feb '07

Date: Saturday, February 17, 2007 @ 03:55:06 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: .cvsignore (1.4 -> 1.5) lib/libalpm/add.c (1.114 -> 1.115) lib/libalpm/backup.c (1.10 -> 1.11) lib/libalpm/backup.h (1.5 -> 1.6) lib/libalpm/package.c (1.70 -> 1.71) lib/libalpm/package.h (1.29 -> 1.30) lib/libalpm/po/de.po (1.5 -> 1.6) lib/libalpm/po/fr.po (1.3 -> 1.4) lib/libalpm/po/hu.po (1.3 -> 1.4) lib/libalpm/po/pt_BR.po (1.2 -> 1.3) lib/libalpm/remove.c (1.63 -> 1.64) src/pacman/downloadprog.c (1.14 -> 1.15) src/pacman/log.c (1.30 -> 1.31) src/pacman/trans.c (1.35 -> 1.36) * A whole mess of backup changes - the code should be clearer, more organized, commented, and have worthwhile variable names now - proactive backup=()s now work. That is, adding a file to a backup array does what it should on the upgrade to that package, no longer forcing you to wait a full upgrade cycle for it to take effect * ldconfig was being run twice on an upgrade operation - fixed * fixed another pm_fprintf/printf output corruption with the progress bars * refactored some duplicate code for adjusting 'requiredby' lists * Added config.rpath to .cvsignore ---------------------------+ .cvsignore | 1 lib/libalpm/add.c | 668 ++++++++++++++++++++------------------------ lib/libalpm/backup.c | 4 lib/libalpm/backup.h | 2 lib/libalpm/package.c | 114 +++++++ lib/libalpm/package.h | 2 lib/libalpm/po/de.po | 33 +- lib/libalpm/po/fr.po | 337 +++++++++++----------- lib/libalpm/po/hu.po | 337 +++++++++++----------- lib/libalpm/po/pt_BR.po | 325 ++++++++++----------- lib/libalpm/remove.c | 103 +----- src/pacman/downloadprog.c | 5 src/pacman/log.c | 4 src/pacman/trans.c | 5 14 files changed, 1000 insertions(+), 940 deletions(-) The diff is longer than the limit of 39KB.

4 5

[pacman-dev] CVS update of pacman-lib/contrib (vimproject)
by Aaron Griffin 17 Feb '07

17 Feb '07

Date: Saturday, February 17, 2007 @ 05:19:09 Author: aaron Path: /home/cvs-pacman/pacman-lib/contrib Added: vimproject (1.1) Added a config file for the vim-project plugin for kicks. To use: pacman -S vim-project and read :h project enjoy ------------+ vimproject | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) Index: pacman-lib/contrib/vimproject diff -u /dev/null pacman-lib/contrib/vimproject:1.1 --- /dev/null Sat Feb 17 05:19:09 2007 +++ pacman-lib/contrib/vimproject Sat Feb 17 05:19:09 2007 @@ -0,0 +1,101 @@ +This is a project file for the vim-project +plugin. I like it, so decided to contribute +this to the main repo. +$ pacman -S vim-project +change the pacman= path below +$ vim +:Project vimproject + +pacman=~/devel/pacman-lib CD=. flags=S { + Makefile.am + configure.ac + libalpm=lib/libalpm/ filter="*.c *.h *.am"{ + add.c + alpm.c + alpm_list.c + backup.c + be_files.c + cache.c + conflict.c + db.c + deps.c + error.c + group.c + handle.c + log.c + md5.c + md5driver.c + package.c + provide.c + remove.c + server.c + sha1.c + sync.c + trans.c + util.c + versioncmp.c + add.h + alpm.h + alpm_list.h + backup.h + cache.h + conflict.h + db.h + deps.h + error.h + group.h + handle.h + log.h + md5.h + package.h + provide.h + remove.h + server.h + sha1.h + sync.h + trans.h + util.h + versioncmp.h + Makefile.am + Makefile.in + } + pacman=src/pacman/ filter="*.c *.h *.am" { + add.c + conf.c + deptest.c + downloadprog.c + log.c + package.c + pacman.c + query.c + remove.c + sync.c + trans.c + upgrade.c + util.c + add.h + conf.h + deptest.h + downloadprog.h + log.h + package.h + query.h + remove.h + sync.h + trans.h + upgrade.h + util.h + Makefile.am + } + utils=src/util filter="*.c *.h *.am" { + testpkg.c + vercmp.c + Makefile.am + } + contrib=contrib CD=. { + bash_completion + pacsearch + vimproject + zsh_completion + } +}

1 0

[pacman-dev] New libalpm_it.po Italian
by Giovanni Scafora 17 Feb '07

17 Feb '07

Hi guys, this is new italian libalpm_it.po file. Please upgrade it. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [Bug] using strlen with utf8
by Pierre Schmitz 17 Feb '07

17 Feb '07

Hi, it seems as if the function strlen only counts the number of bytes within a given string and not the number of characters. In case of utf8 a character can have a length of one or two bytes. The attached screenshot show that in trans.c:337 the length is calculated wrong (because he counts the ü twice). When replacing ü with ue everything is right. Pierre -- http://www.archlinux.de

2 4

[pacman-dev] CVS update of pacman-lib (TODO.dan)
by dan＠archlinux.org 17 Feb '07

17 Feb '07

Date: Saturday, February 17, 2007 @ 00:06:13 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.10 -> 1.11) Small updates, read diff for details ----------+ TODO.dan | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.10 pacman-lib/TODO.dan:1.11 --- pacman-lib/TODO.dan:1.10 Wed Feb 14 14:35:41 2007 +++ pacman-lib/TODO.dan Sat Feb 17 00:06:13 2007 @@ -70,6 +70,9 @@ issues- use non-printf when necessary, make sure all two line printed messages (especially usage instructions) are printed using one print statement. +Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should +allow us to do this. + Other ideas: ============ @@ -77,8 +80,6 @@ Possibly split utilities/extras from pacman package -Rewrite gensync/updatesync - FS #4185 - move where message is logged, perhaps? ideas mentioned here- http://bbs.archlinux.org/viewtopic.php?id=29450- add a @@ -108,3 +109,11 @@ Revamp the downloadprog function a bit. Seems kind of messy. Add localized pkgdesc variables to makepkg. + +Fix inconsistency of args- _alpm_db_read, _alpm_db_write + +--print-uri option to sync should not require saying yes or no to up to date + +Resurrect test scripts, and add ones as needed. Testing by scripts > testing by +hand. +

1 0

[pacman-dev] CVS update of pacman-lib/contrib (pacsearch)
by dan＠archlinux.org 17 Feb '07

17 Feb '07

Date: Friday, February 16, 2007 @ 23:40:00 Author: dan Path: /home/cvs-pacman/pacman-lib/contrib Added: pacsearch (1.1) * Adding pacsearch - a script to search both the sync repos and locally installed packages in color, and indicate those which are installed. -----------+ pacsearch | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) Index: pacman-lib/contrib/pacsearch diff -u /dev/null pacman-lib/contrib/pacsearch:1.1 --- /dev/null Fri Feb 16 23:40:00 2007 +++ pacman-lib/contrib/pacsearch Fri Feb 16 23:39:59 2007 @@ -0,0 +1,77 @@ +#!/bin/bash +# pacsearch - Adds color and install information to a 'pacman -Ss' search +# +# Copyright (C) 2006-2007 Dan McGee <dpmcgee(a)gmail.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +#TODO: colors flag on commandline + +readonly progname="pacsearch" + +readonly CLR1='\\\e[0;34m' +readonly CLR2='\\\e[0;32m' +readonly CLR3='\\\e[0;35m' +readonly CLR4='\\\e[0;36m' +readonly CLR5='\\\e[0;31m' +readonly CLR6='\\\e[0;33m' +readonly CLR7='\\\e[1;36m' +readonly INST='\\\e[1;31m' +readonly BASE='\\\e[0m' + +if [ -z "$1" ]; then + echo "Usage: $progname <pattern>" + echo "Ex: $progname ^gnome" + exit 0 +fi + +# Make two temp files and send output of commands to these files +querydump=$(mktemp) +pacman -Qs $1 > $querydump +syncdump=$(mktemp) +pacman -Ss $1 > $syncdump + +# Strip descriptions and 'local/' from -Qs query +instpkg=$(mktemp) +egrep '^[^ ]' $querydump | sed -e 's@^local/@@' > $instpkg + +# Add pkgs not in sync db, mark pkgs that are installed +cat $instpkg | while read -r pkg; do + if [ -z "$(grep "$pkg" $syncdump)" ]; then + # grep package name; pipe to another grep that prints at most one + # line starting with 'local/', allows for comments >1 line + grep -A10 "$pkg" $querydump | grep -A10 -m1 "local/" >> $syncdump + fi + sed -i "s@^$.\+/$pkg$@\***\1@" $syncdump +done + +# Print colorized package list and descriptions to screen +echo -e "$(sed -r \ + -e "s@current/.*@$CLR1&$BASE@" \ + -e "s@extra/.*@$CLR2&$BASE@" \ + -e "s@community/.*@$CLR3&$BASE@" \ + -e "s@testing/.*@$CLR4&$BASE@" \ + -e "s@unstable/.*@$CLR5&$BASE@" \ + -e "s@custom/.*@$CLR6&$BASE@" \ + -e "s@local/.*@$CLR7&$BASE@" \ + -e "s@(^|\*\*\*)([[:alnum:]]*/.* .*)@\1$CLR6\2$BASE@" \ + -e "s@\*\*\*@$INST&@" \ + < $syncdump )" +echo -en "\e[0m" + +rm $querydump +rm $syncdump +rm $instpkg +

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (alpm_list.h deps.c)
by dan＠archlinux.org 16 Feb '07

16 Feb '07

Date: Friday, February 16, 2007 @ 17:41:51 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm_list.h (1.4 -> 1.5) deps.c (1.65 -> 1.66) * Removed unnecessary #define * Added comment for something I noticed while looking through code -------------+ alpm_list.h | 1 - deps.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/alpm_list.h diff -u pacman-lib/lib/libalpm/alpm_list.h:1.4 pacman-lib/lib/libalpm/alpm_list.h:1.5 --- pacman-lib/lib/libalpm/alpm_list.h:1.4 Tue Feb 13 03:15:38 2007 +++ pacman-lib/lib/libalpm/alpm_list.h Fri Feb 16 17:41:51 2007 @@ -60,7 +60,6 @@ alpm_list_t *alpm_list_next(alpm_list_t *list); alpm_list_t *alpm_list_last(alpm_list_t *list); void *alpm_list_getdata(const alpm_list_t *entry); -#define alpm_list_data(type, list) (type)alpm_list_getdata((list)) /* misc */ int alpm_list_count(const alpm_list_t *list); Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.65 pacman-lib/lib/libalpm/deps.c:1.66 --- pacman-lib/lib/libalpm/deps.c:1.65 Wed Jan 31 02:14:50 2007 +++ pacman-lib/lib/libalpm/deps.c Fri Feb 16 17:41:51 2007 @@ -138,6 +138,7 @@ for(i = newtargs; i; i = i->next) { pmpkg_t *p = (pmpkg_t*)i->data; _alpm_log(PM_LOG_DEBUG, "sorting %s", p->name); + /* TODO this may not always work if p->data is a fd, not db */ _alpm_db_read(p->data, INFRQ_DEPENDS, p); for(j = p->depends; j; j = j->next) { pmdepend_t dep;

1 0

[pacman-dev] CVS update of pacman-lib (NEWS)
by dan＠archlinux.org 16 Feb '07

16 Feb '07

Date: Friday, February 16, 2007 @ 16:49:00 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.7 -> 1.8) Updated NEWS file with some of Roman's suggestions. ------+ NEWS | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.7 pacman-lib/NEWS:1.8 --- pacman-lib/NEWS:1.7 Tue Feb 6 17:36:13 2007 +++ pacman-lib/NEWS Fri Feb 16 16:48:59 2007 @@ -15,19 +15,23 @@ - reduced unnecessary calling of ldconfig - selective loading of database to speed up certain operations - switch to usage of libdownload and libarchive + - improved proxy support as a result of switch to libdownload - debugging output improved with --debug flag - added 'rankmirrors' - script to show best available mirrors - added 'repo-add' - the backbone script for building repos - added pactest testing suite - abs - supports cvsup/csup, expanded configuration + - abs - supports fetching of testing repository - makepkg fixes: - new configuration file options format - support alternate integrity checks - extract files using filetype, not extension - added noextract array - - added option to log build process - - added repackage option - repackage pkg/ w/o building + - new option to log build process + - new repackage option - repackage pkg/ w/o building + - user-selectable paths for doc stripping - configurable source cache location + - dependencies now removed on a build success or failure - pacman-optimize - support DB's on separate filesystem 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew

3 3