--- multiboot-0.6.96.orig/multiboot-0.6.96.tar.gz.cdbs-config_list +++ multiboot-0.6.96/multiboot-0.6.96.tar.gz.cdbs-config_list @@ -0,0 +1 @@ +multiboot-0.6.96/config.h.in --- multiboot-0.6.96.orig/debian/examples +++ multiboot-0.6.96/debian/examples @@ -0,0 +1 @@ +build-tree/multiboot-0.6.96/docs/kernel --- multiboot-0.6.96.orig/debian/control +++ multiboot-0.6.96/debian/control @@ -0,0 +1,33 @@ +Source: multiboot +Section: doc +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: GRUB Maintainers +Uploaders: Robert Millan , Felix Zielcke , Jordi Mallach +DM-Upload-Allowed: yes +Build-Depends: + cdbs, + debhelper (>= 7), +Build-Depends-Indep: + automake, + autoconf, + texi2html, +Standards-Version: 3.7.3 + +Package: multiboot +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends}, dpkg (>= 1.15.4) | install-info +Suggests: doc-base +Replaces: grub-doc, multiboot-doc +Description: The Multiboot specification + This specification, created in 1995, describes a method of loading various + multiboot kernels using a single compliant boot loader (such as GNU GRUB) + on i386-based computers. + . + It is used by a variety of kernel images, such as the Hurd, Xen, or NetBSD + kernels. + . + An example implementation of a Multiboot kernel is provided. + . + For an example implementation of a Multiboot loader, check GRUB Legacy + (grub-legacy package), or GRUB 2 (grub-pc package, and others). --- multiboot-0.6.96.orig/debian/docs +++ multiboot-0.6.96/debian/docs @@ -0,0 +1 @@ +build-tree/multiboot-0.6.96/docs/html --- multiboot-0.6.96.orig/debian/rules +++ multiboot-0.6.96/debian/rules @@ -0,0 +1,69 @@ +#!/usr/bin/make -f + +src_package := $(shell dpkg-parsechangelog | sed -ne "s/^Source: \(.*\)/\1/p") +deb_version := $(shell dpkg-parsechangelog | sed -ne "s/^Version: \(.*\)/\1/p") +upstream_version := $(shell echo $(deb_version) | sed -e "s/-[^-]*$$//") +major := $(shell echo $(upstream_version) | sed -e "s/\([0-9]\+\.[0-9]\+\)[\.-].*/\1/g") + +# single-binary package +package := $(src_package) + +export CPPFLAGS += -fno-stack-protector +export CFLAGS += -fno-stack-protector + +export DEB_BUILD_MAINT_OPTIONS=hardening=-all + +DEB_TARBALL = multiboot-$(upstream_version).tar.gz +DEB_TAR_SRCDIR := multiboot-$(upstream_version) + +include /usr/share/cdbs/1/rules/tarball.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_INSTALL_INFO_multiboot := --no-act + +DEB_CONFIGURE_USER_FLAGS := \ + --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --includedir="\$${prefix}/include" \ + --mandir="\$${prefix}/share/man" --infodir="\$${prefix}/share/info" --sysconfdir=/etc --localstatedir=/var \ + --libexecdir="\$${prefix}/lib/$(package)" \ + --enable-example-kernel \ + $(NULL) + +$(DEB_SRCDIR)/configure: apply-patches +$(DEB_SRCDIR)/Makefile: $(DEB_SRCDIR)/configure + cd $(DEB_SRCDIR) && \ + aclocal && \ + autoheader && \ + touch NEWS README && \ + automake -a -c -f && \ + autoconf && \ + ./configure $(DEB_CONFIGURE_USER_FLAGS) + +stamps/build: $(DEB_SRCDIR)/Makefile + $(MAKE) -C $(DEB_SRCDIR) + cd $(DEB_SRCDIR)/docs && texi2html -split_chapter --output=html multiboot.texi + mkdir -p stamps + touch $@ + +stamps/install: + $(MAKE) -C $(DEB_SRCDIR) install DESTDIR=$(CURDIR)/debian/$(package)/ + + rm -f debian/$(package)/usr/share/info/dir + + mkdir -p debian/$(package)/usr/share/lintian/overrides + for i in \ + arch-independent-package-contains-binary-or-object \ + arch-dependent-file-in-usr-share \ + statically-linked-binary \ + ; do \ + echo "$(package): $$i ./usr/share/doc/multiboot/examples/kernel" ; \ + done > debian/$(package)/usr/share/lintian/overrides/$(package) + + mkdir -p stamps + touch $@ + +build/$(package):: stamps/build +install/$(package):: stamps/install + +clean:: + rm -rf stamps --- multiboot-0.6.96.orig/debian/changelog +++ multiboot-0.6.96/debian/changelog @@ -0,0 +1,42 @@ +multiboot (0.6.96-1.1ubuntu2) precise; urgency=low + + * Build with -fno-stack-protector (LP: #934996) + + -- Andreas Moog Sat, 03 Mar 2012 16:58:56 +0100 + +multiboot (0.6.96-1.1ubuntu1) natty; urgency=low + + * Merge from Debian Unstable, remaining changes: + - debian/patches/02_stack_protection.diff: Build without stack protection + as the linker is called with -nostdlib . + + -- Bilal Akhtar Wed, 20 Oct 2010 16:11:41 +0300 + +multiboot (0.6.96-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS in squeeze: rm: cannot remove + `debian/multiboot/usr/share/info/dir': No such file or directory": + "rm -f" so that the file gets removed whether it's created or not (depends + on having install-info installed or not); thanks to Justus Winter for his + debugging help (closes: #595876). + + -- gregor herrmann Tue, 21 Sep 2010 16:58:29 +0200 + +multiboot (0.6.96-1ubuntu2) maverick; urgency=low + + * Let the rm call not fail if the directory is already missing. + + -- Michael Bienia Sat, 26 Jun 2010 13:49:48 +0200 + +multiboot (0.6.96-1ubuntu1) maverick; urgency=low + + * Build without stack protection as the linker is called with -nostdlib. + + -- Michael Bienia Sat, 26 Jun 2010 13:37:51 +0200 + +multiboot (0.6.96-1) unstable; urgency=low + + * Initial release. (Closes: #562484) + + -- Robert Millan Thu, 24 Dec 2009 18:50:23 +0100 --- multiboot-0.6.96.orig/debian/copyright +++ multiboot-0.6.96/debian/copyright @@ -0,0 +1,89 @@ +Name: Multiboot +Maintainer: GNU project +Source: http://alpha.gnu.org/gnu/grub/ + +Files: * +Copyright: 1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc +License: GPL-2+ + +Files: configure.ac +Copyright: 1999,2000,2001,2002,2003,2004,2005,2008,2009 Free Software Foundation, Inc. +License: + Permission to use, copy, modify and distribute this software and its + documentation is hereby granted, provided that both the copyright + notice and this permission notice appear in all copies of the + software, derivative works or modified versions, and any portions + thereof, and that both notices appear in supporting documentation. + . + THE FREE SOFTWARE FOUNDATION ALLOWS FREE USE OF THIS SOFTWARE IN ITS + "AS IS" CONDITION. THE FREE SOFTWARE FOUNDATION DISCLAIMS ANY + LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE + USE OF THIS SOFTWARE. + +Files: docs/boot.S +Copyright: 1999, 2001 Free Software Foundation, Inc. +License: GPL-2+ + +Files: docs/kernel.c +Copyright: 1999 Free Software Foundation, Inc. +License: GPL-2+ + +Files: docs/multiboot.h +Copyright: 1999,2003,2007,2008,2009 Free Software Foundation, Inc. +License: X11 + +Files: docs/multiboot.texi +Copyright: 1995,96 Bryan Ford + 1995,96 Erich Stefan Boleyn + 1999,2000,2001,2002,2005,2006,2009 Free Software Foundation, Inc. +License: + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice + are preserved on all copies. + . + Permission is granted to process this file through TeX and print the + results, provided the printed document carries a copying permission + notice identical to this one except for the removal of this paragraph + (this paragraph not being relevant to the printed manual). + . + Permission is granted to copy and distribute modified versions of this + manual under the conditions for verbatim copying, provided also that + the entire resulting derived work is distributed under the terms of a + permission notice identical to this one. + . + Permission is granted to copy and distribute translations of this manual + into another language, under the above conditions for modified + versions. + +Files: debian/* +Copyright: 2009 Robert Millan +License: GPL-3+ + + +License: GPL-2+ + On Debian systems the full text of the GNU General Public + License can be found in the `/usr/share/common-licenses/GPL' + file. + +License: X11 + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY + DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +License: GPL-3+ + On Debian systems the full text of the GNU General Public + License can be found in the `/usr/share/common-licenses/GPL' + file. --- multiboot-0.6.96.orig/debian/patches/01_no_multilib.diff +++ multiboot-0.6.96/debian/patches/01_no_multilib.diff @@ -0,0 +1,19 @@ +--- multiboot-0.6.96/configure.ac~ 2009-12-24 16:37:54.000000000 +0100 ++++ multiboot-0.6.96/configure.ac 2009-12-24 19:23:14.000000000 +0100 +@@ -18,8 +18,6 @@ + AC_CONFIG_HEADER([config.h]) + AM_INIT_AUTOMAKE + +-CFLAGS="-m32 $CFLAGS" +- + # + # Programs + # +@@ -44,6 +42,7 @@ + CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)' + AC_SUBST(CCASFLAGS) + ++CFLAGS="-m32 $CFLAGS" + + dnl Output. + AC_CONFIG_FILES([Makefile docs/Makefile]) --- multiboot-0.6.96.orig/debian/patches/02_disable_stack_protection.diff +++ multiboot-0.6.96/debian/patches/02_disable_stack_protection.diff @@ -0,0 +1,24 @@ +diff -Nur -x '*.orig' -x '*~' multiboot-0.6.96/build-tree/multiboot-0.6.96/docs/Makefile.am multiboot-0.6.96.new/build-tree/multiboot-0.6.96/docs/Makefile.am +--- multiboot-0.6.96/docs/Makefile.am 2009-12-24 16:38:39.000000000 +0100 ++++ multiboot-0.6.96/docs/Makefile.am 2010-06-26 13:33:09.000000000 +0200 +@@ -10,7 +10,7 @@ + noinst_PROGRAMS = kernel + kernel_SOURCES = $(EXAMPLES) + kernel_CFLAGS = -fno-builtin -nostdinc -O -g -Wall \ +- -imacros $(top_builddir)/config.h ++ -imacros $(top_builddir)/config.h -nostdlib + kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none + + boot.o: multiboot.h +diff -Nur -x '*.orig' -x '*~' multiboot-0.6.96/build-tree/multiboot-0.6.96/docs/Makefile.in multiboot-0.6.96.new/build-tree/multiboot-0.6.96/docs/Makefile.in +--- multiboot-0.6.96/docs/Makefile.in 2009-12-24 16:45:34.000000000 +0100 ++++ multiboot-0.6.96/docs/Makefile.in 2010-06-26 13:33:53.000000000 +0200 +@@ -177,7 +177,7 @@ + noinst_SCRIPTS = $(SRC2TEXI) + @BUILD_EXAMPLE_KERNEL_TRUE@kernel_SOURCES = $(EXAMPLES) + @BUILD_EXAMPLE_KERNEL_TRUE@kernel_CFLAGS = -fno-builtin -nostdinc -O -g -Wall \ +-@BUILD_EXAMPLE_KERNEL_TRUE@ -imacros $(top_builddir)/config.h ++@BUILD_EXAMPLE_KERNEL_TRUE@ -imacros $(top_builddir)/config.h -nostdlib + + @BUILD_EXAMPLE_KERNEL_TRUE@kernel_LDFLAGS = -nostdlib -Wl,-N -Wl,-Ttext -Wl,100000 -Wl,--build-id=none + EXTRA_DIST = $(man_MANS) $(noinst_SCRIPTS) \