Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ba596469db9e3d7ee2b5e80adf6a25bc05fa425b
commit ba596469db9e3d7ee2b5e80adf6a25bc05fa425b Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Fri Mar 14 14:19:27 2008 +0100 reiserfsprogs-3.6.20-1-i686 - version bump - vanilla builds again, removed buildfix patches diff --git a/source/base/reiserfsprogs/FrugalBuild b/source/base/reiserfsprogs/FrugalBuild index f04c7b2..b9ff932 100644 --- a/source/base/reiserfsprogs/FrugalBuild +++ b/source/base/reiserfsprogs/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=reiserfsprogs -pkgver=3.6.19 -pkgrel=3 +pkgver=3.6.20 +pkgrel=1 pkgdesc="Reiserfs utilities" url="http://www.namesys.com"; depends=('e2fsprogs>=1.40.6-2') @@ -12,16 +12,13 @@ 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) up2date="lynx -dump http://mirror.trouble-free.net/sources/|Flasttar" -source=(http://mirror.trouble-free.net/sources//$pkgname-$pkgver.tar.gz \ - reiserfsprogs-3.6.19-fsck-n.patch reiserfsprogs-3.6.19-unaligned.patch) -sha1sums=('9df17f21de2b152a55b9edc5436206d5821c2188' \ - 'fa42d0f5ea6b3210932fe4f16e1dd24caa7a55b0' \ - 'fd97c2e9c9a8dc2064e74e41e7f6b4d8e3b61a09') +source=(http://mirror.trouble-free.net/sources//$pkgname-$pkgver.tar.gz) +sha1sums=('688b26c224769b46400e314c16f4185c55549e70') build() { unset MAKEFLAGS - Fbuild || return 1 + Fbuild 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 deleted file mode 100644 index 2146c94..0000000 --- a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-fsck-n.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 5883ce8..0000000 --- a/source/base/reiserfsprogs/reiserfsprogs-3.6.19-unaligned.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
