[Forensics-changes] [SCM] Guess PC disk partition table, find lost partitions branch, debian, updated. debian/0.1h-4.1-16-g15ef5d1
Daniel Baumann
daniel at debian.org
Fri Sep 19 06:32:53 UTC 2008
The following commit has been merged in the debian branch:
commit 15ef5d17b2c66dcd7e08fae15ab06d165955dc64
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Sep 19 08:31:19 2008 +0200
Removing patch left-over in debian directory.
diff --git a/debian/ia64_and_others.patch b/debian/ia64_and_others.patch
deleted file mode 100644
index 0ab0cea..0000000
--- a/debian/ia64_and_others.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-NOTE: this patch has already been applied, I'm just
-keeping it here for future reference.
-D. Coe 25 Nov 2001.
-
-X-From-Line: debbugs at master.debian.org Mon Nov 12 15:11:01 2001
-Return-Path: <debbugs at master.debian.org>
-Delivered-To: david at someotherplace.org
-Received: from master.debian.org (master.debian.org [216.234.231.5])
- by zona.someotherplace.org (Postfix) with ESMTP id 74B7E7D006
- for <david.coe at someotherplace.org>; Mon, 12 Nov 2001 15:11:00 -0500 (EST)
-Received: from debbugs by master.debian.org with local (Exim 3.12 1 (Debian))
- id 163NIO-0001Oj-00; Mon, 12 Nov 2001 14:03:04 -0600
-Subject: Bug#119347: gpart: fix to build on ia64
-Reply-To: Doug Porter <dsp at debian.org>, 119347 at bugs.debian.org
-Resent-From: Doug Porter <dsp at debian.org>
-Original-Sender: dsp at waterspout.com
-Resent-To: debian-bugs-dist at lists.debian.org
-Resent-Cc: David Coe <davidc at debian.org>
-Resent-Date: Mon, 12 Nov 2001 20:03:03 GMT
-Resent-Message-ID: <handler.119347.B.10055952404995 at bugs.debian.org>
-X-Debian-PR-Message: report 119347
-X-Debian-PR-Package: gpart
-X-Debian-PR-Keywords: patch
-X-Loop: owner at bugs.debian.org
-Received: via spool by submit at bugs.debian.org id=B.10055952404995
- (code B ref -1); Mon, 12 Nov 2001 20:03:03 GMT
-From: Doug Porter <dsp at debian.org>
-To: submit at bugs.debian.org
-Date: Mon, 12 Nov 2001 15:00:23 -0500
-Sender: dsp at waterspout.com
-X-Gnus-Mail-Source: file:/var/mail/david
-Message-Id: <20011112195918.2263D9B08 at squall.waterspout.com>
-Delivered-To: submit at bugs.debian.org
-Resent-Sender: Debian BTS <debbugs at master.debian.org>
-Lines: 106
-Xref: zona bugs.debian.org.owner:104
-
-Package: gpart
-Version: 0.1h-1
-Severity: important
-Tags: patch
-
-Currently the src/gm_ntfs.h that ships with gpart prevents gpart
-from building on a number of Debian's supported architectures. I
-have adapted some stuff that I pulled from recent 2.4 kernel
-source that should allow gpart to build on most Debian platforms
-without any trouble.
-
-
-diff -Naur gpart-0.1h.orig/src/gm_ntfs.h gpart-0.1h/src/gm_ntfs.h
---- gpart-0.1h.orig/src/gm_ntfs.h Mon Nov 12 19:56:57 2001
-+++ gpart-0.1h/src/gm_ntfs.h Mon Nov 12 19:57:28 2001
-@@ -14,6 +14,9 @@
- *
- */
-
-+#include <stdint.h>
-+#include <asm/byteorder.h>
-+
- #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__) || defined(__arm__)
--
- /* 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 */
-
-
-I hope this helps.
-
---
-Doug Porter <dsp at waterspout.com>
-
-
-
--
Guess PC disk partition table, find lost partitions
More information about the forensics-changes
mailing list