--- klibc-1.5.12.orig/debian/compat +++ klibc-1.5.12/debian/compat @@ -0,0 +1 @@ +5 --- klibc-1.5.12.orig/debian/libklibc-dev.preinst +++ klibc-1.5.12/debian/libklibc-dev.preinst @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +BASEDIR=/usr/lib/klibc/include +SYMLINKDIRS="asm asm-generic asm-i386 asm-ia64 asm-parisc asm-ppc asm-ppc64 asm-sparc asm-sparc64 asm-x86_64 linux" + +for x in ${SYMLINKDIRS}; do + if [ -L ${BASEDIR}/${x} ]; then + rm ${BASEDIR}/${x} + fi +done --- klibc-1.5.12.orig/debian/rules +++ klibc-1.5.12/debian/rules @@ -0,0 +1,54 @@ +#!/usr/bin/make -f +include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +ifeq ($(DEB_ARCH),armel) +DEB_MAKE_ENVVARS := CONFIG_AEABI=y +endif +ifeq ($(DEB_ARCH),ia64) +DEB_MAKE_ENVVARS := ARCH=ia64 +endif +ifeq ($(DEB_ARCH),sparc) +DEB_MAKE_ENVVARS := ARCH=sparc +endif +ifeq ($(DEB_ARCH),s390) +DEB_MAKE_ENVVARS := ARCH=s390 +endif +ifeq ($(DEB_ARCH),powerpc) +ARCH=ppc +endif + +DEB_MAKE_INVOKE := make +DEB_MAKE_CLEAN_TARGET := clean +DEB_MAKE_BUILD_TARGET := all +DEB_MAKE_ENVVARS := INSTALLROOT=debian/tmp $(DEB_MAKE_ENVVARS) + +# Enable this to get verbose build information +DEB_MAKE_ENVVARS += KBUILD_VERBOSE=1 + +# gcc 4.3.1 known broken +DEB_MAKE_ENVVARS += CC=gcc-4.1 + +DEB_MAKE_INVOKE = make -C $(DEB_BUILDDIR) $(DEB_MAKE_ENVVARS) + +DEB_MAKE_INSTALL_TARGET := install + +DEB_FIXPERMS_EXCLUDE := klibc- + +pre-build:: + if [ ! -e linux ]; then \ + rm -rf linux/include; \ + mkdir -p linux/include; \ + ln -s /usr/include/linux linux/include; \ + for x in /usr/include/asm*; do \ + ln -s $${x} linux/include; \ + done \ + fi + +clean:: + rm -rf linux + make $(DEB_MAKE_ENVVARS) mrproper + +#common-build-arch:: +# if [ -e ash/sh.shared ]; then mv -f ash/sh.shared ash/sh; fi --- klibc-1.5.12.orig/debian/copyright +++ klibc-1.5.12/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Jeff Bailey on +Sun, 23 Jan 2005 21:11:50 -0500. + +It was downloaded from http://www.kernel.org/pub/linux/libs/klibc/ + +Copyright 2004-2006 H. Peter Anvin + +License: + +BSD/GPL + +On Debian GNU/Linux systems, the complete text of the UCB BSD license and the +GNU General Public License can be found in `/usr/share/common-licenses/BSD' +and `/usr/share/common-licenses/GPL'. --- klibc-1.5.12.orig/debian/control +++ klibc-1.5.12/debian/control @@ -0,0 +1,78 @@ +Source: klibc +Priority: optional +Maintainer: maximilian attems +Uploaders: Jeff Bailey +Build-Depends: cdbs, debhelper (>= 5.0.0), linux-libc-dev, bison, m4, gcc-4.1 +Section: libs +Standards-Version: 3.7.3 +Vcs-Browser: http://git.debian.org/?p=kernel/klibc.git +Vcs-Git: git://git.debian.org/git/kernel/klibc.git + +Package: libklibc-dev +Section: libdevel +Architecture: any +Depends: libklibc (= ${binary:Version}), gcc-4.1 +Description: kernel headers used during the build of klibc + This package contains the set of kernel headers that were required to + build klibc and the utilities that ship with it. This may or may + not be a complete enough set to build other programs that link against + klibc. If in doubt, use real kernel headers instead. + +Package: libklibc +Section: libs +Architecture: any +Description: minimal libc subset for use with initramfs + klibc is intended to be a minimalistic libc subset for use with + initramfs. It is deliberately written for small size, minimal + entanglement, and portability, not speed. It is definitely a work in + progress, and a lot of things are still missing. + + +Package: klibc-utils +Section: libs +Architecture: any +Depends: libklibc (= ${binary:Version}) +Description: small utilities built with klibc for early boot + This package contains a collection of programs that are linked + against klibc. These duplicate some of the functionality of a + regular Linux toolset, but are typically much smaller than their + full-function counterparts. They are intended for inclusion in + initramfs images and embedded systems. + +Package: klibc-utils-udeb +Section: debian-installer +Architecture: any +XC-Package-Type: udeb +Depends: libklibc-udeb (= ${binary:Version}) +Description: small utilities built with klibc for early boot + This package contains a collection of programs that are linked + against klibc. These duplicate some of the functionality of a + regular Linux toolset, but are typically much smaller than their + full-function counterparts. They are intended for inclusion in + initramfs images and embedded systems. + + +Package: klibc-utils-floppy-udeb +Section: debian-installer +Architecture: alpha arm armeb armel amd64 hppa i386 m68k mips mipsel powerpc s390 sparc +XC-Package-Type: udeb +Depends: libklibc-udeb (= ${binary:Version}) +Description: small utilities built with klibc for the boot floppy + This package contains a small collection of programs that are linked + against klibc. These duplicate some of the functionality of a + regular Linux toolset, but are typically much smaller than their + full-function counterparts. They are intended for inclusion in + boot floppies. + + +Package: libklibc-udeb +Section: debian-installer +Architecture: any +XC-Package-Type: udeb +Description: minimal libc subset for use with initramfs + klibc is intended to be a minimalistic libc subset for use with + initramfs. It is deliberately written for small size, minimal + entanglement, and portability, not speed. It is definitely a work in + progress, and a lot of things are still missing. + + --- klibc-1.5.12.orig/debian/klibc-utils-udeb.install +++ klibc-1.5.12/debian/klibc-utils-udeb.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/klibc/bin/* --- klibc-1.5.12.orig/debian/klibc-utils-floppy-udeb.install +++ klibc-1.5.12/debian/klibc-utils-floppy-udeb.install @@ -0,0 +1,7 @@ +debian/tmp/usr/lib/klibc/bin/cat +debian/tmp/usr/lib/klibc/bin/cpio +debian/tmp/usr/lib/klibc/bin/insmod +debian/tmp/usr/lib/klibc/bin/mount +debian/tmp/usr/lib/klibc/bin/run-init +debian/tmp/usr/lib/klibc/bin/umount +debian/tmp/usr/lib/klibc/bin/zcat --- klibc-1.5.12.orig/debian/changelog +++ klibc-1.5.12/debian/changelog @@ -0,0 +1,947 @@ +klibc (1.5.12-2~bpo40+1) etch-backports; urgency=low + + * Rebuild for etch. + + -- Norbert Tretkowski Wed, 27 Aug 2008 13:55:46 +0200 + +klibc (1.5.12-2) unstable; urgency=medium + + * Add backport 11_klibc-Default-signal-3-to-bsd_signal-3.patch. + * Adjust watch file. + + -- maximilian attems Mon, 11 Aug 2008 16:09:45 +0200 + +klibc (1.5.12-1) unstable; urgency=low + + * New upstream release (memmove, fflush, cpio) (closes: #489945) + + -- maximilian attems Sat, 12 Jul 2008 21:48:56 +0200 + +klibc (1.5.11-3) unstable; urgency=high + + * libklibc-dev depend on gcc-4.1. (closes: #489103) + + -- maximilian attems Thu, 03 Jul 2008 19:33:56 +0200 + +klibc (1.5.11-2) unstable; urgency=high + + * gcc-4.1 build dep. + + -- maximilian attems Fri, 27 Jun 2008 01:40:39 +0200 + +klibc (1.5.11-1) unstable; urgency=high + + * New upstream release (ext4, ipconfig, mount) + - drop merged 11-klibc-run-init-drop-executable-stack.patch, + 12-klibc-avoid-.gitignore-in-the-include-directory.patch + * Fallback to gcc-4.1 4.3 miscompiles. (closes: #486557) + + -- maximilian attems Fri, 27 Jun 2008 00:59:27 +0200 + +klibc (1.5.10-1) unstable; urgency=low + + * New upstream release (dmesg, nfsmount) + - dmesg: fix the stripping of priority codes (closes: #483186) + - ubuntu sync rework 11-klibc-run-init-drop-executable-stack.patch + - add git fix 12-klibc-avoid-.gitignore-in-the-include-directory.patch + + -- maximilian attems Fri, 27 Jun 2008 00:59:21 +0200 + +klibc (1.5.9-2) unstable; urgency=low + + * debian/control: Fix Description klibc-utils are not statically linked. + Thanks Anthony Towns for noticing. + * klibc-utils-floppy-udeb.install: Drop mkdir, mknod, sh due to full floppy. + Thanks Joey Hess . (closes: #474061) + + -- maximilian attems Wed, 09 Apr 2008 11:00:29 +0200 + +klibc (1.5.9-1) unstable; urgency=low + + * New upstream release (fstype jfs + nilfs2, ipconfig, nfsmount) + - Drop merged 02_header_clean_install.patch, 20_mount-options.patch + - mknod gained -m permission switch. (closes: #469577) + * debian/control: Add git Vcs fields. + + -- maximilian attems Fri, 28 Mar 2008 23:09:57 +0100 + +klibc (1.5.8-1) unstable; urgency=low + + * New upstream release (fstype squashfs-lzma, ipconfig) (closes: #455703) + * Ubuntu sync add 20_mount-options.patch for FUSE mount. (closes: #463258) + * Add 02_header_clean_install.patch. + * Drop unused 03-sparc-libgcc42.patch. + * Add 10_insmod.patch for d-i floppy usage. + * Fix copyright notice. + * Newer standard version without changes. + + -- maximilian attems Sat, 22 Mar 2008 14:09:56 +0100 + +klibc (1.5.7-4) unstable; urgency=high + + * debian/rules: Set verbose kbuild for toolchain troubles. Compile + 32 bit on ppc and 31 bit on s390. (closes: #453422, #453424) + + -- maximilian attems Fri, 7 Dec 2007 16:12:36 +0100 + +klibc (1.5.7-3) unstable; urgency=high + + * debian/rules: s/sparc64/sparc/ thanks to the Debian sparc folks. + (closes: #399724) + + -- maximilian attems Thu, 22 Nov 2007 18:50:55 +0100 + +klibc (1.5.7-2) unstable; urgency=high + + * Add 03-sparc-libgcc42.patch (closes: #440721) + Thanks for report and testing to Kilian Krause + + -- maximilian attems Thu, 22 Nov 2007 18:50:50 +0100 + +klibc (1.5.7-1) unstable; urgency=low + + * New upstream release + * Build-dep on s/flex/m4/. + + -- maximilian attems Tue, 04 Sep 2007 13:03:09 +0200 + +klibc (1.5.6-2) unstable; urgency=high + + * debian/rules: Pass for ia64 ARCH=ia64 on install target, enables static + workaround. (closes: #439548) + + -- maximilian attems Sat, 25 Aug 2007 17:39:35 +0200 + +klibc (1.5.6-1) unstable; urgency=low + + * New upstream release (mount, bzero) + * debian/rules: Disable verbose build. + + -- maximilian attems Sat, 25 Aug 2007 01:54:22 +0200 + +klibc (1.5.5-1) unstable; urgency=low + + * New upstream release (dash 0.5.4) + + -- maximilian attems Thu, 23 Aug 2007 18:15:24 +0200 + +klibc (1.5.4-1) unstable; urgency=low + + * New upstream release (dmesg, fstype ocfs2) + + -- maximilian attems Tue, 21 Aug 2007 12:31:27 +0200 + +klibc (1.5.3-1) unstable; urgency=low + + * New upstream (ext4 gfs2 reiser4 squashfs fstype, sync) (closes: #392073) + - Drop merged 09_mips-linux-libc-dev.patch, + 08_nfsmount-rpc_header_length.patch, 02-squashfs.diff. + - Drop dubious Debian unused 07_kinit_no_vfork.patch. + + -- maximilian attems Wed, 15 Aug 2007 21:32:06 +0200 + +klibc (1.5-4) unstable; urgency=low + + * Add 09_mips-linux-libc-dev.patch. (closes: 435113) + + -- maximilian attems Sat, 04 Aug 2007 23:24:10 +0200 + +klibc (1.5-3) unstable; urgency=low + + * Build-dep on linux-libc-dev - ubuntu sync + rules cleanup. (closes: 423998) + Thus drop 08-revert_nostdinc_iwithprefix_include.patch + * Switch to ${binary:Version} + * Add 08_nfsmount-rpc_header_length.patch. (closes: 428832) + Thanks Tomas Vanderka for patch. + * Add armel support. (closes: 430593) + Thanks Riku Voipio + + -- maximilian attems Sat, 28 Jul 2007 12:44:57 +0200 + +klibc (1.5-2) unstable; urgency=low + + * klibc-utils-floppy-udeb.install: sort + add cpio. + + -- maximilian attems Mon, 2 Apr 2007 23:25:38 +0200 + +klibc (1.5-1) unstable; urgency=low + + * New upstream (cpio, read -t, resume offset, support newer linux headers) + * Change Maintainers field + + -- maximilian attems Sat, 31 Mar 2007 17:09:59 +0200 + +klibc (1.4.34-1) unstable; urgency=low + + * New upstream release (pwd, FD_ZERO, __sum*) + - drop 09-qsort-infinite-loop.patch + + -- maximilian attems Wed, 7 Feb 2007 23:52:30 +0100 + +klibc (1.4.31-1) unstable; urgency=low + + * New minor upstream release (fstype endian fixes) + - drop merged 09-klibc-utils-add_swsusp_to_fstype.patch + - add out of current git 09-qsort-infinite-loop.patch + * Build against linux-headers-2.6.18-4. + Use one variable to set them in order to ease stable updates. + + -- maximilian attems Fri, 26 Jan 2007 20:29:07 +0100 + +klibc (1.4.30-3) unstable; urgency=high + + * Disable klibc-utils-floppy-udeb build on ia64 by explicitly listing + all other architectures. ia64 does not build shared binaries. + urgency high as fixes RC bugs in etch. + + -- maximilian attems Wed, 13 Dec 2006 10:04:40 +0100 + +klibc (1.4.30-2) unstable; urgency=low + + * Build against linux-headers-2.6.18-3. (closes: 398334) + * Add klibc-utils-add_swsusp_to_fstype.patch (closes: 398302) + thanks David Härdeman . + * Add klibc-utils-floppy-udeb on request by the d-i folks. + + -- maximilian attems Wed, 29 Nov 2006 11:39:52 +0100 + +klibc (1.4.30-1) unstable; urgency=low + + * New upstream release (ia64, vsscanf, signal, creat) + * Fix watch file, remove stray newline in changelog. Thanks Christoph Berg + for review. + + -- maximilian attems Fri, 3 Nov 2006 08:53:02 +0100 + +klibc (1.4.29-1) unstable; urgency=low + + * New upstream release (closes: 362442) + - fstype iso9660 detection thanks David Härdeman + - rediff 02-squashfs.diff + * Build against linux-headers-2.6.18-1. (closes: 392855) + + -- maximilian attems Sat, 14 Oct 2006 13:31:24 +0200 + +klibc (1.4.27-1) unstable; urgency=low + + * New upstream release (mips, sh, malloc, free, fnmatch, getopt_long) + - Corrects mips statfs (closes: 347827) + - Drop merged 08_nuke_no_error_return.patch + - Drop merged 05_ipconfig_d-i.patch (closes: 374982) + - Add build fix 08-revert_nostdinc_iwithprefix_include.patch. + + -- maximilian attems Fri, 25 Aug 2006 08:12:10 +0200 + +klibc (1.4.19-2) unstable; urgency=high + + * Add 08_nuke_no_error_return.patch - + urgency high to get into testing before udev. + * debian/control, debian/rules: Use newer linux-headers-2.6.17-2. + Thanks Michael Banck for noticing. + + -- maximilian attems Sat, 19 Aug 2006 10:45:18 +0200 + +klibc (1.4.19-1) unstable; urgency=low + + * New upstream release (kbuild, readlink, shm_open() + shm_unlink()) + - Drop merged 06_ppc_kbuild.patch, + keep 07_kinit_no_vfork.patch until vfork() is sorted on parisc. + - Build against linux-headers-2.6.17-1. + + -- maximilian attems Tue, 8 Aug 2006 09:17:32 +0200 + +klibc (1.4.11-3) unstable; urgency=low + + * Add 06_ppc_kbuild.patch, 07_kinit_no_vfork.patch. closes: 378953 + + -- maximilian attems Sun, 23 Jul 2006 22:10:17 +0200 + +klibc (1.4.11-2) unstable; urgency=low + + * Add the changelog of the 1.4.8-1.1. Ack NMU. (closes: #378426) + + -- maximilian attems Wed, 19 Jul 2006 10:26:41 +0200 + +klibc (1.4.11-1) experimental; urgency=low + + * New upstream release (kbuild, arm, s390, mknod, kill, resume) + - reworked 01-ia64-static.diff touches more dirs and reapplies + - 02-squashfs.diff reapplies + - Thanks Martin Michlmayr for arm segfault fix. + (closes: #378426) + + -- maximilian attems Mon, 17 Jul 2006 00:40:56 +0200 + +klibc (1.4.8-1.1) unstable; urgency=high + + * NMU with the permission of the maintainer. + * Fix segfault on ARM when compiling without EABI. (closes: #378426) + + -- Martin Michlmayr Mon, 17 Jul 2006 16:31:15 +0200 + +klibc (1.4.8-1) unstable; urgency=low + + * New upstream release (arch fixes) + + -- maximilian attems Mon, 3 Jul 2006 20:24:33 +0200 + +klibc (1.4.6-1) unstable; urgency=low + + * New upstream release (s390, i386) + - Drop merged 00-reboot-poweroff-install.patch and 03-mknod.patch. + + -- maximilian attems Sat, 1 Jul 2006 16:28:16 +0200 + +klibc (1.4.2-3) unstable; urgency=low + + * Add 05_ipconfig_d-i.patch to allow d-i dhcp file preseeding. + Thanks Geert Stappers . (closes: #374982) + + -- maximilian attems Thu, 22 Jun 2006 21:38:34 +0200 + +klibc (1.4.2-2) unstable; urgency=low + + * klibc-utils: Pick up the new puppys reboot/poweroff - added + 00-reboot-poweroff-install.patch. + + * Tweaked 01-ia64-static.diff + + -- maximilian attems Thu, 22 Jun 2006 08:44:42 +0200 + +klibc (1.4.2-1) unstable; urgency=low + + * New upstream release (arm, halt/reboot/poweroff) + + * Add from git upstream 03-mknod.patch. + + -- maximilian attems Thu, 22 Jun 2006 00:53:03 +0200 + +klibc (1.3.38-1) unstable; urgency=low + + * New upstream release (syscalls, sparc32) + - Drop 04-libgcc-dep.diff thanks to upstream fixes. + + -- maximilian attems Wed, 14 Jun 2006 19:10:22 +0200 + +klibc (1.3.35-1) unstable; urgency=low + + * New upstream release (No c++) + + * debian/control,debian/rules: Pump build-dep on newer linux-headers. + + -- maximilian attems Thu, 8 Jun 2006 23:32:52 +0200 + +klibc (1.3.34-1) unstable; urgency=low + + * New upstream release (kinit, s390, dash) + - Rework 01-ia64-static.diff + upload to unstable to fix sparc32 + * Drop debian/config, no need for gzip atm. + + -- maximilian attems Thu, 8 Jun 2006 12:12:43 +0200 + +klibc (1.3.27-2) experimental; urgency=low + + * debian/rules: Don't override DEB_ARCH on sparc. Thanks to Jurij Smakov + for testing sparc32 and sparc64 32-bit build and boot. + + -- maximilian attems Tue, 6 Jun 2006 11:28:34 +0200 + +klibc (1.3.27-1) experimental; urgency=low + + * New upstream release + (kernel CodingStyle, kinit, arm+alpha+m68k+sparc32+sparc64 fixes) + - Drop hopefully fixed 05-sparc64_statfs.patch. + - Drop merged 06-s390-syscall-declare-err.patch. + - Rework 02-squashfs.diff. + - Remove zlib1g-dev Build-Dep, include dir for zlib.h got fixed. + - dd: handle trunc/notrunc correctly (closes: #367387) + Upload to experimental to give aboves porters chance to check changes. + + * debian/rules: Use mrproper on clean run to get rid of generated .config. + + * debian/config: Build with CONFIG_KLIB_ZIP, gzip does zip not only unzip. + (closes: #355809) + + -- maximilian attems Tue, 6 Jun 2006 00:34:13 +0200 + +klibc (1.3.19-5) experimental; urgency=low + + Thanks to Jeff Bailey for eagle eyes: + + * debian/rules: On clean use proper make clean target. + + * debian/control: Fix dep for klibc-utils-udeb. + + -- maximilian attems Tue, 9 May 2006 21:11:48 +0200 + +klibc (1.3.19-4) experimental; urgency=low + + * Mentors eats udeb, retry upload. + + -- maximilian attems Mon, 8 May 2006 21:12:03 +0200 + +klibc (1.3.19-3) experimental; urgency=low + + * Add klibc-utils and libklibc udeb targets on request of the nice d-i folks. + + * Pump standard version to 3.7.2 without changes. + + -- maximilian attems Mon, 8 May 2006 19:27:15 +0200 + +klibc (1.3.19-2) unstable; urgency=medium + + * Add 06-s390-syscall-declare-err.patch (closes: 366385) + + -- maximilian attems Mon, 8 May 2006 11:21:05 +0200 + +klibc (1.3.19-1) unstable; urgency=medium + + * New upstream release (m68k build fixes, dash cleanup) + - Drop 06-clz-builtins-return.patch + + * Set urgency to medium to get newer klibc into testing. + + -- maximilian attems Mon, 8 May 2006 09:29:52 +0200 + +klibc (1.3.16-2) unstable; urgency=low + + * Add new missing build-dep zlib1g-dev. + + -- maximilian attems Fri, 5 May 2006 15:15:03 +0200 + +klibc (1.3.16-1) unstable; urgency=low + + * New upstream release (m68k + mips work, tree reorganisation, zlib copy) + - Drop merged 06-fix-arch-without-ppoll.patch + - Rework 01-ia64-static.diff, 05-sparc64_statfs.patch + - Add git patch 06-clz-builtins-return.patch + + * Pump standard version to 3.7.1.0 without changes. + + -- maximilian attems Fri, 5 May 2006 00:20:45 +0200 + +klibc (1.3.11-2) unstable; urgency=medium + + * Add gone missing bit 06-fix-arch-without-ppoll.patch. + + * Urgency medium to get that latest with all fixes into Testing. + + -- maximilian attems Mon, 1 May 2006 02:17:32 +0200 + +klibc (1.3.11-1) unstable; urgency=low + + * New upstream release (m68k port, kinit) + - Drop no longer needed m68k-syscall.patch + - Drop merged ia64-syscall.patch + + * Rename 05-sparc64_statfs.patch for consistent patch numbering. + + -- maximilian attems Sat, 29 Apr 2006 20:16:48 +0200 + +klibc (1.3.7-2) unstable; urgency=low + + * Add ia64-syscall.patch, thanks to Jeff Bailey + + * Readd sparc64_statfs.patch, not fixed by proposed sparc_v9 upstream fix. + + -- maximilian attems Sat, 22 Apr 2006 18:41:52 +0200 + +klibc (1.3.7-1) unstable; urgency=low + + * New upstream release (Kbuild, dash, ..): + - Drop merged fstype-lvm2-ext3.patch, alpha-syscall.patch. + - Drop upstream reworked 03-sparc-fix-paths.diff. + - Rework 02-squashfs.diff. + - Rework 01-ia64-static.diff to apply cleanly too. + + -- maximilian attems Sat, 22 Apr 2006 13:39:57 +0200 + +klibc (1.3.3-4) unstable; urgency=low + + * Add alpha-syscall.patch, use the available rt syscalls. (closes: 361910) + Thanks Falk Hueffner and Norbert Tretkowski + for testing the fix. + + -- maximilian attems Tue, 18 Apr 2006 23:08:08 +0200 + +klibc (1.3.3-3) unstable; urgency=low + + * Add fstype-lvm2-ext3.patch thanks David Härdeman + for the fix. (closes: 362631) + + -- maximilian attems Mon, 17 Apr 2006 21:29:53 +0200 + +klibc (1.3.3-1) unstable; urgency=low + + * New upstream release (kinit, run-init) + - Drop merged s390-syscall.patch, statfs-sparc64-mips.patch + (the mips part didn't help, stat() needs more work there). + - Drop upstream nacked gcc-nohardcode.patch, sparc works fine with gcc-4.0. + - Drop arm-build-fix.patch, fixed by coreutils 5.93. + Thanks to Martin Michlmayr for fixing that issue. + + * debian/rules: Fix ppc build with linux-headers-2.6.16-1 - + thanks a lot to Roger Leigh . + + -- maximilian attems Thu, 6 Apr 2006 17:59:34 +0200 + +klibc (1.3.1-1) unstable; urgency=low + + * New upstream release + (kinit, lvm2 fstype, minix detection fix, zlib 1.2.3, whitespace cleanup) + - Rework 02-squashfs.diff. + + -- maximilian attems Tue, 4 Apr 2006 01:37:04 +0200 + +klibc (1.2.6-1) unstable; urgency=low + + * New upstream release + + * Pump build-dep on linux-headers-2.6.16-1. + + * Rework statfs-sparc64.patch into statfs-sparc64-mips.patch + + * Rework 01-ia64-static.diff build dash, fstype, ipconfig and run-init + static too. (closes: #357414) + + -- maximilian attems Wed, 22 Mar 2006 09:54:38 +0100 + +klibc (1.2.4-1) unstable; urgency=low + + * New upstream release + drop merged patches: include-cleanup.patch, mips-pipe.patch. + drop unneeded klibc-sparc64-def-pagesize.patch. + + * debian/watch: Add watch upstream. + + * s390-syscall.patch: Fix wrapper to return positive errno values. + Thanks Bastian Blank (closes: #355548) + + -- maximilian attems Thu, 9 Mar 2006 01:05:25 +0100 + +klibc (1.2.2-3) unstable; urgency=medium + + * Upload with medium urgency to fix sparc ftbfs. + + * Add include-cleanup.patch which removes useless includes. + + -- maximilian attems Fri, 17 Feb 2006 22:02:28 +0100 + +klibc (1.2.2-2) unstable; urgency=high + + * Upload with high urgency as this fixes sparc boots. + (Closes: #347902) + + * Add sparc64_statfs.patch thanks to Sjoerd Simons . + + * Add git upstream mips-pipe.patch. + + -- maximilian attems Thu, 16 Feb 2006 18:40:37 +0100 + +klibc (1.2.2-1) unstable; urgency=low + + * New upstream release (kinit work, LUKS and swap detection) + - reworked 02-squashfs.diff + + * Merge 1.1.16-1ubuntu3 (thanks Jeff Bailey ): + - Do not override the compiler for sparc anymore. + - Link in libc.a after libgcc.a as well to resolve symbols: + 04-libgcc-dep.diff. + - /usr/lib/klibc/include contained symlinks to the real include + directories before. Remove the symlinks in the preinst to avoid + overwriting bits of linux-kernel-headers on upgrade. + + * We no longer need to pass CC to the make invocation. + + * Add m68k-syscall.patch thanks to Kyle McMartin . + Still needs setjmp/longjmp, crt0, and sysstub.ph to be usefull. + + * Change arch list to any to encourage m68k porting. + + -- maximilian attems Tue, 14 Feb 2006 09:54:36 +0100 + +klibc (1.2.1-3) unstable; urgency=high + + * Add gcc-nohardcode.patch to really build sparc with gcc-3.3. + Thanks to Jurij Smakov for spotting the trouble. + (Closes: #347902, #349857) + + * Set urgency high to get all the previous arch fixes into testing. + + * Ack old accidental NMU. (Closes: #336620) + + -- maximilian attems Tue, 31 Jan 2006 10:20:02 +0100 + +klibc (1.2.1-2) unstable; urgency=low + + * Add armeb to the arch list. + + * Add temporary buildfix for arm: arm-build-fix.patch. + + -- maximilian attems Tue, 31 Jan 2006 01:39:24 +0100 + +klibc (1.2.1-1) unstable; urgency=low + + * New upstream release (kinit work) + Drop merged patches: klibc-hppa-fix-atexit.patch, + klibc-hppa-set-sharedflags.patch, klibc-mipsel-build.patch, + klibc-mips-newline-warning.patch, klibc-mips-path-linker.patch, + + * Add ubuntu patch 03-sparc-fix-paths.diff. + + * Add ARCH overrides for armeb and mipsel, + thanks Martin Michlmayr . (closes: #350592) + + -- maximilian attems Tue, 31 Jan 2006 00:16:36 +0100 + +klibc (1.1.16-3) unstable; urgency=low + + * Add mipsel build fix, thanks Martin Michlmayr . + + * Add mips and mipsel to the build archs - shared libraries may still segv. + + -- maximilian attems Sat, 21 Jan 2006 10:10:16 +0100 + +klibc (1.1.16-2) unstable; urgency=low + + * Fixed powerpc build, working around the ARCH=ppc/ARCH=powerpc mess on + 32bit powerpc. Closes: #347551. + * Add myself to uploaders. + + -- Sven Luther Fri, 20 Jan 2006 15:33:41 +0000 + +klibc (1.1.16-1) unstable; urgency=low + + * New upstream version. + Drop merged patches: alpha-kbuild.patch, parisc-arch.patch. + + * Add new upstream patches for better hppa and mips support: + klibc-hppa-fix-atexit.patch, klibc-hppa-set-sharedflags.patch. + Thanks Kyle McMartin + klibc-mips-newline-warning.patch, klibc-mips-path-linker.patch. + Thanks Martin Michlmayr + + * Pass ARCH we are building on to the make call, + fixes build on ppc64 kernel. + + -- maximilian attems Mon, 9 Jan 2006 18:06:04 +0100 + +klibc (1.1.15-4) unstable; urgency=low + + "Soiree Tranquille Release" + + * Really add 01-ia64-static.diff, 02-squashfs.diff. + Thanks again Jeff Bailey for spotting. + + -- maximilian attems Thu, 5 Jan 2006 23:58:55 +0100 + +klibc (1.1.15-3) unstable; urgency=low + + * Add alpha-kbuild.patch fixes alpha kbuild rules. + + -- maximilian attems Thu, 5 Jan 2006 22:20:31 +0100 + +klibc (1.1.15-2) unstable; urgency=low + + * Revert sparc personality switch as buildds inbetween invoke with linux64. + Thanks Jeff Bailey for spotting. + + * Add klibc-sparc64-def-pagesize.patch, should define the chosen PAGE_SIZE. + + -- maximilian attems Thu, 5 Jan 2006 20:07:12 +0100 + +klibc (1.1.15-1) unstable; urgency=low + + * New upstream version. + Drop merged patches: klibc-1.1.14-fstype-segv-1.patch, + klibc-endian.h-dangerous.patch + + * Build against latest linux-headers-2.6.15-1. + + * Try fixing sparc by building with linux26 personality. + + * Add the following ubuntu patches: + - 01-ia64-static.diff (static klibc works on ia64). + - 02-squashfs.diff adds sqashfs support to fstype. + + -- maximilian attems Thu, 5 Jan 2006 17:22:03 +0100 + +klibc (1.1.14-2) unstable; urgency=low + + * Fix new hppa kbuild issue, add parisc-arch.patch. + Thanks Kyle McMartin . + + * Add klibc-1.1.14-fstype-segv-1.patch allowing previous interface to work. + + -- maximilian attems Wed, 4 Jan 2006 00:03:47 +0100 + +klibc (1.1.14-1) unstable; urgency=low + + * New upstream release (merged all of our patches). + Features: dash, kbuild and shiny new packaging by Jeff Bailey! + + * Add klibc-endian.h-dangerous.patch upstream build fix. + + * Don't forget about our linitian overrides. + Added unstripped-binary-or-object libklibc-dev override. + + -- maximilian attems Sat, 31 Dec 2005 00:24:42 +0100 + +klibc (1.1.8-0ubuntu1) dapper; urgency=low + + * New upstream release. + - Obseletes all preview patches. + + * Redo packaging. + - Upstream changed packaging. Redo all packaging to match. + + -- Jeff Bailey Wed, 21 Dec 2005 01:05:04 +0000 + +klibc (1.1.1-10) unstable; urgency=low + + * Correct the powerpc to ppc mapping. + + -- maximilian attems Wed, 28 Dec 2005 01:35:56 +0100 + +klibc (1.1.1-9) unstable; urgency=low + + * Redrop klibc-sparc64-signals.diff, the buildd now uses correct cflags. + Thanks to Jurij Smakov + * Map powerpc to ppc for 2.6.14 based builds, useless for later kernels. + * Pump dephelper dependency as pointed out by linda. + + -- maximilian attems Fri, 23 Dec 2005 20:41:13 +0100 + +klibc (1.1.1-8) unstable; urgency=low + + * Add hppa to the mapped archs, sparc was already there. (Closes: #344482) + + -- maximilian attems Fri, 23 Dec 2005 15:17:22 +0100 + +klibc (1.1.1-7) unstable; urgency=low + + * Now that we handle the asm arch symlink by owerself, take care on the $arch + mapping. + + -- maximilian attems Fri, 23 Dec 2005 14:39:49 +0100 + +klibc (1.1.1-6) unstable; urgency=low + + [ Steve Langasek ] + * Fix the definition of struct statfs64, required for run-init to work on + alpha. + (Closes: #342931) + + -- maximilian attems Mon, 19 Dec 2005 10:22:38 +0100 + +klibc (1.1.1-5) unstable; urgency=low + + [ Steve Langasek ] + * Grab the errno from the right register after syscalls on alpha! + + [ maximilian attems ] + * Add s390 to the current arch list. + + * Bump Build-Deps on newer linux-headers. + + * Sync with 1.1.1-4ubuntu7. + - Use the newer klibc-parisc.diff version, which got upstream. + Thanks a lot Kyle McMartin . + - Add lintian overrides for libklibc-dev. + + * Add kosmetic klibc-parisc-clean-crash.diff for newer toolchain. + Again thanks to Kyle McMartin . + + * linux-kernel-headers is lacking the asm symlink from include/asm-$arch. + Add it by ourself when builing against it. ATTENTION: breaks klibc + crosscompiles. Will be solved by stabilized upstream kbuild tree. + + -- maximilian attems Mon, 19 Dec 2005 09:37:36 +0100 + +klibc (1.1.1-4ubuntu7) dapper; urgency=low + + * Patch to get 5 and 6 argument syscalls working on hppa. + Thanks to Kyle McMartin for this patch! + + -- Jeff Bailey Tue, 22 Nov 2005 13:27:15 -0500 + +klibc (1.1.1-4ubuntu6) dapper; urgency=low + + * Replace the sleep utility with one that calls nanosleep instead, so + can be used for sleeping microseconds. + + -- Scott James Remnant Tue, 22 Nov 2005 07:38:22 +0000 + +klibc (1.1.1-4ubuntu5) dapper; urgency=low + + * Include /usr/lib/klibc/lib/libc.so in the development package, as you + can't link against the uber-stripped klibc-*.so. + + -- Scott James Remnant Thu, 10 Nov 2005 16:44:58 -0500 + +klibc (1.1.1-4ubuntu4) dapper; urgency=low + + * Include /usr/lib/klibc/lib/interp.o in the development package. + + -- Scott James Remnant Thu, 10 Nov 2005 15:33:59 -0500 + +klibc (1.1.1-4ubuntu3) dapper; urgency=low + + * Somewhere, in a hotel room in Montreal, one can hear the sounds of + a big Italian man crying as he places a brown paper bag over his + head and admits that sparc really did need gcc-3.3 after all. + + -- Scott James Remnant Wed, 9 Nov 2005 17:29:33 -0500 + +klibc (1.1.1-4ubuntu2) dapper; urgency=low + + * Fix build-failure on sparc, Debian hadn't fully applied the + "use gcc-3.3 for sparc" patch. + * Use gcc-3.4 on sparc instead. + + -- Scott James Remnant Tue, 8 Nov 2005 16:01:17 -0500 + +klibc (1.1.1-4ubuntu1) dapper; urgency=low + + * Manual merge with Debian: + - Drop klibc-mount-opts.diff, merged upstream. + - Drop mconfig-parisc.patch, merged upstream. + - Keep klibc-sparc64-signals.diff, not yet merged and fabbione + isn't sure whether it's still necessary or not. + - Adjust build-dep on linux-headers to that in dapper + + -- Scott James Remnant Mon, 7 Nov 2005 12:47:13 -0500 + +klibc (1.1.1-4) unstable; urgency=low + + * debian/rules,debian/control: Use gcc-3.3 for sparc. + + * Drop klibc-sparc64-signals.diff. + Thanks to Andrew Pollock for the test box, + to Jurij Smakov and Fabio M. Di Nitto + for confirming. (closes: #330191) + + * Build on archs we do support: sparc, alpha, ppc, i386, amd64, hppa, ia64, + arm. Will need work for m68k, mips, mipsel. + Workaround for #334917 + + * debian/patches/fstype-jfs.patch: New file to support jfs. :) + Thanks to Jeff Bailey. (closes: #336620) + + * debian/patches/sparc64_archstat.patch: New file to fix stat() on sparc64. + Thanks to Jurij Smakov for the patch. + + -- maximilian attems Wed, 2 Nov 2005 09:46:00 +0100 + +klibc (1.1.1-2) unstable; urgency=low + + * Work around bug#328850 in lintian per request of the FTP Master: + Add lintian override for "statically-linked-binary". + + -- maximilian attems Sat, 17 Sep 2005 19:52:49 +0200 + +klibc (1.1.1-1) unstable; urgency=low + + The "Actions Publiques" release + * New upstream release: + - improved mount, umount: drop merged stamp-patch-klibc-mount-opts.diff. + - build warnings cleanup + + * Ready to hit the debian archive. closes: #312563 + + -- maximilian attems Mon, 12 Sep 2005 13:48:05 +0200 + +klibc (1.0.14-5) unstable; urgency=low + + * Remove old dup useless debian changelog. + + * Fix amusing typos in debian/copyright. + + -- maximilian attems Wed, 7 Sep 2005 09:13:50 +0200 + +klibc (1.0.14-4) unstable; urgency=low + + * Rebuild to include original source archive for the upload. + + -- maximilian attems Wed, 7 Sep 2005 00:37:03 +0200 + +klibc (1.0.14-3) unstable; urgency=low + + * Build it as non-native package. + + * Lintian prefers Changelog and Maintainer entries in the same + capitalisation - otherwise it detects an NMU. + + -- maximilian attems Wed, 7 Sep 2005 00:25:59 +0200 + +klibc (1.0.14-2) unstable; urgency=low + + * Release it for Debian. + Thanks to Jeff Bailey for all the hard work. + + * Adapt ubuntu Build-Deps for Debian unstable. + + * klibc happily complies to 3.6.3 standard version. + + * Refer to the BSD and GPL license file in the debian/copyright file. + + -- maximilian attems Tue, 6 Sep 2005 13:14:31 +0200 + +klibc (1.0.14-1ubuntu1) breezy; urgency=low + + * Bump Build-Deps on newer linux-headers. + + * Fix sparc64 signals special cases: + - Add patch klibc-sparc64-signals.diff. + + -- Fabio M. Di Nitto Wed, 17 Aug 2005 09:07:13 +0200 + +klibc (1.0.14-1) breezy; urgency=low + + The "OMG, A User!" Release. + + * New upstream release. + + * Fix mount option handling (Thanks to mdz@ubuntu.com for the patch) + + * Prune unnecessary substitution variables from control file. + + -- Jeff Bailey Wed, 1 Jun 2005 09:33:38 -0400 + +klibc (1.0.10-0ubuntu1) breezy; urgency=low + + * New upstream release. + + * klibc-utils must depend on the library. + * Add section: libs for the source package. + + -- Jeff Bailey Tue, 24 May 2005 14:34:05 +0000 + +klibc (1.0.8-0ubuntu2) breezy; urgency=low + + * Bump linux-headers dep to 2.6.12, suggested by Fabio. + + * Build-dep on bison and flex. + + -- Jeff Bailey Sun, 15 May 2005 22:22:21 -0400 + +klibc (1.0.8-0ubuntu1) breezy; urgency=low + + * Initial upload to Ubuntu. + + -- Jeff Bailey Mon, 9 May 2005 13:28:30 -0400 + +klibc (0.197-2) breezy; urgency=low + + * Make sure the shell is called 'sh' not 'sh.shared' when installed + * Don't strip execute permissions from the klibc + + -- Jeff Bailey Fri, 28 Jan 2005 17:27:07 -0500 + +klibc (0.197-1) breezy; urgency=low + + * Initial Release. + + -- Jeff Bailey Sun, 23 Jan 2005 21:11:50 -0500 + --- klibc-1.5.12.orig/debian/libklibc-dev.manpages +++ klibc-1.5.12/debian/libklibc-dev.manpages @@ -0,0 +1 @@ +klcc/klcc.1 --- klibc-1.5.12.orig/debian/libklibc-dev.install +++ klibc-1.5.12/debian/libklibc-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/klibc/include/* +debian/tmp/usr/lib/klibc/lib/* +debian/tmp/usr/bin/klcc* +debian/lintian/libklibc-dev usr/share/lintian/overrides --- klibc-1.5.12.orig/debian/klibc-utils.install +++ klibc-1.5.12/debian/klibc-utils.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/klibc/bin/* +debian/lintian/klibc-utils usr/share/lintian/overrides --- klibc-1.5.12.orig/debian/watch +++ klibc-1.5.12/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.kernel.org/pub/linux/libs/klibc/Testing/klibc-([0-9].[0-9].[0-9]+).tar.bz2 --- klibc-1.5.12.orig/debian/libklibc.install +++ klibc-1.5.12/debian/libklibc.install @@ -0,0 +1,2 @@ +debian/tmp/lib/klibc*.so +debian/lintian/libklibc usr/share/lintian/overrides --- klibc-1.5.12.orig/debian/libklibc-udeb.install +++ klibc-1.5.12/debian/libklibc-udeb.install @@ -0,0 +1 @@ +debian/tmp/lib/klibc*.so --- klibc-1.5.12.orig/debian/patches/11_klibc-Default-signal-3-to-bsd_signal-3.patch +++ klibc-1.5.12/debian/patches/11_klibc-Default-signal-3-to-bsd_signal-3.patch @@ -0,0 +1,97 @@ +From 40a8a74d148297bc029aafab844c3845fbe10186 Mon Sep 17 00:00:00 2001 +From: H. Peter Anvin +Date: Wed, 30 Jul 2008 14:04:34 -0700 +Subject: [PATCH] klibc: Default signal(3) to bsd_signal(3) + +The Linux universe, at least, seems to have settled on BSD semantics +for signal(3) -- even though signal(2) implements SysV semantics. +POSIX has gone from mandating SysV semantics to permitting either. + +Signed-off-by: H. Peter Anvin +--- + usr/include/signal.h | 3 +++ + usr/klibc/CAVEATS | 12 +----------- + usr/klibc/bsd_signal.c | 3 +++ + 3 files changed, 7 insertions(+), 11 deletions(-) + +diff --git a/usr/include/signal.h b/usr/include/signal.h +index bb6b470..a513282 100644 +--- a/usr/include/signal.h ++++ b/usr/include/signal.h +@@ -88,6 +88,9 @@ static __inline__ int sigismember(sigset_t * __set, int __signum) + } + + __extern __sighandler_t __signal(int, __sighandler_t, int); ++#ifndef signal ++__extern __sighandler_t signal(int, __sighandler_t); ++#endif + __extern __sighandler_t sysv_signal(int, __sighandler_t); + __extern __sighandler_t bsd_signal(int, __sighandler_t); + __extern int sigaction(int, const struct sigaction *, struct sigaction *); +diff --git a/usr/klibc/CAVEATS b/usr/klibc/CAVEATS +index 02b9b9e..2cead70 100644 +--- a/usr/klibc/CAVEATS ++++ b/usr/klibc/CAVEATS +@@ -4,7 +4,6 @@ + + optimization: + ------------- +- + Compiling with -O0 is not supported. It may or may not work; please + use -O1 if you want to do maximize debuggability. + +@@ -13,7 +12,6 @@ Compiling with -O0 is more likely to work on gcc 3. + + setjmp()/longjmp(): + ------------------- +- + setjmp() and longjmp() *do not* save signal state. sigsetjmp() and + siglongjmp() *do* save the signal mask -- regardless of the value of + the extra argument. +@@ -27,7 +25,6 @@ value of 0 you get what you deserve -- setjmp() will happily return 0. + + stdio: + ------ +- + Only a small subset of the stdio functions are implemented. Those + that are implemented do not buffer, although they *do* trap EINTR or + short read/writes and iterate. +@@ -38,23 +35,16 @@ read/write), but do handle EINTR/short return are also available. + + namespaces: + ----------- +- + klibc frequently includes headers in other headers in a way that + exposes more symbols than POSIX says they should. "Live with it." + + + theading: + --------- +- + klibc is not thread-safe. Consequently, clone() or any of the + pthreads functions are not included. + + + bsd_signal vs sysv_signal: + -------------------------- +- +-There is no signal() call, because you never know if you want +-Linux/SysV semantics (SA_RESETHAND) or GNU/BSD semantics (SA_RESTART). +-The best, in *any* circumstances, is to never use signal() and instead +-use sigaction(), but in order to simplify porting you can use either +-sysv_signal() or bsd_signal(), depending on what you actually want. ++signal() now defaults to bsd_signal(). +diff --git a/usr/klibc/bsd_signal.c b/usr/klibc/bsd_signal.c +index 4e6238c..3d78d2c 100644 +--- a/usr/klibc/bsd_signal.c ++++ b/usr/klibc/bsd_signal.c +@@ -9,3 +9,6 @@ __sighandler_t bsd_signal(int signum, __sighandler_t handler) + /* BSD signal() semantics */ + return __signal(signum, handler, SA_RESTART); + } ++ ++__sighandler_t signal(int signum, __sighandler_t handler) ++ __alias("bsd_signal"); +-- +1.5.6.3 + --- klibc-1.5.12.orig/debian/patches/10_insmod.patch +++ klibc-1.5.12/debian/patches/10_insmod.patch @@ -0,0 +1,172 @@ +revert upstream nuked insmod. +utilized by d-i floppies, can be dropped once m-i-t +packages an insmod/modprobe compiled against klibc. + +diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild +index 5b6dc28..09157a8 100644 +--- a/usr/utils/Kbuild ++++ b/usr/utils/Kbuild +@@ -4,7 +4,7 @@ + + progs := chroot dd mkdir mkfifo mknod mount pivot_root umount + progs += true false sleep ln nuke minips cat +-progs += uname halt kill readlink cpio sync dmesg ++progs += insmod uname halt kill readlink cpio sync dmesg + + static-y := $(addprefix static/, $(progs)) + shared-y := $(addprefix shared/, $(progs)) +@@ -42,6 +42,8 @@ static/minips-y := minips.o + shared/minips-y := minips.o + static/cat-y := cat.o + shared/cat-y := cat.o ++static/insmod-y := insmod.o ++shared/insmod-y := insmod.o + static/uname-y := uname.o + shared/uname-y := uname.o + static/halt-y := halt.o +diff --git a/usr/utils/insmod.c b/usr/utils/insmod.c +new file mode 100644 +index 0000000..47b5880 +--- /dev/null ++++ b/usr/utils/insmod.c +@@ -0,0 +1,140 @@ ++/* insmod.c: insert a module into the kernel. ++ Copyright (C) 2001 Rusty Russell. ++ Copyright (C) 2002 Rusty Russell, IBM Corporation. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++*/ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define streq(a,b) (strcmp((a),(b)) == 0) ++ ++/* This really needs to be in a header file... */ ++extern long init_module(void *, unsigned long, const char *); ++ ++static void print_usage(const char *progname) ++{ ++ fprintf(stderr, "Usage: %s filename [args]\n", progname); ++ exit(1); ++} ++ ++/* We use error numbers in a loose translation... */ ++static const char *moderror(int err) ++{ ++ switch (err) { ++ case ENOEXEC: ++ return "Invalid module format"; ++ case ENOENT: ++ return "Unknown symbol in module"; ++ case ESRCH: ++ return "Module has wrong symbol version"; ++ case EINVAL: ++ return "Invalid parameters"; ++ default: ++ return strerror(err); ++ } ++} ++ ++static void *grab_file(const char *filename, unsigned long *size) ++{ ++ unsigned int max = 16384; ++ int ret, fd; ++ void *buffer = malloc(max); ++ ++ if (streq(filename, "-")) ++ fd = dup(STDIN_FILENO); ++ else ++ fd = open(filename, O_RDONLY, 0); ++ ++ if (fd < 0) ++ return NULL; ++ ++ *size = 0; ++ while ((ret = read(fd, buffer + *size, max - *size)) > 0) { ++ *size += ret; ++ if (*size == max) ++ buffer = realloc(buffer, max *= 2); ++ } ++ if (ret < 0) { ++ free(buffer); ++ buffer = NULL; ++ } ++ close(fd); ++ return buffer; ++} ++ ++int main(int argc, char *argv[]) ++{ ++ int i; ++ long int ret; ++ unsigned long len; ++ void *file; ++ char *filename, *options = strdup(""); ++ char *progname = argv[0]; ++ ++ if (argv[1] && (streq(argv[1], "--version") || streq(argv[1], "-V"))) { ++ puts("klibc insmod"); ++ exit(0); ++ } ++ ++ /* Ignore old options, for backwards compat. */ ++ while (argv[1] && (streq(argv[1], "-p") ++ || streq(argv[1], "-s") ++ || streq(argv[1], "-f"))) { ++ argv++; ++ argc--; ++ } ++ ++ filename = argv[1]; ++ if (!filename) ++ print_usage(progname); ++ ++ /* Rest is options */ ++ for (i = 2; i < argc; i++) { ++ options = realloc(options, ++ strlen(options) + 2 + strlen(argv[i]) + 2); ++ /* Spaces handled by "" pairs, but no way of escaping ++ quotes */ ++ if (strchr(argv[i], ' ')) ++ strcat(options, "\""); ++ strcat(options, argv[i]); ++ if (strchr(argv[i], ' ')) ++ strcat(options, "\""); ++ strcat(options, " "); ++ } ++ ++ file = grab_file(filename, &len); ++ if (!file) { ++ fprintf(stderr, "insmod: can't read '%s': %s\n", ++ filename, strerror(errno)); ++ exit(1); ++ } ++ ++ ret = init_module(file, len, options); ++ if (ret != 0) { ++ fprintf(stderr, "insmod: error inserting '%s': %li %s\n", ++ filename, ret, moderror(errno)); ++ exit(1); ++ } ++ exit(0); ++} --- klibc-1.5.12.orig/debian/patches/01-ia64-static.diff +++ klibc-1.5.12/debian/patches/01-ia64-static.diff @@ -0,0 +1,91 @@ +diff --git a/usr/dash/Kbuild b/usr/dash/Kbuild +index 10e9591..b712a30 100644 +--- a/usr/dash/Kbuild ++++ b/usr/dash/Kbuild +@@ -108,4 +108,8 @@ # side effect.. + $(Q): + + # Targets to install ++ifeq ($(ARCH),ia64) ++install-y := sh ++else + install-y := sh.shared ++endif +diff --git a/usr/kinit/fstype/Kbuild b/usr/kinit/fstype/Kbuild +index 9b20db1..cfc5dd7 100644 +--- a/usr/kinit/fstype/Kbuild ++++ b/usr/kinit/fstype/Kbuild +@@ -22,4 +22,8 @@ shared/fstype-y := $(objs) + clean-dirs := static shared + + # install binary ++ifeq ($(ARCH),ia64) ++install-y := $(static-y) ++else + install-y := $(shared-y) ++endif +diff --git a/usr/kinit/ipconfig/Kbuild b/usr/kinit/ipconfig/Kbuild +index 7f8d181..7d67802 100644 +--- a/usr/kinit/ipconfig/Kbuild ++++ b/usr/kinit/ipconfig/Kbuild +@@ -28,4 +28,8 @@ shared/ipconfig-y := $(objs) + clean-dirs := static shared + + # install binary ++ifeq ($(ARCH),ia64) ++install-y := $(static-y) ++else + install-y := $(shared-y) ++endif +diff --git a/usr/kinit/nfsmount/Kbuild b/usr/kinit/nfsmount/Kbuild +index 461e6f3..af5e78f 100644 +--- a/usr/kinit/nfsmount/Kbuild ++++ b/usr/kinit/nfsmount/Kbuild +@@ -24,4 +24,8 @@ # TODO - do we want the static.g + share + clean-dirs := static shared + + # Install binary ++ifeq ($(ARCH),ia64) ++install-y := $(static-y) ++else + install-y := $(shared-y) ++endif +diff --git a/usr/kinit/resume/Kbuild b/usr/kinit/resume/Kbuild +index ce6d0ce..d0c74a9 100644 +--- a/usr/kinit/resume/Kbuild ++++ b/usr/kinit/resume/Kbuild +@@ -25,4 +25,8 @@ # Cleaning + clean-dirs := static shared + + # install binary ++ifeq ($(ARCH),ia64) ++install-y := $(static-y) ++else + install-y := $(shared-y) ++endif +diff --git a/usr/kinit/run-init/Kbuild b/usr/kinit/run-init/Kbuild +index 61a9d0b..64d3b1c 100644 +--- a/usr/kinit/run-init/Kbuild ++++ b/usr/kinit/run-init/Kbuild +@@ -22,4 +22,8 @@ shared/run-init-y := $(objs) + clean-dirs := static shared + + # install binary ++ifeq ($(ARCH),ia64) ++install-y := $(static-y) ++else + install-y := $(shared-y) ++endif +diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild +index f760a6b..e5054ef 100644 +--- a/usr/utils/Kbuild ++++ b/usr/utils/Kbuild +@@ -61,4 +61,8 @@ shared/uname-y := uname.o + clean-dirs := static shared + + # install only install the shared binaries ++ifeq ($(ARCH),ia64) ++install-y := $(static-y) static/reboot static/poweroff ++else + install-y := $(shared-y) shared/reboot shared/poweroff ++endif --- klibc-1.5.12.orig/debian/lintian/libklibc-dev +++ klibc-1.5.12/debian/lintian/libklibc-dev @@ -0,0 +1,2 @@ +libklibc-dev: statically-linked-binary +libklibc-dev: unstripped-binary-or-object --- klibc-1.5.12.orig/debian/lintian/klibc-utils +++ klibc-1.5.12/debian/lintian/klibc-utils @@ -0,0 +1 @@ +klibc-utils: statically-linked-binary --- klibc-1.5.12.orig/debian/lintian/libklibc +++ klibc-1.5.12/debian/lintian/libklibc @@ -0,0 +1 @@ +libklibc: statically-linked-binary