Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gcc43.git;a=commitdiff;h=c7648da274b3adefcbcd7227d3bc7c93b51c867d
commit c7648da274b3adefcbcd7227d3bc7c93b51c867d Author: crazy <[EMAIL PROTECTED]> Date: Wed Mar 12 03:12:32 2008 +0100 reiserfsprogs-3.6.19-3-i686 * rebuild * added 2 patches to fix the build diff --git a/source/base/reiserfsprogs/FrugalBuild b/source/base/reiserfsprogs/FrugalBuild index 7c73f3a..e1fffcc 100644 --- a/source/base/reiserfsprogs/FrugalBuild +++ b/source/base/reiserfsprogs/FrugalBuild @@ -3,18 +3,23 @@ pkgname=reiserfsprogs pkgver=3.6.19 -pkgrel=2 +pkgrel=3 pkgdesc="Reiserfs utilities" url="http://www.namesys.com"; -depends=('e2fsprogs') +depends=('e2fsprogs>=1.40.6-2') groups=('base') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://www.namesys.com/download.html|grep reiserfsprogs|sed -n '1 p'|tr -s ' '|sed 's/.tar.gz.//'|cut -d - -f 2" -source=(ftp://ftp.namesys.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) -sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188') +#source=(ftp://ftp.namesys.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://www.sfr-fresh.com/linux/misc/$pkgname-$pkgver.tar.gz \ + reiserfsprogs-3.6.19-fsck-n.patch reiserfsprogs-3.6.19-unaligned.patch) +sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188' \ + 'fa42d0f5ea6b3210932fe4f16e1dd24caa7a55b0' \ + 'fd97c2e9c9a8dc2064e74e41e7f6b4d8e3b61a09') build() { + unset MAKEFLAGS Fbuild || return 1 Fmv /usr/sbin / Fln reiserfsck /sbin/fsck.reiserfs diff --git a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch new file mode 100644 index 0000000..2146c94 --- /dev/null +++ b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch @@ -0,0 +1,12 @@ +diff -ur reiserfsprogs-3.6.19.orig/fsck/main.c reiserfsprogs-3.6.19/fsck/main.c +--- reiserfsprogs-3.6.19.orig/fsck/main.c 2004-10-07 15:04:08.000000000 +0100 ++++ reiserfsprogs-3.6.19/fsck/main.c 2007-05-02 16:05:08.000000000 +0100 +@@ -416,7 +416,7 @@ + (data->log == stdout) ? "stdout" : + (data->log_file_name ? data->log_file_name : "fsck.run")); + +- if (!(data->options & OPT_YES) && !user_confirmed (warn_to, "\nDo you want to " ++ if (!(data->options & OPT_YES) && !(data->options & OPT_SILENT) && !user_confirmed (warn_to, "\nDo you want to " + "run this program?[N/Yes] (note need to type Yes if you do):", "Yes\n")) + exit (EXIT_USER); + } diff --git a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch new file mode 100644 index 0000000..5883ce8 --- /dev/null +++ b/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch @@ -0,0 +1,35 @@ +backported from 3.6.20 + +http://bugs.gentoo.org/153494 + +--- include/reiserfs_fs.h ++++ include/reiserfs_fs.h +@@ -38,14 +38,22 @@ + # define extern_inline + #endif + +-#include <asm/unaligned.h> +- + #ifndef get_unaligned +-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ +- defined(__PPC) || defined(powerpc) || defined(__powerpc__) +-# define get_unaligned(ptr) (*(ptr)) +-# define put_unaligned(val,ptr) ((void)(*(ptr) = (val))) ++#define get_unaligned(ptr) \ ++({ \ ++ __typeof__(*(ptr)) __tmp; \ ++ memcpy(&__tmp, (ptr), sizeof(*(ptr))); \ ++ __tmp; \ ++}) + #endif ++ ++#ifndef put_unaligned ++#define put_unaligned(val, ptr) \ ++({ \ ++ __typeof__(*(ptr)) __tmp = (val); \ ++ memcpy((ptr), &__tmp, sizeof(*(ptr))); \ ++ (void)0; \ ++}) + #endif + + #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field)) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
