Changeset - 34d059ff6ee6
Parent rev.
Child rev.
[Not reviewed]
default
2 2 2
Nathan Brink (binki) - 16 years ago 2009-01-03 13:19:48
ohnobinki@ohnopublishing.net
upgraded fix against sys-fs/e2fsprogs's tst_csum failing to compile. bumped to sys-fs/e2fsprogs-1.41.3
6 files changed with 60 insertions and 7 deletions:
sys-fs/e2fsprogs/Manifest
4
3
sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild
1
1
sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild
19
3
sys-fs/e2fsprogs/files/10_all_tests-include-fix.patch.bz2
bin+del
sys-fs/e2fsprogs/files/10_all_tests-include-fix.patch.bz2~
bin+del
sys-fs/e2fsprogs/files/e2fsprogs-1.41.3-tst_csum.patch
36
0 comments (0 inline, 0 general)
sys-fs/e2fsprogs/Manifest
➞
Show inline comments
 
AUX 10_all_tests-include-fix.patch.bz2 380 RMD160 58fa676275dfe035bf1df336d957c08f8e87cb91 SHA1 4e589a80383b4799f369a007f4b901aee436e873 SHA256 4228bbfaaef8a0ad300ed64789f1d9d5482b01a01939b08b54b783dcd9954394
 
AUX 10_all_tests-include-fix.patch.bz2~ 385 RMD160 f0086c647c91dce3878e9fdaa656cd86f3730727 SHA1 4dca69d4a1373367df5e978b10fd7b11e46a1fda SHA256 eca9e062508a3de7d8a731b2915f53dd3f34e9ab110bfd789b26d5c74e270856
 
AUX e2fsprogs-1.38-tests-locale.patch 656 RMD160 16c625c16144ed16942fa19988524b7b5727c583 SHA1 debd15eba41a392cf0336e694bebf0c2409b18e3 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598
 
AUX e2fsprogs-1.40-fbsd.patch 352 RMD160 2d3f0979522a29bdf5aae1af9c73b33e76b02f23 SHA1 b229990591965b454dfaa88bf47437cc8386343d SHA256 52865c6600fa0f601a89e4396797ae2d23a1ed895e64b098c36e8bcab1ac8505
 
AUX e2fsprogs-1.41.2-makefile.patch 2813 RMD160 11b20c97f58efe18850296aefe08a155084dc825 SHA1 37bb9fd7cd06e1d7f5f302c2e7c0ff24fbd3c448 SHA256 48192b8d38bc00c048489de92a7361a773df0b6c4bbbb5e22b0b5c91962864f4
 
AUX e2fsprogs-1.41.3-tst_csum.patch 1159 RMD160 3f9ba3a816a1237026be58e29dcd0d51b38f63f2 SHA1 92717554e01a42d0e8b68cbfaa455744ddeb406b SHA256 9e45c16a6a30cc6de000a20fefb24eddbb4792d621f9ec71a4b2acd3e00f0e24
 
DIST e2fsprogs-1.41.2.tar.gz 4365064 RMD160 debe0ee72e2e68fb773887fb60ef509ad7bf6d76 SHA1 8334f9eaea5f0001e3241ea71ea094f2d87298a9 SHA256 635d6d07e5a4d615e599c051166af965baa754f9ff7435e746de1a5d2a5c0d56
 
EBUILD e2fsprogs-1.41.2.ebuild 3470 RMD160 0cb10649af7082c8c82e892defd42a1c30fcd858 SHA1 3f861d66f88d054c807d3f0d28e983889cbf3ddf SHA256 1e598d0176b5efdf597ba4bb2331d06b03c16d5b11eb992484e18c51308797a3
 
DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204abd6 SHA1 d85f05b7bcef1adf8306a789f3ac0325c3c67e8d SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
 
EBUILD e2fsprogs-1.41.2.ebuild 3498 RMD160 0ff55f3950011a5e0200fb6ea07f45e25369f40d SHA1 21ac571c2f8171d007517cd39bd903a736afdd59 SHA256 f73e0e866833696db7992a3666897b9994f4232e46c9b7f01a1c155781eb8e8d
 
EBUILD e2fsprogs-1.41.3.ebuild 3885 RMD160 94e8a89ffaf648be2a14afc6d39f69f52feac364 SHA1 3033bcc9247be1d2bdba3a960ccbe549797d4a01 SHA256 799f74fd38a37fed4479d930cb6bb23cbd2eb911ce4693dc206cb5f9f4d3bcc6
sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild
➞
Show inline comments
 
@@ -4,49 +4,49 @@
 

			




	
	
	
		
 
inherit eutils flag-o-matic toolchain-funcs multilib

			




	
	
	
		
 

			




	
	
	
		
 
DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"

			




	
	
	
		
 
HOMEPAGE="http://e2fsprogs.sourceforge.net/"

			




	
	
	
		
 
SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"

			




	
	
	
		
 

			




	
	
	
		
 
LICENSE="GPL-2 BSD"

			




	
	
	
		
 
SLOT="0"

			




	
	
	
		
 
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd"

			




	
	
	
		
 
IUSE="nls elibc_FreeBSD"

			




	
	
	
		
 

			




	
	
	
		
 
RDEPEND="~sys-libs/${PN}-libs-${PV}

			




	
	
	
		
 
	nls? ( virtual/libintl )"

			




	
	
	
		
 
DEPEND="${RDEPEND}

			




	
	
	
		
 
	nls? ( sys-devel/gettext )

			




	
	
	
		
 
	sys-apps/texinfo"

			




	
	
	
		
 

			




	
	
	
		
 
src_unpack() {

			




	
	
	
		
 
	unpack ${A}

			




	
	
	
		
 
	cd "${S}"

			




	
	
	
		
 
	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766

			




	
	
	
		
 
	epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch

			




	
	
	
		
 
	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch

			




	
	
	
		
 
	epatch "${FILESDIR}"

			




	
	
	
		
 
	epatch "${FILESDIR}"/${PN}-1.41.3-tst_csum.patch

			




	
	
	
		
 
	# blargh ... trick e2fsprogs into using e2fsprogs-libs

			




	
	
	
		
 
	rm -rf doc

			




	
	
	
		
 
	sed -i -r \

			




	
	
	
		
 
		-e 's:@LIBINTL@:@LTLIBINTL@:' \

			




	
	
	
		
 
		-e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \

			




	
	
	
		
 
		-e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \

			




	
	
	
		
 
		MCONFIG.in || die "muck libs" #122368

			




	
	
	
		
 
	sed -i -r \

			




	
	
	
		
 
		-e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \

			




	
	
	
		
 
		Makefile.in || die "remove subdirs"

			




	
	
	
		
 
	touch lib/ss/ss_err.h

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
src_compile() {

			




	
	
	
		
 
	# Keep the package from doing silly things

			




	
	
	
		
 
	addwrite /var/cache/fonts

			




	
	
	
		
 
	export LDCONFIG=:

			




	
	
	
		
 
	export CC=$(tc-getCC)

			




	
	
	
		
 
	export STRIP=:

			




	
	
	
		
 

			




	
	
	
		
 
	# We want to use the "bsd" libraries while building on Darwin, but while

			




	
	
	
		
 
	# building on other Gentoo/*BSD we prefer elf-naming scheme.

			




	
	
	
		
 
	local libtype

			




	
	
	
		
 
	case ${CHOST} in

			




        

    


    
    

    

        

                

                    sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
file copied from sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild to sys-fs/e2fsprogs/e2fsprogs-1.41.3.ebuild

			




	
	
	
		
 
# Copyright 1999-2008 Gentoo Foundation

			




	
	
	
		
 
# Copyright 1999-2009 Gentoo Foundation

			




	
	
	
		
 
# Distributed under the terms of the GNU General Public License v2

			




	
	
	
		
 
# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.2.ebuild,v 1.4 2008/10/28 00:25:05 ranger Exp $

			




	
	
	
		
 

			




	
	
	
		
 
inherit eutils flag-o-matic toolchain-funcs multilib

			




	
	
	
		
 

			




	
	
	
		
 
DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"

			




	
	
	
		
 
HOMEPAGE="http://e2fsprogs.sourceforge.net/"

			




	
	
	
		
 
SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"

			




	
	
	
		
 

			




	
	
	
		
 
LICENSE="GPL-2 BSD"

			




	
	
	
		
 
SLOT="0"

			




	
	
	
		
 
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd"

			




	
	
	
		
 
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"

			




	
	
	
		
 
IUSE="nls elibc_FreeBSD"

			




	
	
	
		
 

			




	
	
	
		
 
RDEPEND="~sys-libs/${PN}-libs-${PV}

			




	
	
	
		
 
	nls? ( virtual/libintl )"

			




	
	
	
		
 
DEPEND="${RDEPEND}

			




	
	
	
		
 
	nls? ( sys-devel/gettext )

			




	
	
	
		
 
	sys-apps/texinfo"

			




	
	
	
		
 

			




	
	
	
		
 
pkg_setup() {

			




	
	
	
		
 
	if [[ ! -e ${ROOT}/etc/mtab ]] ; then

			




	
	
	
		
 
		# add some crap to deal with missing /etc/mtab #217719

			




	
	
	
		
 
		ewarn "No /etc/mtab file, creating one temporarily"

			




	
	
	
		
 
		echo "${PN} crap for src_test" > "${ROOT}"/etc/mtab

			




	
	
	
		
 
	fi

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
src_unpack() {

			




	
	
	
		
 
	unpack ${A}

			




	
	
	
		
 
	cd "${S}"

			




	
	
	
		
 
	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766

			




	
	
	
		
 
	epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch

			




	
	
	
		
 
	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch

			




	
	
	
		
 
	epatch "${FILESDIR}"

			




	
	
	
		
 
	epatch "${FILESDIR}"/${PN}-1.41.3-tst_csum.patch

			




	
	
	
		
 
	# blargh ... trick e2fsprogs into using e2fsprogs-libs

			




	
	
	
		
 
	rm -rf doc

			




	
	
	
		
 
	sed -i -r \

			




	
	
	
		
 
		-e 's:@LIBINTL@:@LTLIBINTL@:' \

			




	
	
	
		
 
		-e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \

			




	
	
	
		
 
		-e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \

			




	
	
	
		
 
		MCONFIG.in || die "muck libs" #122368

			




	
	
	
		
 
	sed -i -r \

			




	
	
	
		
 
		-e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \

			




	
	
	
		
 
		Makefile.in || die "remove subdirs"

			




	
	
	
		
 
	touch lib/ss/ss_err.h

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
src_compile() {

			




	
	
	
		
 
	# Keep the package from doing silly things

			




	
	
	
		
 
	addwrite /var/cache/fonts

			




	
	
	
		
 
	export LDCONFIG=:

			




	
	
	
		
 
	export CC=$(tc-getCC)

			




	
	
	
		
 
	export STRIP=:

			




	
	
	
		
 

			




	
	
	
		
 
	# We want to use the "bsd" libraries while building on Darwin, but while

			




	
	
	
		
 
	# building on other Gentoo/*BSD we prefer elf-naming scheme.

			




	
	
	
		
 
	local libtype

			




	
	
	
		
 
	case ${CHOST} in

			




	
	
		
 
@@ -58,48 +66,56 @@ src_compile() {

			




	
	
	
		
 
		--bindir=/bin \

			




	
	
	
		
 
		--sbindir=/sbin \

			




	
	
	
		
 
		--enable-${libtype}-shlibs \

			




	
	
	
		
 
		--with-ldopts="${LDFLAGS}" \

			




	
	
	
		
 
		$(use_enable !elibc_uclibc tls) \

			




	
	
	
		
 
		--without-included-gettext \

			




	
	
	
		
 
		$(use_enable nls) \

			




	
	
	
		
 
		$(use_enable userland_GNU fsck) \

			




	
	
	
		
 
		|| die

			




	
	
	
		
 
	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then

			




	
	
	
		
 
		eerror "INTL sanity check failed, aborting build."

			




	
	
	
		
 
		eerror "Please post your ${S}/config.log file as an"

			




	
	
	
		
 
		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"

			




	
	
	
		
 
		die "Preventing included intl cruft from building"

			




	
	
	
		
 
	fi

			




	
	
	
		
 
	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die

			




	
	
	
		
 

			




	
	
	
		
 
	# Build the FreeBSD helper

			




	
	
	
		
 
	if use elibc_FreeBSD ; then

			




	
	
	
		
 
		cp "${FILESDIR}"/fsck_ext2fs.c .

			




	
	
	
		
 
		emake fsck_ext2fs || die

			




	
	
	
		
 
	fi

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
pkg_preinst() {

			




	
	
	
		
 
	if [[ -r ${ROOT}/etc/mtab ]] ; then

			




	
	
	
		
 
		if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then

			




	
	
	
		
 
			rm -f "${ROOT}"/etc/mtab

			




	
	
	
		
 
		fi

			




	
	
	
		
 
	fi

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
src_install() {

			




	
	
	
		
 
	emake DESTDIR="${D}" install || die

			




	
	
	
		
 
	emake DESTDIR="${D}" install-libs || die

			




	
	
	
		
 
	dodoc README RELEASE-NOTES

			




	
	
	
		
 

			




	
	
	
		
 
	# Move shared libraries to /lib/, install static libraries to /usr/lib/,

			




	
	
	
		
 
	# and install linker scripts to /usr/lib/.

			




	
	
	
		
 
	dodir /$(get_libdir)

			




	
	
	
		
 
	local lib slib

			




	
	
	
		
 
	for lib in "${D}"/usr/$(get_libdir)/*.a ; do

			




	
	
	
		
 
		slib=${lib##*/}

			




	
	
	
		
 
		mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}"

			




	
	
	
		
 
		gen_usr_ldscript ${slib%.a}$(get_libname)

			




	
	
	
		
 
	done

			




	
	
	
		
 

			




	
	
	
		
 
	# move 'useless' stuff to /usr/

			




	
	
	
		
 
	dosbin "${D}"/sbin/mklost+found

			




	
	
	
		
 
	rm -f "${D}"/sbin/mklost+found

			




	
	
	
		
 

			




	
	
	
		
 
	if use elibc_FreeBSD ; then

			




	
	
	
		
 
		# Install helpers for us

			




	
	
	
		
 
		into /

			




	
	
	
		
 
		dosbin "${S}"/fsck_ext2fs || die

			




	
	
	
		
 
		doman "${FILESDIR}"/fsck_ext2fs.8

			




        

    


    
    

    

        

                

                    sys-fs/e2fsprogs/files/10_all_tests-include-fix.patch.bz2
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




	
	
		
 
binary diff not shown

			




        

    


    
    

    

        

                

                    sys-fs/e2fsprogs/files/10_all_tests-include-fix.patch.bz2~
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
deleted file

			




	
	
		
 
binary diff not shown

			




        

    


    
    

    

        

                

                    sys-fs/e2fsprogs/files/e2fsprogs-1.41.3-tst_csum.patch
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
new file 100644

			




	
	
	
		
 
--- /tmp/e2fsprogs-1.41.3.orig/work/e2fsprogs-1.41.3/lib/ext2fs/csum.c  2009-01-03 12:52:03.000000000 -0500

			




	
	
	
		
 
+++ /lib/ext2fs/csum.c    2009-01-03 13:00:47.000000000 -0500

			




	
	
	
		
 
@@ -28,6 +28,7 @@

			




	
	
	
		
 
 #define STATIC static

			




	
	
	
		
 
 #endif

			




	
	
	
		
 
 

			




	
	
	
		
 
+#include "csum.h"

			




	
	
	
		
 
 STATIC __u16 ext2fs_group_desc_csum(ext2_filsys fs, dgrp_t group)

			




	
	
	
		
 
 {

			




	
	
	
		
 
        __u16 crc = 0;

			




	
	
	
		
 
--- /tmp/e2fsprogs-1.41.3.orig/work/e2fsprogs-1.41.3/lib/ext2fs/csum.h  1969-12-31 19:00:00.000000000 -0500

			




	
	
	
		
 
+++ /lib/ext2fs/csum.h    2009-01-03 13:00:25.000000000 -0500

			




	
	
	
		
 
@@ -0,0 +1,13 @@

			




	
	
	
		
 
+/*

			




	
	
	
		
 
+  local definitions for csum.c and tst_csum, not to be put in /usr/include

			




	
	
	
		
 
+*/

			




	
	
	
		
 
+

			




	
	
	
		
 
+#ifndef STATIC

			




	
	
	
		
 
+#ifdef DEBUG

			




	
	
	
		
 
+#define STATIC

			




	
	
	
		
 
+#else

			




	
	
	
		
 
+#define STATIC static

			




	
	
	
		
 
+#endif

			




	
	
	
		
 
+#endif

			




	
	
	
		
 
+

			




	
	
	
		
 
+STATIC __u16 ext2fs_group_desc_csum(ext2_filsys fs, dgrp_t group);

			




	
	
	
		
 
--- /tmp/e2fsprogs-1.41.3.orig/work/e2fsprogs-1.41.3/lib/ext2fs/tst_csum.c      2009-01-03 12:52:04.000000000 -0500

			




	
	
	
		
 
+++ /lib/ext2fs/tst_csum.c        2009-01-03 13:01:53.000000000 -0500

			




	
	
	
		
 
@@ -16,6 +16,7 @@

			




	
	
	
		
 
 #include "ext2fs/ext2_fs.h"

			




	
	
	
		
 
 #include "ext2fs/ext2fs.h"

			




	
	
	
		
 
 #include "ext2fs/crc16.h"

			




	
	
	
		
 
+#include "csum.h"

			




	
	
	
		
 
 

			




	
	
	
		
 
 #ifndef offsetof

			




	
	
	
		
 
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-756375
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support