From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- sys-block/gpart/Manifest | 2 + sys-block/gpart/files/gpart-0.1h-PIC.patch | 20 ++++++ sys-block/gpart/files/gpart-0.1h-errno.patch | 20 ++++++ sys-block/gpart/files/gpart-0.1h-l64seek.patch | 71 ++++++++++++++++++++ sys-block/gpart/files/gpart-0.1h-no-_syscall.patch | 15 +++++ sys-block/gpart/files/gpart-0.1h-ntfs.patch | 75 ++++++++++++++++++++++ sys-block/gpart/files/gpart-0.1h-openmode.patch | 11 ++++ sys-block/gpart/files/gpart-0.1h-vfat.patch | 17 +++++ sys-block/gpart/gpart-0.1h-r1.ebuild | 35 ++++++++++ sys-block/gpart/gpart-0.1h-r2.ebuild | 36 +++++++++++ sys-block/gpart/metadata.xml | 5 ++ 11 files changed, 307 insertions(+) create mode 100644 sys-block/gpart/Manifest create mode 100644 sys-block/gpart/files/gpart-0.1h-PIC.patch create mode 100644 sys-block/gpart/files/gpart-0.1h-errno.patch create mode 100644 sys-block/gpart/files/gpart-0.1h-l64seek.patch create mode 100644 sys-block/gpart/files/gpart-0.1h-no-_syscall.patch create mode 100644 sys-block/gpart/files/gpart-0.1h-ntfs.patch create mode 100644 sys-block/gpart/files/gpart-0.1h-openmode.patch create mode 100644 sys-block/gpart/files/gpart-0.1h-vfat.patch create mode 100644 sys-block/gpart/gpart-0.1h-r1.ebuild create mode 100644 sys-block/gpart/gpart-0.1h-r2.ebuild create mode 100644 sys-block/gpart/metadata.xml (limited to 'sys-block/gpart') diff --git a/sys-block/gpart/Manifest b/sys-block/gpart/Manifest new file mode 100644 index 000000000000..59881a7a306b --- /dev/null +++ b/sys-block/gpart/Manifest @@ -0,0 +1,2 @@ +DIST gpart-0.1h-reiserfs-3.6.patch.gz 3658 RMD160 b049e0ba9d6e1c54877c54ac0d1f12f9f7d235e2 SHA1 4b1042bf0dcf570d2e7ed6bd34f5116879bca7b0 SHA256 769f5587853cb7d9c3ba4d0496bbb57d42d04ad561a42d24bcbe5f4723849a3c +DIST gpart-0.1h.tar.gz 52352 RMD160 1cdfb1779801ee8755b05975ced24441a3a2b639 SHA1 23f66162e1d85977ea43bfe6b5e5bff0ad2d566e SHA256 b9fdb064efabf5d63d7db6f07605c2fca3d011ecfa05ab3723dd98b9bde3a2ff diff --git a/sys-block/gpart/files/gpart-0.1h-PIC.patch b/sys-block/gpart/files/gpart-0.1h-PIC.patch new file mode 100644 index 000000000000..e810bd99960d --- /dev/null +++ b/sys-block/gpart/files/gpart-0.1h-PIC.patch @@ -0,0 +1,20 @@ +--- gpart-0.1h/src/l64seek.c ++++ gpart-0.1h/src/l64seek.c +@@ -26,7 +26,7 @@ + } ostck[OSTACKLEN]; + static int osptr = -1; + +-#if defined(__linux__) && defined(__i386__) ++#if defined(__linux__) && defined(__i386__) && ! defined(__PIC__) + _syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh) + #endif + +@@ -36,7 +36,7 @@ + { + off64_t ret = (off64_t)-1; + +-#if defined(__linux__) && defined(__i386__) ++#if defined(__linux__) && defined(__i386__) && ! defined(__PIC__) + int iret; + unsigned long ohi, olo; + diff --git a/sys-block/gpart/files/gpart-0.1h-errno.patch b/sys-block/gpart/files/gpart-0.1h-errno.patch new file mode 100644 index 000000000000..13041c20245d --- /dev/null +++ b/sys-block/gpart/files/gpart-0.1h-errno.patch @@ -0,0 +1,20 @@ +--- gpart-0.1h/src/l64seek.c ++++ gpart-0.1h-working/src/l64seek.c +@@ -16,6 +16,7 @@ + + #include "l64seek.h" + ++#include + + #define OSTACKLEN 16 + static struct +--- gpart-0.1h/src/disku.c ++++ gpart-0.1h-working/src/disku.c +@@ -20,6 +20,7 @@ + #include + #include + #include "gpart.h" ++#include + + #if defined(__linux__) + #include diff --git a/sys-block/gpart/files/gpart-0.1h-l64seek.patch b/sys-block/gpart/files/gpart-0.1h-l64seek.patch new file mode 100644 index 000000000000..8a14411a5ccc --- /dev/null +++ b/sys-block/gpart/files/gpart-0.1h-l64seek.patch @@ -0,0 +1,71 @@ +--- gpart-0.1h.orig/src/l64seek.c ++++ gpart-0.1h/src/l64seek.c +@@ -25,30 +25,11 @@ + } ostck[OSTACKLEN]; + static int osptr = -1; + +-#if defined(__linux__) && defined(__i386__) +-_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh) +-#endif +- +- +- + off64_t l64seek(int fd,off64_t offset,int whence) + { + off64_t ret = (off64_t)-1; + +-#if defined(__linux__) && defined(__i386__) +- int iret; +- unsigned long ohi, olo; +- +- ohi = (unsigned long)((offset >> 32) & 0xFFFFFFFF); +- olo = (unsigned long)(offset & 0xFFFFFFFF); +- iret = _llseek(fd,ohi,olo,&ret,whence); +- if (iret == -1) +- ret = (off64_t)-1; +-#endif +- +-#if defined(__FreeBSD__) || (defined(__linux__) && defined(__alpha__)) + ret = lseek(fd,offset,whence); +-#endif + + return (ret); + } +--- gpart-0.1h.orig/src/l64seek.h ++++ gpart-0.1h/src/l64seek.h +@@ -17,6 +17,8 @@ + #ifndef _L64SEEK_H + #define _L64SEEK_H + ++#include ++#include + #include + + /* +@@ -25,19 +27,7 @@ + * offsets. + */ + +- +-#if defined(__linux__) +-# include +-# include +- typedef int64_t off64_t; +-#endif +- +- +-#if defined(__FreeBSD__) +- typedef off_t off64_t; +-#endif +- +- ++typedef loff_t off64_t; + typedef off64_t s64_t; + + off64_t l64seek(int fd, off64_t offset, int whence); +@@ -45,5 +35,4 @@ + int l64opush(int); + s64_t l64opop(int); + +- + #endif diff --git a/sys-block/gpart/files/gpart-0.1h-no-_syscall.patch b/sys-block/gpart/files/gpart-0.1h-no-_syscall.patch new file mode 100644 index 000000000000..fe68d08b6f4b --- /dev/null +++ b/sys-block/gpart/files/gpart-0.1h-no-_syscall.patch @@ -0,0 +1,15 @@ +use syscall() rather than _syscall#() + +http://bugs.gentoo.org/163800 + +--- src/l64seek.c ++++ src/l64seek.c +@@ -27,7 +27,7 @@ + static int osptr = -1; + + #if defined(__linux__) && defined(__i386__) && ! defined(__PIC__) +-_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh) ++#define _llseek(fd,hi,lo,res,wh) syscall(__NR__llseek,fd,hi,lo,res,wh) + #endif + + diff --git a/sys-block/gpart/files/gpart-0.1h-ntfs.patch b/sys-block/gpart/files/gpart-0.1h-ntfs.patch new file mode 100644 index 000000000000..1f887ac47135 --- /dev/null +++ b/sys-block/gpart/files/gpart-0.1h-ntfs.patch @@ -0,0 +1,75 @@ +Ripped out of debian + +--- gpart-0.1h.orig/src/gm_ntfs.h ++++ gpart-0.1h/src/gm_ntfs.h +@@ -14,6 +14,9 @@ + * + */ + ++#include ++#include ++ + #ifndef _GM_NTFS_H + #define _GM_NTFS_H + +@@ -29,32 +32,38 @@ + /* 'NTFS' in little endian */ + #define NTFS_SUPER_MAGIC 0x5346544E + +-#if defined(i386) || defined(__i386__) || defined(__alpha__) +- + /* unsigned integral types */ + #ifndef NTFS_INTEGRAL_TYPES + #define NTFS_INTEGRAL_TYPES +-typedef unsigned char ntfs_u8; +-typedef unsigned short ntfs_u16; +-typedef unsigned int ntfs_u32; +-typedef s64_t ntfs_u64; ++typedef uint8_t ntfs_u8; ++typedef uint16_t ntfs_u16; ++typedef uint32_t ntfs_u32; ++typedef uint64_t ntfs_u64; ++typedef int8_t ntfs_s8; ++typedef int16_t ntfs_s16; + #endif /* NTFS_INTEGRAL_TYPES */ +-#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) */ +- +- +-/* Macros reading unsigned integers from a byte pointer */ +-/* these should work for all little endian machines */ +-#define NTFS_GETU8(p) (*(ntfs_u8*)(p)) +-#define NTFS_GETU16(p) (*(ntfs_u16*)(p)) +-#define NTFS_GETU24(p) (NTFS_GETU32(p) & 0xFFFFFF) +-#define NTFS_GETU32(p) (*(ntfs_u32*)(p)) +-#define NTFS_GETU64(p) (*(ntfs_u64*)(p)) +- +-/* Macros reading signed integers, returning int */ +-#define NTFS_GETS8(p) ((int)(*(char*)(p))) +-#define NTFS_GETS16(p) ((int)(*(short*)(p))) +-#define NTFS_GETS24(p) (NTFS_GETU24(p) < 0x800000 ? (int)NTFS_GETU24(p) : +- + ++#define CPU_TO_LE16(a) __cpu_to_le16(a) ++#define CPU_TO_LE32(a) __cpu_to_le32(a) ++#define CPU_TO_LE64(a) __cpu_to_le64(a) ++ ++#define LE16_TO_CPU(a) __cpu_to_le16(a) ++#define LE32_TO_CPU(a) __cpu_to_le32(a) ++#define LE64_TO_CPU(a) __cpu_to_le64(a) ++ ++/* Macros reading unsigned integers */ ++#define NTFS_GETU8(p) (*(ntfs_u8*)(p)) ++#define NTFS_GETU16(p) ((ntfs_u16)LE16_TO_CPU(*(ntfs_u16*)(p))) ++#define NTFS_GETU24(p) ((ntfs_u32)NTFS_GETU16(p) | \ ++ ((ntfs_u32)NTFS_GETU8(((char*)(p)) + 2) << 16)) ++#define NTFS_GETU32(p) ((ntfs_u32)LE32_TO_CPU(*(ntfs_u32*)(p))) ++#define NTFS_GETU64(p) ((ntfs_u64)LE64_TO_CPU(*(ntfs_u64*)(p))) ++ ++/* Macros reading signed integers */ ++#define NTFS_GETS8(p) ((*(ntfs_s8*)(p))) ++#define NTFS_GETS16(p) ((ntfs_s16)LE16_TO_CPU(*(short*)(p))) ++#define NTFS_GETS24(p) (NTFS_GETU24(p) < 0x800000 ? \ ++ (int)NTFS_GETU24(p) : \ ++ (int)(NTFS_GETU24(p) - 0x1000000)) + + #endif /* _GM_NTFS_H */ diff --git a/sys-block/gpart/files/gpart-0.1h-openmode.patch b/sys-block/gpart/files/gpart-0.1h-openmode.patch new file mode 100644 index 000000000000..ca13cc9420e6 --- /dev/null +++ b/sys-block/gpart/files/gpart-0.1h-openmode.patch @@ -0,0 +1,11 @@ +--- gpart.orig/src/gpart.c 2008-10-19 15:06:06.000000000 +0000 ++++ gpart/src/gpart.c 2008-11-25 07:34:47.000000000 +0000 +@@ -1221,7 +1221,7 @@ static int make_mbr_backup(disk_desc *d, + { + int fd, ret = 0; + +- if ((fd = open(bfile,O_WRONLY|O_CREAT)) < 0) ++ if ((fd = open(bfile,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0) + return (ret); + + if (write(fd,d->d_pt.t_boot,512) == 512) diff --git a/sys-block/gpart/files/gpart-0.1h-vfat.patch b/sys-block/gpart/files/gpart-0.1h-vfat.patch new file mode 100644 index 000000000000..7234ac689831 --- /dev/null +++ b/sys-block/gpart/files/gpart-0.1h-vfat.patch @@ -0,0 +1,17 @@ +Ripped out of debian + +--- gpart-0.1h.orig/src/gm_fat.h ++++ gpart-0.1h/src/gm_fat.h +@@ -60,6 +60,10 @@ + __u16 info_sector; /* filesystem info sector */ + __u16 backup_boot; /* backup boot sector */ + __u16 reserved2[6]; /* Unused */ +-}; +- ++} __attribute__ ((packed)); ++/* "__attribute__ ((packed))" ++ added by davidc@debian.org, ++ as suggested by falk@zxmjz18.extern.uni-tuebingen.de ++ Fri Jul 07 18:04:15 2000 ++ in debian bug report #66893 "FAT detection broken on Alpha" */ + #endif /* _GM_FAT_H */ diff --git a/sys-block/gpart/gpart-0.1h-r1.ebuild b/sys-block/gpart/gpart-0.1h-r1.ebuild new file mode 100644 index 000000000000..e7c807d33d71 --- /dev/null +++ b/sys-block/gpart/gpart-0.1h-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +inherit eutils + +DESCRIPTION="Partition table rescue/guessing tool" +HOMEPAGE="http://www.stud.uni-hannover.de/user/76201/gpart/" +SRC_URI="http://www.stud.uni-hannover.de/user/76201/gpart/${P}.tar.gz + ftp://ftp.namesys.com/pub/misc-patches/gpart-0.1h-reiserfs-3.6.patch.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-amd64 ~hppa x86" +IUSE="" + +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-errno.patch + epatch "${FILESDIR}"/${P}-vfat.patch + epatch "${FILESDIR}"/${P}-ntfs.patch + epatch "${FILESDIR}"/${P}-PIC.patch + epatch "${FILESDIR}"/${P}-no-_syscall.patch + epatch "${WORKDIR}"/gpart-0.1h-reiserfs-3.6.patch + sed -i -e "/^CFLAGS/s: -O2 : ${CFLAGS} :" make.defs +} + +src_install() { + dobin src/gpart || die + doman man/gpart.8 + dodoc README Changes INSTALL LSM +} diff --git a/sys-block/gpart/gpart-0.1h-r2.ebuild b/sys-block/gpart/gpart-0.1h-r2.ebuild new file mode 100644 index 000000000000..7b1d74272985 --- /dev/null +++ b/sys-block/gpart/gpart-0.1h-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +inherit eutils + +DESCRIPTION="Partition table rescue/guessing tool" +HOMEPAGE="http://www.stud.uni-hannover.de/user/76201/gpart/" +SRC_URI="http://www.stud.uni-hannover.de/user/76201/gpart/${P}.tar.gz + ftp://ftp.namesys.com/pub/misc-patches/gpart-0.1h-reiserfs-3.6.patch.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 hppa x86" +IUSE="" + +RDEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-errno.patch + epatch "${FILESDIR}"/${P}-vfat.patch + epatch "${FILESDIR}"/${P}-ntfs.patch + epatch "${WORKDIR}"/gpart-0.1h-reiserfs-3.6.patch + epatch "${FILESDIR}"/${P}-l64seek.patch + epatch "${FILESDIR}"/${P}-openmode.patch + sed -i -e "/^CFLAGS/s: -O2 : ${CFLAGS} :" make.defs + sed -i -e "/^LDFLAGS/s:=:=${LDFLAGS} :" make.defs +} + +src_install() { + dobin src/gpart || die + doman man/gpart.8 + dodoc README Changes INSTALL LSM +} diff --git a/sys-block/gpart/metadata.xml b/sys-block/gpart/metadata.xml new file mode 100644 index 000000000000..96a2d586367d --- /dev/null +++ b/sys-block/gpart/metadata.xml @@ -0,0 +1,5 @@ + + + +base-system + -- cgit v1.2.3-65-gdbad