- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (4 files)
by Aaron Griffin 23 Jan '07

23 Jan '07

Date: Monday, January 22, 2007 @ 20:34:58 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/alpm_list.c (1.2 -> 1.3) lib/libalpm/db.c (1.54 -> 1.55) lib/libalpm/group.c (1.11 -> 1.12) src/pacman/sync.c (1.95 -> 1.96) * Added some calloc calls to replace the malloc-then-set-to-zero functionality * Fixed -Ss output so as not to call alpm_list_getdata with a NULl list * Added a NULL check in alpm_list_getdata * Fixed alpm_list_add_sorted to properly handle a new / beginning insertions -------------------------+ lib/libalpm/alpm_list.c | 5 ++++- lib/libalpm/db.c | 8 ++------ lib/libalpm/group.c | 5 +---- src/pacman/sync.c | 23 ++++++++++++++++------- 4 files changed, 23 insertions(+), 18 deletions(-) Index: pacman-lib/lib/libalpm/alpm_list.c diff -u pacman-lib/lib/libalpm/alpm_list.c:1.2 pacman-lib/lib/libalpm/alpm_list.c:1.3 --- pacman-lib/lib/libalpm/alpm_list.c:1.2 Mon Jan 22 04:27:00 2007 +++ pacman-lib/lib/libalpm/alpm_list.c Mon Jan 22 20:34:58 2007 @@ -145,8 +145,10 @@ if(prev != NULL) { prev->next = add; /* In middle. */ + } else { + list = add; /* At beginning, or new list */ } - + return(list); } } @@ -369,6 +371,7 @@ */ void *alpm_list_getdata(const alpm_list_t *entry) { + if(entry == NULL) return(NULL); return(entry->data); } Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.54 pacman-lib/lib/libalpm/db.c:1.55 --- pacman-lib/lib/libalpm/db.c:1.54 Fri Jan 19 04:28:44 2007 +++ pacman-lib/lib/libalpm/db.c Mon Jan 22 20:34:58 2007 @@ -55,14 +55,14 @@ { pmdb_t *db; - db = (pmdb_t *)malloc(sizeof(pmdb_t)); + db = calloc(1, sizeof(pmdb_t)); if(db == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failed: could not allocate %d bytes"), sizeof(pmdb_t)); RET_ERR(PM_ERR_MEMORY, NULL); } - db->path = (char *)malloc(strlen(root)+strlen(dbpath)+strlen(treename)+2); + db->path = calloc(1, strlen(root)+strlen(dbpath)+strlen(treename)+2); if(db->path == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failed: could not allocate %d bytes"), strlen(root)+strlen(dbpath)+strlen(treename)+2); @@ -73,10 +73,6 @@ STRNCPY(db->treename, treename, PATH_MAX); - db->pkgcache = NULL; - db->grpcache = NULL; - db->servers = NULL; - return(db); } Index: pacman-lib/lib/libalpm/group.c diff -u pacman-lib/lib/libalpm/group.c:1.11 pacman-lib/lib/libalpm/group.c:1.12 --- pacman-lib/lib/libalpm/group.c:1.11 Fri Jan 19 04:28:45 2007 +++ pacman-lib/lib/libalpm/group.c Mon Jan 22 20:34:58 2007 @@ -36,16 +36,13 @@ { pmgrp_t* grp; - grp = (pmgrp_t *)malloc(sizeof(pmgrp_t)); + grp = calloc(1, sizeof(pmgrp_t)); if(grp == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes"), sizeof(pmgrp_t)); RET_ERR(PM_ERR_MEMORY, NULL); } - grp->name[0] = '\0'; - grp->packages = NULL; - return(grp); } Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.95 pacman-lib/src/pacman/sync.c:1.96 --- pacman-lib/src/pacman/sync.c:1.95 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/sync.c Mon Jan 22 20:34:58 2007 @@ -248,14 +248,20 @@ continue; } for(j = ret; j; j = alpm_list_next(j)) { + char *group = NULL; + alpm_list_t *grp; pmpkg_t *pkg = alpm_list_getdata(j); - char *group = (char *)alpm_list_getdata(alpm_pkg_get_groups(pkg)); - printf("%s/%s %s %s%s%s\n ", - alpm_db_get_name(db), - alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), - (group ? " (" : ""), (group ? group : ""), (group ? ") " : "")); + printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); + + if((grp = alpm_pkg_get_groups(pkg)) != NULL) { + group = alpm_list_getdata(grp); + printf(" (%s)\n ", (char *)alpm_list_getdata(grp)); + } else { + printf("\n "); + } + indentprint(alpm_pkg_get_desc(pkg), 4); printf("\n\n"); } @@ -280,9 +286,12 @@ if(targets) { for(i = targets; i; i = alpm_list_next(i)) { + char *grpname = alpm_list_getdata(i); for(j = syncs; j; j = alpm_list_next(j)) { pmdb_t *db = alpm_list_getdata(j); - pmgrp_t *grp = alpm_db_readgrp(db, alpm_list_getdata(i)); + printf("searching '%s' for groups '%s'\n", alpm_db_get_name(db), grpname); + fflush(stdout); + pmgrp_t *grp = alpm_db_readgrp(db, grpname); if(grp) { MSG(NL, "%s\n", (char *)alpm_grp_get_name(grp));

3 2

[pacman-dev] remove.c - after pacsave still tries to delete
by James Rosten 23 Jan '07

23 Jan '07

I noticed that even after moving it to *.pacsave it will still try to delete the original file which fails and causes an error message which will only 'cause the user to worry about this (possibly), which they don't need to. Patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com>

2 1

[pacman-dev] CVS update of pacman-lib/lib/libalpm (remove.c)
by Aaron Griffin 23 Jan '07

23 Jan '07

Date: Tuesday, January 23, 2007 @ 11:05:21 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: remove.c (1.56 -> 1.57) James Rosten <seinfeld90(a)gmail.com> * attempt to unlink file AFTER moving to .pacsave always fails ----------+ remove.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.56 pacman-lib/lib/libalpm/remove.c:1.57 --- pacman-lib/lib/libalpm/remove.c:1.56 Fri Jan 19 04:28:45 2007 +++ pacman-lib/lib/libalpm/remove.c Tue Jan 23 11:05:21 2007 @@ -225,9 +225,10 @@ int list_count = alpm_list_count(trans->packages); /* this way we don't have to call alpm_list_count twice during PROGRESS */ PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, (double)(percent * 100), list_count, (list_count - alpm_list_count(targ) + 1)); ++(*position); - } - if (unlink(line) == -1) { - _alpm_log(PM_LOG_ERROR, _("cannot remove file %s: %s"), file, strerror(errno)); + + if (unlink(line) == -1) { + _alpm_log(PM_LOG_ERROR, _("cannot remove file %s: %s"), file, strerror(errno)); + } } } }

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 23 Jan '07

23 Jan '07

Date: Tuesday, January 23, 2007 @ 11:02:37 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.33 -> 1.34) James Rosten <seinfeld90(a)gmail.com> * noextract PKGBUILD option to NOT extract source files - implemented with existing in_array function ---------+ makepkg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.33 pacman-lib/scripts/makepkg:1.34 --- pacman-lib/scripts/makepkg:1.33 Mon Jan 22 14:26:23 2007 +++ pacman-lib/scripts/makepkg Tue Jan 23 11:02:37 2007 @@ -425,7 +425,7 @@ unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force unset replaces depends conflicts backup source install build makedepends -unset options +unset options noextract # some applications (eg, blackbox) will not build with some languages unset LC_ALL LANG @@ -681,6 +681,11 @@ for netfile in "${source[@]}"; do unziphack=0 file=$(strip_url "$netfile") + if in_array "$file" ${noextract[@]}; then + #skip source files in the noextract=() array + # these are marked explicitly to NOT be extracted + continue + fi # fix flyspray #6246 file_type=$(file -biz "$file") unset cmd

1 0

[pacman-dev] FS #6246 - makepkg fails if the extensions is wrong on the archive
by James Rosten 22 Jan '07

22 Jan '07

This is a fix for FS #6246 ( http://bugs.archlinux.org/task/6246 ). Instead of using the extension of the source archive, I make use of file -biz (the z allows use to know if it is just a bzip2 or a tar.bzip2). As usual the patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com>

4 9

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 22 Jan '07

22 Jan '07

Date: Monday, January 22, 2007 @ 14:26:23 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.32 -> 1.33) Lowercase "changelog" in output message ---------+ makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.32 pacman-lib/scripts/makepkg:1.33 --- pacman-lib/scripts/makepkg:1.32 Mon Jan 22 12:53:56 2007 +++ pacman-lib/scripts/makepkg Mon Jan 22 14:26:23 2007 @@ -898,7 +898,7 @@ # do we have a changelog? have_changelog=0 if [ -f "$startdir/ChangeLog" ]; then - msg "Copying package ChangeLog" + msg "Copying package changelog" cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" have_changelog=1 fi

1 0

[pacman-dev] [patch] extra newlines in package install reason
by Dan McGee 22 Jan '07

22 Jan '07

Newlines were included in both setting the string variable and in the printf, remove the extra ones. Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> --- pacman-lib.orig/src/pacman/package.c 2007-01-21 17:42:14.000000000 -0500 +++ pacman-lib/src/pacman/package.c 2007-01-21 17:40:50.000000000 -0500 @@ -49,13 +49,13 @@ void dump_pkg_full(pmpkg_t *pkg, int lev switch((long)alpm_pkg_get_reason(pkg)) { case PM_PKG_REASON_EXPLICIT: - reason = _("Explicitly installed\n"); + reason = _("Explicitly installed"); break; case PM_PKG_REASON_DEPEND: - reason = _("Installed as a dependency for another package\n"); + reason = _("Installed as a dependency for another package"); break; default: - reason = _("Unknown\n"); + reason = _("Unknown"); break; }

5 7

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 22 Jan '07

22 Jan '07

Date: Monday, January 22, 2007 @ 04:57:21 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.30 -> 1.31) Changelog support for makepkg - this has been in pacman itself for some time, but I don't know why I never crammed the changes for makepkg in. * Adds a "Changelog" file next to a PKGBUILD as part of the package (viewed with pacman -Qc) ---------+ makepkg | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.30 pacman-lib/scripts/makepkg:1.31 --- pacman-lib/scripts/makepkg:1.30 Mon Jan 22 03:45:12 2007 +++ pacman-lib/scripts/makepkg Mon Jan 22 04:57:20 2007 @@ -892,27 +892,36 @@ # check for an install script if [ "$install" != "" ]; then msg "Copying install script..." - cp $startdir/$install $startdir/pkg/.INSTALL + cp "$startdir/$install" "$startdir/pkg/.INSTALL" +fi + +# do we have a changelog? +have_changelog=0 +if [ -f "$startdir/Changelog" ]; then + msg "Copying package Changelog" + cp "$startdir/Changelog" "$startdir/pkg/.CHANGELOG" + have_changelog=1 fi # build a filelist msg "Generating .FILELIST file..." -cd $startdir/pkg +cd "$startdir/pkg" tar cvf /dev/null * | sort >.FILELIST # tar it up msg "Compressing package..." -cd $startdir/pkg +cd "$startdir/pkg" pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" +[ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" if ! tar czf $pkg_file $comp_files *; then error "Failed to create package file." exit 1 fi -cd $startdir +cd "$startdir" if [ "$CLEANUP" = "1" ]; then msg "Cleaning up..." rm -rf src pkg

4 5

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 22 Jan '07

22 Jan '07

Date: Monday, January 22, 2007 @ 12:53:57 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.31 -> 1.32) Rename Changelog -> ChangeLog (the standard way of casing a ChangeLog) ---------+ makepkg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.31 pacman-lib/scripts/makepkg:1.32 --- pacman-lib/scripts/makepkg:1.31 Mon Jan 22 04:57:20 2007 +++ pacman-lib/scripts/makepkg Mon Jan 22 12:53:56 2007 @@ -897,9 +897,9 @@ # do we have a changelog? have_changelog=0 -if [ -f "$startdir/Changelog" ]; then - msg "Copying package Changelog" - cp "$startdir/Changelog" "$startdir/pkg/.CHANGELOG" +if [ -f "$startdir/ChangeLog" ]; then + msg "Copying package ChangeLog" + cp "$startdir/ChangeLog" "$startdir/pkg/.CHANGELOG" have_changelog=1 fi

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.c)
by Aaron Griffin 22 Jan '07

22 Jan '07

Date: Monday, January 22, 2007 @ 11:16:52 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.48 -> 1.49) * Added a check for .FILELIST for package validity in addition to .PKGINFO -----------+ package.c | 3 +++ 1 file changed, 3 insertions(+) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.48 pacman-lib/lib/libalpm/package.c:1.49 --- pacman-lib/lib/libalpm/package.c:1.48 Fri Jan 19 18:44:50 2007 +++ pacman-lib/lib/libalpm/package.c Mon Jan 22 11:16:51 2007 @@ -339,6 +339,9 @@ if(!config) { _alpm_log(PM_LOG_ERROR, _("missing package info file in %s"), pkgfile); goto error; + } else if(!filelist) { + _alpm_log(PM_LOG_ERROR, _("missing package filelist in %s"), pkgfile); + goto error; } /* internal */

1 0