[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2019-11-13 Thread Felix Yan via arch-commits 
Date: Wednesday, November 13, 2019 @ 18:17:14
  Author: felixonmars
Revision: 368455

[core] mass rebuild

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 18:16:11 UTC (rev 368454)
+++ PKGBUILD2019-11-13 18:17:14 UTC (rev 368455)
@@ -3,7 +3,7 @@
 
 pkgname=mdadm
 pkgver=4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(x86_64)
 license=('GPL')

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2019-11-13 Thread Christian Hesse via arch-commits 
Date: Wednesday, November 13, 2019 @ 18:16:11
  Author: eworm
Revision: 368454

build from git, cherry-pick build fixes

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |   34 --
 1 file changed, 24 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 18:13:04 UTC (rev 368453)
+++ PKGBUILD2019-11-13 18:16:11 UTC (rev 368454)
@@ -1,5 +1,6 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
+
 pkgname=mdadm
 pkgver=4.1
 pkgrel=1
@@ -8,25 +9,38 @@
 license=('GPL')
 url="https://git.kernel.org/cgit/utils/mdadm";
 conflicts=('mkinitcpio<0.7')
+makedepends=('git')
 depends=('glibc')
+replaces=('raidtools')
 backup=('etc/mdadm.conf')
-source=("https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.1.tar."{xz,sign}
-mdadm.conf 
-mdadm_udev_install)
-replaces=('raidtools')
 validpgpkeys=('6A86B80E1D22F21D0B26BA75397D82E0531A9C91') # Jes Sorensen
-md5sums=('51bf3651bd73a06c413a2f964f299598'
- 'SKIP'
- '5a37c112aa07dccdde62f9fa5b888607'
- 'b6b0bfd6487c99264578630616dfe5eb')
+source=("git+https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git#tag=${pkgname}-${pkgver}?signed";
+'mdadm.conf'
+'mdadm_udev_install')
+sha256sums=('SKIP'
+'4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5'
+'170b0e5d548416c0adb9df4e6941bea6bc33d843419c997e45ecaf9e36a58f38')
 
+prepare() {
+  cd mdadm
+
+  git cherry-pick -n \
+a4f7290c20c2ff78328c9db0b18029165cfb05b2 \
+7039d1f8200b9599b23db5953934fdb43b0442e0 \
+486720e0c2418e7e2e0a16221f7c42a308622254 \
+9f4218274cd4a1e1f356a1617f9a1d09960cf255 \
+761e3bd9f5e3aafa95ad3ae50a637dc67c8774f0
+}
+
 build() {
-  cd $pkgname-$pkgver
+  cd mdadm
+
   make CXFLAGS="$CFLAGS" BINDIR=/usr/bin UDEVDIR=/usr/lib/udev
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd mdadm
+
   make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR="$pkgdir" 
UDEVDIR=/usr/lib/udev install
   make SYSTEMD_DIR="$pkgdir"/usr/lib/systemd/system install-systemd
   install -D -m644 ../mdadm.conf "$pkgdir"/etc/mdadm.conf

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2019-11-13 Thread Christian Hesse via arch-commits 
Date: Wednesday, November 13, 2019 @ 12:16:07
  Author: eworm
Revision: 368095

base group removal

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |1 -
 1 file changed, 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 12:15:35 UTC (rev 368094)
+++ PKGBUILD2019-11-13 12:16:07 UTC (rev 368095)
@@ -7,7 +7,6 @@
 arch=(x86_64)
 license=('GPL')
 url="https://git.kernel.org/cgit/utils/mdadm";
-groups=('base')
 conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2019-10-08 Thread Antonio Rojas via arch-commits 
Date: Tuesday, October 8, 2019 @ 20:27:34
  Author: arojas
Revision: 364195

Fix quoting

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-08 20:26:47 UTC (rev 364194)
+++ PKGBUILD2019-10-08 20:27:34 UTC (rev 364195)
@@ -20,16 +20,17 @@
  'SKIP'
  '5a37c112aa07dccdde62f9fa5b888607'
  'b6b0bfd6487c99264578630616dfe5eb')
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make CXFLAGS="$CFLAGS" BINDIR=/usr/bin UDEVDIR=/usr/lib/udev
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir 
UDEVDIR=/usr/lib/udev install
-  make SYSTEMD_DIR=$pkgdir/usr/lib/systemd/system install-systemd
-  install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
-  install -D -m644 ../mdadm_udev_install 
$pkgdir/usr/lib/initcpio/install/mdadm_udev
-  ln -s /usr/lib/initcpio/install/mdadm_udev 
$pkgdir/usr/lib/initcpio/install/mdadm
+  cd $pkgname-$pkgver
+  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR="$pkgdir" 
UDEVDIR=/usr/lib/udev install
+  make SYSTEMD_DIR="$pkgdir"/usr/lib/systemd/system install-systemd
+  install -D -m644 ../mdadm.conf "$pkgdir"/etc/mdadm.conf
+  install -D -m644 ../mdadm_udev_install 
"$pkgdir"/usr/lib/initcpio/install/mdadm_udev
+  ln -s /usr/lib/initcpio/install/mdadm_udev 
"$pkgdir"/usr/lib/initcpio/install/mdadm
 }

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2019-05-07 Thread Antonio Rojas via arch-commits 
Date: Tuesday, May 7, 2019 @ 20:43:15
  Author: arojas
Revision: 352737

https

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-07 20:26:02 UTC (rev 352736)
+++ PKGBUILD2019-05-07 20:43:15 UTC (rev 352737)
@@ -6,7 +6,7 @@
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(x86_64)
 license=('GPL')
-url="http://git.kernel.org/cgit/utils/mdadm";
+url="https://git.kernel.org/cgit/utils/mdadm";
 groups=('base')
 conflicts=('mkinitcpio<0.7')
 depends=('glibc')

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2018-11-09 Thread Felix Yan via arch-commits 
Date: Friday, November 9, 2018 @ 21:16:39
  Author: felixonmars
Revision: 338547

PIE/BUILDINFO rebuild

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-09 21:16:25 UTC (rev 338546)
+++ PKGBUILD2018-11-09 21:16:39 UTC (rev 338547)
@@ -2,7 +2,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(x86_64)
 license=('GPL')

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2017-11-23 Thread Jelle van der Waa 
Date: Thursday, November 23, 2017 @ 19:35:20
  Author: jelle
Revision: 310765

Update source location

ftp://kernel.org moved to https://kernel.org

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-23 16:36:23 UTC (rev 310764)
+++ PKGBUILD2017-11-23 19:35:20 UTC (rev 310765)
@@ -12,7 +12,7 @@
 conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
-source=("ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${pkgver}.tar."{xz,sign}
+source=("https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-4.0.tar."{xz,sign}
 mdadm.conf 
 mdadm_install
 mdadm_hook

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2017-03-09 Thread Tobias Powalowski 
Date: Thursday, March 9, 2017 @ 08:03:38
  Author: tpowa
Revision: 290179

upgpkg: mdadm 4.0-1

bump to latest release

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-09 08:00:15 UTC (rev 290178)
+++ PKGBUILD2017-03-09 08:03:38 UTC (rev 290179)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.4
+pkgver=4.0
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
@@ -19,8 +19,8 @@
 mdadm_udev_install
 disable-werror.patch)
 replaces=('raidtools')
-validpgpkeys=('1BC629EBD390D8707B5F497A39EC9EDD566281B9') # Neil Brown
-md5sums=('04b8b21f637540350f8517c7e68d3c63'
+validpgpkeys=('6A86B80E1D22F21D0B26BA75397D82E0531A9C91') # Jes Sorensen
+md5sums=('2cb4feffea9167ba71b5f346a0c0a40d'
  'SKIP'
  '5a37c112aa07dccdde62f9fa5b888607'
  'af2f73f0094ebee66f503ca4710c7142'

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2016-02-02 Thread Tobias Powalowski 
Date: Tuesday, February 2, 2016 @ 20:09:09
  Author: tpowa
Revision: 258808

upgpkg: mdadm 3.4-1

bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-02 18:54:02 UTC (rev 258807)
+++ PKGBUILD2016-02-02 19:09:09 UTC (rev 258808)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.3.4
+pkgver=3.4
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
@@ -20,7 +20,7 @@
 disable-werror.patch)
 replaces=('raidtools')
 validpgpkeys=('1BC629EBD390D8707B5F497A39EC9EDD566281B9') # Neil Brown
-md5sums=('7ca8b114710f98f53f20c5787b674a09'
+md5sums=('04b8b21f637540350f8517c7e68d3c63'
  'SKIP'
  '5a37c112aa07dccdde62f9fa5b888607'
  'af2f73f0094ebee66f503ca4710c7142'

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2015-08-17 Thread Tobias Powalowski 
Date: Monday, August 17, 2015 @ 10:30:45
  Author: tpowa
Revision: 243825

upgpkg: mdadm 3.3.4-1

bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-17 08:29:17 UTC (rev 243824)
+++ PKGBUILD2015-08-17 08:30:45 UTC (rev 243825)
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.3.2
-pkgrel=2
+pkgver=3.3.4
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,7 +12,7 @@
 conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.xz
+source=("ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${pkgver}.tar."{xz,sign}
 mdadm.conf 
 mdadm_install
 mdadm_hook
@@ -19,7 +19,9 @@
 mdadm_udev_install
 disable-werror.patch)
 replaces=('raidtools')
-md5sums=('44698d351501cac6a89072dc877eb220'
+validpgpkeys=('1BC629EBD390D8707B5F497A39EC9EDD566281B9') # Neil Brown
+md5sums=('7ca8b114710f98f53f20c5787b674a09'
+ 'SKIP'
  '5a37c112aa07dccdde62f9fa5b888607'
  'af2f73f0094ebee66f503ca4710c7142'
  'fbfb7d07efcbaf5dc61af424c5f6e352'

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm.service)

2015-05-19 Thread Sven-Hendrik Haase 
Date: Tuesday, May 19, 2015 @ 17:16:51
  Author: svenstaro
Revision: 239555

upgpkg: mdadm 3.3.2-2

Remove duplicate .service file (Fixes FS#40965)

Modified:
  mdadm/trunk/PKGBUILD
Deleted:
  mdadm/trunk/mdadm.service

---+
 PKGBUILD  |6 +-
 mdadm.service |8 
 2 files changed, 1 insertion(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-19 09:36:52 UTC (rev 239554)
+++ PKGBUILD2015-05-19 15:16:51 UTC (rev 239555)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,7 +17,6 @@
 mdadm_install
 mdadm_hook
 mdadm_udev_install
-mdadm.service
 disable-werror.patch)
 replaces=('raidtools')
 md5sums=('44698d351501cac6a89072dc877eb220'
@@ -25,7 +24,6 @@
  'af2f73f0094ebee66f503ca4710c7142'
  'fbfb7d07efcbaf5dc61af424c5f6e352'
  'b6b0bfd6487c99264578630616dfe5eb'
- 'eb1786b18fa4d13cfd7b71d6b05cfb4f'
  '599745ed2bec4489e83991cff89c46ee')
 
 prepare() {
@@ -50,6 +48,4 @@
   install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
   install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
   install -D -m644 ../mdadm_udev_install 
$pkgdir/usr/lib/initcpio/install/mdadm_udev
-  # systemd service file
-  install -D -m644 $srcdir/mdadm.service 
$pkgdir/usr/lib/systemd/system/mdadm.service
 }

Deleted: mdadm.service
===
--- mdadm.service   2015-05-19 09:36:52 UTC (rev 239554)
+++ mdadm.service   2015-05-19 15:16:51 UTC (rev 239555)
@@ -1,8 +0,0 @@
-[Unit]
-Description=MDADM Event Monitor
-
-[Service]
-ExecStart=/usr/bin/mdadm --monitor --scan
-
-[Install]
-WantedBy=multi-user.target

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2014-12-11 Thread Tobias Powalowski 
Date: Thursday, December 11, 2014 @ 09:49:36
  Author: tpowa
Revision: 227430

upgpkg: mdadm 3.3.2-1

bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-12-11 08:47:30 UTC (rev 227429)
+++ PKGBUILD2014-12-11 08:49:36 UTC (rev 227430)
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.3.1
-pkgrel=2
+pkgver=3.3.2
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -20,7 +20,7 @@
 mdadm.service
 disable-werror.patch)
 replaces=('raidtools')
-md5sums=('4227d48de62dfb217c92fa0c54171bbe'
+md5sums=('44698d351501cac6a89072dc877eb220'
  '5a37c112aa07dccdde62f9fa5b888607'
  'af2f73f0094ebee66f503ca4710c7142'
  'fbfb7d07efcbaf5dc61af424c5f6e352'

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2014-06-10 Thread Tobias Powalowski 
Date: Tuesday, June 10, 2014 @ 15:30:35
  Author: tpowa
Revision: 214773

upgpkg: mdadm 3.3.1-2

fix udev rule dir

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-10 10:35:54 UTC (rev 214772)
+++ PKGBUILD2014-06-10 13:30:35 UTC (rev 214773)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -35,7 +35,7 @@
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin
+  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin UDEVDIR=/usr/lib/udev
   # build static mdassemble for Arch's initramfs
   make MDASSEMBLE_AUTO=1 mdassemble
   
@@ -43,7 +43,7 @@
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir 
UDEVDIR=/usr/lib/udev install
   make SYSTEMD_DIR=$pkgdir/usr/lib/systemd/system install-systemd
   install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2014-06-09 Thread Tobias Powalowski 
Date: Tuesday, June 10, 2014 @ 08:59:04
  Author: tpowa
Revision: 214764

upgpkg: mdadm 3.3.1-1

bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-10 03:34:16 UTC (rev 214763)
+++ PKGBUILD2014-06-10 06:59:04 UTC (rev 214764)
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.3
-pkgrel=2
+pkgver=3.3.1
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,7 +12,7 @@
 conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
+source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.xz
 mdadm.conf 
 mdadm_install
 mdadm_hook
@@ -20,7 +20,7 @@
 mdadm.service
 disable-werror.patch)
 replaces=('raidtools')
-md5sums=('8ac04259cdd74b4566c3b6dea9414b57'
+md5sums=('4227d48de62dfb217c92fa0c54171bbe'
  '5a37c112aa07dccdde62f9fa5b888607'
  'af2f73f0094ebee66f503ca4710c7142'
  'fbfb7d07efcbaf5dc61af424c5f6e352'

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2013-10-30 Thread Tobias Powalowski 
Date: Wednesday, October 30, 2013 @ 08:22:09
  Author: tpowa
Revision: 197780

upgpkg: mdadm 3.3-2

#37537 add mdmon systemd file

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-30 03:01:45 UTC (rev 197779)
+++ PKGBUILD2013-10-30 07:22:09 UTC (rev 197780)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -44,6 +44,7 @@
 package() {
   cd $srcdir/$pkgname-$pkgver
   make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+  make SYSTEMD_DIR=$pkgdir/usr/lib/systemd/system install-systemd
   install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
   install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm

[arch-commits] Commit in mdadm/trunk (PKGBUILD disable-werror.patch)

2013-09-04 Thread Tobias Powalowski 
Date: Wednesday, September 4, 2013 @ 16:55:19
  Author: tpowa
Revision: 193895

upgpkg: mdadm 3.3-1

bump to latest version

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/disable-werror.patch

--+
 PKGBUILD |   13 +
 disable-werror.patch |4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-04 03:26:45 UTC (rev 193894)
+++ PKGBUILD2013-09-04 14:55:19 UTC (rev 193895)
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.2.6
-pkgrel=4
+pkgver=3.3
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -18,22 +18,19 @@
 mdadm_hook
 mdadm_udev_install
 mdadm.service
-disable-werror.patch
-mdadm-fix-udev-rules.patch)
+disable-werror.patch)
 replaces=('raidtools')
-md5sums=('3e255dc71e5144bbcb872788ca647267'
+md5sums=('8ac04259cdd74b4566c3b6dea9414b57'
  '5a37c112aa07dccdde62f9fa5b888607'
  'af2f73f0094ebee66f503ca4710c7142'
  'fbfb7d07efcbaf5dc61af424c5f6e352'
  'b6b0bfd6487c99264578630616dfe5eb'
  'eb1786b18fa4d13cfd7b71d6b05cfb4f'
- '4ad87b74a4bc9a34621280abe0e0c3e4'
- '6c76f2f261c1c3397c7290633f0a9acc')
+ '599745ed2bec4489e83991cff89c46ee')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
-  patch -p1 -i ../mdadm-fix-udev-rules.patch
 }
 
 build() {

Modified: disable-werror.patch
===
--- disable-werror.patch2013-09-04 03:26:45 UTC (rev 193894)
+++ disable-werror.patch2013-09-04 14:55:19 UTC (rev 193895)
@@ -3,9 +3,9 @@
 @@ -42,7 +42,7 @@
  
  CC = $(CROSS_COMPILE)gcc
- CXFLAGS = -ggdb
+ CXFLAGS ?= -ggdb
 -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
 +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
  ifdef WARN_UNUSED
- CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3
  endif

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm-fix-udev-rules.patch)

2013-02-09 Thread Thomas Bächler 
Date: Sunday, February 10, 2013 @ 01:17:38
  Author: thomas
Revision: 177844

upgpkg: mdadm 3.2.6-3 - fix the udev rules again

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm-fix-udev-rules.patch

+
 PKGBUILD   |4 ++--
 mdadm-fix-udev-rules.patch |6 --
 2 files changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-09 23:01:59 UTC (rev 177843)
+++ PKGBUILD2013-02-10 00:17:38 UTC (rev 177844)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.2.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -53,4 +53,4 @@
  '0e35422d0cc007c3654a5e2591a9f9b5'
  'aafb5f9ac8437a284cbf948b9b13b179'
  '4ad87b74a4bc9a34621280abe0e0c3e4'
- '6c2961a0685dc0feb9bb397c39d8f351')
+ '0bf45d6dcb3ea14facddbb10b3303806')

Modified: mdadm-fix-udev-rules.patch
===
--- mdadm-fix-udev-rules.patch  2013-02-09 23:01:59 UTC (rev 177843)
+++ mdadm-fix-udev-rules.patch  2013-02-10 00:17:38 UTC (rev 177844)
@@ -19,9 +19,11 @@
 index 000..883ee4d
 --- /dev/null
 +++ b/udev-md-raid-arrays.rules
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,35 @@
 +# do not edit this file, it will be overwritten on update
 +
++SUBSYSTEM!="block", GOTO="md_end"
++
 +# handle md arrays
 +ACTION!="add|change", GOTO="md_end"
 +KERNEL!="md*", GOTO="md_end"
@@ -63,7 +65,7 @@
 +
 +# assemble md arrays
 +
-+SUBSYSTEM!="block", GOTO="md_end"
++SUBSYSTEM!="block", GOTO="md_inc_end"
 +
 +# handle potential components of arrays (the ones supported by md)
 +ENV{ID_FS_TYPE}=="ddf_raid_member|isw_raid_member|linux_raid_member", 
GOTO="md_inc"

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2012-10-30 Thread Tobias Powalowski 
Date: Tuesday, October 30, 2012 @ 03:43:24
  Author: tpowa
Revision: 169812

upgpkg: mdadm 3.2.6-1

bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-29 22:16:57 UTC (rev 169811)
+++ PKGBUILD2012-10-30 07:43:24 UTC (rev 169812)
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.2.5
-pkgrel=2
+pkgver=3.2.6
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -21,14 +21,6 @@
 mdadm.service
 disable-werror.patch)
 replaces=('raidtools')
-md5sums=('83ba4a6249ae24677e915e44c9cfcc58'
- '8333d405f550317c2bacd5510bf1cb60'
- '00cbed931db4f15b6ce49e3e7d433966'
- '609d10888727710cb20db7ac3e096116'
- 'fbb5542d9bdf87441a11dd7e7a0a17f8'
- 'd1d8e9eb81ce9347de74f3c84a9db09e'
- 'aafb5f9ac8437a284cbf948b9b13b179'
- '4ad87b74a4bc9a34621280abe0e0c3e4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -56,3 +48,11 @@
   # systemd service file
   install -D -m644 $srcdir/mdadm.service 
$pkgdir/usr/lib/systemd/system/mdadm.service
 }
+md5sums=('3e255dc71e5144bbcb872788ca647267'
+ '8333d405f550317c2bacd5510bf1cb60'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '609d10888727710cb20db7ac3e096116'
+ 'fbb5542d9bdf87441a11dd7e7a0a17f8'
+ 'd1d8e9eb81ce9347de74f3c84a9db09e'
+ 'aafb5f9ac8437a284cbf948b9b13b179'
+ '4ad87b74a4bc9a34621280abe0e0c3e4')

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm_install mdadm_udev_install)

2012-05-25 Thread Dave Reisner 
Date: Friday, May 25, 2012 @ 19:52:16
  Author: dreisner
Revision: 159623

upgpkg: mdadm 3.2.5-2

- update install hook for mkinitcpio .0.9.0

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm_install
  mdadm/trunk/mdadm_udev_install

+
 PKGBUILD   |6 ++--
 mdadm_install  |   64 +--
 mdadm_udev_install |6 +++-
 3 files changed, 39 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-25 23:50:39 UTC (rev 159622)
+++ PKGBUILD2012-05-25 23:52:16 UTC (rev 159623)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -24,9 +24,9 @@
 md5sums=('83ba4a6249ae24677e915e44c9cfcc58'
  '8333d405f550317c2bacd5510bf1cb60'
  '00cbed931db4f15b6ce49e3e7d433966'
- '9b01e96b6c3c218fb61628c9281fe688'
+ '609d10888727710cb20db7ac3e096116'
  'fbb5542d9bdf87441a11dd7e7a0a17f8'
- '2318b99701dba9b01a6891c62be7bc1c'
+ 'd1d8e9eb81ce9347de74f3c84a9db09e'
  'aafb5f9ac8437a284cbf948b9b13b179'
  '4ad87b74a4bc9a34621280abe0e0c3e4')
 

Modified: mdadm_install
===
--- mdadm_install   2012-05-25 23:50:39 UTC (rev 159622)
+++ mdadm_install   2012-05-25 23:52:16 UTC (rev 159623)
@@ -1,45 +1,45 @@
-# vim: set ft=sh:
+#!/bin/bash
 
-build()
-{
-MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
-BINARIES=""
-FILES=""
-SCRIPT="mdadm"
+build() {
+add_checked_modules -f 'dm-' 'drivers/md/*'
+
 # check if a custom mdadm.conf exists
 if grep -q ^ARRAY /etc/mdadm.conf; then
 echo "Custom /etc/mdadm.conf file will be used in initramfs for 
assembling arrays."
 add_file "/etc/mdadm.conf"
 fi
 add_binary "/sbin/mdassemble"
+
+add_runscript
 }
 
-help ()
-{
-cat<,dev0,dev1,...,devn
-md=,uuid
-  - for partitionable raid arrays with persistent superblocks:
-md=d,dev0,dev1,...,devn
-md=d,uuid
+If arrays are defined in /etc/mdadm.conf, the file will be used instead
+of command line assembling.
 
-  Parameters:
-  -  = the number of the md device: 
-0 means md0, 1 means md1, ...
-  - : e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1
-   or 0900878d:f95f6057:c39a36e9:55efa60a
-  Examples:
-  - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1
-This will setup 2 md partitionable arrays.
-  - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1
-This will setup 2 md arrays with persistent superblocks.
+Command Line Setup:
+- for raid arrays with persistent superblocks:
+  md=,dev0,dev1,...,devn
+  md=,uuid
+- for partitionable raid arrays with persistent superblocks:
+  md=d,dev0,dev1,...,devn
+  md=d,uuid
+
+Parameters:
+-  = the number of the md device: 
+  0 means md0, 1 means md1, ...
+- : e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1
+ or 0900878d:f95f6057:c39a36e9:55efa60a
+Examples:
+- md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1
+  This will setup 2 md partitionable arrays.
+- md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1
+  This will setup 2 md arrays with persistent superblocks.
 HELPEOF
 }
+
+# vim: set ft=sh ts=4 sw=4 et:

Modified: mdadm_udev_install
===
--- mdadm_udev_install  2012-05-25 23:50:39 UTC (rev 159622)
+++ mdadm_udev_install  2012-05-25 23:52:16 UTC (rev 159623)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 build() {
-MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-")"
+add_checked_modules -f 'dm-' 'drivers/md/*'
 
 # check if a custom mdadm.conf exists
 if grep -qw ^ARRAY "$BASEDIR/etc/mdadm.conf"; then
@@ -15,7 +15,9 @@
 
 help() {
   cat <

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2012-05-22 Thread Tobias Powalowski 
Date: Tuesday, May 22, 2012 @ 15:20:35
  Author: tpowa
Revision: 159370

upgpkg: mdadm 3.2.5-1

bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-22 19:07:09 UTC (rev 159369)
+++ PKGBUILD2012-05-22 19:20:35 UTC (rev 159370)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.2.4
+pkgver=3.2.5
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
@@ -21,7 +21,7 @@
 mdadm.service
 disable-werror.patch)
 replaces=('raidtools')
-md5sums=('c25007b981e0f5362eacdad385ff0e15'
+md5sums=('83ba4a6249ae24677e915e44c9cfcc58'
  '8333d405f550317c2bacd5510bf1cb60'
  '00cbed931db4f15b6ce49e3e7d433966'
  '9b01e96b6c3c218fb61628c9281fe688'

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm.service)

2012-05-10 Thread Tobias Powalowski 
Date: Thursday, May 10, 2012 @ 09:57:43
  Author: tpowa
Revision: 158802

upgpkg: mdadm 3.2.4-1

bump to latest version, added systemd file

Added:
  mdadm/trunk/mdadm.service
Modified:
  mdadm/trunk/PKGBUILD

---+
 PKGBUILD  |   22 +-
 mdadm.service |8 
 2 files changed, 21 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-10 13:44:49 UTC (rev 158801)
+++ PKGBUILD2012-05-10 13:57:43 UTC (rev 158802)
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.2.3
-pkgrel=3
+pkgver=3.2.4
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -18,8 +18,17 @@
 mdadm_install
 mdadm_hook
 mdadm_udev_install
+mdadm.service
 disable-werror.patch)
 replaces=('raidtools')
+md5sums=('c25007b981e0f5362eacdad385ff0e15'
+ '8333d405f550317c2bacd5510bf1cb60'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '9b01e96b6c3c218fb61628c9281fe688'
+ 'fbb5542d9bdf87441a11dd7e7a0a17f8'
+ '2318b99701dba9b01a6891c62be7bc1c'
+ 'aafb5f9ac8437a284cbf948b9b13b179'
+ '4ad87b74a4bc9a34621280abe0e0c3e4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -44,11 +53,6 @@
   # move /lib/* to /usr/lib/
   mv $pkgdir/lib/udev $pkgdir/usr/lib/
   rm -rf $pkgdir/lib
+  # systemd service file
+  install -D -m644 $srcdir/mdadm.service 
$pkgdir/usr/lib/systemd/system/mdadm.service
 }
-md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
- '8333d405f550317c2bacd5510bf1cb60'
- '00cbed931db4f15b6ce49e3e7d433966'
- '9b01e96b6c3c218fb61628c9281fe688'
- 'fbb5542d9bdf87441a11dd7e7a0a17f8'
- '2318b99701dba9b01a6891c62be7bc1c'
- '4ad87b74a4bc9a34621280abe0e0c3e4')

Added: mdadm.service
===
--- mdadm.service   (rev 0)
+++ mdadm.service   2012-05-10 13:57:43 UTC (rev 158802)
@@ -0,0 +1,8 @@
+[Unit]
+Description=MDADM Event Monitor
+
+[Service]
+ExecStart=/sbin/mdadm --monitor --scan
+
+[Install]
+WantedBy=multi-user.target

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm_udev_install)

2012-05-02 Thread Tom Gundersen 
Date: Wednesday, May 2, 2012 @ 08:15:13
  Author: tomegun
Revision: 158072

upgpkg: mdadm 3.2.3-3

move /lib/* to /usr/lib/

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm_udev_install

+
 PKGBUILD   |   19 +++
 mdadm_udev_install |2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-02 11:54:49 UTC (rev 158071)
+++ PKGBUILD2012-05-02 12:15:13 UTC (rev 158072)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -20,13 +20,6 @@
 mdadm_udev_install
 disable-werror.patch)
 replaces=('raidtools')
-md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
- '6df172c8f77b280018cf87eb3d313f29'
- '00cbed931db4f15b6ce49e3e7d433966'
- '9b01e96b6c3c218fb61628c9281fe688'
- 'c8c0713f5c7da51822ee6f3911473a1c'
- 'cd258e1bf430c02a25f40b4329df9f57'
- '4ad87b74a4bc9a34621280abe0e0c3e4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -48,4 +41,14 @@
   install -D -m644 ../mdadm_udev_install 
$pkgdir/usr/lib/initcpio/install/mdadm_udev
   # symlink for backward compatibility
   ln -sf /usr/lib/initcpio/hooks/mdadm  $pkgdir/usr/lib/initcpio/hooks/raid
+  # move /lib/* to /usr/lib/
+  mv $pkgdir/lib/udev $pkgdir/usr/lib/
+  rm -rf $pkgdir/lib
 }
+md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
+ '8333d405f550317c2bacd5510bf1cb60'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '9b01e96b6c3c218fb61628c9281fe688'
+ 'fbb5542d9bdf87441a11dd7e7a0a17f8'
+ '2318b99701dba9b01a6891c62be7bc1c'
+ '4ad87b74a4bc9a34621280abe0e0c3e4')

Modified: mdadm_udev_install
===
--- mdadm_udev_install  2012-05-02 11:54:49 UTC (rev 158071)
+++ mdadm_udev_install  2012-05-02 12:15:13 UTC (rev 158072)
@@ -10,7 +10,7 @@
 fi
 
 add_binary "mdadm"
-add_file "/lib/udev/rules.d/64-md-raid.rules"
+add_file "/usr/lib/udev/rules.d/64-md-raid.rules"
 }
 
 help() {

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm.install)

2012-04-21 Thread Dave Reisner 
Date: Saturday, April 21, 2012 @ 13:00:19
  Author: dreisner
Revision: 156603

remove install scriptlet warning. mdadm 2.6.8 is nearing 4 years old

Modified:
  mdadm/trunk/PKGBUILD
Deleted:
  mdadm/trunk/mdadm.install

---+
 PKGBUILD  |2 --
 mdadm.install |   10 --
 2 files changed, 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-21 15:51:04 UTC (rev 156602)
+++ PKGBUILD2012-04-21 17:00:19 UTC (rev 156603)
@@ -19,8 +19,6 @@
 mdadm_hook
 mdadm_udev_install
 disable-werror.patch)
-
-install=mdadm.install
 replaces=('raidtools')
 md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
  '6df172c8f77b280018cf87eb3d313f29'

Deleted: mdadm.install
===
--- mdadm.install   2012-04-21 15:51:04 UTC (rev 156602)
+++ mdadm.install   2012-04-21 17:00:19 UTC (rev 156603)
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions 
/etc/mkinitcpio.conf)" ]; then
-echo "Attention mdadm update:"
-echo "raid_partitions hook has been replaced by the more powerfull mdadm 
hook."
-echo "Please update your /etc/mkinitcpio.conf accordingly."
-  fi
-}

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2012-04-20 Thread Tobias Powalowski 
Date: Friday, April 20, 2012 @ 12:53:03
  Author: tpowa
Revision: 156532

upgpkg: mdadm 3.2.3-2

move rules to /usr

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-20 16:45:31 UTC (rev 156531)
+++ PKGBUILD2012-04-20 16:53:03 UTC (rev 156532)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -41,13 +41,13 @@
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/bin/install DESTDIR=$pkgdir install
+  make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
   install -D -m755 mdassemble $pkgdir/sbin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
   install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
-  install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm
-  install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
-  install -D -m644 ../mdadm_udev_install 
$pkgdir/lib/initcpio/install/mdadm_udev
+  install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
+  install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
+  install -D -m644 ../mdadm_udev_install 
$pkgdir/usr/lib/initcpio/install/mdadm_udev
   # symlink for backward compatibility
-  ln -sf /lib/initcpio/hooks/mdadm  $pkgdir/lib/initcpio/hooks/raid
+  ln -sf /usr/lib/initcpio/hooks/mdadm  $pkgdir/usr/lib/initcpio/hooks/raid
 }

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2012-01-20 Thread Tobias Powalowski 
Date: Friday, January 20, 2012 @ 08:38:55
  Author: tpowa
Revision: 146999

upgpkg: mdadm 3.2.3-1

bump to 3.2.3

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |   14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 11:30:17 UTC (rev 146998)
+++ PKGBUILD2012-01-20 13:38:55 UTC (rev 146999)
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.2.2
-pkgrel=4
+pkgver=3.2.3
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -18,23 +18,21 @@
 mdadm_install
 mdadm_hook
 mdadm_udev_install
-disable-werror.patch
-linux-3.0.patch)
+disable-werror.patch)
+
 install=mdadm.install
 replaces=('raidtools')
-md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
+md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
  '9b01e96b6c3c218fb61628c9281fe688'
  'c8c0713f5c7da51822ee6f3911473a1c'
  'cd258e1bf430c02a25f40b4329df9f57'
- '4ad87b74a4bc9a34621280abe0e0c3e4'
- 'c499b3edbf2c400c8a1984e18c7ce7fa')
+ '4ad87b74a4bc9a34621280abe0e0c3e4')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
-  patch -Np1 -i ../linux-3.0.patch
   make CXFLAGS="$CFLAGS"
   # build static mdassemble for Arch's initramfs
   make MDASSEMBLE_AUTO=1 mdassemble

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2011-10-05 Thread Tobias Powalowski 
Date: Wednesday, October 5, 2011 @ 10:22:46
  Author: tpowa
Revision: 139862

update url

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-05 14:22:29 UTC (rev 139861)
+++ PKGBUILD2011-10-05 14:22:46 UTC (rev 139862)
@@ -7,7 +7,7 @@
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
-url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/";
+url="http://neil.brown.name/blog/mdadm";
 groups=('base')
 conflicts=('mkinitcpio<0.7')
 depends=('glibc')

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2011-08-26 Thread Tobias Powalowski 
Date: Friday, August 26, 2011 @ 06:47:27
  Author: tpowa
Revision: 136324

fix typo in CFLAGS #25756

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-26 10:46:24 UTC (rev 136323)
+++ PKGBUILD2011-08-26 10:47:27 UTC (rev 136324)
@@ -33,7 +33,7 @@
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
   patch -Np1 -i ../linux-3.0.patch
-  make CXiFLAGS="$CFLAGS"
+  make CXFLAGS="$CFLAGS"
 }
 
 package() {

[arch-commits] Commit in mdadm/trunk (PKGBUILD linux-3.0.patch)

2011-08-02 Thread Tobias Powalowski 
Date: Wednesday, August 3, 2011 @ 02:56:40
  Author: tpowa
Revision: 134363

upgpkg: mdadm 3.2.2-3
add linux-3.0 compat patch

Added:
  mdadm/trunk/linux-3.0.patch
Modified:
  mdadm/trunk/PKGBUILD

-+
 PKGBUILD|   11 +++
 linux-3.0.patch |   45 +
 2 files changed, 52 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-03 06:03:20 UTC (rev 134362)
+++ PKGBUILD2011-08-03 06:56:40 UTC (rev 134363)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,7 +17,8 @@
 mdadm.conf 
 mdadm_install
 mdadm_hook
-disable-werror.patch)
+disable-werror.patch
+linux-3.0.patch)
 install=mdadm.install
 replaces=('raidtools')
 md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
@@ -25,12 +26,14 @@
  '00cbed931db4f15b6ce49e3e7d433966'
  '4bb000166fb13e82ceaa2422fdfaac7e'
  '36f7cc564ed3267888d90208e0eb7adc'
- '4ad87b74a4bc9a34621280abe0e0c3e4')
+ '4ad87b74a4bc9a34621280abe0e0c3e4'
+ 'c499b3edbf2c400c8a1984e18c7ce7fa')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
-  make CXFLAGS="$CFLAGS"
+  patch -Np1 -i ../linux-3.0.patch
+  make CXiFLAGS="$CFLAGS"
 }
 
 package() {

Added: linux-3.0.patch
===
--- linux-3.0.patch (rev 0)
+++ linux-3.0.patch 2011-08-03 06:56:40 UTC (rev 134363)
@@ -0,0 +1,45 @@
+From f161d047eed634b3380262767f955eb888502e88 Mon Sep 17 00:00:00 2001
+From: NeilBrown 
+Date: Fri, 17 Jun 2011 22:49:24 +1000
+Subject: [PATCH 1/1] util: correctly parse shorter linux version numbers.
+
+The next version of Linux might be 3.0.  If it is, get_linux_version
+will fail.
+So make it more robust.
+
+Reported-by: Namhyung Kim 
+Reported-by: Milan Broz 
+Signed-off-by: NeilBrown 
+---
+ util.c |   10 +-
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/util.c b/util.c
+index 10bbe56..55d171a 100644
+--- a/util.c
 b/util.c
+@@ -146,16 +146,16 @@ int get_linux_version()
+ {
+   struct utsname name;
+   char *cp;
+-  int a,b,c;
++  int a = 0, b = 0,c = 0;
+   if (uname(&name) <0)
+   return -1;
+ 
+   cp = name.release;
+   a = strtoul(cp, &cp, 10);
+-  if (*cp != '.') return -1;
+-  b = strtoul(cp+1, &cp, 10);
+-  if (*cp != '.') return -1;
+-  c = strtoul(cp+1, NULL, 10);
++  if (*cp == '.')
++  b = strtoul(cp+1, &cp, 10);
++  if (*cp == '.')
++  c = strtoul(cp+1, &cp, 10);
+ 
+   return (a*100)+(b*1000)+c;
+ }
+-- 
+1.7.2.3
+

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm_install)

2011-06-30 Thread Thomas Bächler 
Date: Thursday, June 30, 2011 @ 14:05:23
  Author: thomas
Revision: 129978

mdadm: Adjust mkinitcpio hook for mkinitcpio 0.7

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm_install

---+
 PKGBUILD  |6 +++---
 mdadm_install |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-30 18:03:08 UTC (rev 129977)
+++ PKGBUILD2011-06-30 18:05:23 UTC (rev 129978)
@@ -3,13 +3,13 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/";
 groups=('base')
-conflicts=('mkinitcpio<0.5.99')
+conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
@@ -23,7 +23,7 @@
 md5sums=('12ee2fbf3beddb60601fb7a4c4905651'
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
- '53f58d4a8f6e23c452d67007186262e3'
+ '4bb000166fb13e82ceaa2422fdfaac7e'
  '36f7cc564ed3267888d90208e0eb7adc'
  '4ad87b74a4bc9a34621280abe0e0c3e4')
 

Modified: mdadm_install
===
--- mdadm_install   2011-06-30 18:03:08 UTC (rev 129977)
+++ mdadm_install   2011-06-30 18:05:23 UTC (rev 129978)
@@ -1,6 +1,6 @@
 # vim: set ft=sh:
 
-install ()
+build()
 {
 MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
 BINARIES=""

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm)

2011-04-23 Thread Tobias Powalowski 
Date: Saturday, April 23, 2011 @ 03:42:14
  Author: tpowa
Revision: 120375

upgpkg: mdadm 3.2.1-3
fix #23868 #23691

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm

--+
 PKGBUILD |9 ++---
 mdadm|1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-23 07:03:05 UTC (rev 120374)
+++ PKGBUILD2011-04-23 07:42:14 UTC (rev 120375)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -40,13 +40,8 @@
   make MDASSEMBLE_AUTO=1 mdassemble
   install -D -m755 mdassemble $pkgdir/sbin/mdassemble
 }
-md5sums=('5af65c32193fe0aea1aac4c4d44ac383'
- '7bff0e506fb6017510c8ec4a01896952'
- '00cbed931db4f15b6ce49e3e7d433966'
- '865c3d39e5f5dae58388160b563981f1'
- '1a3eb63832cecd6550f5b0a21d58cfdb')
 md5sums=('d1e2549202bd79d9e99f1498d1109530'
- '7bff0e506fb6017510c8ec4a01896952'
+ '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
  '865c3d39e5f5dae58388160b563981f1'
  '1a3eb63832cecd6550f5b0a21d58cfdb'

Modified: mdadm
===
--- mdadm   2011-04-23 07:03:05 UTC (rev 120374)
+++ mdadm   2011-04-23 07:42:14 UTC (rev 120375)
@@ -13,7 +13,6 @@
 if [ ! -z "$PID" -o $? -gt 0 ]; then
   stat_fail
 else
-  mdadm --monitor --oneshot --scan
   add_daemon mdadm
   stat_done
 fi

[arch-commits] Commit in mdadm/trunk (PKGBUILD segfault-3.2.1.patch)

2011-04-13 Thread Tobias Powalowski 
Date: Wednesday, April 13, 2011 @ 03:07:09
  Author: tpowa
Revision: 119650

upgpkg: mdadm 3.2.1-2
fix segfaults in mdadm monitor mode

Added:
  mdadm/trunk/segfault-3.2.1.patch
Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |   22 ++-
 segfault-3.2.1.patch |   68 +
 2 files changed, 83 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-13 04:54:21 UTC (rev 119649)
+++ PKGBUILD2011-04-13 07:07:09 UTC (rev 119650)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,17 +16,14 @@
 mdadm 
 mdadm.conf 
 mdadm_install
-mdadm_hook)
+mdadm_hook
+segfault-3.2.1.patch)
 install=mdadm.install
 replaces=('raidtools')
-md5sums=('d1e2549202bd79d9e99f1498d1109530'
- '7bff0e506fb6017510c8ec4a01896952'
- '00cbed931db4f15b6ce49e3e7d433966'
- '865c3d39e5f5dae58388160b563981f1'
- '1a3eb63832cecd6550f5b0a21d58cfdb')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i ../segfault-3.2.1.patch
   make CXFLAGS="$CFLAGS"
 }
 
@@ -43,3 +40,14 @@
   make MDASSEMBLE_AUTO=1 mdassemble
   install -D -m755 mdassemble $pkgdir/sbin/mdassemble
 }
+md5sums=('5af65c32193fe0aea1aac4c4d44ac383'
+ '7bff0e506fb6017510c8ec4a01896952'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '865c3d39e5f5dae58388160b563981f1'
+ '1a3eb63832cecd6550f5b0a21d58cfdb')
+md5sums=('d1e2549202bd79d9e99f1498d1109530'
+ '7bff0e506fb6017510c8ec4a01896952'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '865c3d39e5f5dae58388160b563981f1'
+ '1a3eb63832cecd6550f5b0a21d58cfdb'
+ '2fd25605bd1836a33c689ac442cb73ed')

Added: segfault-3.2.1.patch
===
--- segfault-3.2.1.patch(rev 0)
+++ segfault-3.2.1.patch2011-04-13 07:07:09 UTC (rev 119650)
@@ -0,0 +1,68 @@
+From 4019ad07013a5d8618b867f724d1c4a13c5cb05d Mon Sep 17 00:00:00 2001
+From: Jonathan Liu 
+Date: Tue, 12 Apr 2011 18:28:01 +1000
+Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata
+
+0.90 array do not report the metadata type in /proc/mdstat, so
+we cannot assume that mse->metadata_version is non-NULL.
+
+So add an appropriate check.
+
+This adds an additional check missed by commit
+eb28e119b03fd5149886ed516fa4bb006ad3602e.
+
+Signed-off-by: NeilBrown 
+---
+ Monitor.c |3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Monitor.c b/Monitor.c
+index a3ea724..55aebeb 100644
+--- a/Monitor.c
 b/Monitor.c
+@@ -577,7 +577,8 @@ static int check_array(struct state *st, struct mdstat_ent 
*mdstat,
+   info[i].major = info[i].minor = 0;
+   }
+ 
+-  if (strncmp(mse->metadata_version, "external:", 9) == 0 &&
++  if (mse->metadata_version &&
++  strncmp(mse->metadata_version, "external:", 9) == 0 &&
+   is_subarray(mse->metadata_version+9))
+   st->parent_dev =
+   devname2devnum(mse->metadata_version+10);
+-- 
+1.7.2.3
+
+From eb28e119b03fd5149886ed516fa4bb006ad3602e Mon Sep 17 00:00:00 2001
+From: NeilBrown 
+Date: Tue, 5 Apr 2011 09:16:57 +1000
+Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata
+
+0.90 array do not report the metadata type in /proc/mdstat, so
+we cannot assume that mse->metadata_version is non-NULL.
+
+So add an appropriate check.
+
+Reported-by: Eugene 
+Signed-off-by: NeilBrown 
+---
+ Monitor.c |3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Monitor.c b/Monitor.c
+index 291e465..337785d 100644
+--- a/Monitor.c
 b/Monitor.c
+@@ -688,7 +688,8 @@ static int add_new_arrays(struct mdstat_ent *mdstat, 
struct state **statelist,
+   st->devnum = mse->devnum;
+   st->percent = -2;
+   st->expected_spares = -1;
+-  if (strncmp(mse->metadata_version, "external:", 9) == 0 
&&
++  if (mse->metadata_version &&
++  strncmp(mse->metadata_version, "external:", 9) == 0 
&&
+   is_subarray(mse->metadata_version+9))
+   st->parent_dev =
+   
devname2devnum(mse->metadata_version+10);
+-- 
+1.7.2.3
+

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2011-03-30 Thread Tobias Powalowski 
Date: Thursday, March 31, 2011 @ 02:36:59
  Author: tpowa
Revision: 117346

upgpkg: mdadm 3.2.1-1
bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-31 06:30:02 UTC (rev 117345)
+++ PKGBUILD2011-03-31 06:36:59 UTC (rev 117346)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.1.5
+pkgver=3.2.1
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@
 mdadm_hook)
 install=mdadm.install
 replaces=('raidtools')
-md5sums=('a7575707a5f2d1ed6d408446eabcb19b'
+md5sums=('d1e2549202bd79d9e99f1498d1109530'
  '7bff0e506fb6017510c8ec4a01896952'
  '00cbed931db4f15b6ce49e3e7d433966'
  '865c3d39e5f5dae58388160b563981f1'
@@ -28,6 +28,10 @@
 build() {
   cd $srcdir/$pkgname-$pkgver
   make CXFLAGS="$CFLAGS"
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make INSTALL=/bin/install DESTDIR=$pkgdir install
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
   install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm)

2011-03-25 Thread Tobias Powalowski 
Date: Friday, March 25, 2011 @ 04:21:55
  Author: tpowa
Revision: 116698

upgpkg: mdadm 3.1.5-1
bump to latest version

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm

--+
 PKGBUILD |8 
 mdadm|1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-25 07:50:28 UTC (rev 116697)
+++ PKGBUILD2011-03-25 08:21:55 UTC (rev 116698)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.1.4
+pkgver=3.1.5
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
@@ -19,15 +19,15 @@
 mdadm_hook)
 install=mdadm.install
 replaces=('raidtools')
-md5sums=('0e7dcb5cc4192ae3abd9956bac475576'
- '6df172c8f77b280018cf87eb3d313f29'
+md5sums=('a7575707a5f2d1ed6d408446eabcb19b'
+ '7bff0e506fb6017510c8ec4a01896952'
  '00cbed931db4f15b6ce49e3e7d433966'
  '865c3d39e5f5dae58388160b563981f1'
  '1a3eb63832cecd6550f5b0a21d58cfdb')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  make || return 1
+  make CXFLAGS="$CFLAGS"
   make INSTALL=/bin/install DESTDIR=$pkgdir install
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
   install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm

Modified: mdadm
===
--- mdadm   2011-03-25 07:50:28 UTC (rev 116697)
+++ mdadm   2011-03-25 08:21:55 UTC (rev 116698)
@@ -13,6 +13,7 @@
 if [ ! -z "$PID" -o $? -gt 0 ]; then
   stat_fail
 else
+  mdadm --monitor --oneshot --scan
   add_daemon mdadm
   stat_done
 fi

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2010-08-31 Thread Tobias Powalowski 
Date: Wednesday, September 1, 2010 @ 02:46:31
  Author: tpowa
Revision: 89445

upgpkg: mdadm 3.1.4-1
bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-31 19:00:41 UTC (rev 89444)
+++ PKGBUILD2010-09-01 06:46:31 UTC (rev 89445)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.1.3
+pkgver=3.1.4
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@
 mdadm_hook)
 install=mdadm.install
 replaces=('raidtools')
-md5sums=('8f01a979939811abede6527212b46cda'
+md5sums=('0e7dcb5cc4192ae3abd9956bac475576'
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
  '865c3d39e5f5dae58388160b563981f1'

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2010-03-17 Thread Tobias Powalowski 
Date: Thursday, March 18, 2010 @ 02:43:53
  Author: tpowa
Revision: 72526

upgpkg: mdadm 3.1.2-1
bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-17 23:54:49 UTC (rev 72525)
+++ PKGBUILD2010-03-18 06:43:53 UTC (rev 72526)
@@ -2,8 +2,8 @@
 # Maintainer: Tobias Powalowski 
 # Contributor: Judd Vinet 
 pkgname=mdadm
-pkgver=3.1.1
-pkgrel=2
+pkgver=3.1.2
+pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -19,7 +19,7 @@
 mdadm_hook)
 install=mdadm.install
 replaces=('raidtools')
-md5sums=('4fd8e375a2ee314becd3196c1a250d98'
+md5sums=('c5a39f38c465229767a5af2a4eb81bef'
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
  '865c3d39e5f5dae58388160b563981f1'
@@ -39,4 +39,3 @@
   make MDASSEMBLE_AUTO=1 mdassemble
   install -D -m755 mdassemble $pkgdir/sbin/mdassemble
 }
-

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm_install)

2010-02-17 Thread Thomas Bächler 
Date: Wednesday, February 17, 2010 @ 13:39:27
  Author: thomas
Revision: 69106

Replace BINARIES="mdassemble" with add_binary "/sbin/mdassemble" (Ref: FS#18365)

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm_install

---+
 PKGBUILD  |2 +-
 mdadm_install |3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-17 18:09:23 UTC (rev 69105)
+++ PKGBUILD2010-02-17 18:39:27 UTC (rev 69106)
@@ -22,7 +22,7 @@
 md5sums=('4fd8e375a2ee314becd3196c1a250d98'
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
- '0c201efd85790fea6aaf7686a9b31510'
+ '865c3d39e5f5dae58388160b563981f1'
  '1a3eb63832cecd6550f5b0a21d58cfdb')
 
 build() {

Modified: mdadm_install
===
--- mdadm_install   2010-02-17 18:09:23 UTC (rev 69105)
+++ mdadm_install   2010-02-17 18:39:27 UTC (rev 69106)
@@ -3,7 +3,7 @@
 install ()
 {
 MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
-BINARIES="mdassemble"
+BINARIES=""
 FILES=""
 SCRIPT="mdadm"
 # check if a custom mdadm.conf exists
@@ -11,6 +11,7 @@
 echo "Custom /etc/mdadm.conf file will be used in initramfs for 
assembling arrays."
 add_file "/etc/mdadm.conf"
 fi
+add_binary "/sbin/mdassemble"
 add_file "/lib/udev/rules.d/64-md-raid.rules"
 }

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2010-02-07 Thread Thomas Bächler 
Date: Sunday, February 7, 2010 @ 05:46:43
  Author: thomas
Revision: 67473

Add versioned conflict to old mkinitcpio

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-07 10:46:15 UTC (rev 67472)
+++ PKGBUILD2010-02-07 10:46:43 UTC (rev 67473)
@@ -9,6 +9,7 @@
 license=('GPL')
 url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/";
 groups=('base')
+conflicts=('mkinitcpio<0.5.99')
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm_hook)

2010-02-07 Thread Tobias Powalowski 
Date: Sunday, February 7, 2010 @ 03:48:42
  Author: tpowa
Revision: 67448

removed sleep again not the error source

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm_hook

+
 PKGBUILD   |3 ++-
 mdadm_hook |6 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-07 08:47:21 UTC (rev 67447)
+++ PKGBUILD2010-02-07 08:48:42 UTC (rev 67448)
@@ -22,7 +22,7 @@
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
  '0c201efd85790fea6aaf7686a9b31510'
- '8e44a59031f896d64985a63741ad2cad')
+ '1a3eb63832cecd6550f5b0a21d58cfdb')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -38,3 +38,4 @@
   make MDASSEMBLE_AUTO=1 mdassemble
   install -D -m755 mdassemble $pkgdir/sbin/mdassemble
 }
+

Modified: mdadm_hook
===
--- mdadm_hook  2010-02-07 08:47:21 UTC (rev 67447)
+++ mdadm_hook  2010-02-07 08:48:42 UTC (rev 67448)
@@ -40,9 +40,5 @@
 done
 fi
 # assemble everything
-if [ -e $mdconfig ]; then
-/sbin/mdassemble
-#fix for udev creating md devices 
-sleep 0.5
-fi
+[ -e $mdconfig ] && /sbin/mdassemble
 }
\ No newline at end of file

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm_hook)

2010-02-07 Thread Tobias Powalowski 
Date: Sunday, February 7, 2010 @ 03:36:41
  Author: tpowa
Revision: 67446

added sleep 0.5 for safety

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm_hook

+
 PKGBUILD   |   11 +--
 mdadm_hook |6 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-07 08:31:20 UTC (rev 67445)
+++ PKGBUILD2010-02-07 08:36:41 UTC (rev 67446)
@@ -18,7 +18,11 @@
 mdadm_hook)
 install=mdadm.install
 replaces=('raidtools')
-options=('force')
+md5sums=('4fd8e375a2ee314becd3196c1a250d98'
+ '6df172c8f77b280018cf87eb3d313f29'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '0c201efd85790fea6aaf7686a9b31510'
+ '8e44a59031f896d64985a63741ad2cad')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -34,8 +38,3 @@
   make MDASSEMBLE_AUTO=1 mdassemble
   install -D -m755 mdassemble $pkgdir/sbin/mdassemble
 }
-md5sums=('4fd8e375a2ee314becd3196c1a250d98'
- '6df172c8f77b280018cf87eb3d313f29'
- '00cbed931db4f15b6ce49e3e7d433966'
- '0c201efd85790fea6aaf7686a9b31510'
- '1a3eb63832cecd6550f5b0a21d58cfdb')

Modified: mdadm_hook
===
--- mdadm_hook  2010-02-07 08:31:20 UTC (rev 67445)
+++ mdadm_hook  2010-02-07 08:36:41 UTC (rev 67446)
@@ -40,5 +40,9 @@
 done
 fi
 # assemble everything
-[ -e $mdconfig ] && /sbin/mdassemble
+if [ -e $mdconfig ]; then
+/sbin/mdassemble
+#fix for udev creating md devices 
+sleep 0.5
+fi
 }
\ No newline at end of file

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm_hook)

2010-02-06 Thread Tobias Powalowski 
Date: Saturday, February 6, 2010 @ 12:04:00
  Author: tpowa
Revision: 67400

fixes for new mkinitcpio

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm_hook

+
 PKGBUILD   |5 +++--
 mdadm_hook |   18 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-06 17:03:49 UTC (rev 67399)
+++ PKGBUILD2010-02-06 17:04:00 UTC (rev 67400)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer: Judd Vinet 
+# Maintainer: Tobias Powalowski 
+# Contributor: Judd Vinet 
 pkgname=mdadm
 pkgver=3.1.1
 pkgrel=2
@@ -37,4 +38,4 @@
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
  '0c201efd85790fea6aaf7686a9b31510'
- '055dd8c8e58afde63dc695b3e36aa5b2')
+ '1a3eb63832cecd6550f5b0a21d58cfdb')

Modified: mdadm_hook
===
--- mdadm_hook  2010-02-06 17:03:49 UTC (rev 67399)
+++ mdadm_hook  2010-02-06 17:04:00 UTC (rev 67400)
@@ -5,48 +5,40 @@
 mdconfig="/etc/mdadm.conf"
 # for partitionable raid, we need to load md_mod first!
 modprobe md_mod 2>/dev/null
-# if no config file is present create one from command line parameters
-if ! [ -e $mdconfig ]; then
+# If md is specified on commandline, create config file from those 
parameters.
+if [ "$(echo $input | grep "md=")" ]; then
 #Create initial mdadm.conf
 # scan all devices in /proc/partitions
 echo DEVICE partitions > $mdconfig
 for i in $input; do 
-case $i in
+case $i in
 # raid 
 md=[0-9]*,/*)
 device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')"
 array="$(echo $i | cut -d, -f2-)"
 echo "ARRAY /dev/$device devices=$array" >> $mdconfig
-RAID_FOUND=1
 ;;
 # partitionable raid
 md=d[0-9]*,/*)
 device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')"
 array="$(echo $i | cut -d, -f2-)"
 echo "ARRAY /dev/$device devices=$array" >> $mdconfig
-RAID_FOUND=1
 ;;
 # raid UUID 
 md=[0-9]*,[0-9,a-z]*)
 device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')"
 array="$(echo $i | cut -d, -f2-)"
 echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
-RAID_FOUND=1
 ;;
 # partitionable raid UUID
 md=d[0-9]*,[0-9,a-z]*)
 device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')"
 array="$(echo $i | cut -d, -f2-)"
 echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
-RAID_FOUND=1
 ;;
 esac 
 done
-else
-RAID_FOUND=1
 fi
-if [ "$RAID_FOUND" = 1 ]; then
-# assemble everything
-/sbin/mdassemble
-fi
+# assemble everything
+[ -e $mdconfig ] && /sbin/mdassemble
 }
\ No newline at end of file

[arch-commits] Commit in mdadm/trunk (PKGBUILD mdadm_hook mdadm_install)

2010-02-05 Thread Tobias Powalowski 
Date: Friday, February 5, 2010 @ 14:04:52
  Author: tpowa
Revision: 67227

change to new mkinitcpio

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm_hook
  mdadm/trunk/mdadm_install

---+
 PKGBUILD  |   12 +++-
 mdadm_hook|   26 +-
 mdadm_install |3 ++-
 3 files changed, 22 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-05 12:04:08 UTC (rev 67226)
+++ PKGBUILD2010-02-05 19:04:52 UTC (rev 67227)
@@ -2,7 +2,7 @@
 # Maintainer: Judd Vinet 
 pkgname=mdadm
 pkgver=3.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -27,12 +27,14 @@
   install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
   install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm
   install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
+  # symlink for backward compatibility
+  ln -sf /lib/initcpio/hooks/mdadm  $pkgdir/lib/initcpio/hooks/raid
   # build static mdassemble for Arch's initramfs
-  make mdassemble.auto
-  install -D -m755 mdassemble.auto $pkgdir/sbin/mdassemble.static
+  make MDASSEMBLE_AUTO=1 mdassemble
+  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
 }
 md5sums=('4fd8e375a2ee314becd3196c1a250d98'
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
- '5067783b0051dedc95d159af22f0c681'
- 'ef76d9dda597ffca4ef1934fe801cb60')
+ '0c201efd85790fea6aaf7686a9b31510'
+ '055dd8c8e58afde63dc695b3e36aa5b2')

Modified: mdadm_hook
===
--- mdadm_hook  2010-02-05 12:04:08 UTC (rev 67226)
+++ mdadm_hook  2010-02-05 19:04:52 UTC (rev 67227)
@@ -14,30 +14,30 @@
 case $i in
 # raid 
 md=[0-9]*,/*)
-device="$(/bin/replace -s,/ "$i" "=" "")"
-array="$(/bin/replace -s/ "$device" "," " devices=")"
-echo "ARRAY /dev/$array" >> $mdconfig
+device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')"
+array="$(echo $i | cut -d, -f2-)"
+echo "ARRAY /dev/$device devices=$array" >> $mdconfig
 RAID_FOUND=1
 ;;
 # partitionable raid
 md=d[0-9]*,/*)
-device="$(/bin/replace -s=d "$i" "md=" "md_")"
-array="$(/bin/replace -s/ "$device" "," " devices=")"
-echo "ARRAY /dev/$array" >> $mdconfig
+device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')"
+array="$(echo $i | cut -d, -f2-)"
+echo "ARRAY /dev/$device devices=$array" >> $mdconfig
 RAID_FOUND=1
 ;;
 # raid UUID 
 md=[0-9]*,[0-9,a-z]*)
-device="$(/bin/replace -s,/ "$i" "=" "")"
-array="$(/bin/replace -s/ "$device" "," " uuid=")"
-echo "ARRAY /dev/$array" >> $mdconfig
+device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')"
+array="$(echo $i | cut -d, -f2-)"
+echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
 RAID_FOUND=1
 ;;
 # partitionable raid UUID
 md=d[0-9]*,[0-9,a-z]*)
-device="$(/bin/replace -s=d "$i" "md=" "md_")"
-array="$(/bin/replace -s/ "$device" "," " uuid=")"
-echo "ARRAY /dev/$array" >> $mdconfig
+device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')"
+array="$(echo $i | cut -d, -f2-)"
+echo "ARRAY /dev/$device UUID=$array" >> $mdconfig
 RAID_FOUND=1
 ;;
 esac 
@@ -47,6 +47,6 @@
 fi
 if [ "$RAID_FOUND" = 1 ]; then
 # assemble everything
-/sbin/mdassemble.static
+/sbin/mdassemble
 fi
 }
\ No newline at end of file

Modified: mdadm_install
===
--- mdadm_install   2010-02-05 12:04:08 UTC (rev 67226)
+++ mdadm_install   2010-02-05 19:04:52 UTC (rev 67227)
@@ -3,7 +3,7 @@
 install ()
 {
 MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") "
-BINARIES="mdassemble.static"
+BINARIES="mdassemble"
 FILES=""
 SCRIPT="mdadm"
 # check if a custom mdadm.conf exists
@@ -11,6 +11,7 @@
 echo "Custom /etc/mdadm.conf file will be used in initramfs for 
assembling arrays."
 add_file "/etc/mdadm.conf"
 fi
+add_file "/lib/udev/rules.d/64-md-raid.rules"
 }
 
 help ()

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2009-11-27 Thread Tobias Powalowski 
Date: Friday, November 27, 2009 @ 05:34:45
  Author: tpowa
Revision: 59755

upgpkg: mdadm 3.1.1-1
bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |   15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-27 10:28:04 UTC (rev 59754)
+++ PKGBUILD2009-11-27 10:34:45 UTC (rev 59755)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Judd Vinet 
 pkgname=mdadm
-pkgver=3.0.3
+pkgver=3.1.1
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
@@ -18,11 +18,6 @@
 install=mdadm.install
 replaces=('raidtools')
 options=('force')
-md5sums=('1ab786dee6c65c68ea74199788bf88c7'
- '6df172c8f77b280018cf87eb3d313f29'
- '00cbed931db4f15b6ce49e3e7d433966'
- '5067783b0051dedc95d159af22f0c681'
- 'ef76d9dda597ffca4ef1934fe801cb60')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -35,7 +30,9 @@
   # build static mdassemble for Arch's initramfs
   make mdassemble.auto
   install -D -m755 mdassemble.auto $pkgdir/sbin/mdassemble.static
-  # remove udev rule, it's wrong and uses vol_id which was replaced some time 
ago
-  rm $pkgdir/lib/udev/rules.d/64-md-raid.rules
 }
-
+md5sums=('4fd8e375a2ee314becd3196c1a250d98'
+ '6df172c8f77b280018cf87eb3d313f29'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '5067783b0051dedc95d159af22f0c681'
+ 'ef76d9dda597ffca4ef1934fe801cb60')

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2009-11-07 Thread Tobias Powalowski 
Date: Saturday, November 7, 2009 @ 14:11:46
  Author: tpowa
Revision: 58411

upgpkg: mdadm 3.0.3-1
revert to 3.0.x branch due to potential dataloss problems

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-07 18:51:55 UTC (rev 58410)
+++ PKGBUILD2009-11-07 19:11:46 UTC (rev 58411)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Judd Vinet 
 pkgname=mdadm
-pkgver=3.1
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
@@ -17,7 +17,8 @@
 mdadm_hook)
 install=mdadm.install
 replaces=('raidtools')
-md5sums=('67619281f86f4d578f6515439fb19f2c'
+options=('force')
+md5sums=('1ab786dee6c65c68ea74199788bf88c7'
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
  '5067783b0051dedc95d159af22f0c681'
@@ -37,3 +38,4 @@
   # remove udev rule, it's wrong and uses vol_id which was replaced some time 
ago
   rm $pkgdir/lib/udev/rules.d/64-md-raid.rules
 }
+

[arch-commits] Commit in mdadm/trunk (PKGBUILD)

2009-11-02 Thread Tobias Powalowski 
Date: Monday, November 2, 2009 @ 10:44:49
  Author: tpowa
Revision: 57841

upgpkg: mdadm 3.1-1
bump to latest version

Modified:
  mdadm/trunk/PKGBUILD

--+
 PKGBUILD |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2009-11-02 14:47:51 UTC (rev 57840)
+++ PKGBUILD2009-11-02 15:44:49 UTC (rev 57841)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Judd Vinet 
 pkgname=mdadm
-pkgver=2.6.9
+pkgver=3.1
 pkgrel=1
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as 
Software RAID"
 arch=(i686 x86_64)
@@ -10,11 +10,14 @@
 groups=('base')
 depends=('glibc')
 backup=('etc/mdadm.conf')
-source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 \
-mdadm mdadm.conf mdadm_install mdadm_hook)
+source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
+mdadm 
+mdadm.conf 
+mdadm_install
+mdadm_hook)
 install=mdadm.install
 replaces=('raidtools')
-md5sums=('96c1bcac1699ba1aa70dfd04a08549c9'
+md5sums=('67619281f86f4d578f6515439fb19f2c'
  '6df172c8f77b280018cf87eb3d313f29'
  '00cbed931db4f15b6ce49e3e7d433966'
  '5067783b0051dedc95d159af22f0c681'
@@ -31,4 +34,6 @@
   # build static mdassemble for Arch's initramfs
   make mdassemble.auto
   install -D -m755 mdassemble.auto $pkgdir/sbin/mdassemble.static
+  # remove udev rule, it's wrong and uses vol_id which was replaced some time 
ago
+  rm $pkgdir/lib/udev/rules.d/64-md-raid.rules
 }