Package: efibootmgr
Version: 0.5.3-1
Followup-For: Bug #389923
Attached is the patch for the 0.5.3-1.1 NMU. It also fixes a bug in gpt.h.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (50, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.17.11
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
diff -puriN efibootmgr-0.5.3.orig/debian/changelog efibootmgr-0.5.3/debian/changelog
--- efibootmgr-0.5.3.orig/debian/changelog 2006-10-08 14:46:16.000000000 +0200
+++ efibootmgr-0.5.3/debian/changelog 2006-10-08 14:46:06.000000000 +0200
@@ -1,3 +1,17 @@
+efibootmgr (0.5.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * src/include/gpt.h:
+ + Fix GPT_HEADER_SIGNATURE declaration on 32bit architectures.
+ * src/lib/efi.c:
+ + Remove questionable "hack to allow include of ethtool.h".
+ + Include asm/types.h so that proper types are defined (Closes: #389923).
+ * debian/control:
+ + Set policy to 3.7.2.
+ + Uncapitalised short description.
+
+ -- Sam Hocevar (Debian packages) <[EMAIL PROTECTED]> Sun, 8 Oct 2006 14:21:38 +0200
+
efibootmgr (0.5.3-1) unstable; urgency=low
* new upstream version, closes: #357884
diff -puriN efibootmgr-0.5.3.orig/debian/control efibootmgr-0.5.3/debian/control
--- efibootmgr-0.5.3.orig/debian/control 2006-10-08 14:46:16.000000000 +0200
+++ efibootmgr-0.5.3/debian/control 2006-10-08 14:46:06.000000000 +0200
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: Bdale Garbee <[EMAIL PROTECTED]>
Build-Depends: debhelper (>> 5), docbook-to-man, pciutils-dev
-Standards-Version: 3.6.2.2
+Standards-Version: 3.7.2
Package: efibootmgr
Architecture: amd64 i386 ia64
diff -puriN efibootmgr-0.5.3.orig/src/include/gpt.h efibootmgr-0.5.3/src/include/gpt.h
--- efibootmgr-0.5.3.orig/src/include/gpt.h 2002-04-03 01:00:01.000000000 +0200
+++ efibootmgr-0.5.3/src/include/gpt.h 2006-10-08 14:46:06.000000000 +0200
@@ -35,7 +35,7 @@
#define GPT_BLOCK_SIZE 512
-#define GPT_HEADER_SIGNATURE 0x5452415020494645
+#define GPT_HEADER_SIGNATURE ((uint64_t)(0x5452415020494645LL))
#define GPT_HEADER_REVISION_V1_02 0x00010200
#define GPT_HEADER_REVISION_V1_00 0x00010000
#define GPT_HEADER_REVISION_V0_99 0x00009900
diff -puriN efibootmgr-0.5.3.orig/src/lib/efi.c efibootmgr-0.5.3/src/lib/efi.c
--- efibootmgr-0.5.3.orig/src/lib/efi.c 2006-10-08 14:46:16.000000000 +0200
+++ efibootmgr-0.5.3/src/lib/efi.c 2006-10-08 14:46:06.000000000 +0200
@@ -18,10 +18,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#define _FILE_OFFSET_BITS 64
-
-typedef unsigned long long u64; /* hack to allow include of ethtool.h */
-
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -39,6 +35,7 @@ typedef unsigned long long u64; /*
#include <linux/sockios.h>
#include <net/if.h>
#include <pci/pci.h>
+#include <asm/types.h>
#include <linux/ethtool.h>
#include "efi.h"
#include "efichar.h"
