- Pacman-dev - lists.archlinux.org

[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

[pacman-dev] makepkg.conf - trouble 'upgrading'
by Dan McGee 01 Feb '07

01 Feb '07

When we do roll all this out, everyone is going to get a new makepkg.conf.pacnew file. Our format has changed a bit so we should probably mention this in the install message (e.g. no longer putting export in front of variables, new variables, etc.). One of the new additions is the INTEGRITY_CHECK variable. If this is not present in makepkg,conf, makepkg fails silently as I discovered tonight- when generating it does not generate, and the integrity checks never happen when building. I bring this one up more than anything because isn't this fairly standard and unlikely to be changed by the user? Should this just be at the top of makepkg.conf? It seems like a distribution-wide thing that is standard, and it should join BUILDSCRIPT and PKGEXT at the top of makepkg. -Dan

1 0

[pacman-dev] Removal of bindings
by Jürgen Hötzel 31 Jan '07

31 Jan '07

Hi, I don't know why language bindings generation is part of the pacman-lib CVS repository. Any swig-supported (not only perl/python/java) language binding can be generated from alpm.h and a swig interface file. Real language bindings will also ship higher level function/classes. So i would prefer to remove automated bindings generation. Jürgen

3 3

[pacman-dev] Fun supplementary files
by Aaron Griffin 31 Jan '07

31 Jan '07

I wanted to put this out there. There's a handful of supplementary files that would be nice to have in pacman cvs. One that I can think of off the top of my head, is an 'indent.pro' (see The Fine Manual for details) file for GNU indent (based on the pacman coding guidelines). In addition, it'd be nice to have a guide for translators, so they would know how to send translations (I don't feel qualified to write something like that). I had some more, I'll tack them on with other emails later. This is mainly here for people with free time who want to help out, so feel free to submit anything you feel would be worthwhile. Thanks, aaron

2 1