Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=211d0cdc37065755c91189578de0b5c88407c001

commit 211d0cdc37065755c91189578de0b5c88407c001
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon Oct 3 23:55:50 2011 +0200

raidtools-1.00.3-4-i686

- bin, replaced by mdadm

diff --git a/source/apps-extra/raidtools/FrugalBuild 
b/source/apps-extra/raidtools/FrugalBuild
deleted file mode 100644
index 708c4c2..0000000
--- a/source/apps-extra/raidtools/FrugalBuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Compiling Time: 0.01 SBU
-# Maintainer: Miklos Vajna <vmik...@frugalware.org>
-
-pkgname=raidtools
-pkgver=1.00.3
-pkgrel=4
-pkgdesc="System utilities you need to maintain a software RAID device"
-url="http://people.redhat.com/mingo/raidtools/";
-depends=('popt')
-groups=('apps-extra')
-archs=('i686' 'x86_64')
-up2date="lynx -dump 'http://people.redhat.com/mingo/raidtools/?M=D'|grep 
tar.gz$|sed -n -e 's/.*s-\([0-9\.]*\).tar.gz$/\1/' -e '1 p'"
-source=(http://people.redhat.com/mingo/$pkgname/$pkgname-$pkgver.tar.gz \
-       $pkgname-$pkgver-gcc3.diff \
-       raidtools-1.00.3-2.6.Headers.patch \
-       raidtools-1.00.3-mkraid.patch \
-       raidtools-1.00.3-PIC.patch \
-       raidtools-1.00.3-glibc25.diff)
-
-build()
-{
-       Fpatchall
-       # Fix up optim.
-       sed -i -e'/^CFLAGS/s:-O2:@CFLAGS@:' Makefile.in || Fdie
-       Fmake
-       Fmakeinstall ROOTDIR=$Fdestdir
-       Frm /dev
-       Ffilerel /etc/raidtab.sample
-}
-
-# optimization OK
-
-sha1sums=('db6a05e371622e4b83e054355d906b0a48e76844' \
-         '693de76e619304efa627125f0fcd726f9339f4ed' \
-         'ab7e728458ef05fde1d3c1df0ccaaf4a76ebd4b6' \
-         'd62d1a36b0db2744ae1b93d4599bd245a380614e' \
-         '9058343824bb124a0fd741fc5678d83f530af81f' \
-         '41cec8a6df67194627f24e1522891dc65f009d1e')
diff --git a/source/apps-extra/raidtools/raidtools-1.00.3-2.6.Headers.patch 
b/source/apps-extra/raidtools/raidtools-1.00.3-2.6.Headers.patch
deleted file mode 100644
index c790149..0000000
--- a/source/apps-extra/raidtools/raidtools-1.00.3-2.6.Headers.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur raidtools-1.00.3/list.h raidtools-1.00.3.plasmaroo/list.h
---- raidtools-1.00.3/list.h    2003-01-15 08:58:25.000000000 +0000
-+++ raidtools-1.00.3.plasmaroo/list.h  2004-07-18 12:25:15.000000000 +0100
-@@ -14,6 +14,11 @@
-  * using the generic single-entry routines.
-  */
-
-+#define _LINUX_LIST_H
-+struct hlist_node {
-+        struct hlist_node *next, **pprev;
-+};
-+
- struct list_head {
-       struct list_head *next, *prev;
- };
-diff -ur raidtools-1.00.3/lsraid.c raidtools-1.00.3.plasmaroo/lsraid.c
---- raidtools-1.00.3/lsraid.c  2003-01-15 08:58:25.000000000 +0000
-+++ raidtools-1.00.3.plasmaroo/lsraid.c        2004-07-18 12:25:19.000000000 
+0100
-@@ -40,16 +40,15 @@
- #include <unistd.h>
- #include <errno.h>
-
-+/* Local copies of things I use - Clean up later */
-+#include "list.h"
-+
- #include <linux/types.h>
- #include <linux/major.h>
- #include <linux/fs.h>
- #include <linux/raid/md_u.h>
- #include <linux/raid/md_p.h>
-
--/* Local copies of things I use - Clean up later */
--#include "list.h"
--
--
- /*
-  * Defines
-  */
-diff -ur raidtools-1.00.3/raid_io.h raidtools-1.00.3.plasmaroo/raid_io.h
---- raidtools-1.00.3/raid_io.h.old     2005-04-07 15:25:24.937871896 -0600
-+++ raidtools-1.00.3/raid_io.h 2005-04-07 15:25:35.315801456 -0600
-@@ -12,7 +12,7 @@
- #include "common.h"
- #include "raidlib.h"
-
--void progress (unsigned long blocks, unsigned long current);
-+void progress (unsigned long blocks, unsigned long _current_);
-
- long long raidseek (unsigned int fd, unsigned long blk);
- extern void print_sb (mdp_super_t *sb);
diff --git a/source/apps-extra/raidtools/raidtools-1.00.3-PIC.patch 
b/source/apps-extra/raidtools/raidtools-1.00.3-PIC.patch
deleted file mode 100644
index 65518a2..0000000
--- a/source/apps-extra/raidtools/raidtools-1.00.3-PIC.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix building with -fPIC
-http://bugs.gentoo.org/show_bug.cgi?id=34712
-(note: this is outdated since we fixed the PIC issues in our linux-headers
-ebuilds when doing syscall()'s on x86)
-
-Fix running on amd64
-http://bugs.gentoo.org/show_bug.cgi?id=93694
-
---- raidtools-1.00.3/raid_io.c
-+++ raidtools-1.00.3/raid_io.c
-@@ -81,7 +81,7 @@
- }
- #undef F
-
--#if !(defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__))
-+#if !(defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || 
defined(__x86_64__) || defined(__PIC__))
- # ifndef __NR__llseek
- #  ifdef __sparc__
- #   define __NR__llseek               236
-@@ -105,7 +105,7 @@
-       long long result;
-       int retval;
-
--#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__)
-+#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || 
defined(__x86_64__) || defined(__PIC__)
-       return lseek(fd, offset, SEEK_SET);
- #else
-       retval = _llseek (fd, ((unsigned long long) offset) >> 32,
diff --git a/source/apps-extra/raidtools/raidtools-1.00.3-gcc3.diff 
b/source/apps-extra/raidtools/raidtools-1.00.3-gcc3.diff
deleted file mode 100644
index bea6aac..0000000
--- a/source/apps-extra/raidtools/raidtools-1.00.3-gcc3.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur raidtools-1.00.3.orig/mkraid.c raidtools-1.00.3/mkraid.c
---- raidtools-1.00.3.orig/mkraid.c     2003-01-15 00:58:25.000000000 -0800
-+++ raidtools-1.00.3/mkraid.c  2003-08-30 17:41:16.000000000 -0700
-@@ -169,34 +169,7 @@
-       return EXIT_FAILURE;
-
-     if (old_force_flag && (func == mkraid)) {
--      fprintf(stderr,
--
--"
-- WARNING!
--
-- NOTE: if you are recovering a double-disk error or some other failure mode
-- that made your array unrunnable but data is still intact then it's strongly
-- recommended to use the lsraid utility and to read the lsraid HOWTO.
--
-- If your RAID array holds useful and not yet backed up data then --force
-- and the hot-add/hot-remove functionality should be used with extreme care!
-- If your /etc/raidtab file is not in sync with the real array configuration,
-- then --force might DESTROY ALL YOUR DATA. It's especially dangerous to use
-- -f if the array is in degraded mode.
--
-- If your /etc/raidtab file matches the real layout of on-disk data then
-- recreating the array will not hurt your data, but be aware of the risks
-- of doing this anyway: freshly created RAID1 and RAID5 arrays do a full
-- resync of their mirror/parity blocks, which, if the raidtab is incorrect,
-- the resync will wipe out data irrecoverably. Also, if your array is in
-- degraded mode then the raidtab must match the degraded config exactly,
-- otherwise you'll get the same kind of data destruction during resync.
-- (see the failed-disk raidtab option.) You have been warned!
--
-- [ If your array holds no data, or you have it all backed up, or if you
-- know precisely what you are doing and you still want to proceed then use
-- the --really-force (or -R) flag. ]
--");
-+      fprintf(stderr, " WARNING!\n\n NOTE: if you are recovering a 
double-disk error or some other failure mode\n that made your array unrunnable 
but data is still intact then it's strongly\n recommended to use the lsraid 
utility and to read the lsraid HOWTO.\n\n If your RAID array holds useful and 
not yet backed up data then --force\n and the hot-add/hot-remove functionality 
should be used with extreme care!\n If your /etc/raidtab file is not in sync 
with the real array configuration,\n then --force might DESTROY ALL YOUR DATA. 
It's especially dangerous to use\n -f if the array is in degraded mode.\n\n If 
your /etc/raidtab file matches the real layout of on-disk data then\n 
recreating the array will not hurt your data, but be aware of the risks\n of 
doing this anyway: freshly created RAID1 and RAID5 arrays do a full\n resync of 
their mirror/parity blocks, which, if the raidtab is incorrect,\n the resync 
will wipe out data irrecoverably. Also, if your array is in\n degraded mode
  then the raidtab must match the degraded config exactly,\n otherwise you'll 
get the same kind of data destruction during resync.\n (see the failed-disk 
raidtab option.) You have been warned!\n\n [ If your array holds no data, or 
you have it all backed up, or if you\n know precisely what you are doing and 
you still want to proceed then use\n the --really-force (or -R) flag. ]\n ");
-       return EXIT_FAILURE;
-     }
-
diff --git a/source/apps-extra/raidtools/raidtools-1.00.3-glibc25.diff 
b/source/apps-extra/raidtools/raidtools-1.00.3-glibc25.diff
deleted file mode 100644
index e200f8c..0000000
--- a/source/apps-extra/raidtools/raidtools-1.00.3-glibc25.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- raidtools-1.00.3/raid_io.c.orig    2006-11-03 22:52:32.000000000 +0100
-+++ raidtools-1.00.3/raid_io.c 2006-11-03 23:51:02.000000000 +0100
-@@ -81,23 +81,6 @@
- }
- #undef F
-
--#if !(defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || 
defined(__x86_64__) || defined(__PIC__))
--# ifndef __NR__llseek
--#  ifdef __sparc__
--#   define __NR__llseek               236
--#  else
--#   define __NR__llseek               140
--#  endif
--# endif
--
--static int _llseek (unsigned int, unsigned long,
--              unsigned long, long long *, unsigned int);
--
--static _syscall5( int, _llseek, unsigned int, fd, unsigned long, offset_high,
--              unsigned long, offset_low, long long *, result,
--              unsigned int, origin)
--#endif
--
- long long raidseek (unsigned int fd, unsigned long blk)
- {
-       unsigned long long offset = (unsigned long long)blk *
-@@ -105,14 +88,7 @@
-       long long result;
-       int retval;
-
--#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || 
defined(__x86_64__) || defined(__PIC__)
-       return lseek(fd, offset, SEEK_SET);
--#else
--      retval = _llseek (fd, ((unsigned long long) offset) >> 32,
--                      ((unsigned long long) offset) & 0xffffffff,
--                      &result, SEEK_SET);
--      return (retval == -1 ? (long long) retval : result);
--#endif
- }
-
- int upgrade_sb (int fd, mdp_super_t *sb, md_cfg_entry_t * cfg, int verbose)
diff --git a/source/apps-extra/raidtools/raidtools-1.00.3-mkraid.patch 
b/source/apps-extra/raidtools/raidtools-1.00.3-mkraid.patch
deleted file mode 100644
index f3391b9..0000000
--- a/source/apps-extra/raidtools/raidtools-1.00.3-mkraid.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-ripped from Fedora
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=73365
-http://bugs.gentoo.org/show_bug.cgi?id=46847
-
---- raidtools-1.00.3/mkraid.c.cfg      2003-08-22 18:47:10.000000000 -0400
-+++ raidtools-1.00.3/mkraid.c  2003-08-22 18:47:31.000000000 -0400
-@@ -244,7 +244,7 @@
-     while (*args) {
-       for (p = cfg_head; p; p = p->next) {
-           if (strcmp(p->md_name, *args)) continue;
--          if (check_active(cfg))
-+          if (check_active(p))
-               goto abort;
-           if (force_flag) {
-               fprintf(stderr, "DESTROYING the contents of %s in 5 seconds, 
Ctrl-C if unsure!\n", *args);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to