Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=99a57a1f8bfe53c002cb09c783414516cad460e5
commit 99a57a1f8bfe53c002cb09c783414516cad460e5 Author: James Buren <[email protected]> Date: Sun Jul 1 02:23:49 2012 -0500 fw32-0.8.9-4-x86_64 * backport fix from git diff --git a/source/fw32-extra/fw32/FrugalBuild b/source/fw32-extra/fw32/FrugalBuild index bee4c9d..b13f3b6 100644 --- a/source/fw32-extra/fw32/FrugalBuild +++ b/source/fw32-extra/fw32/FrugalBuild @@ -3,7 +3,7 @@ pkgname=fw32 pkgver=0.8.9 -pkgrel=3 +pkgrel=4 pkgdesc="A framework for maintaining an i686 environment on x86_64." url="http://www.frugalware.org"; depends=('glibc' 'pacman-g2') @@ -13,7 +13,7 @@ up2date="Flasttar http://ftp.frugalware.org/pub/other/$pkgname"; backup=('etc/fw32/pacman-g2.conf') source=(http://ftp.frugalware.org/pub/other/$pkgname/$pkgname-$pkgver.tar.xz git.patch) sha1sums=('8fb725232342f35617f30559030b8e5743807a93' \ - '5a730047495ffe036a4a9cf7013659fc19d149af') + 'c836e9157e3ffa2bc6eb5c9ff81c23a2a01bec51') _F_systemd_scriptlet="$pkgname.install" _F_systemd_units=(fw32=) Finclude systemd diff --git a/source/fw32-extra/fw32/git.patch b/source/fw32-extra/fw32/git.patch index cc6aa30..a285e16 100644 --- a/source/fw32-extra/fw32/git.patch +++ b/source/fw32-extra/fw32/git.patch @@ -1,7 +1,16 @@ diff --git a/fw32.c b/fw32.c -index 6b45bcb..7d8f034 100644 +index 6b45bcb..20f914c 100644 --- a/fw32.c +++ b/fw32.c +@@ -270,7 +270,7 @@ ismounted(const char *path) + + *e = 0; + +- char *ptr = strstr(s,"\\040"); ++ char *ptr = strstr(s,"\\040(deleted)"); + + if(ptr) + *ptr = 0; @@ -364,7 +364,7 @@ umount_directory(FW32_DIR *path) { assert(path); @@ -11,6 +20,19 @@ index 6b45bcb..7d8f034 100644 error("Failed to umount directory: %s: %s\n",path->dir,strerror(errno)); } +@@ -414,10 +414,10 @@ umount_all(void) + + if(!strncmp(s,FW32_ROOT,strlen(FW32_ROOT))) + { +- char *ptr = strstr(s,"\\040"); ++ char *ptr = strstr(s,"\\040(deleted)"); + if(ptr) + *ptr = 0; +- if(fwrite(s,1,e-s,out) != e-s || fwrite("\n",1,1,out) != 1 || fflush(out)) ++ if(fprintf(out,"%s\n",s) < 0 || fflush(out)) + error("Failed to write to memory stream.\n"); + } + } diff --git a/pacman-g2.conf b/pacman-g2.conf index 464aad5..a53203f 100644 --- a/pacman-g2.conf _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
