From e97905efe58369baaab77bcc110bd86869de8860 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 29 Dec 2006 21:48:12 +0000 Subject: [PATCH] Add back in symlinks for /sbin #159319 and backport fix for missing asm/unaligned.h #153494. Package-Manager: portage-2.1.2_rc4-r1 --- sys-fs/reiserfsprogs/ChangeLog | 10 +++++- sys-fs/reiserfsprogs/Manifest | 25 +++++++++---- .../files/digest-reiserfsprogs-3.6.19-r1 | 3 ++ .../reiserfsprogs-3.6.19-unaligned.patch | 35 +++++++++++++++++++ .../reiserfsprogs-3.6.19-r1.ebuild | 32 +++++++++++++++++ 5 files changed, 97 insertions(+), 8 deletions(-) create mode 100644 sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.19-r1 create mode 100644 sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch create mode 100644 sys-fs/reiserfsprogs/reiserfsprogs-3.6.19-r1.ebuild diff --git a/sys-fs/reiserfsprogs/ChangeLog b/sys-fs/reiserfsprogs/ChangeLog index b4bcc1a25688..7be15774cbfa 100644 --- a/sys-fs/reiserfsprogs/ChangeLog +++ b/sys-fs/reiserfsprogs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-fs/reiserfsprogs # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.38 2006/10/31 07:18:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/ChangeLog,v 1.39 2006/12/29 21:48:12 vapier Exp $ + +*reiserfsprogs-3.6.19-r1 (29 Dec 2006) + + 29 Dec 2006; Mike Frysinger + +files/reiserfsprogs-3.6.19-unaligned.patch, + +reiserfsprogs-3.6.19-r1.ebuild: + Add back in symlinks for /sbin #159319 and backport fix for missing + asm/unaligned.h #153494. *reiserfsprogs-3.6.20 (31 Oct 2006) diff --git a/sys-fs/reiserfsprogs/Manifest b/sys-fs/reiserfsprogs/Manifest index 831d81449090..5ec52d72c23a 100644 --- a/sys-fs/reiserfsprogs/Manifest +++ b/sys-fs/reiserfsprogs/Manifest @@ -1,8 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX reiserfsprogs-3.6.19-unaligned.patch 1129 RMD160 7429d2e600301a61502018af1134d56e4daba151 SHA1 fd97c2e9c9a8dc2064e74e41e7f6b4d8e3b61a09 SHA256 9e076de8c0318dcae6f1eae0949f6e1098ac875a2dfc3e1cbe0815b8e5f8e573 +MD5 8c9ad6ad3f0498966eab7cbac519bf6e files/reiserfsprogs-3.6.19-unaligned.patch 1129 +RMD160 7429d2e600301a61502018af1134d56e4daba151 files/reiserfsprogs-3.6.19-unaligned.patch 1129 +SHA256 9e076de8c0318dcae6f1eae0949f6e1098ac875a2dfc3e1cbe0815b8e5f8e573 files/reiserfsprogs-3.6.19-unaligned.patch 1129 DIST reiserfsprogs-3.6.19.tar.gz 406895 RMD160 a082eb9de980b3d24dd9d08e5028a19f448ed40a SHA1 9df17f21de2b152a55b9edc5436206d5821c2188 SHA256 c0862c53aecd23724a72d32fb54706d61d9858925c78408a2852d042417e68bf DIST reiserfsprogs-3.6.20.tar.gz 486333 RMD160 977cb8c328136f90718a1ef95a4fa9f42ad9ec7f SHA1 688b26c224769b46400e314c16f4185c55549e70 SHA256 1441d802da72e224d91545fc47f6def7d38c1e4035f9058d08c813aa2eb25079 +EBUILD reiserfsprogs-3.6.19-r1.ebuild 846 RMD160 a40b39548eee19ec7fbacafe6adceb0a2f27065f SHA1 d7e748e0659507b7d7e812de1f8641cdc8ad9f66 SHA256 e5b1ca5f3190d6935b2148c58acdfbad04e803de2d431d1d13033e9b5e707c7f +MD5 ad954c934a7eb26ad5582a8ddd83c2a1 reiserfsprogs-3.6.19-r1.ebuild 846 +RMD160 a40b39548eee19ec7fbacafe6adceb0a2f27065f reiserfsprogs-3.6.19-r1.ebuild 846 +SHA256 e5b1ca5f3190d6935b2148c58acdfbad04e803de2d431d1d13033e9b5e707c7f reiserfsprogs-3.6.19-r1.ebuild 846 EBUILD reiserfsprogs-3.6.19.ebuild 666 RMD160 7f4fe3a45bf315082710e521910a68052d68cf2d SHA1 f79a3fb07cc1450705254245045a7eaf9e572f7b SHA256 9f453559a4fee87cb6acefd7940e09e00dadee4a507fc6bc2e3f3e6219baf713 MD5 ea977b4c371b9a7bc67079fcbf463fc5 reiserfsprogs-3.6.19.ebuild 666 RMD160 7f4fe3a45bf315082710e521910a68052d68cf2d reiserfsprogs-3.6.19.ebuild 666 @@ -11,10 +19,10 @@ EBUILD reiserfsprogs-3.6.20.ebuild 730 RMD160 a8f5ce2d4c6efdc443c0f0a4c3622ae3bc MD5 5f77a31e4edd6f9d9e4f7b04e1365c07 reiserfsprogs-3.6.20.ebuild 730 RMD160 a8f5ce2d4c6efdc443c0f0a4c3622ae3bc5ff028 reiserfsprogs-3.6.20.ebuild 730 SHA256 6505a3463aca4ac1e719224021a7097223704ac73adba516018cfe70abc32dd3 reiserfsprogs-3.6.20.ebuild 730 -MISC ChangeLog 9331 RMD160 b5bb3f095e83871d749afa599174f55c4e768a74 SHA1 dbcb600000dc7a280c4c2f1993fff55cae73fc89 SHA256 081efc4c78b7fd0be053f83db94be0c4e4373fb7ce2eb54f92959032b5eb6607 -MD5 9234ae5d21bf797068550d4fdd9d09db ChangeLog 9331 -RMD160 b5bb3f095e83871d749afa599174f55c4e768a74 ChangeLog 9331 -SHA256 081efc4c78b7fd0be053f83db94be0c4e4373fb7ce2eb54f92959032b5eb6607 ChangeLog 9331 +MISC ChangeLog 9601 RMD160 b30aa4c109532f737006c4ef08ad1ad101fa6f6f SHA1 abf6cd195f9995b9852aa857e30d6997cf4198d8 SHA256 9ee296f8f3d1421d814de19f26c50c873eb42760e81b65dffacdb01b6aed15b4 +MD5 24ae6a8a9956186eb35ecbe180c152e0 ChangeLog 9601 +RMD160 b30aa4c109532f737006c4ef08ad1ad101fa6f6f ChangeLog 9601 +SHA256 9ee296f8f3d1421d814de19f26c50c873eb42760e81b65dffacdb01b6aed15b4 ChangeLog 9601 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -22,13 +30,16 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata MD5 61afa9dc62653e58f20fd74452fea9d8 files/digest-reiserfsprogs-3.6.19 262 RMD160 6a04580f2912548b2bf44ebd27e9b176a4b4622b files/digest-reiserfsprogs-3.6.19 262 SHA256 9f943ea12c6c3168f7cebc02ba721619d6e54b1d390c34405b246f6e97999db0 files/digest-reiserfsprogs-3.6.19 262 +MD5 61afa9dc62653e58f20fd74452fea9d8 files/digest-reiserfsprogs-3.6.19-r1 262 +RMD160 6a04580f2912548b2bf44ebd27e9b176a4b4622b files/digest-reiserfsprogs-3.6.19-r1 262 +SHA256 9f943ea12c6c3168f7cebc02ba721619d6e54b1d390c34405b246f6e97999db0 files/digest-reiserfsprogs-3.6.19-r1 262 MD5 9573520829903a49edbab0108fa649fb files/digest-reiserfsprogs-3.6.20 262 RMD160 875df15cf4eff4524ba2b0ebed3f373ea0582d38 files/digest-reiserfsprogs-3.6.20 262 SHA256 01c34718a761d25552745efc5713f687f0dfbfdb66602264ad620c91e4de0e5b files/digest-reiserfsprogs-3.6.20 262 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFlCez8bi6rjpTunYRAuB7AJ0fGEvBEtZvWFzl0IoH5AATUitnogCfcdYi -C8sVrhZfriC6HfwGx5UeSQ0= -=MdoG +iD8DBQFFlY1b8bi6rjpTunYRAm0vAJ42dX1g7lKSl2kWQovoS8gSkSPYQwCeNJ9h +jhThk8jg89502r8ZqJQmaac= +=BF51 -----END PGP SIGNATURE----- diff --git a/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.19-r1 b/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.19-r1 new file mode 100644 index 000000000000..dafe8ed8d8bd --- /dev/null +++ b/sys-fs/reiserfsprogs/files/digest-reiserfsprogs-3.6.19-r1 @@ -0,0 +1,3 @@ +MD5 b42cf15f6651c3ceff5cb84996c0d539 reiserfsprogs-3.6.19.tar.gz 406895 +RMD160 a082eb9de980b3d24dd9d08e5028a19f448ed40a reiserfsprogs-3.6.19.tar.gz 406895 +SHA256 c0862c53aecd23724a72d32fb54706d61d9858925c78408a2852d042417e68bf reiserfsprogs-3.6.19.tar.gz 406895 diff --git a/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch new file mode 100644 index 000000000000..5883ce85f827 --- /dev/null +++ b/sys-fs/reiserfsprogs/files/reiserfsprogs-3.6.19-unaligned.patch @@ -0,0 +1,35 @@ +backported from 3.6.20 + +http://bugs.gentoo.org/153494 + +--- include/reiserfs_fs.h ++++ include/reiserfs_fs.h +@@ -38,14 +38,22 @@ + # define extern_inline + #endif + +-#include +- + #ifndef get_unaligned +-#if defined(__ppc__) || defined(ppc) || defined(__ppc) || \ +- defined(__PPC) || defined(powerpc) || defined(__powerpc__) +-# define get_unaligned(ptr) (*(ptr)) +-# define put_unaligned(val,ptr) ((void)(*(ptr) = (val))) ++#define get_unaligned(ptr) \ ++({ \ ++ __typeof__(*(ptr)) __tmp; \ ++ memcpy(&__tmp, (ptr), sizeof(*(ptr))); \ ++ __tmp; \ ++}) + #endif ++ ++#ifndef put_unaligned ++#define put_unaligned(val, ptr) \ ++({ \ ++ __typeof__(*(ptr)) __tmp = (val); \ ++ memcpy((ptr), &__tmp, sizeof(*(ptr))); \ ++ (void)0; \ ++}) + #endif + + #define get_leXX(xx,p,field) (le##xx##_to_cpu ((p)->field)) diff --git a/sys-fs/reiserfsprogs/reiserfsprogs-3.6.19-r1.ebuild b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.19-r1.ebuild new file mode 100644 index 000000000000..fbf82754b4c3 --- /dev/null +++ b/sys-fs/reiserfsprogs/reiserfsprogs-3.6.19-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiserfsprogs/reiserfsprogs-3.6.19-r1.ebuild,v 1.1 2006/12/29 21:48:12 vapier Exp $ + +inherit eutils + +DESCRIPTION="Reiserfs Utilities" +HOMEPAGE="http://www.namesys.com/" +SRC_URI="http://www.namesys.com/pub/reiserfsprogs/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86" +IUSE="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-unaligned.patch +} + +src_compile() { + econf --prefix=/ || die "Failed to configure" + emake || die "Failed to compile" +} + +src_install() { + emake DESTDIR="${D}" install || die "Failed to install" + dosym reiserfsck /sbin/fsck.reiserfs + dosym mkreiserfs /sbin/mkfs.reiserfs + dodoc ChangeLog INSTALL README +} -- 2.26.2