- Pacman-dev - lists.archlinux.org

[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

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

22 Jan '07

Date: Monday, January 22, 2007 @ 04:27:01 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm_list.c (1.1 -> 1.2) Introduced an infinite loop during the pmlist -> alpm_list transition, whoops -------------+ alpm_list.c | 1 + 1 file changed, 1 insertion(+) Index: pacman-lib/lib/libalpm/alpm_list.c diff -u pacman-lib/lib/libalpm/alpm_list.c:1.1 pacman-lib/lib/libalpm/alpm_list.c:1.2 --- pacman-lib/lib/libalpm/alpm_list.c:1.1 Fri Jan 19 04:28:44 2007 +++ pacman-lib/lib/libalpm/alpm_list.c Mon Jan 22 04:27:00 2007 @@ -420,6 +420,7 @@ if(lp->data && strcmp((const char *)lp->data, needle) == 0) { return(1); } + lp = lp->next; } return(0); }

1 0

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

22 Jan '07

Date: Monday, January 22, 2007 @ 03:52:18 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: package.c (1.22 -> 1.23) * Dan McGee <dpmcgee(a)gmail.com> Newlines were included in both setting the string variable and in the printf, remove the extra ones. -----------+ package.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.22 pacman-lib/src/pacman/package.c:1.23 --- pacman-lib/src/pacman/package.c:1.22 Mon Jan 22 03:46:12 2007 +++ pacman-lib/src/pacman/package.c Mon Jan 22 03:52:18 2007 @@ -50,13 +50,13 @@ 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; }

1 0

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

22 Jan '07

Date: Monday, January 22, 2007 @ 03:46:12 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: package.c (1.21 -> 1.22) Removed list.h -----------+ package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.21 pacman-lib/src/pacman/package.c:1.22 --- pacman-lib/src/pacman/package.c:1.21 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/package.c Mon Jan 22 03:46:12 2007 @@ -27,10 +27,10 @@ #include <libintl.h> #include <alpm.h> +#include <alpm_list.h> /* pacman */ #include "log.h" #include "util.h" -#include "list.h" #include "package.h" /* Display the content of an installed package

1 0

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

22 Jan '07

Date: Monday, January 22, 2007 @ 03:45:12 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.29 -> 1.30) makepkg file-type detection changes from James Rosten <seinfeld90(a)gmail.com> and Johannes Weiner <hannes(a)saeurebad.de> This should fix FS#6246 ---------+ makepkg | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.29 pacman-lib/scripts/makepkg:1.30 --- pacman-lib/scripts/makepkg:1.29 Wed Jan 17 00:29:54 2007 +++ pacman-lib/scripts/makepkg Mon Jan 22 03:45:12 2007 @@ -681,24 +681,20 @@ for netfile in "${source[@]}"; do unziphack=0 file=$(strip_url "$netfile") + # fix flyspray #6246 + file_type=$(file -biz "$file") unset cmd - case "$(echo $file |tr "A-Z" "a-z")" in - *.tar.gz|*.tar.z|*.tgz) - cmd="tar --use-compress-program=gzip -xf $file" ;; - *.tar.bz2|*.tbz2) - cmd="tar --use-compress-program=bzip2 -xf $file" ;; - *.tar) + case "$file_type" in + *application/x-tar*) cmd="tar -xf $file" ;; - *.zip) + *application/x-zip*) unziphack=1 cmd="unzip -qqo $file" ;; - *.cpio.gz) + *application/x-cpio*) cmd="bsdtar -x -f $file" ;; - *.cpio.bz2) - cmd="bsdtar -x -f $file" ;; - *.gz) + *application/x-gzip*) cmd="gunzip -f $file" ;; - *.bz2) + *application/x-bzip*) cmd="bunzip2 -f $file" ;; esac if [ "$cmd" != "" ]; then

1 0