diff options
| author |   Daniel Drake <dsd@gentoo.org> | 2005-05-17 19:30:17 +0000 |
|---|---|---|
| committer | Daniel Drake <dsd@gentoo.org> | 2005-05-17 19:30:17 +0000 |
| commit | 5405a77a00279b993fbdb11256bfb810e7023678 (patch) | |
| tree | 42dd375285685b564088573bd4beb46326a06b5b /sys-fs | |
| parent | using genpatches-base, fixing several recent sec vulns by patching up to 2.6.... (diff) | |
| download | gentoo-2-5405a77a00279b993fbdb11256bfb810e7023678.tar.gz gentoo-2-5405a77a00279b993fbdb11256bfb810e7023678.tar.bz2 gentoo-2-5405a77a00279b993fbdb11256bfb810e7023678.zip | |
Fix compilation with Linux 2.4 headers thanks to Christophe Garault <gentoo@garault.org> in bug #90646
(Portage version: 1.589-cvs)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/cloop/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/cloop/cloop-2.01.5-r1.ebuild | 10 | ||||
| -rw-r--r-- | sys-fs/cloop/files/cloop-2.01.5-netinet-gentoo.patch | 18 |
3 files changed, 26 insertions, 9 deletions
diff --git a/sys-fs/cloop/ChangeLog b/sys-fs/cloop/ChangeLog index 9d7c11bd459d..dc66a9498551 100644 --- a/sys-fs/cloop/ChangeLog +++ b/sys-fs/cloop/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/cloop # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.7 2005/04/27 11:26:02 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/ChangeLog,v 1.8 2005/05/17 19:30:17 dsd Exp $ + + 17 May 2005; Daniel Drake <dsd@gentoo.org> + +files/cloop-2.01.5-netinet-gentoo.patch, cloop-2.01.5-r1.ebuild: + Fix compilation with Linux 2.4 headers thanks to Christophe Garault + <gentoo@garault.org> in bug #90646 27 Apr 2005; Stefan Schweizer <genstef@gentoo.org> -files/kernel-2.6.8-fs_h-fix.patch, -files/cloop.fix.patch, diff --git a/sys-fs/cloop/cloop-2.01.5-r1.ebuild b/sys-fs/cloop/cloop-2.01.5-r1.ebuild index ad57eb99d387..8616bae2c8c1 100644 --- a/sys-fs/cloop/cloop-2.01.5-r1.ebuild +++ b/sys-fs/cloop/cloop-2.01.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.01.5-r1.ebuild,v 1.2 2005/04/27 11:26:02 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cloop/cloop-2.01.5-r1.ebuild,v 1.3 2005/05/17 19:30:17 dsd Exp $ inherit linux-mod eutils versionator @@ -33,16 +33,10 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/cloop.fix-7z-syntax-for-gcc-3.4.patch epatch ${FILESDIR}/cloop.fix-create_compressed_fs-segfault-on-amd64.patch + epatch ${FILESDIR}/${P}-netinet-gentoo.patch # Debian uses conf.vars, everyone else uses .config sed -i "s:conf.vars:.config:" Makefile - - # Remove erroneous 2.4 include - has_version =sys-kernel/linux-headers-2.4.* && \ - sed -i "s:#include <netinet/in.h>::" \ - advancecomp-1.9_create_compressed_fs/advfs.cc \ - create_compressed_fs.c \ - extract_compressed_fs.c } src_install() { diff --git a/sys-fs/cloop/files/cloop-2.01.5-netinet-gentoo.patch b/sys-fs/cloop/files/cloop-2.01.5-netinet-gentoo.patch new file mode 100644 index 000000000000..4d7d73c8c334 --- /dev/null +++ b/sys-fs/cloop/files/cloop-2.01.5-netinet-gentoo.patch @@ -0,0 +1,18 @@ +--- cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc.orig 2005-05-17 20:19:15.000000000 +0100 ++++ cloop-2.01/advancecomp-1.9_create_compressed_fs/advfs.cc 2005-05-17 20:19:36.000000000 +0100 +@@ -21,6 +21,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/stat.h> ++#include <netinet/in.h> + #include <asm/byteorder.h> + #include <fcntl.h> + #include <zlib.h> +@@ -31,7 +32,6 @@ + #include "compress.h" + #include "siglock.h" + #define __OPTIMIZE__ +-#include <netinet/in.h> + + #include "lib/mng.h" + #include "lib/endianrw.h" |