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

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 22:00:35 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.54 -> 1.55) Loading package data from a file was ALWAYS generating the filelist, instead of using the in-package one. This is now fixed, and an autogenerated one is used as a last resort. This fixes the bug where /.CHANGELOG showed up in -Ql. -----------+ package.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.54 pacman-lib/lib/libalpm/package.c:1.55 --- pacman-lib/lib/libalpm/package.c:1.54 Wed Jan 31 20:51:12 2007 +++ pacman-lib/lib/libalpm/package.c Wed Jan 31 22:00:34 2007 @@ -241,11 +241,12 @@ int config = 0; int filelist = 0; int scriptcheck = 0; - register struct archive *archive; + struct archive *archive; struct archive_entry *entry; pmpkg_t *info = NULL; char *descfile = NULL; int fd = -1; + alpm_list_t *all_files = NULL; ALPM_LOG_FUNC; @@ -272,11 +273,14 @@ * from a libarchive archive, it can be done by reading * directly from the archive */ for(i = 0; archive_read_next_header (archive, &entry) == ARCHIVE_OK; i++) { + const char *entry_name = archive_entry_pathname(entry); + if(config && filelist && scriptcheck) { /* we have everything we need */ break; } - if(strcmp(archive_entry_pathname (entry), ".PKGINFO") == 0) { + + if(strcmp(entry_name, ".PKGINFO") == 0) { /* extract this file into /tmp. it has info for us */ descfile = strdup("/tmp/alpm_XXXXXX"); fd = mkstemp(descfile); @@ -299,10 +303,10 @@ FREE(descfile); close(fd); continue; - } else if(strcmp(archive_entry_pathname (entry), ".INSTALL") == 0) { + } else if(strcmp(entry_name, ".INSTALL") == 0) { info->scriptlet = 1; scriptcheck = 1; - } else if(strcmp(archive_entry_pathname (entry), ".FILELIST") == 0) { + } else if(strcmp(entry_name, ".FILELIST") == 0) { /* Build info->files from the filelist */ FILE *fp; char *fn; @@ -314,7 +318,7 @@ } fn = strdup("/tmp/alpm_XXXXXX"); fd = mkstemp(fn); - archive_read_data_into_fd (archive,fd); + archive_read_data_into_fd(archive,fd); fp = fopen(fn, "r"); while(!feof(fp)) { if(fgets(str, PATH_MAX, fp) == NULL) { @@ -334,28 +338,29 @@ continue; } else { scriptcheck = 1; - if(!filelist) { - /* no .FILELIST present in this package.. build the filelist the */ - /* old-fashioned way, one at a time */ - expath = strdup(archive_entry_pathname (entry)); - info->files = alpm_list_add(info->files, expath); - } + /* Keep track of all files so we can generate a filelist later if missing */ + all_files = alpm_list_add(all_files, strdup(entry_name)); } - if(archive_read_data_skip (archive)) { + if(archive_read_data_skip(archive)) { _alpm_log(PM_LOG_ERROR, _("bad package file in %s"), pkgfile); goto error; } expath = NULL; } - archive_read_finish (archive); + archive_read_finish(archive); 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; + } + + if(!filelist) { + _alpm_log(PM_LOG_ERROR, _("missing package filelist in %s, generating one"), pkgfile); + info->files = all_files; + } else { + alpm_list_free_inner(all_files, free); + alpm_list_free(all_files); } /* internal */ @@ -376,7 +381,7 @@ } error: FREEPKG(info); - archive_read_finish (archive); + archive_read_finish(archive); return(NULL); }

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:34:03 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.39 -> 1.40) It appears I misunderstood what this bash-ism did ---------+ makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.39 pacman-lib/scripts/makepkg:1.40 --- pacman-lib/scripts/makepkg:1.39 Wed Jan 31 21:12:49 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 21:34:03 2007 @@ -927,7 +927,7 @@ cd "$startdir/pkg" pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" -comp_files=".PKGINFO .FILELIST .INSTALL" +comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" if ! tar czf $pkg_file $comp_files *; then

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:29:07 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.109 -> 1.110) Cleaned up some of the metadata control -------+ add.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.109 pacman-lib/lib/libalpm/add.c:1.110 --- pacman-lib/lib/libalpm/add.c:1.109 Wed Jan 31 01:10:21 2007 +++ pacman-lib/lib/libalpm/add.c Wed Jan 31 21:29:07 2007 @@ -504,25 +504,17 @@ PROGRESS(trans, cb_state, what, (int)(percent * 100), alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); } - if(!strcmp(pathname, ".PKGINFO") || !strcmp(pathname, ".FILELIST")) { + if(strcmp(pathname, ".PKGINFO") == 0 || strcmp(pathname, ".FILELIST") == 0) { archive_read_data_skip (archive); continue; - } - - /*if(!strcmp(pathname, "._install") || !strcmp(pathname, ".INSTALL")) { - * the install script goes inside the db - * snprintf(expath, PATH_MAX, "%s/%s-%s/install", db->path, info->name, info->version); */ - if(!strcmp(pathname, "._install") || !strcmp(pathname, ".INSTALL") || - !strcmp(pathname, ".CHANGELOG")) { - if(!strcmp(pathname, ".CHANGELOG")) { - /* the changelog goes inside the db */ - snprintf(expath, PATH_MAX, "%s/%s-%s/changelog", db->path, - info->name, info->version); - } else { - /* the install script goes inside the db */ - snprintf(expath, PATH_MAX, "%s/%s-%s/install", db->path, - info->name, info->version); - } + } else if(strcmp(pathname, ".INSTALL") == 0) { + /* the install script goes inside the db */ + snprintf(expath, PATH_MAX, "%s/%s-%s/install", db->path, + info->name, info->version); + } else if(strcmp(pathname, ".CHANGELOG") == 0) { + /* the changelog goes inside the db */ + snprintf(expath, PATH_MAX, "%s/%s-%s/changelog", db->path, + info->name, info->version); } else { /* build the new pathname relative to handle->root */ snprintf(expath, PATH_MAX, "%s%s", handle->root, pathname);

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (package.c)
by Aaron Griffin 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:16:14 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: package.c (1.25 -> 1.26) -Ql needs the 'root' prepended to each file -----------+ package.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.25 pacman-lib/src/pacman/package.c:1.26 --- pacman-lib/src/pacman/package.c:1.25 Mon Jan 29 23:15:14 2007 +++ pacman-lib/src/pacman/package.c Wed Jan 31 21:16:13 2007 @@ -203,7 +203,8 @@ pkgfiles = alpm_pkg_get_files(pkg); for(i = pkgfiles; i; i = alpm_list_next(i)) { - fprintf(stdout, "%s %s\n", (char *)pkgname, (char *)alpm_list_getdata(i)); + fprintf(stdout, "%s %s%s\n", pkgname, alpm_option_get_root(), + (char *)alpm_list_getdata(i)); } fflush(stdout);

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by dan＠archlinux.org 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:12:49 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.38 -> 1.39) This removes the warning about skipping dependency checking when the user is either generating the md5sums, repackaging, or just downloading and extracting. The patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> ---------+ makepkg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.38 pacman-lib/scripts/makepkg:1.39 --- pacman-lib/scripts/makepkg:1.38 Wed Jan 31 21:02:45 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 21:12:49 2007 @@ -524,7 +524,10 @@ unset deplist makedeplist # fix flyspray bug #5973 if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then - warning "skipping dependency checks" + if [ "$NODEPS" = "1" ]; then + warning "skipping dependency checks" + fi + # skip printing a warning message for the others: geninteg, nobuild, repkg elif [ $(type -p pacman) ]; then msg "Checking Runtime Dependencies..." deplist=$(checkdeps ${depends[@]})

1 0

[pacman-dev] makepkg skip deps warning
by James Rosten 01 Feb '07

01 Feb '07

This removes the warning about skipping dependency checking when the user is either generating the md5sums, repackaging, or just downloading and extracting. The patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> # # old_revision [3498d7019151c435522f9e5e16086802c47817b7] # # patch "scripts/makepkg" # from [1a46635579e41cba0a1b90026f229ae572ebcbce] # to [37d27ab59d685c584be7b23a352d0fd9201518fb] # ============================================================ --- scripts/makepkg 1a46635579e41cba0a1b90026f229ae572ebcbce +++ scripts/makepkg 37d27ab59d685c584be7b23a352d0fd9201518fb @@ -524,7 +524,9 @@ if [ "$NODEPS" = "1" -o "$GENINTEG" = "1 unset deplist makedeplist # fix flyspray bug #5973 if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then - warning "skipping dependency checks" + if [ "$GENINTEG" != "1" -a "$NOBUILD" != "1" -a "$REPKG" != "1" ]; then + warning "skipping dependency checks" + fi elif [ $(type -p pacman) ]; then msg "Checking Runtime Dependencies..." deplist=$(checkdeps ${depends[@]})

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 21:02:45 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.37 -> 1.38) install scriptlet is _always_ .INSTALL ---------+ makepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.37 pacman-lib/scripts/makepkg:1.38 --- pacman-lib/scripts/makepkg:1.37 Wed Jan 31 20:59:26 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 21:02:45 2007 @@ -924,7 +924,7 @@ cd "$startdir/pkg" pkg_file="$PKGDEST/$pkgname-$pkgver-$pkgrel-${CARCH}.${PKGEXT}" -comp_files=".PKGINFO .FILELIST ${install:+.INSTALL}" +comp_files=".PKGINFO .FILELIST .INSTALL" [ $have_changelog -eq 1 ] && comp_files=".CHANGELOG $comp_files" if ! tar czf $pkg_file $comp_files *; then

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 20:59:26 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.36 -> 1.37) Move filelist creation ABOVE the other metafiles to keep them out of the list ---------+ makepkg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.36 pacman-lib/scripts/makepkg:1.37 --- pacman-lib/scripts/makepkg:1.36 Wed Jan 31 20:18:22 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 20:59:26 2007 @@ -861,6 +861,11 @@ fi size=$(du -cb $startdir/pkg | tail -n 1 | awk '{print $1}') +# build a filelist - do this first to keep meta files out of the list +msg "Generating .FILELIST file..." +cd "$startdir/pkg" +tar cvf /dev/null * | sort >.FILELIST + # write the .PKGINFO file msg "Generating .PKGINFO file..." cd $startdir/pkg @@ -914,11 +919,6 @@ have_changelog=1 fi -# build a filelist -msg "Generating .FILELIST file..." -cd "$startdir/pkg" -tar cvf /dev/null * | sort >.FILELIST - # tar it up msg "Compressing package..." cd "$startdir/pkg"

1 0

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

01 Feb '07

Date: Wednesday, January 31, 2007 @ 20:51:12 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.c (1.53 -> 1.54) * !strcmp reads funny (as "not string compare" - switch those to == 0, which has a positive connotation. * Added a nice TODO -----------+ package.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.53 pacman-lib/lib/libalpm/package.c:1.54 --- pacman-lib/lib/libalpm/package.c:1.53 Tue Jan 30 03:14:11 2007 +++ pacman-lib/lib/libalpm/package.c Wed Jan 31 20:51:12 2007 @@ -268,12 +268,15 @@ RET_ERR(PM_ERR_MEMORY, NULL); } + /* TODO there is no reason to make temp files to read + * from a libarchive archive, it can be done by reading + * directly from the archive */ for(i = 0; archive_read_next_header (archive, &entry) == ARCHIVE_OK; i++) { if(config && filelist && scriptcheck) { /* we have everything we need */ break; } - if(!strcmp(archive_entry_pathname (entry), ".PKGINFO")) { + if(strcmp(archive_entry_pathname (entry), ".PKGINFO") == 0) { /* extract this file into /tmp. it has info for us */ descfile = strdup("/tmp/alpm_XXXXXX"); fd = mkstemp(descfile); @@ -296,10 +299,10 @@ FREE(descfile); close(fd); continue; - } else if(!strcmp(archive_entry_pathname (entry), "._install") || !strcmp(archive_entry_pathname (entry), ".INSTALL")) { + } else if(strcmp(archive_entry_pathname (entry), ".INSTALL") == 0) { info->scriptlet = 1; scriptcheck = 1; - } else if(!strcmp(archive_entry_pathname (entry), ".FILELIST")) { + } else if(strcmp(archive_entry_pathname (entry), ".FILELIST") == 0) { /* Build info->files from the filelist */ FILE *fp; char *fn;

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by dan＠archlinux.org 01 Feb '07

01 Feb '07

Date: Wednesday, January 31, 2007 @ 20:18:22 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.35 -> 1.36) removal of unnecessary '\' in integrity check generation ---------+ makepkg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.35 pacman-lib/scripts/makepkg:1.36 --- pacman-lib/scripts/makepkg:1.35 Thu Jan 25 20:26:08 2007 +++ pacman-lib/scripts/makepkg Wed Jan 31 20:18:22 2007 @@ -626,7 +626,6 @@ msg "Generating ${integrity_name}s for source files" plain "" ct=0 - newline=0 numsrc=${#source[@]} for netfile in "${source[@]}"; do file=$(strip_url "$netfile") @@ -641,8 +640,7 @@ if [ $ct -eq $numsrc ]; then echo ')' else - echo ' \' - newline=0 + echo fi done plain ""

1 0