mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-01-24 02:22:15 +08:00
* chakra-initscripts: bump to new 2011.04
* dmraid: bump to 1.0.0.rc16.3 * mdadm: rebuild against new initscripts * initscripts: update tarball
This commit is contained in:
philm
parent
3e33221529
commit
9be04abd32
@ -19,7 +19,7 @@ groups=('livecd')
|
||||
provides=("initscripts=${pkgver}")
|
||||
conflicts=('initscripts')
|
||||
backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
|
||||
depends=('bash' 'awk' 'grep' 'coreutils' 'sed' 'udev'
|
||||
depends=('bash' 'grep' 'coreutils' 'udev>=167'
|
||||
'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit')
|
||||
optdepends=('bridge-utils: Network bridging support'
|
||||
'dhcpcd: DHCP network configuration'
|
||||
@ -28,15 +28,14 @@ install=initscripts.install
|
||||
source=("http://chakra-project.org/sources/initscripts/initscripts-${pkgver}.tar.xz"
|
||||
'http://chakra-project.org/sources/initscripts/wireless.conf.d'
|
||||
"http://chakra-project.org/sources/initscripts/chakra-initscripts-${pkgver}-${pkgrel}.patch")
|
||||
sha256sums=('ae32415b06110e28cdb90263e55013368a9c897626921cc208ea2c0db311440b'
|
||||
sha256sums=('95d09e2f68f18e6af5bba1a650352a1b9052eb5a10f1b432f3a78b649d545d9d'
|
||||
'0eba4250b07e0a727ef64772f5ee9027b123cbd4bb0894ba2842f545035c827f'
|
||||
'768a4c6727370f07d0ccee5a4590fc1eb10a21444f17eaa53863a7a7eba9c579')
|
||||
|
||||
package() {
|
||||
cd ${srcdir}/${_origname}-${pkgver}
|
||||
DESTDIR=${pkgdir} ./install.sh
|
||||
cd ${srcdir}/initscripts-${pkgver}
|
||||
make DESTDIR=${pkgdir} install
|
||||
install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
|
||||
#cp -vr ${startdir}/etc ${pkgdir}
|
||||
cd ${pkgdir}
|
||||
patch -Np1 -i ${srcdir}/chakra-initscripts-${pkgver}-${pkgrel}.patch || return 1
|
||||
rm -v $(find . -type f -name '*.orig')
|
||||
|
||||
@ -1,30 +1,35 @@
|
||||
# $Id: PKGBUILD 77425 2010-04-12 20:48:57Z thomas $
|
||||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
#Contributor: Urs Wolfer <uwolfer @ fwo.ch>
|
||||
#
|
||||
# Chakra Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=dmraid
|
||||
pkgver=1.0.0.rc16+CVS
|
||||
pkgrel=2
|
||||
pkgver=1.0.0.rc16.3
|
||||
pkgrel=1
|
||||
pkgdesc="Device mapper RAID interface"
|
||||
url="http://people.redhat.com/~heinzm/sw/dmraid/"
|
||||
depends=('device-mapper>=2.0.54')
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL')
|
||||
source=(ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
|
||||
#http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-$pkgver.tar.bz2
|
||||
source=(#ftp://ftp.archlinux.org/other/dmraid/$pkgname-$pkgver.tar.bz2
|
||||
http://people.redhat.com/~heinzm/sw/dmraid/src/$pkgname-1.0.0.rc16-3.tar.bz2
|
||||
dmraid_install
|
||||
dmraid_hook)
|
||||
install=dmraid.install
|
||||
md5sums=('c0de87073de96b311d26ab0170b2a753'
|
||||
md5sums=('819338fcef98e8e25819f0516722beeb'
|
||||
'd01908b414e1686c0f3233ff37de78a5'
|
||||
'0a748b6e78b156f2f9dda45fc629651f')
|
||||
|
||||
build() {
|
||||
cd "$srcdir"/$pkgname/$pkgver
|
||||
|
||||
cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
|
||||
./configure --enable-led --enable-intel_led
|
||||
make || return 1
|
||||
make DESTDIR="$pkgdir" mandir=/usr/share/man includedir=/usr/include install || return 1
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir"/$pkgname/1.0.0.rc16-3/$pkgname
|
||||
make DESTDIR="$pkgdir" prefix=/ libdir=/lib mandir=/usr/share/man includedir=/usr/include install
|
||||
mkdir -p "$pkgdir"/var/lock/dmraid
|
||||
chmod 1777 "$pkgdir"/var/lock/
|
||||
install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/lib/initcpio/install/dmraid
|
||||
|
||||
@ -13,7 +13,7 @@ url="http://www.chakra-project.org"
|
||||
license=('GPL2')
|
||||
groups=('base')
|
||||
backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
|
||||
depends=('bash' 'awk' 'grep' 'coreutils' 'sed' 'udev'
|
||||
depends=('bash' 'grep' 'coreutils' 'udev>=167'
|
||||
'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit')
|
||||
optdepends=('bridge-utils: Network bridging support'
|
||||
'dhcpcd: DHCP network configuration'
|
||||
@ -21,11 +21,11 @@ optdepends=('bridge-utils: Network bridging support'
|
||||
install=initscripts.install
|
||||
source=("http://chakra-project.org/sources/initscripts/initscripts-${pkgver}.tar.xz"
|
||||
'http://chakra-project.org/sources/initscripts/wireless.conf.d')
|
||||
sha256sums=('ae32415b06110e28cdb90263e55013368a9c897626921cc208ea2c0db311440b'
|
||||
sha256sums=('95d09e2f68f18e6af5bba1a650352a1b9052eb5a10f1b432f3a78b649d545d9d'
|
||||
'0eba4250b07e0a727ef64772f5ee9027b123cbd4bb0894ba2842f545035c827f')
|
||||
|
||||
package() {
|
||||
cd ${srcdir}/${pkgname}-${pkgver}
|
||||
DESTDIR=${pkgdir} ./install.sh
|
||||
make DESTDIR=${pkgdir} install
|
||||
install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
|
||||
}
|
||||
|
||||
@ -1,9 +1,12 @@
|
||||
# $Id: PKGBUILD 72624 2010-03-18 23:00:10Z tpowa $
|
||||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
# Contributor: Judd Vinet <jvinet@zeroflux.org>
|
||||
#
|
||||
# Chakra Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=mdadm
|
||||
pkgver=3.1.2
|
||||
pkgrel=2
|
||||
pkgver=3.2.1
|
||||
pkgrel=3
|
||||
pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
|
||||
arch=(i686 x86_64)
|
||||
license=('GPL')
|
||||
@ -17,24 +20,25 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
|
||||
mdadm.conf
|
||||
mdadm_install
|
||||
mdadm_hook
|
||||
mdadm-3.1.2-mapfile.patch
|
||||
mdadm-3.1.2-fix-udev.patch)
|
||||
segfault-3.2.1.patch)
|
||||
install=mdadm.install
|
||||
replaces=('raidtools')
|
||||
md5sums=('c5a39f38c465229767a5af2a4eb81bef'
|
||||
|
||||
md5sums=('d1e2549202bd79d9e99f1498d1109530'
|
||||
'6df172c8f77b280018cf87eb3d313f29'
|
||||
'00cbed931db4f15b6ce49e3e7d433966'
|
||||
'865c3d39e5f5dae58388160b563981f1'
|
||||
'1a3eb63832cecd6550f5b0a21d58cfdb'
|
||||
'b8e4f97a0045c958202758a88a822331'
|
||||
'5251b6a53992308cad199a4ea1e19420')
|
||||
'2fd25605bd1836a33c689ac442cb73ed')
|
||||
|
||||
build() {
|
||||
cd $srcdir/$pkgname-$pkgver
|
||||
# fix udev hang
|
||||
patch -Np1 -i ../mdadm-3.1.2-mapfile.patch || return 1
|
||||
patch -Np0 -i ../mdadm-3.1.2-fix-udev.patch || return 1
|
||||
make || return 1
|
||||
patch -Np1 -i ../segfault-3.2.1.patch
|
||||
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
|
||||
@ -46,4 +50,3 @@ build() {
|
||||
make MDASSEMBLE_AUTO=1 mdassemble
|
||||
install -D -m755 mdassemble $pkgdir/sbin/mdassemble
|
||||
}
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- Makefile~ 2010-03-18 23:52:23.000000000 +0100
|
||||
+++ Makefile 2010-03-18 23:52:23.000000000 +0100
|
||||
@@ -62,7 +62,7 @@
|
||||
# from early boot to late boot.
|
||||
# If you don't have /lib/init/rw you might want to use /dev/.something
|
||||
# e.g. make ALT_RUN=/dev/.mdadm
|
||||
-ALT_RUN = /lib/init/rw
|
||||
+ALT_RUN = /dev/md
|
||||
VAR_RUN = /var/run
|
||||
ALTFLAGS = -DALT_RUN=\"$(ALT_RUN)\"
|
||||
VARFLAGS = -DVAR_RUN=\"$(VAR_RUN)\"
|
||||
@ -1,40 +0,0 @@
|
||||
commit b25462c1bee1a01c6aae3c215e040bfb2f1c2fb7
|
||||
Author: Doug Ledford <dledford@redhat.com>
|
||||
Date: Tue Mar 16 23:00:11 2010 -0400
|
||||
|
||||
Create /dev/md in mapfile open like we do in mdopen if our ALT_RUN is
|
||||
set to be /dev/md. This keeps udev happy as it won't have to special
|
||||
case our /dev/md directory needs.
|
||||
|
||||
Signed-off-by: Doug Ledford <dledford@redhat.com>
|
||||
|
||||
diff --git a/mapfile.c b/mapfile.c
|
||||
index 366ebe3..eed17c8 100644
|
||||
--- a/mapfile.c
|
||||
+++ b/mapfile.c
|
||||
@@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
/* /var/run/mdadm.map is used to track arrays being created in --incremental
|
||||
- * more. It particularly allows lookup from UUID to array device, but
|
||||
+ * mode. It particularly allows lookup from UUID to array device, but
|
||||
* also allows the array device name to be easily found.
|
||||
*
|
||||
* The map file is line based with space separated fields. The fields are:
|
||||
@@ -64,6 +64,16 @@ char *mapsmode[3] = { "r", "w", "w"};
|
||||
FILE *open_map(int modenum, int *choice)
|
||||
{
|
||||
int i;
|
||||
+ struct stat sbuf;
|
||||
+
|
||||
+ /* Special case...if ALT_RUN is selected to be /dev/md, then
|
||||
+ * because we would normally create /dev/md ourselves in order to
|
||||
+ * stuff array symlinks in there as needed, udev and friends
|
||||
+ * expect us to create our own tree. So, do so.
|
||||
+ */
|
||||
+ if (strcmp(ALT_RUN, "/dev/md") == 0 && stat(ALT_RUN, &sbuf) != 0)
|
||||
+ mkdir(ALT_RUN, 0755);
|
||||
+
|
||||
for (i = 0 ; i < 3 ; i++) {
|
||||
int fd = open(mapname[i][modenum], mapmode[modenum], 0600);
|
||||
if (fd >= 0) {
|
||||
68
mdadm/segfault-3.2.1.patch
Normal file
68
mdadm/segfault-3.2.1.patch
Normal file
@ -0,0 +1,68 @@
|
||||
From 4019ad07013a5d8618b867f724d1c4a13c5cb05d Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Liu <net147@gmail.com>
|
||||
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 <neilb@suse.de>
|
||||
---
|
||||
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 <neilb@suse.de>
|
||||
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 <hdejin@yahoo.com>
|
||||
Signed-off-by: NeilBrown <neilb@suse.de>
|
||||
---
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user