Imported Debian patch 0.4.2-3

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..4340ba2
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,76 @@
+efibootmgr (0.4.2-3) unstable; urgency=low
+
+  * patch from upstream to solve compilation problem, closes: #223146
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 13 Jan 2004 11:20:20 +1030
+
+efibootmgr (0.4.2-2) unstable; urgency=low
+
+  * add i386 to list of supported architectures, since elilo depends on this
+    package to support various options of the elilo shell script.  note that
+    efibootmgr requires associated kernel support which probably isn't in 
+    standard Debian kernels yet, but we'll deal with that when we get access
+    to a real i386 system using EFI firmware...
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 25 Oct 2003 15:23:59 -0600
+
+efibootmgr (0.4.2-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Bdale Garbee <bdale@gag.com>  Thu,  4 Sep 2003 15:38:46 -0600
+
+efibootmgr (0.4.1-1) unstable; urgency=low
+
+  * new upstream version, closes: #165956
+  *   this version can run non-root, closes: #163447
+  *   this version checks if boot option was specified, closes: #163450
+  * remove local copy of man page source and related processing now that
+    man page is integrated with upstream release
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 23 Oct 2002 16:05:53 -0600
+
+efibootmgr (0.4.0-1) unstable; urgency=low
+
+  * new upstream version, closes: #146544
+  * updated man page from Dann Frazier <dannf@debian.org>, closes: #157213
+
+ -- Bdale Garbee <bdale@gag.com>  Sun, 18 Aug 2002 20:40:48 -0600
+
+efibootmgr (0.3.4-3) unstable; urgency=low
+
+  * add man page from Dann Frazier <dannf@debian.org>, closes: #140514
+
+ -- Bdale Garbee <bdale@gag.com>  Sat, 30 Mar 2002 13:53:32 -0700
+
+efibootmgr (0.3.4-2) unstable; urgency=medium
+
+  * apply patch from Alex Williamson so we work with EFI 1.1 too
+  * cosmetic cleanups to packaging
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 30 Jan 2002 10:45:42 -0700
+
+efibootmgr (0.3.4-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 10 Aug 2001 13:15:19 -0600
+
+efibootmgr (0.3.3-2) unstable; urgency=medium
+
+  * patch from Richard Hirst to fix a buffer size problem 
+
+ -- Bdale Garbee <bdale@gag.com>  Wed,  8 Aug 2001 01:21:03 -0600
+
+efibootmgr (0.3.3-1) unstable; urgency=low
+
+  * new upstream release
+  * fix lintian complaint about naming of upstream changelog
+
+ -- Bdale Garbee <bdale@gag.com>  Fri,  3 Aug 2001 17:08:24 -0600
+
+efibootmgr (0.3.2-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 10 Jul 2001 15:37:11 -0600

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..ea29aa1
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,21 @@
+Source: efibootmgr
+Section: admin
+Priority: optional
+Maintainer: Bdale Garbee <bdale@gag.com>
+Build-Depends: debhelper (>> 3.0.0), docbook-to-man
+Standards-Version: 3.6.1.0
+
+Package: efibootmgr
+Architecture: i386 ia64
+Depends: ${shlibs:Depends}
+Description: Interact with the EFI Boot Manager 
+ This is a Linux user-space application to modify the Intel Extensible 
+ Firmware Interface (EFI) Boot Manager configuration.  This application can 
+ create and destroy boot entries, change the boot order, change the next 
+ running boot option, and more.
+ .
+ Details on the EFI Boot Manager are available from the EFI Specification, 
+ v1.02 or above, available from http://developer.intel.com.
+ .
+ Note: efibootmgr requires that the kernel module efivars be loaded prior 
+ to use.  'modprobe efivars' should do the trick.

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..3844600
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,16 @@
+This package was constructed by Bdale Garbee <bdale@gag.com>, using source
+downloaded from
+
+       http://domsch.com/linux/ia64/
+
+Upstream Author: Matt Domsch <Matt_Domsch@Dell.com>
+
+Copyright:
+
+  Copyright (C) 2001-2003 Dell Computer Corporation <Matt_Domsch@dell.com>
+
+  efibootmgr is distributed under the GPL.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+

diff --git a/debian/dirs b/debian/dirs
new file mode 100644 (file)
index 0000000..ba077a4
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+bin

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..44fc486
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+README
+doc/TODO

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..6b02157
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,59 @@
+#!/usr/bin/make -f
+
+export DH_COMPAT=3
+
+configure: configure-stamp
+configure-stamp:
+       dh_testdir
+
+       touch configure-stamp
+
+build: configure-stamp build-stamp
+build-stamp:
+       dh_testdir
+       $(MAKE)
+       touch build-stamp
+
+clean:
+       dh_testdir
+       dh_testroot
+       rm -f build-stamp configure-stamp
+       -$(MAKE) clean
+       dh_clean
+
+install: build
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+
+       cp src/efibootmgr/efibootmgr debian/efibootmgr/bin/efibootmgr
+       chown root:root debian/efibootmgr/bin/efibootmgr
+       chmod 0755 debian/efibootmgr/bin/efibootmgr
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+       dh_testdir
+       dh_testroot
+       dh_installdocs
+       dh_installexamples
+       dh_installmenu
+       dh_installcron
+       dh_installman src/man/man8/efibootmgr.8
+       dh_installinfo
+       dh_installchangelogs doc/ChangeLog
+       dh_link
+       dh_strip
+       dh_compress
+       dh_fixperms
+       dh_installdeb
+       dh_shlibdeps
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

diff --git a/src/lib/gpt.c b/src/lib/gpt.c
index e4985d1353bf401fa9a0f1557ca98717f2c9a855..85aefedd6711f7534f2a59dbd9d519673c7f0461 100644 (file)
--- a/src/lib/gpt.c
+++ b/src/lib/gpt.c
@@ -43,7 +43,7 @@
 #define BLKGETLASTSECT  _IO(0x12,108) /* get last sector of block device */
 #define BLKGETSIZE _IO(0x12,96)        /* return device size */
 #define BLKSSZGET  _IO(0x12,104)       /* get block device sector size */
-#define BLKGETSIZE64 _IOR(0x12,114,sizeof(uint64_t))   /* return device size in bytes (u64 *arg) */
+#define BLKGETSIZE64 _IOR(0x12,114,uint64_t)   /* return device size in bytes (u64 *arg) */
 
 struct blkdev_ioctl_param {
         unsigned int block;