dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add drbl patch for partclone

Browse Source 
Package-Manager: portage-2.2.0_alpha142
RepoMan-Options: --force
This commit is contained in:
Mario Fetka 2012-11-28 21:24:35 +01:00
parent 00fbf96e3a
commit 62673eaa52
5 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys-fs/reiser4progs/ChangeLog
View File

@ -1,7 +1,15 @@
# ChangeLog for sys-fs/reiser4progs # ChangeLog for sys-fs/reiser4progs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.41 2010/07/11 00:34:26 ranger Exp $ # $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.41 2010/07/11 00:34:26 ranger Exp $
*reiser4progs-1.0.7 (28 Nov 2012)
28 Nov 2012; Mario Fetka <mario.fetka@gmail.com>
+files/reiser4progs_1.0.7-6.diff, +reiser4progs-1.0.7.ebuild,
-files/reiser4progs-libreiser4-no-libmisc.patch,
-reiser4progs-1.0.7-r1.ebuild:
add drbl patch for partclone
11 Jul 2010; Brent Baude <ranger@gentoo.org> reiser4progs-1.0.7.ebuild: 11 Jul 2010; Brent Baude <ranger@gentoo.org> reiser4progs-1.0.7.ebuild:
stable ppc64, bug 302479 stable ppc64, bug 302479

12
sys-fs/reiser4progs/Manifest
View File

@ -1,6 +1,6 @@
AUX reiser4progs-1.0.7-gcc-4.4.patch 311 RMD160 c7975242c67610888cd6a694b64b0c90a520bf57 SHA1 6873e21bfddf38bdb0f3dfcb9106444e0daebcd8 SHA256 5d0fc888af703911457f42b16d4da76cfdcb5c38c08387c21f5f5e4e111160bf AUX reiser4progs-1.0.7-gcc-4.4.patch 311 SHA256 5d0fc888af703911457f42b16d4da76cfdcb5c38c08387c21f5f5e4e111160bf SHA512 940fc154fadec21a701ef7914a6b4ef1067fc954101219b2949bf8721e97deb8d832ae288c930a59060ba3171f94bfed5924c8ac6b8c30c655fd0ca09f0bff1a WHIRLPOOL 94f00f3e9a876c990b42a7eec3793d7f31696c2e689b70a411bb6cbe639e6ef69fa431db9e5f01ad20a0beb78eff54c185b669287922f9299dd090e906cc35db
AUX reiser4progs-libreiser4-no-libmisc.patch 1007 RMD160 068f09dde7dbb0696f23129d1ce339eec46d1e27 SHA1 2324dd512195f7ccfd887fada45d701da2c08e13 SHA256 58991a58601417639c873e2c1710ce3c6d4296e03bfcaed196c19c65dd92bf3c AUX reiser4progs_1.0.7-6.diff 898 SHA256 2720a6f288f405779f9c7d4084756f673ca694716a6eb694602a6368c0813ecd SHA512 917a332f466eb3b51bced189a7ffb3e4b2be87a6aa07bd5874091bbbb4a7c84ff6b3292785cc04fedc433fe7a44b62e1b1b83d890e90d733b2f2d4ec8a3df9bc WHIRLPOOL 125d9ecc02698e949c91a2f86412c9c7f65a1ffdfd0e04238abe1a8bc75c67d12c87b9095d22f0625bd9d187e84420c159165e45795cc5bc28bb1df5f87e1f20
DIST reiser4progs-1.0.7.tar.gz 844126 RMD160 6f6a6b5defdcea19f13857768596ff477f0cc877 SHA1 5e29580e6610105346ff88635d48eb37acb3ae67 SHA256 1211996ad3efebc0ca543aea2f67527d33e50fce1b827ad341e207f171d94d96 DIST reiser4progs-1.0.7.tar.gz 844126 SHA256 1211996ad3efebc0ca543aea2f67527d33e50fce1b827ad341e207f171d94d96 SHA512 afc88dc2cb7a2e9c8e8c4bc93012b41a19cecaf96a0dc7d75f20c535ebfbb8eac79688529d42ba5cbe067395a1a13cd997246e5bc57181c6dfaced6e6fec4a05 WHIRLPOOL 6c17458cd68dc3ea02fcfc221b03f860206fcd205d7887cffb84b1f712e305b6097be29ae44a4a098d188ffdaf8cf44f06cadbf24dc25bcaabe059e12f21ae0a
EBUILD reiser4progs-1.0.7-r1.ebuild 1603 RMD160 584e35c57c754bafb88c4838973ffa2b5b34cb91 SHA1 3f66fc2c8fb9fb776e2eead5fedc862f1c197f8f SHA256 215ac8b663cdc617378a775c1861aaea78972a750a382e9bc3873a60bb49b87d EBUILD reiser4progs-1.0.7.ebuild 1604 SHA256 339db03af4b0da9c99d67097f3643edf88b6c712d771b44594a3a9603fefadfb SHA512 ffb0ddaa59f1745f1266e6c885ea99a134bc5a11084f0e6dbe2b874726da2b2d5105d2c385a61bef13b994e43116dc126543a65cd07699ad5ad6c975477eeefe WHIRLPOOL 76d0af7713500334c00308ad8dbf3e9ce970e01f62e3408a82310471390aaa7e0efc036835c810c9da2931b8b45c32ae1b7344bdb7861d0a7b090baa32a19cd6
MISC ChangeLog 5826 RMD160 8e4f509af669b405751d22fa2ebba2b5b9723a85 SHA1 ce723b4b228a87e9f008528a03bd920a858017aa SHA256 ac7d8bc8c5a2fee7b0b7aadded1b6394919fc56175d3e1a40ae00c49b6ab8878 MISC ChangeLog 6092 SHA256 d3d258912ec41b2a73631a13de1887079bdf16ca58fe550542f1cceed6d2bbaf SHA512 45a5b14d4dd8466e4da4e843bbe3fdc417bf41e7ff3fac7dd03a2a6ca69d33bebcf0ed512137f61f18f5c27cb6f69a73777f3316c7cf1f2cb80f63d97c706927 WHIRLPOOL abf7fb4c02611888f2989fafb80811a01713ed713af5524388fcb18037ab63880be0269bf3e3221832188f3fad9c5ff8e9f683864d851433ec9937abb01d30dc
MISC metadata.xml 267 RMD160 ff256714690dbcb9f54233ec9a4fbe77f11068f6 SHA1 f12cbf59a4688ee6b663b50b6a9a1871f096b71b SHA256 afd6f362214e67e2c73e745c7bb7e78c46c190a9c9ecf0712722850d23515e6b MISC metadata.xml 267 SHA256 afd6f362214e67e2c73e745c7bb7e78c46c190a9c9ecf0712722850d23515e6b SHA512 9c577b7491c6865a0010947f6be695e1c8c31a03e0b14fee4d21ccde81229f981a57f95ac6d59eaf496c0b1a3ff117375733dd93bdc3228f097c31da4bb64ae9 WHIRLPOOL 94c08b3e4a38b8085b090d73f27645470d22d324fdf5d8f764c22b9e69b13f2bfefe89ceb76fcf59f29f4851ca13001877f9b3acce718f3bcfd6d4db362063f6

37
sys-fs/reiser4progs/files/reiser4progs-libreiser4-no-libmisc.patch
View File

@ -1,37 +0,0 @@
--- reiser4progs-1.0.7/libreiser4/profile.c~ 2009-01-08 22:34:27.000000000 +0100
+++ reiser4progs-1.0.7/libreiser4/profile.c 2011-01-07 01:28:39.509867695 +0100
@@ -5,7 +5,7 @@
#include <reiser4/libreiser4.h>
-#include <misc/misc.h>
+#define INVAL_DIG (0x7fffffff)
/* All default plugin ids. This is used for getting plugin id if it cannot be
obtained by usual way (get from disk structures, etc.). All these may be
@@ -327,6 +327,25 @@
}
}
+#include <stdlib.h>
+#include <errno.h>
+/* Converts passed @sqtr into long long value. In the case of error, INVAL_DIG
+ will be returned. */
+static long long misc_str2long(const char *str, int base) {
+ char *error;
+ long long result = 0;
+
+ if (!str)
+ return INVAL_DIG;
+
+ result = strtol(str, &error, base);
+
+ if (errno == ERANGE || *error)
+ return INVAL_DIG;
+
+ return result;
+}
+
/* Overrides plugin id by @id found by @name. */
errno_t reiser4_profile_override(const char *slot, const char *name) {
reiser4_plug_t *plug;

30
sys-fs/reiser4progs/files/reiser4progs_1.0.7-6.diff Normal file
View File

@ -0,0 +1,30 @@
--- reiser4progs-1.0.7.orig/libreiser4/profile.c
+++ reiser4progs-1.0.7/libreiser4/profile.c
@@ -5,7 +5,8 @@
#include <reiser4/libreiser4.h>
-#include <misc/misc.h>
+#include <stdlib.h>
+#include <errno.h>
/* All default plugin ids. This is used for getting plugin id if it cannot be
obtained by usual way (get from disk structures, etc.). All these may be
@@ -332,6 +333,7 @@
reiser4_plug_t *plug;
long long int val;
uint8_t i;
+ char *error;
aal_assert("umka-924", slot != NULL);
aal_assert("umka-923", name != NULL);
@@ -354,7 +356,8 @@
}
if (defprof.pid[i].id.type == PARAM_PLUG_TYPE) {
- if ((val = misc_str2long((char *)name, 10)) == INVAL_DIG) {
+ val = strtol((char *)name, &error, 10);
+ if (errno == ERANGE || *error) {
aal_error("Invalid value \"%s\" is provided for the "
"profile slot \"%s\".", (char *)name,
defprof.pid[i].name);

8
sys-fs/reiser4progs/reiser4progs-1.0.7-r1.ebuild → sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild
View File

@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation # Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild,v 1.7 2010/07/11 00:34:26 ranger Exp $ # $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild,v 1.8 2012/05/24 02:54:11 vapier Exp $
inherit multilib eutils inherit multilib eutils toolchain-funcs
MY_P=${PN}-${PV/_p/-} MY_P=${PN}-${PV/_p/-}
DESCRIPTION="reiser4progs: mkfs, fsck, etc..." DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
@ -23,7 +23,7 @@ src_unpack() {
unpack ${A} unpack ${A}
cd "${S}" cd "${S}"
epatch "${FILESDIR}"/${P}-gcc-4.4.patch #269240 epatch "${FILESDIR}"/${P}-gcc-4.4.patch #269240
epatch "${FILESDIR}"/reiser4progs-libreiser4-no-libmisc.patch epatch "${FILESDIR}"/reiser4progs_1.0.7-6.diff
printf '#!/bin/sh\ntrue\n' > run-ldconfig printf '#!/bin/sh\ntrue\n' > run-ldconfig
} }